From 610a48e10fe72b1c61ea3bc072a3ddaa69aaa303 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 30 Sep 2014 11:35:56 -0400
Subject: [PATCH] Bug 9528 - Add delivery branch to the place hold display
Content-Type: text/plain; charset="utf-8"

When viewing the list of a patron's holds from the circulation or patron
detail page the pickup library is not listed. This patch adds a column
to the table of holds which shows the pickup branch.

This patch also removes some unnecessary markup from the generation of
the table and corrects an instance where the term "reserve" was used
instead of "hold."

This patch also modifies the language describing an item which is marked
waiting at the current library: "Item is waiting here" instead of "Item
waiting."

To test, add several holds to a patron's account with various pickup
locations.

- Confirm that those pickup locations are correctly displayed
  under the Holds tab in Circulation.

- Check in and confirm a hold which is to be picked up at the current
  branch. Confirm that the revised language appears.

- Confirm that table sorting works correctly.
---
 .../intranet-tmpl/prog/en/includes/strings.inc     |    5 +++--
 koha-tmpl/intranet-tmpl/prog/en/js/holds.js        |   14 +++++++++++---
 .../prog/en/modules/circ/circulation.tt            |    1 +
 svc/holds                                          |    1 +
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
index 8d1327e..1f92e09 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
@@ -6,7 +6,7 @@
     var CIRCULATION_RENEW_FAILED = _("Renew failed:")
     var NOT_CHECKED_OUT = _("not checked out");
     var TOO_MANY_RENEWALS = _("too many renewals");
-    var ON_RESERVE = _("on reserve");
+    var ON_RESERVE = _("on hold");
     var REASON_UNKNOWN = _("reason unkown");
     var TODAYS_CHECKOUTS = _("Today's checkouts");
     var PREVIOUS_CHECKOUTS = _("Previous checkouts");
@@ -19,7 +19,8 @@
     var RENEWALS_REMAINING = _("%s of %s renewals remaining");
     var HOLD_IS_SUSPENDED = _("Hold is <strong>suspended</strong>");
     var UNTIL = _("until %s");
-    var ITEM_IS_WAITING = _("Item is <strong>waiting</strong>"); //
+    var ITEM_IS_WAITING = _("Item is <strong>waiting</strong>");
+    var ITEM_IS_WAITING_HERE = _("Item is <strong>waiting here</strong>");
     var AT = _("at %s");
     var ITEM_IS_IN_TRANSIT = _("Item is <strong>in transit</strong> from %s");
     var FROM = _("from");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
index 73807ea..80014fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js
@@ -5,7 +5,7 @@ $(document).ready(function() {
         if ( ! holdsTable ) {
             holdsTable = $("#holds-table").dataTable({
                 "bAutoWidth": false,
-                "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
+                "sDom": "rt",
                 "aoColumns": [
                     {
                         "mDataProp": "reservedate_formatted"
@@ -58,11 +58,14 @@ $(document).ready(function() {
                             if ( oObj.barcode ) {
                                 data += "<em>";
                                 if ( oObj.found == "W" ) {
-                                    data += ITEM_IS_WAITING;
 
-                                    if ( ! oObj.waiting_here ) {
+                                    if ( oObj.waiting_here ) {
+                                        data += ITEM_IS_WAITING_HERE;
+                                    } else {
+                                        data += ITEM_IS_WAITING;
                                         data += " " + AT.format( oObj.waiting_at );
                                     }
+
                                 } else if ( oObj.transferred ) {
                                     data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch );
                                 } else if ( oObj.not_transferred ) {
@@ -84,6 +87,11 @@ $(document).ready(function() {
                             return data;
                         }
                     },
+                    {
+                        "mDataProp": function( oObj ) {
+                            return oObj.branchcode || "";
+                        }
+                    },
                     { "mDataProp": "expirationdate_formatted" },
                     {
                         "mDataProp": function( oObj ) {
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 fc61059..d8736ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -764,6 +764,7 @@ No patron matched <span class="ex">[% message %]</span>
                     <th>Title</th>
                     <th>Call number</th>
                     <th>Barcode</th>
+                    <th>Pickup at</th>
                     <th>Expiration</th>
                     <th>Priority</th>
                     <th>Delete?</th>
diff --git a/svc/holds b/svc/holds
index 3ff704f..3c48466 100755
--- a/svc/holds
+++ b/svc/holds
@@ -80,6 +80,7 @@ while ( my $h = $holds_rs->next() ) {
         title          => $h->biblio()->title(),
         author         => $h->biblio()->author(),
         reserve_id     => $h->reserve_id(),
+        branchcode     => $h->branchcode()->branchname(),
         reservedate    => $h->reservedate(),
         expirationdate => $h->expirationdate(),
         suspend        => $h->suspend(),
-- 
1.7.9.5