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

Paleo/ Search Page early/late intervals check and chips functionality #2285

Open
wants to merge 10 commits into
base: paleo-test
Choose a base branch
from

Conversation

NikitaSalikov
Copy link
Collaborator

@NikitaSalikov NikitaSalikov commented Feb 28, 2025

Changes Made:

  • added error handling for cases when early interval is later than late and when either early or late interval field is empty
  • implemented the chips functionality for selectors by adding the option elements to chips functions (addChip(), handleRemoval(). (!) This should probably be part of Development.

@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:

  • made geo context search section conditional on PALEO_ACTIVATED
  • declared paleoTimes const for checking the Mya for each chronostratigraphic time in paleogts table.

Pull Request Checklist:

Pre-Approval

  • There is a description section in the pull request that details what the proposed changes do. It can be very brief if need be, but it ought to exist.
  • Hotfixes should be branched off of the master branch and PR'd using the merge option (not squashed) into the hotfix branch.
  • Features and backlog bugs should be merged into the Development branch, NOT master
  • All new text is preferably internationalized (i.e., no end-user-visible text is hard-coded on the PHP pages), and the spreadsheet tracking internationalizations has been updated either with a new row or with checkmarks to existing rows.
  • There are no linter errors
  • New features have responsive design (i.e., look aesthetically pleasing both full screen and with small or mobile screens)
  • Symbiota coding standards have been followed
  • If any files have been reformatted (e.g., by an autoformatter), the reformat is its own, separate commit in the PR
  • Comment which GitHub issue(s), if any does this PR address
  • If this PR makes any changes that would require additional configuration of any Symbiota portals outside of the files tracked in this repository, make sure that those changes are detailed in this document.

Post-Approval

  • It is the code author's responsibility to merge their own pull request after it has been approved
  • If this PR represents a merge into the Development branch, remember to use the squash & merge option
  • If this PR represents a merge into the hotfix branch, remember to use the merge option (i.e., no squash).
  • If this PR represents a merge from the Development branch into the master branch, remember to use the merge option
  • If this PR represents a merge from the hotfix branch into the master branch use the squash & merge option
    • a subsequent PR from master into Development should be made with the merge option (i.e., no squash).
    • Immediately delete the hotfix branch and create a new hotfix branch
    • increment the Symbiota version number in the symbase.php file and commit to the hotfix branch.
  • If the dev team has agreed that this PR represents the last PR going into the Development branch before a tagged release (i.e., before an imminent merge into the master branch), make sure to notify the team and lock the Development branch to prevent accidental merges while QA takes place. Follow the release protocol here.
  • Don't forget to delete your feature branch upon merge. Ignore this step as required.

Thanks for contributing and keeping it clean!

Slight modification to the error text
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.");
Copy link
Collaborator

Choose a reason for hiding this comment

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

Translate

Copy link
Collaborator

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.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@Atticus29 Solved in 28ce6e6

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.");
Copy link
Collaborator

Choose a reason for hiding this comment

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

Translate

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@Atticus29 Solved in 28ce6e6

Copy link
Collaborator

@Atticus29 Atticus29 left a comment

Choose a reason for hiding this comment

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

The chip stuff seems to be working fine. Thanks for improving it!

Per our convo., I'm seeing some issues if $ACTIVATE_PALEO is set to false:
Screenshot 2025-03-13 at 12 22 52 PM

@NikitaSalikov
Copy link
Collaborator Author

The chip stuff seems to be working fine. Thanks for improving it!

Per our convo., I'm seeing some issues if $ACTIVATE_PALEO is set to false:

@Atticus29 Solved in 28ce6e6

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.

3 participants