From d9aee1625ca2a0028044b2edaf3249e0f6935b03 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 23 Aug 2019 10:52:11 +0100 Subject: [PATCH] Bug 23493: Replace rowGrouping with rowGroup This patch replaces the unmaintained third party rowGrouping datatables plugin with the supported core rowGroup replacement. Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall --- .../prog/en/modules/circ/circulation.tt | 3 +- .../prog/en/modules/members/moremember.tt | 3 +- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 29 ++++++++----------- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 6c5f9ebe7d..e0d86cdc48 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -10,6 +10,7 @@ [% USE AuthorisedValues %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] +[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %] [% SET destination = "circ" %] Koha › Circulation @@ -1014,7 +1015,7 @@ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %] [% INCLUDE 'timepicker.inc' %] - [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") | $raw %] + [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %] <script> /* Set some variable needed in circulation.js */ var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]"; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 0bd690f142..19e573752d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -8,6 +8,7 @@ [% USE Price %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] +[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %] <title>Koha › Patrons › [% UNLESS blocking_error %] Patron details for [% INCLUDE 'patron-title.inc' no_html = 1 %] @@ -845,13 +846,13 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %] [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'strings.inc' %] [% INCLUDE 'calendar.inc' %] [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %] [% INCLUDE 'timepicker.inc' %] - [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") | $raw %] <script> /* Set some variable needed in circulation.js */ var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]"; diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index 0d73aed520..4cb3ddf89c 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -596,19 +596,20 @@ $(document).ready(function() { fnCallback(json) } ); }, + "rowGroup":{ + "dataSrc": "issued_today", + "startRender": function ( rows, group ) { + if ( group ) { + return $('<tr/>').append("<td colspan='100%'><strong>" + TODAYS_CHECKOUTS + "</strong></td>"); + } else { + return $('<tr/>').append("<td colspan='100%'><strong>" + PREVIOUS_CHECKOUTS + "</strong></td>"); + } + } + }, "fnInitComplete": function(oSettings, json) { // Disable rowGrouping plugin after first use // so any sorting on the table doesn't use it - var oSettings = issuesTable.fnSettings(); - - for (f = 0; f < oSettings.aoDrawCallback.length; f++) { - if (oSettings.aoDrawCallback[f].sName == 'fnRowGrouping') { - oSettings.aoDrawCallback.splice(f, 1); - break; - } - } - - oSettings.aaSortingFixed = null; + //var oSettings = issuesTable.fnSettings(); // Build a summary of checkouts grouped by itemtype var checkoutsByItype = json.aaData.reduce(function (obj, row) { @@ -628,13 +629,7 @@ $(document).ready(function() { .append(ul) .insertBefore(oSettings.nTableWrapper) }, - }, columns_settings_issues_table).rowGrouping( - { - iGroupingColumnIndex: 1, - iGroupingOrderByColumnIndex: 0, - sGroupingColumnSortDirection: "asc" - } - ); + }, columns_settings_issues_table); if ( $("#issues-table").length ) { $("#issues-table_processing").position({ -- 2.20.1