Merge resolution branch into biorepo master #559
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
…lict Hotfix 2024-05-17
- Convert Media POST and PUT data input from parameter values to a data object passed within the body - Some improvement with response documentation - Fix duplicate operationId values - Rebuild Swagger API documentation
* uses leaflet path method to set color so that it will update when group is not re drawn closes 1319 * close BioKIC#1320, addes check for catnum
* adds check for duplicate collectionCode / institutionalCode key when updating collection meta data and gives status msg upon failure closes BioKIC#1311 * changes wording of duplicate error * link error to new tab * fixes lang tag error for collmetadata.php title
* Update searchform.js Fix sessionStorage.querystring bug. Javascript was not handling setting db (collections) checkbox array from user sessionStorage. * Update searchform.js Correcting variable name
This reverts commit 79e2a1b.
…oKIC#1343) * cloFix Occur Editor Nav visiblity with no results closes BioKIC#1333 Shifts conditional hiding search form down a level so it only blocks tabs that way navigation is still possible when there is no query results * shifts formating to correct from one less conditional
The image info was being pushed down to the baseline of the displayed image. This fix creates a new class that resets the cell alignment to top aligned.
* Update ProfileManager.php Confirms if 'accessibilityPref' is set in user's dynamic properties and sets AccessibilityPreference to false by default if not.
…KIC#1348) # Issue 1340 # Summary This should fit the bottom scroll bar into view when their is few results.
* remove some font-family references * remove in-line styling for font-family in all files not .scss, .css, vendor, .js, .less, .html, or .map * remove <b> from one of the fieldset-likes * add reference to font-family in reset.css * remove unecessary font-size restriction on fields-available chips
* fix the page flow bugs but confirm existing collection persistance issues * display which collections are to be queried in harvest params * solve the collection selection for the new search page * clean up and subfunctionalize * slight refactor to improve readability * add minor aesthetic improvement * add styling class * remove collection display in harvest params * remove translations that are now cruft
This reverts commit 6580a7a.
- Parse tags and values found within omoccurrences:otherCatalogNumbers field and display within additional identifiers table within the occurrence editor. If form is saved, parsed values are saved within omoccuridentiers table.
othercatalogNumber parsing bug fix
- Fix issue with taxon remapping/merging into another taxon failing due to key violations within taxstatus (relationship already exists). This is another issue with PHP 8.2 throwing fatal error for mysql warnings. Adding an IGNORE to statement solves the issue since already existing relationships don't need to be transferred, and will be deleted when secondary taxon is deleted.
* Update header.css Center hamburger menu and flow menu content into body so that menu content is scrollable on small screens. Remove transitions Reduce padding around hamburger to unblock 'Home' menu link
Taxonomy remap bug
* Add dialog box with info about merging records * Remove redundant lang tags Discovered when finding lang tags corresponding to "more information" via dialog box code that I copied * Change dialog box to a link to Symbiota Docs Seems more consistent with where we're going now
$loanType is a string - was being sanitized as a Int. Variable is not used in any output to client, so should be safe to just use for comparison without filtering.
- Minor adjustment to display of parent taxon to fix issue with lack of space between scientific name and author, with additional minor improvements - Minor improvement to only italicize taxa at genus rank or above - Move htmlspecailchars and formatting into class assignment so that rankid can be used to decide formating
php current() expects an array while parse_url with PHP_URL_PATH paramter should return a string or false. This changes were also committed to hotfix-2024-05-22
…-issue Taxonomy Editor format adjustment
* Hotfix 2024-05-22 - Checklist management: -- Adjust taxon merge function to accommodate PHP v8.1 fatal exceptions during foreign key conflicts within SQL update statements, which previously simply returned false value with a warning - Image processing: -- Bug resolution to avoid fatal error where an array function is incorrectly used on a string. Resolves issue BioKIC#1366 - Occurrence Mapping: -- Fix bug interfering with the exclusion of protected occurrences within the mapping tools when user is not approved to view these records. Associated with issue: BioKIC#1375 Co-authored-by: Greg Post <gregory.post@asu.edu>
- Avoid fatal error that are now thrown by PHP v8.1+ instead of the previous warning
That also wasn't reading projArr['displayMap'] variable
Taxon links bug
BioKIC#1669) * adjust sort comparator to return explcit numbers so v8 doesn't get confused * add origin linking to tid * add origin linking to google map search
Formatting
Additional formatting
- Bug fix resolving issue where collection administrators and editors did not have permission to tag images from their collection. Addresses issue BioKIC#1616
Hotfix 2024 08 22 (BioKIC#1677)
Image batch tagging bug fix
- Move still relevant data files into 3.0 data directory - Update INSTALL.md documentation - Fix misc spelling error - Update version number
3.1 preparation updates
…C#1682) * Adds util function to make use of mysqli_execute_query for older versions of php # Summary `mysqli_execute_query` or `$mysqli->execute_query` function is an 8.2 only function provided by mysqli which could break portals that cannot upgrade to 8.2 from 8 or are running 7.3. Solution is to make a util function with the same api as mysqli_execute_query but will use the php version to decide wether to use mysqli_execute_query or normal statement binding. * removing comment left over from prototyping
* usage of taxa thesaurus family over occurrence family * Modifications - "ts.taxauthid = 1" needs to be added to the where condition or the recordset would return duplicate records for each taxonomic thesaurus defined within taxstatus table (e.g. there are 4 defined within SEINet). I suppose not including it would not be a big problem since the occid would be the same for each record, and thus the output data array would just copy over existing data. However, it would iterate through more records than needed. Another solution would be to change the statement to "SELECT DISTINCT...", but this can significantly slows down an ordered query. - Since "ts.taxauthid = 1" is added to the where clause, the getTableJoins function should always add the taxstatus left join, thus we can leave out that test. * Minor fix to previous submit --------- Co-authored-by: Edward Gilbert <egbot@asu.edu>
fix label printing barcode 500 error
Update CHANGELOG
3.1 Merge of Development into Master
- Occurrence API endpoint development -- Add collector, collector last name, and collector number as searchable functions -- Develop write functions (insert, update, delete), but not yet activated for public use -- Add new endpoint for loading and processing skeletal occurrence data -- Add swagger documentation for skeletal record processing - Taxonomy API endpoint development -- Refactor to use query builder for defining search terms (bring code in sync NEON taxonomy developments) - Mics -- Add helper functions to Lumen API
…update-resolutions
- Archive NEON styles to conserve in case needed later - Adjust head to accommodate biorepo CSS reorganizations - misc customizations required for the Biorepo portal
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.