From eb6b6bbbeb8a401c0c8e71b1e8e9746262abc52b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 23 Dec 2014 11:30:33 +0100 Subject: [PATCH] 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 | 47 ++++++++++++++++++++++ .../prog/en/includes/checkouts-table-footer.inc | 6 +-- koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 13 +++--- .../prog/en/modules/circ/circulation.tt | 5 +++ 4 files changed, 61 insertions(+), 10 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index bf3e4d6..a01f6fe 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -142,3 +142,50 @@ modules: columnname: location - columnname: notes + + 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 dcc5ffc..549030f 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,9 +1,9 @@ Totals: - [% totaldue %] - [% finetotal %] - [% totalprice %] + [% totaldue %] + [% finetotal %] + [% totalprice %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js index c2131b6..b626ece 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 ) { @@ -386,10 +386,9 @@ $(document).ready(function() { total_fine += aaData[i]['fine'] * 1; total_price += aaData[i]['price'] * 1; } - var nCells = nRow.getElementsByTagName('td'); - nCells[1].innerHTML = total_charge.toFixed(2); - nCells[2].innerHTML = total_fine.toFixed(2); - nCells[3].innerHTML = total_price.toFixed(2); + $("#totaldue").html(total_charge.toFixed(2)); + $("#totalfine").html(total_fine.toFixed(2)); + $("#totalprice").html(total_price.toFixed(2)); }, "bPaginate": false, "bProcessing": true, @@ -416,7 +415,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 7d323ec..49d910a 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 ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %] -- 2.1.0