Allow Minors to Change age_range on Source #306
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wasade
requested changes
Dec 11, 2023
| <input type="radio" id="age-range-3" name="age-range" value="13-17" onchange="change_consent_div(this)"> | ||
| <label for="age-range-3" class="consent-age-label">{{ tl['PARTICIPANT_FORM']['AGE_13_17'] |e}}</label> | ||
| </div> | ||
| {% if cur_age_index <= 0 %} |
There was a problem hiding this comment.
This and below is testing against a magic number. Can this be changed to test against an exact value, eg if cur_age in ('UNKNOWN', '0-6')? Though ideally these aren't strings but instead string literals though that may be weird crossing the boundary into jinja
There was a problem hiding this comment.
Changed the magic number situation. The age ranges are now string literals in implementation.py, but I agree that copying them into the jinja2 template would be both weird and clunky. Other than that, this PR is ready for re-review, but it won't pass integration tests until the corresponding Private API PR has been merged.
Co-authored-by: Daniel McDonald <[email protected]>
|
Thanks!
…On Mon, Dec 11, 2023, 15:29 Cassidy Symons ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In microsetta_interface/templates/new_participant.jinja2
<https://urldefense.com/v3/__https://github.com/biocore/microsetta-interface/pull/306*discussion_r1423235224__;Iw!!Mih3wA!GRhP66cHrp6JNRGy8S5SySBzst0TwEh_7mk9ovLF44iTCdj4rjlqQBIsRSCNrX2M6CXLBHfWppklP_Ga0qk8umH58Fhl8zFEP-vG5g$>
:
> @@ -243,18 +258,24 @@
</div>
<div class="row mb-4">
{% if language_tag != "ja_JP" %}
- <div class="col-md">
- <input type="radio" id="age-range-1" name="age-range" value="0-6" onchange="change_consent_div(this)">
- <label for="age-range-1" class="consent-age-label">{{ tl['PARTICIPANT_FORM']['AGE_0_6'] |e}}</label>
- </div>
- <div class="col-md">
- <input type="radio" id="age-range-2" name="age-range" value="7-12" onchange="change_consent_div(this)">
- <label for="age-range-2" class="consent-age-label">{{ tl['PARTICIPANT_FORM']['AGE_7_12'] |e}}</label>
- </div>
- <div class="col-md">
- <input type="radio" id="age-range-3" name="age-range" value="13-17" onchange="change_consent_div(this)">
- <label for="age-range-3" class="consent-age-label">{{ tl['PARTICIPANT_FORM']['AGE_13_17'] |e}}</label>
- </div>
+ {% if cur_age_index <= 0 %}
Changed the magic number situation. The age ranges are now string literals
in implementation.py, but I agree that copying them into the jinja2
template would be both weird and clunky. Other than that, this PR is ready
for re-review, but it won't pass integration tests until the corresponding
Private API PR has been merged.
—
Reply to this email directly, view it on GitHub
<https://urldefense.com/v3/__https://github.com/biocore/microsetta-interface/pull/306*discussion_r1423235224__;Iw!!Mih3wA!GRhP66cHrp6JNRGy8S5SySBzst0TwEh_7mk9ovLF44iTCdj4rjlqQBIsRSCNrX2M6CXLBHfWppklP_Ga0qk8umH58Fhl8zFEP-vG5g$>,
or unsubscribe
<https://urldefense.com/v3/__https://github.com/notifications/unsubscribe-auth/AADTZMV6YZHZF2D7EXVEL7TYI6JNRAVCNFSM6AAAAABAOJRUYOVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMYTONZWGM2DMMRZHA__;!!Mih3wA!GRhP66cHrp6JNRGy8S5SySBzst0TwEh_7mk9ovLF44iTCdj4rjlqQBIsRSCNrX2M6CXLBHfWppklP_Ga0qk8umH58Fhl8zGu3pozZQ$>
.
You are receiving this because your review was requested.Message ID:
***@***.***>
|
|
@wasade Workflow is passing now after merging the corresponding Private API PR. Any further feedback or is this also good to merge? |
|
Nah, +1, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.