[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>	07/01/24 11:14:07

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

Log message:
	bugfixing and improvements for request :
	
		- bug fix for queue list rank management
		- Two distinct calls for queue list of reservations and globality of reservation of this biblionumber (now the security of a single possibility of reservation for a biblionumber now working ....)
		- No possibility to change the order of reservation (maybe managed a possibility to switch by a system preference to change order of reservtion ....)
		-adding the expected place of retreat for the reserve on the item reservation line ...
	
	some improvements will be commit soon, working on it .....

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.17&r2=1.3.2.18
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/request.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.14&r2=1.6.2.15

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.17
retrieving revision 1.3.2.18
diff -u -b -r1.3.2.17 -r1.3.2.18
--- koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl	12 Jan 2007 18:09:19 -0000	1.3.2.17
+++ koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl	24 Jan 2007 11:14:06 -0000	1.3.2.18
@@ -139,6 +139,7 @@
     <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
     <input type="hidden" name="type" value="str8">
     <input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->">
+    <input type="hidden" name="rank-request" value="<!-- TMPL_VAR NAME="fixedRank" -->">
     <p><label>Member</label>
         <!-- TMPL_IF NAME="cardnumber"-->
             <!-- TMPL_VAR NAME="borrowersurname" --> <!-- TMPL_VAR NAME="borrowerfirstname" -->
@@ -149,15 +150,7 @@
     </p>
     <p>
     <label for="priority">Priority</label>
-        <select name="rank-request">
-        <!-- TMPL_LOOP Name="optionloop" -->
-            <!-- TMPL_IF Name="selected" -->
-                        <option value="<!-- TMPL_VAR NAME="num" -->" selected="selected"><!-- TMPL_VAR NAME="num" --></option>
-            <!-- TMPL_ELSE -->
-                        <option value="<!-- TMPL_VAR NAME="num" -->"><!-- TMPL_VAR NAME="num" --></option>
-            <!-- /TMPL_IF -->
-        <!-- /TMPL_LOOP -->
-        </select>
+     	<b> <!-- TMPL_VAR Name="fixedRank" --> </b>
     </p>
     <p>
         <label>Notes</label>
@@ -239,6 +232,8 @@
                 else {return false;}">Cancel A reserve
         	 <span> Item reserved for :
         	 	<!-- TMPL_VAR NAME="ReservedForSurname" -->  <!-- TMPL_VAR NAME="ReservedForFirstname" -->
+        	 <br>
+        	 expected at :	<!-- TMPL_VAR NAME="ExpectedAtLibrary" -->
         	 </span>
         	 </a>
 		<!-- /TMPL_IF -->

Index: reserve/request.pl
===================================================================
RCS file: /sources/koha/koha/reserve/request.pl,v
retrieving revision 1.6.2.14
retrieving revision 1.6.2.15
diff -u -b -r1.6.2.14 -r1.6.2.15
--- reserve/request.pl	20 Dec 2006 16:30:40 -0000	1.6.2.14
+++ reserve/request.pl	24 Jan 2007 11:14:07 -0000	1.6.2.15
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: request.pl,v 1.6.2.14 2006/12/20 16:30:40 btoumi Exp $
+# $Id: request.pl,v 1.6.2.15 2007/01/24 11:14:07 alaurin Exp $
 
 #writen 2/1/00 by chris at katipo.oc.nz
 # Copyright 2000-2002 Katipo Communications
@@ -162,7 +162,7 @@
 }
 
 # get existing reserves .....
-my ( $count, $reserves ) = FindReservesInQueue($biblionumber);
+my ( $count, $reserves ) = FindReserves($biblionumber);
 my $totalcount = $count;
 my $alreadyreserved;
 
@@ -178,9 +178,12 @@
         $alreadyreserved = 1;
     }
 }
+
 $template->param( alreadyreserved => $alreadyreserved );
 
+# FIXME think @optionloop, is maybe obsolete, or  must be switchable by a systeme preference fixed rank or not
 # make priorities options
+
 my @optionloop;
 for ( 1 .. $count + 1 ) {
     push(
@@ -191,6 +194,8 @@
         }
     );
 }
+# adding a fixed value for priority options
+my $fixedRank = $count+1;
 
 my @branchcodes;
 my %itemnumbers_of_biblioitem;
@@ -260,7 +265,7 @@
         }
 
         # checking reserve
-        my ($reservedate,$reservedfor) = GetFirstReserveDateFromItem($itemnumber);
+        my ($reservedate,$reservedfor,$expectedAt) = GetFirstReserveDateFromItem($itemnumber);
         my $ItemBorrowerReserveInfo = getpatroninformation( \%env, $reservedfor, 0);
 
         if ( defined $reservedate ) {
@@ -269,6 +274,7 @@
             $item->{ReservedForBorrowernumber}     = $reservedfor;
             $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
             $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
+            $item->{ExpectedAtLibrary}     = $expectedAt;
             
         }
 
@@ -326,6 +332,7 @@
 # existingreserves building
 my @reserveloop;
 my $branches = GetBranches();
+my ( $count, $reserves ) = FindReservesInQueue($biblionumber);
 foreach my $res ( sort { $a->{found} cmp $b->{found} } @$reserves ) {
     my %reserve;
     my @optionloop;
@@ -363,7 +370,7 @@
         }
     }
     
-#     get borrowers info
+#     get borrowers reserve info
 my $reserveborrowerinfo = getpatroninformation( \%env, $res->{'borrowernumber'}, 0);
 
     $reserve{'date'}           = format_date( $res->{'reservedate'} );
@@ -411,9 +418,10 @@
     CGIbranch   => $CGIbranch,
     reserveloop => \@reserveloop,
     time        => $time,
+    fixedRank	=> $fixedRank,
 );
 
-# setup colors
+# display infos
 $template->param(
     optionloop        => \@optionloop,
     bibitemloop       => \@bibitemloop,