[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/reserve/re... [rel_3_0]

[LAURIN arnaud]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	LAURIN arnaud <alaurin>	06/11/23 13:55:52

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/reserve: request.tmpl 
	reserve        : request.pl 

Log message:
	bug fixing san-op #85
	
	add the call number informations, in the array "items" from request.pl
	
	more visibility ......

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.10&r2=1.3.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/request.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.8&r2=1.6.2.9

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl,v
retrieving revision 1.3.2.10
retrieving revision 1.3.2.11
diff -u -b -r1.3.2.10 -r1.3.2.11
--- koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl	22 Nov 2006 10:38:35 -0000	1.3.2.10
+++ koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl	23 Nov 2006 13:55:52 -0000	1.3.2.11
@@ -173,6 +173,7 @@
         <th>Barcode</th>
         <th>Home branch</th>
         <th>Holding branch</th>
+        <th>Call number</th>
         <th>Information</th>
       </tr>
   <!-- TMPL_LOOP Name="itemloop" -->
@@ -187,6 +188,9 @@
           <!-- TMPL_VAR NAME="holdingbranch" -->
         </td>
         <td>
+          <!-- TMPL_VAR NAME="itemcallnumber" -->
+        </td>
+        <td>
     <!-- TMPL_IF Name="date_due" -->
           On loan, Return expected on <!-- TMPL_VAR NAME="date_due" -->
     <!-- /TMPL_IF -->
@@ -229,6 +233,7 @@
     
     <input type="hidden" name="biblioitem" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
     <input type="hidden" name="alreadyreserved" value="<!-- TMPL_VAR NAME="alreadyreserved" -->">
+  
   </fieldset>
 
   <div id="actions">

Index: reserve/request.pl
===================================================================
RCS file: /sources/koha/koha/reserve/request.pl,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -u -b -r1.6.2.8 -r1.6.2.9
--- reserve/request.pl	20 Nov 2006 11:02:42 -0000	1.6.2.8
+++ reserve/request.pl	23 Nov 2006 13:55:52 -0000	1.6.2.9
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: request.pl,v 1.6.2.8 2006/11/20 11:02:42 toins Exp $
+# $Id: request.pl,v 1.6.2.9 2006/11/23 13:55:52 alaurin Exp $
 
 #writen 2/1/00 by chris at katipo.oc.nz
 # Copyright 2000-2002 Katipo Communications
@@ -247,6 +247,9 @@
               $branchinfos_of->{ $item->{holdingbranch} }{branchname};
         }
 
+# 	add inforrmation
+	$item->{itemcallnumber} = $item->{itemcallnumber};
+	
         # if the item is currently on loan, we display its return date and
         # change the background color
         my $date_due;
@@ -317,7 +320,7 @@
 
 # existingreserves building
 my @reserveloop;
-my $branches = GetBranches('RE');
+my $branches = GetBranches();
 foreach my $res ( sort { $a->{found} cmp $b->{found} } @$reserves ) {
     my %reserve;
     my @optionloop;
@@ -343,18 +346,17 @@
         my %env;
         my $item = $res->{'itemnumber'};
         $item                     = getiteminformation($item);
-        $reserve{'holdingbranch'} = $item->{'holdingbranch'};
-        $reserve{'barcode'}       = $item->{'barcode'};
-        $reserve{'biblionumber'}  = $item->{'biblionumber'};
+        $reserve{'holdingbranch'}=$item->{'holdingbranch'};
+        $reserve{'biblionumber'}=$item->{'biblionumber'};
+        $reserve{'barcode'}=$item->{'barcode'};
         $reserve{'wbrcode'}       = $res->{'branchcode'};
-        $reserve{'wbrname'}       =
-          $branches->{ $res->{'branchcode'} }->{'branchname'};
-
-        if ( $reserve{'holdingbranch'} eq $reserve{'wbrcode'} ) {
+        $reserve{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+        if($reserve{'holdingbranch'} eq $reserve{'wbrcode'}){
             $reserve{'atdestination'} = 1;
         }
     }
 
+
     $reserve{'date'}           = format_date( $res->{'reservedate'} );
     $reserve{'borrowernumber'} = $res->{'borrowernumber'};
     $reserve{'biblionumber'}   = $res->{'biblionumber'};
@@ -370,7 +372,7 @@
     $reserve{'voldesc'}         = $res->{'volumeddesc'};
     $reserve{'ccode'}           = $res->{'ccode'};
     $reserve{'barcode'}         = $res->{'barcode'};
-    warn "retour barcode : " . $res->{'barcode'};
+    
     $reserve{'branchloop'} = \@branchloop;
     $reserve{'optionloop'} = \@optionloop;