From 3412144bf2e92d534d6c7d9c06d2509322720357 Mon Sep 17 00:00:00 2001 From: Jesse Maseto Date: Fri, 2 Mar 2018 13:11:44 +0000 Subject: [PATCH] Bug 19719: Add new column for collection in the patron checkouts data tables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the collection visible in the checkouts table on the details and issues tab in the patron account in staff. TEST: 1. Check out a few items to patron. 2. View check outs on patron account in staff client. 3. Collection code is not present. 4. Apply patch 5. Notice that not Collection code is visible while viewing check outs. Signed-off-by: Severine QUEUNE Signed-off by: Maksim Sen Signed-off-by: Katrin Fischer Signed-off-by: Séverine QUEUNE --- admin/columns_settings.yml | 4 ++++ koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 1 + koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 2 ++ svc/checkouts | 3 +++ 5 files changed, 11 insertions(+) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 2390364..d042464 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -230,6 +230,8 @@ modules: - columnname: item_type - + columnname: collection_code + - columnname: location - columnname: homebranch @@ -385,6 +387,8 @@ modules: - columnname: item_type - + columnname: collection_code + - columnname: location - columnname: homebranch diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc index b34089d..aa38cc8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -16,6 +16,7 @@ Due date Title Item type + Collection code Location Home library Checked out on 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 b2c8834..5fd81b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -851,6 +851,7 @@ No patron matched [% message | html %] Due date Title Item type + Collection code Location Checked out on Checked out from diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index 5167ee1..d4c063e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -291,6 +291,7 @@ $(document).ready(function() { "sType": "anti-the" }, { "mDataProp": "itemtype_description" }, + { "mDataProp": "ccode" }, { "mDataProp": "location" }, { "mDataProp": "homebranch" }, { "mDataProp": "issuedate_formatted" }, @@ -589,6 +590,7 @@ $(document).ready(function() { "sType": "anti-the" }, { "mDataProp": "itemtype" }, + { "mDataProp": "ccode" }, { "mDataProp": "location" }, { "mDataProp": "issuedate_formatted" }, { "mDataProp": "branchname" }, diff --git a/svc/checkouts b/svc/checkouts index fefadee..d1fb8d3 100755 --- a/svc/checkouts +++ b/svc/checkouts @@ -90,6 +90,8 @@ my $sql = ' items.itype, biblioitems.itemtype, + items.ccode, + borrowernumber, surname, firstname, @@ -171,6 +173,7 @@ while ( my $c = $sth->fetchrow_hashref() ) { barcode => $c->{barcode}, itemtype => $item_level_itypes ? $c->{itype} : $c->{itemtype}, itemtype_description => $itemtype ? $itemtype->translated_description : q{}, + ccode => $c->{ccode}, location => $location, homebranch => $c->{homebranch}, itemnotes => $c->{itemnotes}, -- 2.1.4