Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Master-overhaul into Master #288

Merged
merged 178 commits into from
Aug 30, 2023
Merged
Changes from 1 commit
Commits
Show all changes
178 commits
Select commit Hold shift + click to select a range
4dbd4ff
Removing Participant Email field from Source submitting page
Ram6911 Sep 6, 2022
31dac11
Update main.yml
cassidysymons Sep 22, 2022
d0ced4e
Merge pull request #241 from biocore/csymons-overhaul-workflow-fix
wasade Sep 22, 2022
755ec6b
Merge remote-tracking branch 'upstream/master-overhaul' into ramp_rem…
Ram6911 Sep 22, 2022
83d8f9f
Workflow fix for overhaul
cassidysymons Sep 28, 2022
f028603
Merge pull request #243 from biocore/csymons_workflow_adjustment_2
wasade Sep 28, 2022
d9742be
Update main.yml
cassidysymons Sep 28, 2022
0cca05a
Merge remote-tracking branch 'upstream/master-overhaul' into ramp_rem…
Ram6911 Sep 28, 2022
d5e217f
Update account_details.jinja2
ragini7913 Sep 29, 2022
bcd2401
Update account_details.jinja2
ragini7913 Sep 29, 2022
3408a72
Update implementation.py
ragini7913 Sep 29, 2022
fd2a0a3
Update test_integration.py
ragini7913 Sep 29, 2022
711b4c1
Update implementation.py
ragini7913 Sep 29, 2022
145c8b6
Update implementation.py
ragini7913 Sep 29, 2022
c8b514b
Update test_integration.py
ragini7913 Sep 29, 2022
b781d82
Merge pull request #236 from Ram6911/ramp_remove_email_field_on_source
cassidysymons Sep 29, 2022
1059298
Merge pull request #244 from ragini7913/master-overhaul
cassidysymons Sep 29, 2022
6fa5e5e
Merge branch 'master-overhaul' into csymons_overhaul_catchup
cassidysymons Oct 4, 2022
25a9784
Merge pull request #245 from biocore/csymons_overhaul_catchup
cassidysymons Oct 4, 2022
7e7dabd
Merge pull request #263 from biocore/master
cassidysymons Nov 9, 2022
efeeddd
Consent Changes for Data and Bio (#251)
ragini7913 Jan 3, 2023
74cb1dc
Python 3.6 -> 3.7
cassidysymons Jan 6, 2023
64e4794
Initial commit for testing
cassidysymons Jan 12, 2023
6d805ce
Revert "Initial commit for testing"
cassidysymons Jan 12, 2023
8e868a6
Initial commit for testing
cassidysymons Jan 12, 2023
a47ac23
Survey & consent adjustments
cassidysymons Jan 17, 2023
ad62ec3
Survey fix
cassidysymons Jan 17, 2023
234336f
Pin flask-babel to 2.0.0
cassidysymons Jan 17, 2023
02b6438
Survey question numbering
cassidysymons Jan 18, 2023
cd768c1
Initial kit testing
cassidysymons Jan 19, 2023
6b31b7e
Initial kit testing
cassidysymons Jan 19, 2023
2c21408
Fixes
cassidysymons Jan 20, 2023
0b6c141
UI adjustments
cassidysymons Jan 23, 2023
a17715e
UI adjustments
cassidysymons Jan 24, 2023
47878d3
UI adjustments
cassidysymons Jan 25, 2023
ae333c1
UI adjustments
cassidysymons Jan 25, 2023
0d21cae
UI adjustments
cassidysymons Jan 25, 2023
948cf97
UI adjustments
cassidysymons Jan 25, 2023
94ee37a
UI adjustments
cassidysymons Jan 26, 2023
bb8c9e7
UI adjustments
cassidysymons Jan 30, 2023
6ca41a6
UI adjustments
cassidysymons Jan 30, 2023
da00ae5
UI adjustments
cassidysymons Jan 30, 2023
f9d0949
UI adjustments
cassidysymons Jan 31, 2023
cd96913
UI adjustments
cassidysymons Jan 31, 2023
77769b3
UI adjustments
cassidysymons Jan 31, 2023
3c59f09
UI adjustments
cassidysymons Jan 31, 2023
b430281
UI adjustments
cassidysymons Feb 1, 2023
cb19b95
UI adjustments
cassidysymons Feb 1, 2023
86b8e0d
Merge remote-tracking branch 'origin/master-overhaul' into csymons_ov…
cassidysymons Feb 1, 2023
b5ad792
UI adjustments
cassidysymons Feb 1, 2023
04065ef
UI adjustments
cassidysymons Feb 1, 2023
6d8f719
UI adjustments
cassidysymons Feb 1, 2023
d002955
UI adjustments
cassidysymons Feb 1, 2023
cd887b0
UI adjustments
cassidysymons Feb 1, 2023
3b284a3
UI adjustments
cassidysymons Feb 1, 2023
e066557
UI adjustments
cassidysymons Feb 1, 2023
ae4f996
UI adjustments
cassidysymons Feb 1, 2023
68118ff
UI adjustments
cassidysymons Feb 1, 2023
617e761
UI adjustments
cassidysymons Feb 1, 2023
08b5c00
UI adjustments
cassidysymons Feb 2, 2023
93eb6a4
UI adjustments
cassidysymons Feb 2, 2023
86baa75
UI adjustments
cassidysymons Feb 2, 2023
0030a9b
UI adjustments
cassidysymons Feb 2, 2023
bba72ce
UI adjustments
cassidysymons Feb 2, 2023
389cea2
UI adjustments
cassidysymons Feb 2, 2023
7d9b156
UI adjustments
cassidysymons Feb 2, 2023
bf6e295
Get master-overhaul current (#269)
cassidysymons Feb 2, 2023
3265f6a
Revert "Get master-overhaul current (#269)" (#270)
cassidysymons Feb 2, 2023
194221c
Merge pull request #271 from biocore/master
cassidysymons Feb 2, 2023
5358766
UI adjustments
cassidysymons Feb 3, 2023
014039f
Merge branch 'master-overhaul' into csymons_overhaul
cassidysymons Feb 7, 2023
0fb3614
Update microsetta_interface/implementation.py
cassidysymons Feb 14, 2023
f233c2c
Update microsetta_interface/templates/survey.jinja2
cassidysymons Feb 14, 2023
8e30742
Update microsetta_interface/implementation.py
cassidysymons Feb 14, 2023
a8e2966
Update microsetta_interface/implementation.py
cassidysymons Feb 14, 2023
0c1a068
Update microsetta_interface/implementation.py
cassidysymons Feb 14, 2023
f3ba2a8
Update microsetta_interface/implementation.py
cassidysymons Feb 14, 2023
26ec5db
Update microsetta_interface/static/css/minimal_interface.css
cassidysymons Feb 14, 2023
116c89d
Update microsetta_interface/templates/consents.jinja2
cassidysymons Feb 14, 2023
5e421c9
Update microsetta_interface/templates/consents.jinja2
cassidysymons Feb 14, 2023
1e66850
Update microsetta_interface/templates/consents.jinja2
cassidysymons Feb 14, 2023
6b91d58
Update microsetta_interface/templates/kits.jinja2
cassidysymons Feb 14, 2023
a43524f
Update microsetta_interface/implementation.py
cassidysymons Feb 14, 2023
65e4d83
Update microsetta_interface/templates/kits.jinja2
cassidysymons Feb 14, 2023
7afb7d1
Update microsetta_interface/templates/new_participant.jinja2
cassidysymons Feb 14, 2023
13dbb48
Update microsetta_interface/templates/reports.jinja2
cassidysymons Feb 14, 2023
bcd0f6d
Update microsetta_interface/templates/source.jinja2
cassidysymons Feb 14, 2023
d531892
Update microsetta_interface/templates/sample.jinja2
cassidysymons Feb 14, 2023
9a44f38
Update microsetta_interface/templates/survey.jinja2
cassidysymons Feb 14, 2023
e034ca1
Update microsetta_interface/templates/sample.jinja2
cassidysymons Feb 14, 2023
906feb4
Update microsetta_interface/templates/sample.jinja2
cassidysymons Feb 14, 2023
735fd3e
Update microsetta_interface/templates/sitebase.jinja2
cassidysymons Feb 14, 2023
c41bcc8
Update microsetta_interface/templates/survey.jinja2
cassidysymons Feb 14, 2023
96f921a
Update microsetta_interface/templates/survey.jinja2
cassidysymons Feb 14, 2023
bcd8378
Update microsetta_interface/templates/source.jinja2
cassidysymons Feb 14, 2023
717ed51
Update microsetta_interface/templates/source.jinja2
cassidysymons Feb 14, 2023
7dcee3f
Code review changes
cassidysymons Feb 15, 2023
ee38219
Lint fixes
cassidysymons Feb 15, 2023
90ab335
Test adjustments
cassidysymons Feb 15, 2023
c1d33ff
Fix babel issue
cassidysymons Feb 15, 2023
827b738
Fix babel issue
cassidysymons Feb 15, 2023
3bb07a3
Test adjustments
cassidysymons Feb 15, 2023
6f891d8
State machine update + minor adjustments
cassidysymons Feb 22, 2023
1c63149
Lint + tests
cassidysymons Feb 22, 2023
09b19df
Lint + tests
cassidysymons Feb 22, 2023
ad51bd3
Integration
cassidysymons Feb 22, 2023
e564375
Integration
cassidysymons Feb 22, 2023
d370088
Integration
cassidysymons Feb 22, 2023
6391fb5
Integration
cassidysymons Feb 22, 2023
6f0d8b5
Integration
cassidysymons Feb 22, 2023
d5148f2
Integration
cassidysymons Feb 22, 2023
127f54f
Integration
cassidysymons Feb 22, 2023
c634fc9
Integration
cassidysymons Feb 22, 2023
953e491
Update microsetta_interface/tests/test_integration.py
cassidysymons Feb 22, 2023
ee053c3
Update microsetta_interface/tests/test_integration.py
cassidysymons Feb 22, 2023
011baf0
Merge pull request #268 from biocore/csymons_overhaul
cassidysymons Feb 22, 2023
1f53ee1
Remove COVID-19 survey
cassidysymons Feb 24, 2023
62e17e3
Merge pull request #272 from biocore/csymons_covid_survey_reorg
cassidysymons Feb 27, 2023
5b287e9
Updates for Spanish (es_MX & es_ES) + responsiveness adjustments
cassidysymons Feb 28, 2023
c21b9c8
Minor UI fixes
cassidysymons Mar 1, 2023
bdba7c7
Fix API path for profile scrub
cassidysymons Mar 1, 2023
8f03425
Resolve sort error
cassidysymons Mar 1, 2023
626a563
UI adjustments + bug fixes
cassidysymons Mar 8, 2023
6eed1c8
Lint fix
cassidysymons Mar 8, 2023
393fa4f
Minor fixes
cassidysymons Mar 8, 2023
0151a8f
Minor fixes
cassidysymons Mar 8, 2023
e9c5323
Updated translations
cassidysymons Mar 9, 2023
9fa6b78
Updated translations
cassidysymons Mar 9, 2023
03a1c54
Requested changes
cassidysymons Jun 5, 2023
1b1811d
Merge pull request #274 from biocore/csymons_spanish_updates
wasade Jun 6, 2023
afa4a89
Prompt to update surveys + test mode message
cassidysymons Jun 16, 2023
7844055
Debug
cassidysymons Jun 16, 2023
c323cdb
Debug
cassidysymons Jun 16, 2023
b3ec433
Debug
cassidysymons Jun 16, 2023
6630b0a
Debug
cassidysymons Jun 16, 2023
74dc3de
Remove debug info
cassidysymons Jun 16, 2023
8864f24
Update microsetta_interface/implementation.py
cassidysymons Jun 26, 2023
c0bfbe2
Merge pull request #281 from biocore/csymons_survey_prompt
cassidysymons Jun 26, 2023
86432e7
Merge remote-tracking branch 'origin/master' into csymons_overhaul_co…
cassidysymons Jun 27, 2023
ceee041
Conflict resolutions + updated PO files
cassidysymons Jun 27, 2023
5e19d8b
Merge pull request #282 from biocore/csymons_overhaul_conflicts
wasade Jul 26, 2023
adcec8a
Hide taxa violin graph
cassidysymons Aug 3, 2023
7f6e980
Fix multivitamin question
cassidysymons Aug 3, 2023
1e44faf
Fix minor CSS issues on Diversity tab
cassidysymons Aug 3, 2023
d2e7114
Fix spacing
cassidysymons Aug 3, 2023
17ef0c6
Merge pull request #283 from biocore/csymons_20230803
cassidysymons Aug 4, 2023
133a64e
Post-testing adjustments
cassidysymons Aug 22, 2023
fb210b7
Results dataset testing
cassidysymons Aug 22, 2023
5c87b27
Results dataset testing
cassidysymons Aug 22, 2023
16e5f25
Results dataset testing
cassidysymons Aug 22, 2023
f701448
Add study 11546 to results
cassidysymons Aug 22, 2023
906f4e0
Lint
cassidysymons Aug 22, 2023
6fd615a
Age field change
cassidysymons Aug 22, 2023
4f60e20
Revert age change
cassidysymons Aug 22, 2023
5c3ac9b
Requested changes
cassidysymons Aug 22, 2023
7b9ce0f
Merge pull request #284 from biocore/csymons_overhaul_feedback
cassidysymons Aug 23, 2023
1e7aced
Tweaks to reconsent pathing + minor fixes
cassidysymons Aug 23, 2023
3d1090d
Fixes
cassidysymons Aug 24, 2023
416c0ae
Report content updates
cassidysymons Aug 24, 2023
b54e042
Report content updates
cassidysymons Aug 24, 2023
bfb3884
Report content updates
cassidysymons Aug 24, 2023
8000f0f
Report content updates
cassidysymons Aug 24, 2023
95f3a28
Report content updates
cassidysymons Aug 24, 2023
0b5d4f0
Report content updates
cassidysymons Aug 24, 2023
1bf11cd
Allow admins to update samples without current consent
cassidysymons Aug 24, 2023
2b70a6c
Lint
cassidysymons Aug 24, 2023
f2a45fb
Add missing gettext calls
cassidysymons Aug 27, 2023
5a49346
Disable Japanese locale
cassidysymons Aug 28, 2023
910d74d
Update microsetta_interface/implementation.py
cassidysymons Aug 28, 2023
c6df5c7
Update microsetta_interface/implementation.py
cassidysymons Aug 28, 2023
3d3d573
Requested changes
cassidysymons Aug 28, 2023
1ed2273
Merge pull request #285 from biocore/csymons_overhaul_20230823
wasade Aug 29, 2023
7a3f906
Merge pull request #286 from biocore/csymons_disable_japanese
wasade Aug 29, 2023
411ba00
Spanish updates
cassidysymons Aug 29, 2023
5cf9398
Spanish updates
cassidysymons Aug 29, 2023
5010cd7
Spanish updates
cassidysymons Aug 29, 2023
2e2132b
Spanish updates
cassidysymons Aug 29, 2023
1fb5528
Merge pull request #287 from biocore/csymons_spanish_20230829
cassidysymons Aug 29, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Report content updates
cassidysymons committed Aug 24, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 0b5d4f0343f49ab4185b2cde1ca1032fa7c39756
4 changes: 2 additions & 2 deletions microsetta_interface/templates/new_results_page.jinja2
Original file line number Diff line number Diff line change
@@ -1370,7 +1370,7 @@
</p>

<p>
{{ _('While our human DNA is 99%% similar to one another, it\'s possible for two individuals to share zero microbial species, meaning that our microbiomes can be entirely unique. We\'ve analyzed your microbiome sample using next-generation DNA sequencing methods, and the results are broken down below in a variety of categories. Find out how you compare to your fellow citizen scientists.') }}:
{{ _('While our human DNA is 99%% similar to one another, it\'s possible for two individuals to share zero microbial species, meaning that our microbiomes can be entirely unique. We\'ve analyzed your microbiome sample using next-generation DNA sequencing methods, and the results are broken down below in a variety of categories. Find out how you compare to your fellow citizen scientists.') }}
</p>

<div class="how_you_compare_section">
@@ -1413,7 +1413,7 @@
{{ _('Recent estimates suggest hundreds of billions of types of microbes live on earth. This number dwarfs the meager 2 million different kinds of animals and plants discovered on the planet.') }}
</p>
<p>
{{ _('If we were to randomly select a set number of microbial DNA sequences from a stool sample, we would find that the&nbsp;<span id="average-us-tooltip" class="orange-text" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="top" title="Based on fecal samples from Microsetta participants in the United States">average</span>&nbsp;American has&nbsp;<strong id="average-american-observed-otus">FILLIN</strong>&nbsp;different types of microbes, which is lower than we find in people living a more hunter-gatherer lifestyle, like the&nbsp;<strong id="average-hadza-observed-otus">FILLIN</strong>&nbsp;we find in samples from the&nbsp;<span id="taxa-tooltip" class="orange-text" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="top" title="The Hadza are an indigenous hunter-gather group in Tanzania. The summary of the Hadza microbiome is based on <a href=\'foobar.com\'>Smits et al. Science 2017</a>">Hadza</span>&nbsp;people of Tanzania.') }}
{{ _('If we were to randomly select a set number of microbial DNA sequences from a stool sample, we would find that the&nbsp;<span id="average-us-tooltip" class="orange-text" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="top" title="Based on fecal samples from Microsetta participants in the United States">average</span>&nbsp;American has&nbsp;<strong id="average-american-observed-otus">FILLIN</strong>&nbsp;different types of microbes, which is lower than we find in people living a more hunter-gatherer lifestyle, like the&nbsp;<strong id="average-hadza-observed-otus">FILLIN</strong>&nbsp;we find in samples from the&nbsp;<span id="taxa-tooltip" class="orange-text" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="top" title="The Hadza are an indigenous hunter-gather group in Tanzania. The summary of the Hadza microbiome is based on Smits et al. Science 2017">Hadza</span>&nbsp;people of Tanzania.') }}
</p>
<p>
{{ _('The number of microbes found in your sample can be very close or vastly different from this average, and it doesn\'t necessarily mean something is right or wrong with you. We are all different, and this number is affected by many different factors.') }}