Limit Sample Collection Date #226
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
Changes made to prevent user form submitting blank surveys in cooking oils and surfer questioner.
cassidysymons
requested changes
Jul 29, 2022
| upper_limit .setDate(upper_limit.getDate()); | ||
| upper_limit .setMonth(upper_limit.getMonth() + 1); | ||
| if(date.getTime() < lower_limit.getTime()) { | ||
| alert('Please select a date within the last 10 years.') |
There was a problem hiding this comment.
Please wrap this string in gettext shorthand (e.g. {{ _('Please select...') }}
| alert('Please select a date within the last 10 years.') | ||
| e.preventDefault(e); | ||
| } else if (date.getTime() > upper_limit.getTime()) { | ||
| alert('Please select a date within the next 30 days.') |
There was a problem hiding this comment.
Please wrap this string in gettext shorthand
| form_submitted = 1; | ||
| } | ||
| else { | ||
| alert("It looks like you're trying to submit this survey without answering any questions. If you'd prefer not to complete this survey, please return to the homepage.") |
There was a problem hiding this comment.
Please wrap this string in gettext shorthand
used gettext shorthand for alert message
used gettext shorthand for alert message
changed you're to you are in the alert text
Added the messages for for survey and sample jinja2 file
cassidysymons
requested changes
Aug 3, 2022
Comment on lines
24
to
25
| lower_limit .setDate(lower_limit.getDate()); | ||
| lower_limit .setMonth(lower_limit.getMonth()); |
There was a problem hiding this comment.
These lines are unnecessary
Suggested change
| lower_limit .setDate(lower_limit.getDate()); | |
| lower_limit .setMonth(lower_limit.getMonth()); |
Comment on lines
27
to
28
| upper_limit .setFullYear( upper_limit.getFullYear() ); | ||
| upper_limit .setDate(upper_limit.getDate()); |
There was a problem hiding this comment.
These lines are unnecessary
Suggested change
| upper_limit .setFullYear( upper_limit.getFullYear() ); | |
| upper_limit .setDate(upper_limit.getDate()); |
| upper_limit .setFullYear( upper_limit.getFullYear() ); | ||
| upper_limit .setDate(upper_limit.getDate()); | ||
| upper_limit .setMonth(upper_limit.getMonth() + 1); | ||
| if(date.getTime() < lower_limit.getTime()) { |
There was a problem hiding this comment.
You can directly compare date objects with the < and > operators, you just can't check equality directly.
Suggested change
| if(date.getTime() < lower_limit.getTime()) { | |
| if(date < lower_limit) { |
| if(date.getTime() < lower_limit.getTime()) { | ||
| alert("{{ _('Please select a date within the last 10 years.') }}") | ||
| e.preventDefault(e); | ||
| } else if (date.getTime() > upper_limit.getTime()) { |
There was a problem hiding this comment.
You can directly compare date objects with the < and > operators, you just can't check equality directly.
Suggested change
| } else if (date.getTime() > upper_limit.getTime()) { | |
| } else if (date > upper_limit) { |
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.
limit the collection date that can be selected for a sample.