Attachment 35481 Details for Bug 13492 – Bug 13492: Add the location column to the checkouts tables

[patch] Bug 13492: Add the location column to the checkouts tables

Bug-13492-Add-the-location-column-to-the-checkouts.patch (text/plain), 4.62 KB, created by Aleisha Amohia on 2015-01-22 22:16:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2015-01-22 22:16:27 UTC

Size: 4.62 KB

patch

obsolete

>From 02c917e56ee4aa79a737fd5c813564033558d876 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Tue, 23 Dec 2014 11:59:07 +0100
>Subject: [PATCH] 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 <aleishaamohia@hotmail.com>
>---
> admin/columns_settings.yml                                         |    4 ++++
> .../intranet-tmpl/prog/en/includes/checkouts-table-footer.inc      |    2 +-
> koha-tmpl/intranet-tmpl/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 deletion(-)
>
>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 @@
> <tfoot>
> 	<tr>
>-        <td colspan="9" style="text-align: right; font-weight:bold;">Totals:</td>
>+        <td colspan="10" style="text-align: right; font-weight:bold;">Totals:</td>
>         <td id="totaldue">[% totaldue %]</td>
>         <td id="totalprice">[% totalprice %]</td>
>                 <td colspan="3"><div class="date-select">
>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 @@
>                         <th scope="col">Due date</th>
>                         <th scope="col">Title</th>
>                         <th scope="col">Item type</th>
>+                        <th scope="col">Location</th>
>                         <th scope="col">Checked out on</th>
>                         <th scope="col">Checked out from</th>
>                         <th scope="col">Call no</th>
>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.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 13492: 34662 | 34663 | 34664 | 35481 | 35511 | 35512 | 35513 | 38434 | 38435 | 38436 | 38473 | 38474