From 8b5db832949c5057dff49dccb894d2bfaa0edf8b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 23 Dec 2014 11:59:07 +0100 Subject: [PATCH] [PASSED QA] Bug 13492: Add the location column to the checkouts tables Test plan: 1/ Verify that the location column is correctly displayed on the checkouts tables (circ/circulation.pl and members/moremember.pl). 2/ Verify that you can hide/show this column (using the admin page and/or the ColVis DT plugin). Signed-off-by: Aleisha Signed-off-by: Kyle M Hall --- admin/columns_settings.yml | 4 ++++ .../prog/en/includes/checkouts-table-footer.inc | 2 +- .../prog/en/includes/checkouts-table.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 2 ++ svc/checkouts | 2 ++ 5 files changed, 10 insertions(+), 1 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 541ad50..70059b4 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -46,6 +46,8 @@ modules: - columnname: item_type - + columnname: location + - columnname: checkout_on - columnname: checkout_from @@ -92,6 +94,8 @@ modules: - columnname: item_type - + columnname: location + - columnname: checkout_on - columnname: checkout_from 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 b16351e..ee487a1 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,6 +1,6 @@ - Totals: + Totals: [% totaldue %] [% totalprice %]
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 c471c46..bbd2f6d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -15,6 +15,7 @@ Due date Title Item type + Location Checked out on Checked out from Call no diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js index e54bfd4..330b261 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js @@ -262,6 +262,7 @@ $(document).ready(function() { } }, { "mDataProp": "itemtype_description" }, + { "mDataProp": "location" }, { "mDataProp": "issuedate_formatted" }, { "mDataProp": "branchname" }, { "mDataProp": "itemcallnumber" }, @@ -496,6 +497,7 @@ $(document).ready(function() { } }, { "mDataProp": "itemtype" }, + { "mDataProp": "location" }, { "mDataProp": "issuedate_formatted" }, { "mDataProp": "branchname" }, { "mDataProp": "itemcallnumber" }, diff --git a/svc/checkouts b/svc/checkouts index 51fd861..fad398f 100755 --- a/svc/checkouts +++ b/svc/checkouts @@ -93,6 +93,7 @@ my $sql = ' itemlost, damaged, + location, DATEDIFF( issuedate, CURRENT_DATE() ) AS not_issued_today FROM issues @@ -149,6 +150,7 @@ while ( my $c = $sth->fetchrow_hashref() ) { barcode => $c->{barcode}, itemtype => $item_level_itypes ? $c->{itype} : $c->{itemtype}, itemtype_description => $item_level_itypes ? $c->{itype_description} : $c->{itemtype_description}, + location => $c->{location} ? GetAuthorisedValueByCode( 'LOC', $c->{location} ) : q{}, itemnotes => $c->{itemnotes}, branchcode => $c->{branchcode}, branchname => $c->{branchname}, -- 1.7.2.5