From 44049ad57e1928f2870abed15e4659f8357c2f19 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 16 Nov 2018 14:51:48 +0000 Subject: [PATCH] Bug 21852: Add more columns and column configuration to overdues report This patch adds some new columns to the overdue report: Patron category, item home library, item holding library, item type. Adding these columns makes available columns better match the available filter fields in the sidebar form. Column configuration is added to this DataTable, with the new columns defined as hidden by default in order to preserve current functionality. This patch also fixes a bug where the home and holding branch template variable names didn't match what was being used in the template for pre-selecting the searched-for value in the sidebar filter menu. To test, apply the patch and go to Circulation -> Overdues. - The list of overdues should look correct, with no new columns shown. - Test the column visibility button, showing the columns which are hidden by default. Confirm that the data in these columns displays correctly. - Update the default configuration for this table in Administration -> Configure columns. Confirm that your changes are applied to the overdues report. Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- admin/columns_settings.yml | 31 ++++++++++++++++++ circ/overdue.pl | 8 +++-- .../prog/en/modules/circ/overdue.tt | 32 ++++++++++++++----- 3 files changed, 60 insertions(+), 11 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 3c5d2a9181..1ea975dce2 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -920,6 +920,37 @@ modules: - columnname: items_needed + overdues: + circ-overdues: + - + columnname: due_date + - + columnname: patron + - + columnname: patron_category + is_hidden: 1 + - + columnname: patron_library + - + columnname: title + - + columnname: home_library + is_hidden: 1 + - + columnname: holding_library + is_hidden: 1 + - + columnname: barcode + - + columnname: call_number + - + columnname: item_type + is_hidden: 1 + - + columnname: price + - + columnname: non-public_note + opac: biblio-detail: holdingst: diff --git a/circ/overdue.pl b/circ/overdue.pl index 0f286bc563..0e558dce1e 100755 --- a/circ/overdue.pl +++ b/circ/overdue.pl @@ -248,7 +248,8 @@ if ($noreport) { items.itemcallnumber, items.replacementprice, items.enumchron, - items.itemnotes_nonpublic + items.itemnotes_nonpublic, + items.itype FROM issues LEFT JOIN borrowers ON (issues.borrowernumber=borrowers.borrowernumber ) LEFT JOIN items ON (issues.itemnumber=items.itemnumber) @@ -331,12 +332,13 @@ if ($noreport) { biblionumber => $data->{biblionumber}, title => $data->{title}, author => $data->{author}, - homebranchcode => $data->{homebranchcode}, - holdingbranchcode => $data->{holdingbranchcode}, + homebranchcode => $data->{homebranch}, + holdingbranchcode => $data->{holdingbranch}, itemcallnumber => $data->{itemcallnumber}, replacementprice => $data->{replacementprice}, itemnotes_nonpublic => $data->{itemnotes_nonpublic}, enumchron => $data->{enumchron}, + itemtype => $data->{itype}, patron_attr_value_loop => \@patron_attr_value_loop, }; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index c1cecc6891..1e29484a70 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -3,6 +3,9 @@ [% USE KohaDates %] [%- USE Branches -%] [%- USE Price -%] +[%- USE ItemTypes -%] +[%- USE Categories -%] +[%- USE ColumnsSettings -%] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Circulation › Items overdue as of [% todaysdate | html %] @@ -51,10 +54,14 @@ Due date Patron - Library - Title + Patron category + Patron library + Title + Home library + Holding library Barcode Call number + Item type Price Non-public note @@ -70,10 +77,14 @@ [% IF ( overdueloo.email ) %][email][% END %] [% IF ( overdueloo.phone ) %]([% overdueloo.phone | html %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile | html %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro | html %])[% END %] [% END %] - [% Branches.GetName( overdueloo.patron.branchcode ) | html %] + [% Categories.GetName( overdueloo.patron.categorycode ) | html %] + [% Branches.GetName( overdueloo.homebranchcode ) | html %] [% INCLUDE 'biblio-default-view.inc' biblionumber = overdueloo.biblionumber %][% INCLUDE 'biblio-title.inc' biblio=overdueloo %] [% IF ( overdueloo.author ) %], by [% overdueloo.author | html %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron | html %][% END %] + [% Branches.GetName( overdueloo.holdingbranchcode ) | html %] + [% Branches.GetName( overdueloo.patron.branchcode ) | html %] [% overdueloo.barcode | html %] [% overdueloo.itemcallnumber | html %] + [% ItemTypes.GetDescription( overdueloo.itemtype ) | html %] [% overdueloo.replacementprice | $Price %] [% overdueloo.itemnotes_nonpublic | html %] @@ -213,7 +224,8 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] - [% END %] -- 2.39.5