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.

Sign up for GitHub

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

Enhancement/js rendering occurrencelist #2071

Merged
merged 16 commits into from
Jan 21, 2025
+304 −266
Merged

Enhancement/js rendering occurrencelist #2071

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9bbb57f
intial template for js rendered occurrence list
MuchQuak Jan 14, 2025
42f335f
Adjust js table to render actual point data
MuchQuak Jan 14, 2025
f5f1798
simple pagination finished with data
MuchQuak Jan 15, 2025
48285e4
fixing random open divs
MuchQuak Jan 15, 2025
6a40d47
Add first|last and left | right arrows on the pagination
MuchQuak Jan 15, 2025
55addbf
fixing some page start issues
MuchQuak Jan 15, 2025
47e282d
Remove usage of occurrencelist, Rework Cross Portal Searching to use …
MuchQuak Jan 15, 2025
5e67119
fix start index of js rendered table
MuchQuak Jan 15, 2025
7512c42
Fix Jquery record table loading for intial rendered tables
MuchQuak Jan 15, 2025
3e955c0
Closes #2053 Closes #1845
MuchQuak Jan 15, 2025
ed9ac21
Add event date to map coordinate data
MuchQuak Jan 16, 2025
9a0715d
Adjust see map to be a globe
MuchQuak Jan 16, 2025
f6a9440
Adjust map globe to sit in middle of table vertically
MuchQuak Jan 17, 2025
49d6047
Add catalog and collector hyper links to occurrence record and add ta…
MuchQuak Jan 17, 2025
710419c
fix client root not being add in domain
MuchQuak Jan 17, 2025
467a86c
Merge branch 'Development' into enhancement/js-rendering-occurrencelist
MuchQuak Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion classes/OccurrenceMapManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function getCoordinateMap($start, $limit){
if($this->sqlWhere){
$statsManager = new OccurrenceAccessStats();
$sql = 'SELECT o.occid, CONCAT_WS(" ",o.recordedby,IFNULL(o.recordnumber,o.eventdate)) AS identifier, '.
'o.sciname, IF(ts.family IS NULL, o.family, ts.family) as family, o.tidinterpreted, o.DecimalLatitude, o.DecimalLongitude, o.collid, o.catalognumber, '.
'o.sciname, IF(ts.family IS NULL, o.family, ts.family) as family, o.tidinterpreted, o.DecimalLatitude, o.DecimalLongitude, o.collid, o.catalogNumber, '.
'o.othercatalognumbers, c.institutioncode, c.collectioncode, c.CollectionName '.
'FROM omoccurrences o INNER JOIN omcollections c ON o.collid = c.collid ';

Expand Down Expand Up @@ -70,6 +70,7 @@ public function getCoordinateMap($start, $limit){
$coordArr[$collName][$row->occid]["tid"] = $tidInterpreted;
$coordArr[$collName][$row->occid]["fam"] = ($row->family?strtoupper($row->family):'undefined');
$coordArr[$collName][$row->occid]["sn"] = $row->sciname;
$coordArr[$collName][$row->occid]["catalogNumber"] = $row->catalogNumber;
$coordArr[$collName][$row->occid]["id"] = $this->htmlEntities($row->identifier);
$coordArr[$collName]["c"] = $color;
}
Expand Down
Loading