From 8e21503439fecf58181e4721a178696cf9bf641a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 30 Sep 2014 11:35:56 -0400 Subject: [PATCH] [SIGNED OFF]Bug 9528 - Add delivery branch to the place hold display 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. Signed-off-by: Nick --- koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc | 5 +++-- koha-tmpl/intranet-tmpl/prog/en/js/holds.js | 12 ++++++++++-- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 1 + .../intranet-tmpl/prog/en/modules/members/moremember.tt | 1 + svc/holds | 1 + 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc index 20a0dad..2421ac6 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 suspended"); var UNTIL = _("until %s"); - var ITEM_IS_WAITING = _("Item is waiting"); // + var ITEM_IS_WAITING = _("Item is waiting"); + var ITEM_IS_WAITING_HERE = _("Item is waiting here"); var AT = _("at %s"); var ITEM_IS_IN_TRANSIT = _("Item is in transit from %s since %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 f2cc350..077b3b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js @@ -64,11 +64,14 @@ $(document).ready(function() { if ( oObj.barcode ) { data += ""; 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, oObj.date_sent ); } else if ( oObj.not_transferred ) { @@ -90,6 +93,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 c1613ad..644925a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -826,6 +826,7 @@ No patron matched [% message %] Title Call number Barcode + Pickup at Expiration Priority Delete? diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 3b89653..253d480 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -469,6 +469,7 @@ function validate1(date) { Title Call number Barcode + Pickup at Expiration Priority Delete? diff --git a/svc/holds b/svc/holds index 43bcf2a..761a161 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.10.4