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

Reconsent Tweaks & Results Report Content #285

Merged
merged 12 commits into from
Aug 29, 2023

Conversation

cassidysymons
Copy link
Collaborator

@cassidysymons cassidysymons commented Aug 24, 2023

  • Adjustments to reconsent paths based on final testing
  • Updates to results report content that were missed earlier

@cassidysymons cassidysymons changed the base branch from master to master-overhaul August 24, 2023 18:37
@cassidysymons cassidysymons requested a review from wasade August 24, 2023 18:52
microsetta_interface/implementation.py Show resolved Hide resolved
microsetta_interface/implementation.py Show resolved Hide resolved
@@ -211,19 +211,27 @@
{% block content%}

<div class="container default-container">
{% if reconsent is not none %}
{% if reconsent != None %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prior didn't work? I thought none was the preferred form for the template?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adjusted

@@ -1363,11 +1366,11 @@
<img class="diversity-banner" src='/static/img/{{ _(EN_US_KEY) }}/hero-home-4-xl.jpeg'>
<br/><br />
<p>
{{ _('Your microbiome is a rainforest of diverse microbes dominated by microbes - some 40 trillion bacteria, weighing around 1 lb, live all over and in your body. The diversity of your microbiome, how similar it is to other peoples\', and the types of bacteria living inside you have all been linked to health, disease and lifestyle traits in numerous studies.') }}
{{ _('There are 40 trillion microbial cells in our bodies. This collection of microbial cells is known as the human microbiome. With roughly 3lbs (1.4kgs) of them in our gut alone, we\'re on a mission to make critical discoveries about their role in our lives. Thank you for contributing to our research project and helping advance the science.') }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The weight is not supported, see https://www.nature.com/articles/s41564-023-01426-7, which suggests ~1lb

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed the verbiage

</div>
</div>
<div class="row mt-2">
<div class="col-12">
<label for="sample_site" name="sample_site_label" class="sample-label">{{ _('Sample Type') }}*</label>
<select id="sample_site" name="sample_site" class="form-control" required {% if sample.sample_edit_locked and not admin_mode %}disabled{% endif %}>
<select id="sample_site" name="sample_site" class="form-control" required {% if (sample.sample_edit_locked and not admin_mode) or ((need_reconsent_data or need_reconsent_biospecimen) and not admin_mode) %}disabled{% endif %}>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

admin_mode test is performed twice

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@@ -228,7 +241,7 @@
<div class="row mt-2">
<div class="col-12">
<label for="sample_notes" id="sample_notes_label" class="sample-label">{{ _('Notes') }}</label>
<textarea class="form-control" id="sample_notes" name="sample_notes" placeholder="{{ _('(Optional) Is there anything else about this sample that you would like to add?') }}" rows=3 {% if sample.sample_edit_locked and not admin_mode %}disabled{% endif %}>{{ sample.sample_notes if sample.sample_notes is not none else '' |e}}</textarea>
<textarea class="form-control" id="sample_notes" name="sample_notes" placeholder="{{ _('(Optional) Is there anything else about this sample that you would like to add?') }}" rows=3 {% if (sample.sample_edit_locked and not admin_mode) or ((need_reconsent_data or need_reconsent_biospecimen) and not admin_mode) %}disabled{% endif %}>{{ sample.sample_notes if sample.sample_notes is not none else '' |e}}</textarea>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@wasade wasade merged commit 1ed2273 into master-overhaul Aug 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants