-
Notifications
You must be signed in to change notification settings - Fork 53
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
Paleo/ Search Page early/late intervals check and chips functionality #2285
base: paleo-test
Are you sure you want to change the base?
Conversation
Slight modification to the error text
…com/BioKIC/Symbiota into search-page-intervals-and-chips-fix
js/symb/collections.harvestparams.js
Outdated
let early = frm.earlyInterval.value; | ||
let late = frm.lateInterval.value; | ||
if ((early !== "" && late === "") || (early === "" && late !== "")) { | ||
alert("Both Early Interval and Late Interval need to have a value selected, even if the values are the same."); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Translate
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see collections/search/js/alerts.js for js file implementation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Atticus29 Solved in 28ce6e6
js/symb/collections.harvestparams.js
Outdated
return false; | ||
} | ||
if (early in paleoTimes && late in paleoTimes && paleoTimes[early].myaStart < paleoTimes[late].myaEnd) { | ||
alert("The Early Interval must be geologically older than the Late Interval."); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Translate
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Atticus29 Solved in 28ce6e6
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
…added a float cast to myaStart and myaEnd
@Atticus29 Solved in 28ce6e6 |
Changes Made:
@Atticus29 ! I changed the associations data-chips to make the selector elements chip adding/removal uniform. This might break some of your code that I'm unaware of or make some functions redundant (setAssociationTaxonTypeToDefault() and similar are still used though).
Minor:
Pull Request Checklist:
Pre-Approval
master
branch and PR'd using the merge option (not squashed) into thehotfix
branch.Development
branch, NOTmaster
Post-Approval
Development
branch, remember to use the squash & merge optionhotfix
branch, remember to use the merge option (i.e., no squash).Development
branch into the master branch, remember to use the merge optionhotfix
branch into themaster
branch use the squash & merge optionmaster
intoDevelopment
should be made with the merge option (i.e., no squash).hotfix
branch and create a newhotfix
branchhotfix
branch.Development
branch before a tagged release (i.e., before an imminent merge into the master branch), make sure to notify the team and lock theDevelopment
branch to prevent accidental merges while QA takes place. Follow the release protocol here.Thanks for contributing and keeping it clean!