pict-section-recordset 1.0.11 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pict-section-recordset",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Pict dynamic record set management views",
   "main": "source/Pict-Section-RecordSet.js",
   "directories": {
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@eslint/js": "^9.27.0",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.15.19",
+    "@types/node": "^16.18.126",
     "browser-env": "^3.3.0",
     "eslint": "^9.27.0",
     "jquery": "^3.7.1",

package/source/views/list/RecordSet-List-PaginationTop.js

@@ -92,9 +92,9 @@ const _DEFAULT_CONFIGURATION_List_PaginationTop = (
 				{
 					Hash: 'PRSP-List-Pagination-Template-Pages',
 					Template: /*html*/`
-	<!-- DefaultPackage pict view template: [PRSP-List-Pagination-Template-Button-Page] -->
-	<a href="{~D:Record.URL~}" aria-label="Go to page {~D:Record.Page~}">{~D:Record.Page~}</a>
-	<!-- DefaultPackage end view template:  [PRSP-List-Pagination-Template-Button-Page] -->
+	<!-- DefaultPackage pict view template: [PRSP-List-Pagination-Template-Button-Pages] -->
+	<a href="{~D:Record.URL~}" aria-label="Go to page {~D:Record.Page~}" class="page-offset_{~D:Record.RelativeOffset~}">{~D:Record.Page~}</a>
+	<!-- DefaultPackage end view template:  [PRSP-List-Pagination-Template-Button-Pages] -->
 	`
 				}
 			],

package/source/views/list/RecordSet-List.js

@@ -235,6 +235,11 @@ class viewRecordSetList extends libPictRecordSetRecordView
 
 		// Generate each page's links.
 		// TODO: This is fast and cool; any reason not to?
+		// Get "bookmarks" as references to the array of page links.
+		tmpRecordListData.PageLinkBookmarks = (
+			{
+				Current: Math.floor(tmpRecordListData.Offset / tmpRecordListData.PageSize)
+			});
 		tmpRecordListData.PageLinks = [];
 		for (let i = 0; i < tmpRecordListData.PageCount; i++)
 		{
@@ -242,24 +247,21 @@ class viewRecordSetList extends libPictRecordSetRecordView
 			{
 				tmpRecordListData.PageLinks.push(
 					{
-						Page: i+1,
-						URL:`#/PSRS/${tmpRecordListData.RecordSet}/List/FilteredTo/${tmpRecordListData.FilterString}/${i * tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
+						Page: i + 1,
+						RelativeOffset: i - tmpRecordListData.PageLinkBookmarks.Current,
+						URL: `#/PSRS/${tmpRecordListData.RecordSet}/List/FilteredTo/${tmpRecordListData.FilterString}/${i * tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
 					});
 			}
 			else
 			{
 				tmpRecordListData.PageLinks.push(
 					{
-						Page: i+1,
-						URL:`#/PSRS/${tmpRecordListData.RecordSet}/List/${i * tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
+						Page: i + 1,
+						RelativeOffset: i - tmpRecordListData.PageLinkBookmarks.Current,
+						URL: `#/PSRS/${tmpRecordListData.RecordSet}/List/${i * tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
 					});
 			}
 		}
-		// Get "bookmarks" as references to the array of page links.
-		tmpRecordListData.PageLinkBookmarks = (
-			{
-				Current: Math.floor(tmpRecordListData.Offset / tmpRecordListData.PageSize)
-			});
 
 		//FIXME: short-term workaround to not blow up the tempplate rendering with way too many links
 		const linkRangeStart = Math.max(0, tmpRecordListData.PageLinkBookmarks.Current - 10);
@@ -267,19 +269,45 @@ class viewRecordSetList extends libPictRecordSetRecordView
 		tmpRecordListData.PageLinksLimited = tmpRecordListData.PageLinks.slice(linkRangeStart, linkRangeEnd);
 		if (linkRangeStart > 0)
 		{
-			tmpRecordListData.PageLinksLimited.unshift(
-				{
-					Page: 1,
-					URL:`#/PSRS/${tmpRecordListData.RecordSet}/List/${0}/${tmpRecordListData.PageSize}`
-				});
+			if (tmpRecordListData.FilterString)
+			{
+				tmpRecordListData.PageLinksLimited.unshift(
+					{
+						Page: 1,
+						RelativeOffset: -tmpRecordListData.PageLinkBookmarks.Current,
+						URL: `#/PSRS/${tmpRecordListData.RecordSet}/List/FilteredTo/${tmpRecordListData.FilterString}/${tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
+					});
+			}
+			else
+			{
+				tmpRecordListData.PageLinksLimited.unshift(
+					{
+						Page: 1,
+						RelativeOffset: -tmpRecordListData.PageLinkBookmarks.Current,
+						URL: `#/PSRS/${tmpRecordListData.RecordSet}/List/${0}/${tmpRecordListData.PageSize}`
+					});
+			}
 		}
 		if (linkRangeEnd < tmpRecordListData.PageLinks.length)
 		{
-			tmpRecordListData.PageLinksLimited.push(
-				{
-					Page: tmpRecordListData.PageCount,
-					URL:`#/PSRS/${tmpRecordListData.RecordSet}/List/${(tmpRecordListData.PageCount - 1) * tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
-				});
+			if (tmpRecordListData.FilterString)
+			{
+				tmpRecordListData.PageLinksLimited.push(
+					{
+						Page: tmpRecordListData.PageCount,
+						RelativeOffset: (tmpRecordListData.PageCount - 1) - tmpRecordListData.PageLinkBookmarks.Current,
+						URL: `#/PSRS/${tmpRecordListData.RecordSet}/List/FilteredTo/${tmpRecordListData.FilterString}/${(tmpRecordListData.PageCount - 1) * tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
+					});
+			}
+			else
+			{
+				tmpRecordListData.PageLinksLimited.push(
+					{
+						Page: tmpRecordListData.PageCount,
+						RelativeOffset: (tmpRecordListData.PageCount - 1) - tmpRecordListData.PageLinkBookmarks.Current,
+						URL: `#/PSRS/${tmpRecordListData.RecordSet}/List/${(tmpRecordListData.PageCount - 1) * tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
+					});
+			}
 		}
 
 		tmpRecordListData.PageLinkBookmarks.Previous = tmpRecordListData.PageLinkBookmarks.Current - 1;

package/types/views/list/RecordSet-List.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RecordSet-List.d.ts","sourceRoot":"","sources":["../../../source/views/list/RecordSet-List.js"],"names":[],"mappings":";AAyEA;IAOE;;;;;;;;MAQC;IAGF,uCAuBC;IAED,+DAuBC;IAWD,8CAGC;IAED,sDAkCC;IA9BA,iCAUC;IAsBF,iIAmJC;CAwBD"}
+{"version":3,"file":"RecordSet-List.d.ts","sourceRoot":"","sources":["../../../source/views/list/RecordSet-List.js"],"names":[],"mappings":";AAyEA;IAOE;;;;;;;;MAQC;IAGF,uCAuBC;IAED,+DAuBC;IAWD,8CAGC;IAED,sDAkCC;IA9BA,iCAUC;IAsBF,iIA+KC;CAwBD"}