From 225a7007052e9027f6fa1c141c6a3494224c1af8 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 13 May 2013 14:26:17 -0400
Subject: [PATCH] Bug 10221 - hold expiration doesn't show on patron's list of
 holds

When viewing the list of a patron's holds on the circulation page or the
patron detail page the table of holds doesn't display the holds
expiration date, if present. This patch adds display of the hold
expiration date.

To test, place a hold for a patron and set an expiration date for it.
View the patron's existing holds on both circulation.pl and
moremember.pl. The expiration date you chose should appear in the table
of information about existing holds.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
works great

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 circ/circulation.pl                                         | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 ++
 .../intranet-tmpl/prog/en/modules/members/moremember.tt     | 6 ++++--
 members/moremember.pl                                       | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index ef0edf7cf8..52823f47df 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -406,6 +406,7 @@ if ($borrowernumber) {
             $getreserv{biblionumber}    = $num_res->{'biblionumber'};
         }
         $getreserv{waitingposition} = $num_res->{'priority'};
+        $getreserv{expirationdate} = $num_res->{'expirationdate'};
         push( @reservloop, \%getreserv );
 
 #         if we have a reserve waiting, initiate waitingreserveloop
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 42a9b27643..95252e70f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -1103,6 +1103,7 @@ No patron matched <span class="ex">[% message %]</span>
             <th>Title</th>
             <th>Call number</th>
             <th>Barcode</th>
+            <th>Expiration</th>
             <th>Priority</th>
             <th>Delete?</th>
             <th>&nbsp;</th>
@@ -1121,6 +1122,7 @@ No patron matched <span class="ex">[% message %]</span>
                         [% END %]
                         [% IF ( reservloo.nottransfered ) %] hasn't been transferred yet from [% reservloo.nottransferedby %]</i>
                         [% END %]</em></td>
+                    <td>[% reservloo.expirationdate | $KohaDates %]</td>
                     <td>
                         [% IF ( reservloo.waitingposition ) %]<b> [% reservloo.waitingposition %] </b>[% END %]
                     </td>
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 6ccdd3916a..1566a32992 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -51,7 +51,7 @@ $(document).ready(function() {
             { "aTargets": [ -1,-2 ], "bSortable": false, "bSearchable": false }
         ],
         "aoColumns": [
-            { "sType": "title-string" },null,null,null,null,null,null
+            { "sType": "title-string" },null,null,null,null,null,null,null
         ],
         "bPaginate": false
     }));
@@ -116,7 +116,7 @@ if (nodename =="barcodes[]"){
     var Node=me.parentNode.previousSibling;
     while (Node.nodeName!="TD"){Node=Node.previousSibling}
     var Nodes=Node.childNodes;
-    for (var i=0;i<Nodes.length;i++){
+    for (var i=0;i < Nodes.length;i++){
       if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){
         Nodes[i].checked=false;
       }     
@@ -624,6 +624,7 @@ function validate1(date) {
 			<th>Title</th>
             <th>Call number</th>
 			<th>Barcode</th>
+            <th>Expiration</th>
 			<th>Priority</th>
 			<th>Delete?</th>
 			<th>&nbsp;</th>
@@ -650,6 +651,7 @@ function validate1(date) {
                 <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% reservloo.biblionumber %]">[% reservloo.barcodereserv %]</a>
                 [% END %]
             </td>
+            <td>[% reservloo.expirationdate | $KohaDates %]</td>
             <td>[% IF ( reservloo.waitingposition ) %]<strong>[% reservloo.waitingposition %]</strong>[% END %]</td>
             <td><select name="rank-request">
                     <option value="n">No</option>
diff --git a/members/moremember.pl b/members/moremember.pl
index 1cd6c05498..598b07db82 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -317,6 +317,7 @@ if ($borrowernumber) {
         $getreserv{waitingposition} = $num_res->{'priority'};
         $getreserv{suspend} = $num_res->{'suspend'};
         $getreserv{suspend_until} = $num_res->{'suspend_until'};
+        $getreserv{expirationdate} = $num_res->{'expirationdate'};
 
         push( @reservloop, \%getreserv );
     }
-- 
2.20.1