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

Update CoTRAM to 3.1 #1837

Merged
merged 797 commits into from
Nov 7, 2024
Merged

Update CoTRAM to 3.1 #1837

merged 797 commits into from
Nov 7, 2024

Conversation

themerekat
Copy link
Collaborator

No description provided.

egbot and others added 30 commits May 17, 2024 09:23
- 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 #1320, addes check for catnum
* adds check for duplicate collectionCode / institutionalCode key when updating collection meta data and gives status msg upon failure closes #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
* cloFix Occur Editor Nav visiblity with no results closes #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.
# 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
- 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.
- 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
* 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
* 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 #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: #1375 

Co-authored-by: Greg Post <[email protected]>
* 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 #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: #1375

Co-authored-by: Greg Post <[email protected]>
egbot and others added 28 commits August 23, 2024 17:05
- Remove second declaration of taxonlinks array, which was causing the array to be redefined throughout each record loop.
That also wasn't reading projArr['displayMap'] variable
#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  #1616
- Minor bug fix that was interfering with saving of locationRemarks when a new record is saved (resolves #1445)
- Move still relevant data files into 3.0 data directory
- Update INSTALL.md documentation
- Fix misc spelling error
- Update version number
* 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 <[email protected]>
fix label printing barcode 500 error
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
* Occurrence Mapping: Adjust SQL to relax enforcement of link to taxon thesaurus, thus to include records with coordinates but lacking thesaurus relationship 
* Styling: Various styling, spacing, and display adjustments 
* Occurrence search: add type attribute to buttons to avoid defaulting as submit buttons 
* Occurrence Profile: Fix error triggered when otherCatalogNumbers are used to create backlink to original snapshot record within external institution web resource
* Occurrence editing functions  
-- Fix fatal error triggered by cloning an occurrence record with the create association option selected
-- Fix fatal error triggered when quick association feature is activated within occurrence editor
-- Fix fatal error when deleting an occurrence when the occurrence was previously deleted (e.g. record already in omoccurarchive)
-- Adjust occurrence restore option to dynamically determine associationType when restoring a record that was deleted prior to this field being added as a required input
-- If resource association does not have an objectID, use url as the display text
* Taxonomy editor: bug fix triggered by adding a child directly to the root node of the thesaurus (e.g. kingdom)
* Scientific name parsing utility functions: Integrate cleanInfra function directly into code. It served no purpose being separate, and was also causing a bug where parent authors were being incorrectly merged with insfraspecific authors

---------

Co-authored-by: Katie Pearson <[email protected]>
Co-authored-by: Mark <[email protected]>
Co-authored-by: MuchQuak <[email protected]>
Co-authored-by: Logan Wilt <[email protected]>
* Hotfix v3.1.3 
- Adjusted hotfix merge instructions
- Inventory Management: Bug fix interfering with adding new editors to an inventory project
- Image migration modifications
-- Add option to copy over existing target files
-- Add checks and error handling for non-existent source files and already existing target files
-- Direct log files to be written to /content/logs/
- fix misspelled log directory name, with support still maintained for portals that already have the misspelled directory
- Fix jquery selector to be correct so button is enabled when trait is changed
- Misc language file and wording adjustments
@themerekat themerekat merged commit 5bfb5b0 into cotram-3.1 Nov 7, 2024
@themerekat themerekat deleted the resolve-conflict branch November 7, 2024 15:41
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.

6 participants