Attachment 79196 Details for Bug 15219 – Bug 15219: Fix date sorting when server-side processing is disabled

[patch] Bug 15219: Fix date sorting when server-side processing is disabled

Bug-15219-Fix-date-sorting-when-server-side-proces.patch (text/plain), 27.47 KB, created by Julian Maurice on 2018-09-21 08:38:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2018-09-21 08:38:48 UTC

Size: 27.47 KB

patch

obsolete

>From cf936fd0f53834b78874d32a24d1e0b93f052382 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Fri, 24 Feb 2017 09:51:59 +0100
>Subject: [PATCH] Bug 15219: Fix date sorting when server-side processing is
> disabled
>
>Use DataTables 'columns' option instead of 'aoColumns'
>This allow more control on what data is used for display, sorting,
>filtering, ...
>
>A large part of this patch is about rewording things to better match the
>DataTables documentation.
>The real change is that
>
> "mRender": renderingFunc
>
>becomes
>
> "render": {
> "display": renderingFunc
> }
>
>So the return value of renderingFunc is now only used for display (not
>for filtering, sorting, ...)
>
>Signed-off-by: Eric Gosselin <eric.gosselin@inlibro.com>
>---
> koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 377 +++++++++++--------
> 1 file changed, 217 insertions(+), 160 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>index 390a16cbb2..6a391d00f7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>@@ -22,232 +22,232 @@ function disableGrouping(datatable) {
> }
> }
> 
>-var mRenders = {
>- groupOrder: function (oData, sType, oObj) {
>- if ( oObj.issued_today ) {
>+var renderers = {
>+ groupOrder: function (data, type, row) {
>+ if ( row.issued_today ) {
> return "1";
> } else {
> return "0";
> }
> },
>- groupName: function (oData, sType, oObj) {
>- if (oObj.issued_today) {
>+ groupName: function (data, type, row) {
>+ if (row.issued_today) {
> return "" + TODAYS_CHECKOUTS + "";
> } else {
> return "" + PREVIOUS_CHECKOUTS + "";
> }
> },
>- dateDueFormatted: function (oData, sType, oObj) {
>- var due = oObj.date_due_formatted;
>+ dateDueFormatted: function (data, type, row) {
>+ var due = row.date_due_formatted;
> 
>- if ( oObj.date_due_overdue ) {
>+ if ( row.date_due_overdue ) {
> due = "" + due + "";
> }
> 
>- due = "" + due + "";
>+ due = "" + due + "";
> 
>- if ( oObj.lost ) {
>- due += "" + oObj.lost.escapeHtml() + "";
>+ if ( row.lost ) {
>+ due += "" + row.lost.escapeHtml() + "";
> }
> 
>- if ( oObj.damaged ) {
>- due += "" + oObj.damaged.escapeHtml() + "";
>+ if ( row.damaged ) {
>+ due += "" + row.damaged.escapeHtml() + "";
> }
> 
> return due;
> },
>- title: function (oData, sType, oObj) {
>- var title = "<a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber="
>- + oObj.biblionumber
>+ title: function (data, type, row) {
>+ var title = "<a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber="
>+ + row.biblionumber
> + "'>"
>- + oObj.title.escapeHtml();
>+ + row.title.escapeHtml();
> 
>- $.each(oObj.subtitle, function( index, value ) {
>+ $.each(row.subtitle, function( index, value ) {
> title += " " + value.subfield.escapeHtml();
> });
> 
>- if ( oObj.enumchron ) {
>- title += " (" + oObj.enumchron.escapeHtml() + ")";
>+ if ( row.enumchron ) {
>+ title += " (" + row.enumchron.escapeHtml() + ")";
> }
> 
> title += "</a>";
> 
>- if ( oObj.author ) {
>- title += " " + BY.replace( "_AUTHOR_", " " + oObj.author.escapeHtml() );
>+ if ( row.author ) {
>+ title += " " + BY.replace( "_AUTHOR_", " " + row.author.escapeHtml() );
> }
> 
>- if ( oObj.itemnotes ) {
>+ if ( row.itemnotes ) {
> var span_class = "text-muted";
>- if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
>+ if ( $.datepicker.formatDate('yy-mm-dd', new Date(row.issuedate) ) == ymd ) {
> span_class = "circ-hlt";
> }
>- title += " - " + oObj.itemnotes.escapeHtml() + "";
>+ title += " - " + row.itemnotes.escapeHtm() + "";
> }
> 
>- if ( oObj.itemnotes_nonpublic ) {
>+ if ( row.itemnotes_nonpublic ) {
> var span_class = "text-danger";
>- if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
>+ if ( $.datepicker.formatDate('yy-mm-dd', new Date(row.issuedate) ) == ymd ) {
> span_class = "circ-hlt";
> }
>- title += " - " + oObj.itemnotes_nonpublic.escapeHtml() + "";
>+ title += " - " + row.itemnotes_nonpublic.escapeHtml() + "";
> }
> 
> var onsite_checkout = '';
>- if ( oObj.onsite_checkout == 1 ) {
>+ if ( row.onsite_checkout == 1 ) {
> onsite_checkout += " (" + INHOUSE_USE + ")";
> }
> 
> title += " "
> + "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="
>- + oObj.biblionumber
>+ + row.biblionumber
> + "&itemnumber="
>- + oObj.itemnumber
>+ + row.itemnumber
> + "#"
>- + oObj.itemnumber
>+ + row.itemnumber
> + "'>"
>- + oObj.barcode.escapeHtml()
>+ + row.barcode.escapeHtml()
> + "</a>"
> + onsite_checkout
> 
> return title;
> },
>- itemtype: function (oData, sType, oObj) {
>- return oObj.itemtype_description.escapeHtml();
>+ itemtype: function (data, type, row) {
>+ return row.itemtype_description.escapeHtml();
> },
>- collection: function (oData, sType, oObj) {
>- return oObj.collection ? oObj.collection.escapeHtml() : '';
>+ collection: function (data, type, row) {
>+ return row.collection ? row.collection.escapeHtml() : '';
> },
>- location: function (oData, sType, oObj) {
>- return oObj.location ? oObj.location.escapeHtml() : '';
>+ location: function (data, type, row) {
>+ return row.location ? row.location.escapeHtml() : '';
> },
>- homebranch: function (oData, sType, oObj) {
>- return oObj.homebranch.escapeHtml();
>+ homebranch: function (data, type, row) {
>+ return row.homebranch.escapeHtml();
> },
>- issuedate: function (oData, sType, oObj) {
>- return oObj.issuedate_formatted;
>+ issuedate: function (data, type, row) {
>+ return row.issuedate_formatted;
> },
>- branch: function (oData, sType, oObj) {
>- return oObj.branchname.escapeHtml();
>+ branch: function (data, type, row) {
>+ return row.branchname.escapeHtml();
> },
>- itemcallnumber: function (oData, sType, oObj) {
>- return oObj.itemcallnumber ? oObj.itemcallnumber.escapeHtml() : '';
>+ itemcallnumber: function (data, type, row) {
>+ return row.itemcallnumber ? row.itemcallnumber.escapeHtml() : '';
> },
>- charge: function (oData, sType, oObj) {
>- if (!oObj.charge) oObj.charge = 0;
>- return '' + parseFloat(oObj.charge).toFixed(2) + '';
>+ charge: function (data, type, row) {
>+ if (!row.charge) row.charge = 0;
>+ return '' + parseFloat(row.charge).toFixed(2) + '';
> },
>- fine: function (oData, sType, oObj) {
>- if (!oObj.fine) oObj.fine = 0;
>- return '' + parseFloat(oObj.fine).toFixed(2) + '';
>+ fine: function (data, type, row) {
>+ if (!row.fine) row.fine = 0;
>+ return '' + parseFloat(row.fine).toFixed(2) + '';
> },
>- price: function (oData, sType, oObj) {
>- if (!oObj.price) oObj.price = 0;
>- return parseFloat(oObj.price).toFixed(2);
>+ price: function (data, type, row) {
>+ if (!row.price) row.price = 0;
>+ return parseFloat(row.price).toFixed(2);
> },
>- renew: function (oData, sType, oObj) {
>+ renew: function (data, type, row) {
> var content = "";
> var span_style = "";
> var span_class = "";
> 
> content += "";
>- content += "" + oObj.renewals_count + "";
>+ content += "" + row.renewals_count + "";
> 
>- if ( oObj.can_renew ) {
>+ if ( row.can_renew ) {
> // Do nothing
>- } else if ( oObj.can_renew_error == "on_reserve" ) {
>+ } else if ( row.can_renew_error == "on_reserve" ) {
> content += ""
>- + "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>"
>+ + "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + row.biblionumber + "'>" + ON_HOLD + "</a>"
> + "";
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
>- } else if ( oObj.can_renew_error == "too_many" ) {
>+ } else if ( row.can_renew_error == "too_many" ) {
> content += ""
> + NOT_RENEWABLE
> + "";
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
>- } else if ( oObj.can_renew_error == "restriction" ) {
>+ } else if ( row.can_renew_error == "restriction" ) {
> content += ""
> + NOT_RENEWABLE_RESTRICTION
> + "";
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
>- } else if ( oObj.can_renew_error == "overdue" ) {
>+ } else if ( row.can_renew_error == "overdue" ) {
> content += ""
> + NOT_RENEWABLE_OVERDUE
> + "";
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
>- } else if ( oObj.can_renew_error == "too_soon" ) {
>+ } else if ( row.can_renew_error == "too_soon" ) {
> content += ""
>- + NOT_RENEWABLE_TOO_SOON.format( oObj.can_renew_date )
>+ + NOT_RENEWABLE_TOO_SOON.format( row.can_renew_date )
> + "";
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
>- } else if ( oObj.can_renew_error == "auto_too_soon" ) {
>+ } else if ( row.can_renew_error == "auto_too_soon" ) {
> content += ""
> + NOT_RENEWABLE_AUTO_TOO_SOON
> + "";
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
>- } else if ( oObj.can_renew_error == "auto_too_late" ) {
>+ } else if ( row.can_renew_error == "auto_too_late" ) {
> content += ""
> + NOT_RENEWABLE_AUTO_TOO_LATE
> + "";
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
>- } else if ( oObj.can_renew_error == "auto_too_much_oweing" ) {
>+ } else if ( row.can_renew_error == "auto_too_much_oweing" ) {
> content += ""
> + NOT_RENEWABLE_AUTO_TOO_MUCH_OWEING
> + "";
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
>- } else if ( oObj.can_renew_error == "auto_account_expired" ) {
>+ } else if ( row.can_renew_error == "auto_account_expired" ) {
> content += ""
> + NOT_RENEWABLE_AUTO_ACCOUNT_EXPIRED
> + "";
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
>- } else if ( oObj.can_renew_error == "auto_renew" ) {
>+ } else if ( row.can_renew_error == "auto_renew" ) {
> content += ""
> + NOT_RENEWABLE_AUTO_RENEW
> + "";
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
>- } else if ( oObj.can_renew_error == "onsite_checkout" ) {
>+ } else if ( row.can_renew_error == "onsite_checkout" ) {
> // Don't display something if it's an onsite checkout
> } else {
> content += ""
>- + oObj.can_renew_error
>+ + row.can_renew_error
> + "";
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
> }
> 
>- var can_force_renew = ( oObj.onsite_checkout == 0 ) && ( oObj.can_renew_error != "on_reserve" );
>- var can_renew = ( oObj.renewals_remaining > 0 && !oObj.can_renew_error );
>+ var can_force_renew = ( row.onsite_checkout == 0 ) && ( row.can_renew_error != "on_reserve" );
>+ var can_renew = ( row.renewals_remaining > 0 && !row.can_renew_error );
> if ( can_renew || can_force_renew ) {
> content += ""
> + "<input type='checkbox' ";
>- if ( oObj.date_due_overdue && can_renew ) {
>+ if ( row.date_due_overdue && can_renew ) {
> content += "checked='checked' ";
> }
>- content += "class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>"
>+ content += "class='renew' id='renew_" + row.itemnumber + "' name='renew' value='" + row.itemnumber +"'/>"
> + "";
> 
> content += "("
>- + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
>+ + RENEWALS_REMAINING.format( row.renewals_remaining, row.renewals_allowed )
> + ")";
> }
> 
>@@ -255,25 +255,25 @@ var mRenders = {
> 
> return content;
> },
>- checkin: function (oData, sType, oObj) {
>- if (oObj.can_renew_error == "on_reserve") {
>- return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>";
>+ checkin: function (data, type, row) {
>+ if (row.can_renew_error == "on_reserve") {
>+ return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + row.biblionumber + "'>" + ON_HOLD + "</a>";
> } else {
>- return "<input type='checkbox' class='checkin' id='checkin_" + oObj.itemnumber + "' name='checkin' value='" + oObj.itemnumber +"'></input>";
>+ return "<input type='checkbox' class='checkin' id='checkin_" + row.itemnumber + "' name='checkin' value='" + row.itemnumber +"'></input>";
> }
> },
>- export: function (oData, sType, oObj) {
>- var s = "<input type='checkbox' name='itemnumbers' value='" + oObj.itemnumber + "' style='visibility:hidden;' />";
>+ export: function (data, type, row) {
>+ var s = "<input type='checkbox' name='itemnumbers' value='" + row.itemnumber + "' style='visibility:hidden;' />";
> 
>- s += "<input type='checkbox' class='export' id='export_" + oObj.biblionumber + "' name='biblionumbers' value='" + oObj.biblionumber + "' />";
>+ s += "<input type='checkbox' class='export' id='export_" + row.biblionumber + "' name='biblionumbers' value='" + row.biblionumber + "' />";
> return s;
> },
>- patron: function (oData, sType, oObj) {
>- return "<a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=" + oObj.borrowernumber + "'>"
>- + oObj.borrower.firstname.escapeHtml()
>+ patron: function (data, type, row) {
>+ return "<a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=" + row.borrowernumber + "'>"
>+ + row.borrower.firstname.escapeHtml()
> + " "
>- + oObj.borrower.surname.escapeHtml()
>- + " (" + oObj.borrower.cardnumber.escapeHtml() + ")</a>"
>+ + row.borrower.surname.escapeHtml()
>+ + " (" + row.borrower.cardnumber.escapeHtml() + ")</a>"
> }
> };
> 
>@@ -493,14 +493,14 @@ $(document).ready(function() {
> "sPaginationType": "four_button",
> "dom": 'B<"clearfix"><"top pager"ilp>rt',
> "aaSorting": [],
>- "aoColumns": [
>+ "columns": [
> {
>- "mData": "issued_today",
>- "mRender": mRenders.groupOrder
>+ "data": "issued_today",
>+ "render": renderers.groupOrder
> },
> {
>- "mData": function (oObj) {
>- if (oObj.issued_today) {
>+ "data": function (row) {
>+ if (row.issued_today) {
> return "" + TODAYS_CHECKOUTS + "";
> } else {
> return "" + PREVIOUS_CHECKOUTS + "";
>@@ -508,70 +508,103 @@ $(document).ready(function() {
> }
> },
> {
>- "mData": "date_due",
>- "mRender": mRenders.dateDueFormatted
>+ "data": "date_due",
>+ "render": {
>+ "display": renderers.dateDueFormatted
>+ }
> },
> {
>- "mData": "title",
>- "mRender": mRenders.title
>+ "data": "title",
>+ "render": {
>+ "display": renderers.title
>+ }
> },
> {
>- "mData": "itemtype",
>- "mRender": mRenders.itemtype
>+ "data": "itemtype",
>+ "render": {
>+ "display": renderers.itemtype
>+ }
> },
> {
>- "mData": "ccode",
>- "mRender": mRenders.collection
>+ "data": "collection",
>+ "render": {
>+ "display": renderers.collection
>+ }
> },
> {
>- "mData": "location",
>- "mRender": mRenders.location
>+ "data": "location",
>+ "render": {
>+ "display": renderers.location
>+ }
> },
> {
>- "mData": "homebranch",
>- "mRender": mRenders.homebranch
>+ "data": "homebranch",
>+ "render": {
>+ "display": renderers.homebranch
>+ }
> },
> {
>- "mData": "issuedate",
>- "mRender": mRenders.issuedate
>+ "data": "issuedate",
>+ "render": {
>+ "display": renderers.issuedate
>+ }
> },
> {
>- "mData": "branchcode",
>- "mRender": mRenders.branch
>+ "data": "branchcode",
>+ "render": {
>+ "display": renderers.branch
>+ }
> },
> {
>- "mData": "itemcallnumber",
>- "mRender": mRender.itemcallnumber
>+ "data": "itemcallnumber",
>+ "render": {
>+ "display": renderers.itemcallnumber
>+ }
> },
> {
>- "mData": "charge",
>- "mRender": mRenders.charge,
>- "bSortable": ServerSideCheckoutsTables ? false : true
>+ "data": "charge",
>+ "render": {
>+ "display": renderers.charge
>+ },
>+ "orderable": ServerSideCheckoutsTables ? false : true
> },
> {
>- "mData": "fine",
>- "mRender": mRenders.fine,
>- "bSortable": ServerSideCheckoutsTables ? false : true
>+ "data": "fine",
>+ "render": {
>+ "display": renderers.fine
>+ },
>+ "orderable": ServerSideCheckoutsTables ? false : true
> },
> {
>- "mData": "replacementprice",
>- "mRender": mRenders.price,
>- "bSortable": ServerSideCheckoutsTables ? false : true
>+ "data": "price",
>+ "render": {
>+ "display": renderers.price
>+ },
>+ "orderable": ServerSideCheckoutsTables ? false : true
> },
> {
>- "bVisible": AllowCirculate ? true : false,
>- "mRender": mRenders.renew,
>- "bSortable": false
>+ "data": null,
>+ "render": {
>+ "display": renderers.renew
>+ },
>+ "visible": AllowCirculate ? true : false,
>+ "orderable": false
> },
> {
>- "bVisible": AllowCirculate ? true : false,
>- "mRender": mRenders.checkin,
>- "bSortable": false
>+ "data": null,
>+ "render": {
>+ "display": renderers.checkin
>+ },
>+ "visible": AllowCirculate ? true : false,
>+ "orderable": false
> },
> {
>- "bVisible": exports_enabled == 1 ? true : false,
>- "bSortable": false,
>- "mRender": mRenders.export
>+ "data": null,
>+ "render": {
>+ "display": renderers.export
>+ },
>+ "visible": exports_enabled == 1 ? true : false,
>+ "orderable": false
> }
> ],
> "fnFooterCallback": function ( nRow, aaData, iStart, iEnd, aiDisplay ) {
>@@ -638,58 +671,82 @@ $(document).ready(function() {
> },
> "bPaginate": true,
> "sPaginationType": "four_button",
>- "aoColumns": [
>+ "columns": [
> {
>- "mData": "date_due",
>- "mRender": mRenders.dateDueFormatted
>+ "data": "date_due",
>+ "render": {
>+ "display": renderers.dateDueFormatted
>+ }
> },
> {
>- "mData": "title",
>- "mRender": mRenders.title,
>+ "data": "title",
>+ "render": {
>+ "display": renderers.title
>+ }
> },
> {
>- "mData": "itemtype",
>- "mRender": mRenders.itemtype
>+ "data": "itemtype",
>+ "render": {
>+ "display": renderers.itemtype
>+ }
> },
> {
>- "mData": "ccode",
>- "mRender": mRenders.collection
>+ "data": "collection",
>+ "render": {
>+ "display": renderers.collection
>+ }
> },
> {
>- "mData": "location",
>- "mRender": mRenders.location
>+ "data": "location",
>+ "render": {
>+ "display": renderers.location
>+ }
> },
> {
>- "mData": "issuedate",
>- "mRender": mRenders.issuedate
>+ "data": "issuedate",
>+ "render": {
>+ "display": renderers.issuedate
>+ }
> },
> {
>- "mData": "branchcode",
>- "mRender": mRenders.branch
>+ "data": "branchcode",
>+ "render": {
>+ "display": renderers.branch
>+ }
> },
> {
>- "mData": "itemcallnumber",
>- "mRender": mRenders.itemcallnumber
>+ "data": "itemcallnumber",
>+ "render": {
>+ "display": renderers.itemcallnumber
>+ }
> },
> {
>- "mData": "charge",
>- "mRender": mRenders.charge,
>- "bSortable": ServerSideCheckoutsTables ? false : true
>+ "data": "charge",
>+ "render": {
>+ "display": renderers.charge
>+ },
>+ "orderable": ServerSideCheckoutsTables ? false : true
> },
> {
>- "mData": "fine",
>- "mRender": mRenders.fine,
>- "bSortable": ServerSideCheckoutsTables ? false : true
>+ "data": "fine",
>+ "render": {
>+ "display": renderers.fine
>+ },
>+ "orderable": ServerSideCheckoutsTables ? false : true
> },
> {
>- "mData": "replacementprice",
>- "mRender": mRenders.price,
>- "bSortable": ServerSideCheckoutsTables ? false : true
>+ "data": "replacementprice",
>+ "render": {
>+ "display": renderers.price
>+ },
>+ "orderable": ServerSideCheckoutsTables ? false : true
> },
> {
>- "mData": "borrowernumber",
>- "mRender": mRenders.patron,
>- "bSortable": ServerSideCheckoutsTables ? false : true
>+ "data": "borrowernumber",
>+ "render": {
>+ "display": renderers.patron
>+ },
>+ "orderable": ServerSideCheckoutsTables ? false : true
> }
> ]
> }, relatives_columns_settings);
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 15219: 45018 | 45036 | 45054 | 48107 | 50075 | 60071 | 60642 | 61158 | 61159 | 61545 | 61546 | 72905 | 72906 | 74224 | 74225 | 75911 | 75912 | 75913 | 78555 | 78556 | 78557 | 78558 | 78559 | 79195 | 79196 | 79197 | 79198 | 79199 | 92776 | 92777 | 92778 | 92779 | 92780 | 92781 | 93921