From be72da36e19a93e0a266075e881b184ad9b3051f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 23 Dec 2014 11:30:33 +0100 Subject: [PATCH] [PASSED QA] Bug 13492: Add the column configuration for the checkouts table - circulation.pl Test plan: 1/ Verify that you can show/hide columns on the checkouts table (circulation.pl). 2/ Play with the column configuration admin page (admin/columns_settings.pl), and confirm the behavior is correct (depends on what you have selected). Signed-off-by: Kyle M Hall --- admin/columns_settings.yml | 46 ++++++++++++++++++++ .../prog/en/includes/checkouts-table-footer.inc | 4 +- koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 11 ++--- .../prog/en/modules/circ/circulation.tt | 5 ++ 4 files changed, 58 insertions(+), 8 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 9e9a49c..3bb70b4 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -21,3 +21,49 @@ modules: columnname: active - columnname: actions + circ: + circulation: + issues-table: + - + columnname: un + cannot_be_toggled: 1 + cannot_be_modified: 1 + is_hidden: 1 + - + columnname: deux + cannot_be_toggled: 1 + cannot_be_modified: 1 + is_hidden: 1 + - + columnname: due_date_unformatted + cannot_be_toggled: 1 + cannot_be_modified: 1 + is_hidden: 1 + - + columnname: due_date + - + columnname: title + - + columnname: item_type + - + columnname: checkout_on + - + columnname: checkout_from + - + columnname: callno + - + columnname: charge + - + columnname: price + - + columnname: renew + cannot_be_toggled: 1 + cannot_be_modified: 1 + - + columnname: checkin + cannot_be_toggled: 1 + cannot_be_modified: 1 + - + columnname: export + cannot_be_toggled: 1 + cannot_be_modified: 1 diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc index 3f8db22..b16351e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc @@ -1,8 +1,8 @@ Totals: - [% totaldue %] - [% totalprice %] + [% totaldue %] + [% totalprice %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js index 71d2be2..e54bfd4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js @@ -164,13 +164,13 @@ $(document).ready(function() { $('#issues-table').show(); $('#issues-table-actions').show(); - issuesTable = $("#issues-table").dataTable({ + issuesTable = KohaTable("#issues-table", { "oLanguage": { "sEmptyTable" : MSG_DT_LOADING_RECORDS, "sProcessing": MSG_DT_LOADING_RECORDS, }, "bAutoWidth": false, - "sDom": "rt", + "sDom": 'C<"clearfix">rt', "aoColumns": [ { "mDataProp": function( oObj ) { @@ -381,9 +381,8 @@ $(document).ready(function() { total_charge += aaData[i]['charge'] * 1; total_price += aaData[i]['price'] * 1; } - var nCells = nRow.getElementsByTagName('td'); - nCells[1].innerHTML = total_charge.toFixed(2); - nCells[2].innerHTML = total_price.toFixed(2); + $("#totaldue").html(total_charge.toFixed(2)); + $("#totalprice").html(total_price.toFixed(2)); }, "bPaginate": false, "bProcessing": true, @@ -410,7 +409,7 @@ $(document).ready(function() { oSettings.aaSortingFixed = null; }, - }).rowGrouping( + }, columns_settings).rowGrouping( { iGroupingColumnIndex: 1, iGroupingOrderByColumnIndex: 0, 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 c1613ad..b57b6cf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1,6 +1,7 @@ [% USE Koha %] [% USE Branches %] [% USE KohaDates %] +[% USE ColumnsSettings %] [% IF Koha.Preference('ExportRemoveFields') OR Koha.Preference('ExportWithCsvProfile') %] [% SET exports_enabled = 1 %] [% END %] @@ -18,6 +19,7 @@ [% INCLUDE 'strings.inc' %] [% INCLUDE 'datatables.inc' %] +[% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'timepicker.inc' %] @@ -43,6 +45,9 @@ var relatives_borrowernumbers = new Array(); var MSG_ADD_MESSAGE = _("Add a new message"); var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); + +columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %] + [% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %] [% UNLESS ( borrowernumber ) %][% UNLESS ( selectborrower ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %] -- 1.7.2.5