From 1608da7acfb8d057a7a869a876b514b977258587 Mon Sep 17 00:00:00 2001 From: Jesse Maseto Date: Fri, 2 Mar 2018 13:11:44 +0000 Subject: [PATCH] =?UTF-8?q?Bug=2019719=20-=20Add=20a=20=E2=80=98Collection?= =?UTF-8?q?=E2=80=99=20column=20in=20the=20patron=20loans=20data=20table.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Severine 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 f56a745..5371eff 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 @@ -342,6 +344,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 4c66feb..f1f9cac 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