Bugzilla – Attachment 180190 Details for
Bug 24533
Improved sorting in checkouts table
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24533: Switch to aDataSort for multi-column sorting
Bug-24533-Switch-to-aDataSort-for-multi-column-sor.patch (text/plain), 5.14 KB, created by
Magnus Enger
on 2025-04-01 13:36:29 UTC
(
hide
)
Description:
Bug 24533: Switch to aDataSort for multi-column sorting
Filename:
MIME Type:
Creator:
Magnus Enger
Created:
2025-04-01 13:36:29 UTC
Size:
5.14 KB
patch
obsolete
>From ab512def34e1b9ce1344638b209b13f5a94f4b3b Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 5 Mar 2025 09:08:00 +0000 >Subject: [PATCH] Bug 24533: Switch to aDataSort for multi-column sorting > >This patch adds aDataSort configurations for each sortable column such >that we always maintain the group sorting primarily and apply a >secondary sort using the column in question. > >When sorting by due date you are much more likely to want the true date >sorting without forcing a primary sort on the grouping column. We achieve >that by removing the primary sort on checkout date and disable rowGrouping >in such a case. > >Signed-off-by: Magnus Enger <magnus@libriotech.no> >Works as advertised. When sorting on "Due date", the grouping by >"Previous/Today's checkouts" is disabled. >--- > koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 24 +++++++++++++++++++- > 1 file changed, 23 insertions(+), 1 deletion(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >index f11f755964..439ff91964 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >@@ -245,16 +245,19 @@ function LoadIssuesTable() { > return title; > }, > type: "anti-the", >+ orderData: [1, 3], > }, > { > data: function (oObj) { > return oObj.recordtype_description.escapeHtml(); > }, >+ orderData: [1, 4], > }, > { > data: function (oObj) { > return oObj.itemtype_description.escapeHtml(); > }, >+ orderData: [1, 5], > }, > { > data: function (oObj) { >@@ -262,11 +265,13 @@ function LoadIssuesTable() { > ? oObj.collection.escapeHtml() > : ""; > }, >+ orderData: [1, 6], > }, > { > data: function (oObj) { > return oObj.location ? oObj.location.escapeHtml() : ""; > }, >+ orderData: [1, 7], > }, > { > data: function (oObj) { >@@ -274,13 +279,14 @@ function LoadIssuesTable() { > ? oObj.homebranch.escapeHtml() > : ""; > }, >+ orderData: [1, 8], > }, > { > data: "issuedate", > visible: false, > }, > { >- orderData: 10, // Sort on hidden unformatted issuedate column >+ orderData: [1, 10], // Sort on hidden unformatted issuedate column > data: function (oObj) { > return $datetime(oObj.issuedate, { > no_tz_adjust: true, >@@ -293,6 +299,7 @@ function LoadIssuesTable() { > ? oObj.branchname.escapeHtml() > : ""; > }, >+ orderData: [1, 11], > }, > { > data: function (oObj) { >@@ -300,6 +307,7 @@ function LoadIssuesTable() { > ? oObj.itemcallnumber.escapeHtml() > : ""; > }, >+ orderData: [1, 12], > }, > { > data: function (oObj) { >@@ -307,6 +315,7 @@ function LoadIssuesTable() { > ? oObj.copynumber.escapeHtml() > : ""; > }, >+ orderData: [1, 13], > }, > { > data: function (oObj) { >@@ -317,6 +326,7 @@ function LoadIssuesTable() { > "<span>" > ); > }, >+ orderData: [1, 14], > className: "nowrap", > }, > { >@@ -328,6 +338,7 @@ function LoadIssuesTable() { > "<span>" > ); > }, >+ orderData: [1, 15], > className: "nowrap", > }, > { >@@ -339,6 +350,7 @@ function LoadIssuesTable() { > "<span>" > ); > }, >+ orderData: [1, 16], > className: "nowrap", > }, > { >@@ -702,6 +714,16 @@ function LoadIssuesTable() { > collision: "none", > }); > } >+ >+ // Disable rowGroup when sorting on due date >+ $("#issues-table").on("order.dt", function () { >+ var order = issuesTable.api().order(); >+ if (order[0][0] === 3) { >+ issuesTable.api().rowGroup().disable(); >+ } else { >+ issuesTable.api().rowGroup().enable(); >+ } >+ }); > } > > var loadIssuesTableDelayTimeoutId; >-- >2.34.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 24533
:
98088
|
99765
|
108836
|
113120
|
178953
| 180190