[Koha-patches] [PATCH] [SIGNED-OFF] bug_6405: added enumchron to reserve copy list

[Katrin Fischer]

From: Srdjan Jankovic <srd...@catalyst.net.nz>

Conflicts:

        koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl

Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
---
 .../prog/en/modules/reserve/request.tt             |    8 ++++++++
 opac/opac-reserve.pl                               |    8 ++++----
 reserve/request.pl                                 |    8 ++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt 
b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 66c9235..325c8ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -388,6 +388,9 @@ function checkMultiHold() {
             <th>Last Location</th>
             <th>Call no.</th>
             <th>Copy no.</th>
+            [% IF itemdata_enumchron %]
+            <th>Vol no.</th>
+            [% END %]
             <th>Information</th>
         </tr>
     [% FOREACH itemloo IN bibitemloo.itemloop %]
@@ -426,6 +429,11 @@ function checkMultiHold() {
             [% itemloo.itemcallnumber %]
             </td>
             <td>[% IF ( itemloo.copynumber ) %][% itemloo.copynumber %][% ELSE 
%]&nbsp;[% END %]</td>
+            [% IF itemdata_enumchron %]
+            <td>
+            [% itemloo.enumchron %]
+            </td>
+            [% END %]
             <td>
                [% IF ( itemloo.onloan ) %]
             <span class="checkedout">Due [% itemloo.date_due %]</span>
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index d50480a..c0b940e 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -447,13 +447,13 @@ foreach my $biblioNum (@biblionumbers) {
        $itemLoopIter->{imageurl} = getitemtypeimagelocation( 'opac', 
$itemTypes->{ $itemInfo->{itype} }{imageurl} );
 
     # Show serial enumeration when needed
-    if ($itemLoopIter->{enumchron}) {
-        $itemdata_enumchron = 1;
-    }
-    $template->param( itemdata_enumchron => $itemdata_enumchron );
+        if ($itemLoopIter->{enumchron}) {
+            $itemdata_enumchron = 1;
+        }
 
         push @{$biblioLoopIter{itemLoop}}, $itemLoopIter;
     }
+    $template->param( itemdata_enumchron => $itemdata_enumchron );
 
     if ($numCopiesAvailable > 0) {
         $numBibsAvailable++;
diff --git a/reserve/request.pl b/reserve/request.pl
index 0b3bebc..3923992 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -230,6 +230,7 @@ if ($multihold) {
     push @biblionumbers, $input->param('biblionumber');
 }
 
+my $itemdata_enumchron = 0;
 my @biblioloop = ();
 foreach my $biblionumber (@biblionumbers) {
 
@@ -456,6 +457,12 @@ foreach my $biblionumber (@biblionumbers) {
             while (my $wait_hashref = $sth2->fetchrow_hashref) {
                 $item->{waitingdate} = 
format_date($wait_hashref->{waitingdate});
             }
+
+            # Show serial enumeration when needed
+            if ($item->{enumchron}) {
+                $itemdata_enumchron = 1;
+            }
+
             push @{ $biblioitem->{itemloop} }, $item;
         }
         
@@ -561,6 +568,7 @@ foreach my $biblionumber (@biblionumbers) {
     $template->param(
                      optionloop        => \@optionloop,
                      bibitemloop       => \@bibitemloop,
+                     itemdata_enumchron => $itemdata_enumchron,
                      date              => $date,
                      biblionumber      => $biblionumber,
                      findborrower      => $findborrower,
-- 
1.7.4.1

_______________________________________________
Koha-patches mailing list
Koha-patches@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/