[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/members/gu... [rel_3_0]

Bruno Toumi btoumi at ouestprovence.fr
Fri Nov 17 11:53:44 CET 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Bruno Toumi <btoumi>	06/11/17 10:53:44

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/members: guarantor_search.tmpl 
	                                         memberentryC.tmpl 
	members        : guarantor_search.pl memberentry.pl 

Log message:
	add new field in memberentryC template to show name and surname of guarantor if exist 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9.2.11&r2=1.9.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/members/guarantor_search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.12&r2=1.38.2.13

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl	16 Nov 2006 15:13:16 -0000	1.2.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl	17 Nov 2006 10:53:44 -0000	1.2.2.2
@@ -28,7 +28,7 @@
 				<tr bgcolor="white">
 			<!-- /TMPL_IF -->
 				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
-				<td><p><a href="javascript:window.opener.document.form.guarantorid.value=<!-- TMPL_VAR NAME="borrowernumber" -->;window.opener.document.form.guarantorsearch.value='Modify Guarantor';self.close();"><!-- TMPL_VAR NAME="surname" --></a></p>
+				<td><p><a href="javascript:window.opener.document.form.guarantorid.value=<!-- TMPL_VAR NAME="borrowernumber" -->;window.opener.document.form.guarantorsearch.value='Modify Guarantor';window.opener.document.form.guarantorinfo.value='<!-- TMPL_VAR NAME="guarantorinfo" -->';self.close();"><!-- TMPL_VAR NAME="surname" --></a></p>
 				<td><b><!-- TMPL_VAR NAME="firstname" --></b></td> 
 				<td><!-- TMPL_VAR NAME="dateofbirth" --></td>
 				<td><p><!-- TMPL_VAR NAME="address" --> <!-- TMPL_VAR NAME="city" --></p></td>

Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl,v
retrieving revision 1.9.2.11
retrieving revision 1.9.2.12
diff -u -b -r1.9.2.11 -r1.9.2.12
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl	16 Nov 2006 15:13:16 -0000	1.9.2.11
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl	17 Nov 2006 10:53:44 -0000	1.9.2.12
@@ -184,6 +184,7 @@
 	<!-- TMPL_ELSE -->
 		<input name="guarantorsearch" type="button" value="Find guarantor" onClick="javascript:Dopopguarantor('guarantor_search.pl');">
 	<!-- /TMPL_IF -->	
+	<input name="guarantorinfo" type="text"  size="20"  value="<!-- TMPL_VAR NAME="guarantorinfo" -->" disabled readOnly >
 	</p>
 	</fieldset>
 	<fieldset id="memberentry_identity">
@@ -271,6 +272,7 @@
 		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">	
 		<input type="hidden" name="sort1"  value="<!-- TMPL_VAR NAME="sort1" -->">
 		<input type="hidden" name="sort2"  value="<!-- TMPL_VAR NAME="sort2" -->">
+		<input name="guarantorinfo" type="hidden"  size="20"  value="<!-- TMPL_VAR NAME="guarantorinfo" -->" readOnly >
 
 <!-- 		input from form3		 -->
 		<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
@@ -522,6 +524,7 @@
 		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">	
 		<input type="hidden" name="sort1"  value="<!-- TMPL_VAR NAME="sort1" -->">
 		<input type="hidden" name="sort2"  value="<!-- TMPL_VAR NAME="sort2" -->">
+		<input name="guarantorinfo" type="hidden"  size="20"  value="<!-- TMPL_VAR NAME="guarantorinfo" -->" readOnly >
 <!-- 		input from form 2 -->
 		<input type="hidden" name="contacttitle" size="20" value="<!-- TMPL_VAR NAME="contacttitle" -->">
 		<input type="hidden" name="contactname" size="35" value="<!-- TMPL_VAR NAME="contactname" -->">

Index: members/guarantor_search.pl
===================================================================
RCS file: /sources/koha/koha/members/guarantor_search.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- members/guarantor_search.pl	14 Apr 2006 09:32:34 -0000	1.1
+++ members/guarantor_search.pl	17 Nov 2006 10:53:44 -0000	1.1.2.1
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: guarantor_search.pl,v 1.1 2006/04/14 09:32:34 tipaul Exp $
+# $Id: guarantor_search.pl,v 1.1.2.1 2006/11/17 10:53:44 btoumi Exp $
 
 # script to find a guarantor
 
@@ -76,7 +76,7 @@
 	for (my $i=0; $i < $count; $i++){
 	#find out stats
 	my ($od,$issue,$fines)=borrdata2($env,$results->[$i]{'borrowerid'});
-	
+	my $guarantorinfo=uc($results->[$i]{'surname'})." , ".ucfirst($results->[$i]{'firstname'});
 	my %row = (
 		background => $background,
 		count => $i+1,
@@ -88,7 +88,7 @@
 		address => $results->[$i]{'address'},
 		city => $results->[$i]{'city'},
 		branchcode => $results->[$i]{'branchcode'},
-		
+		guarantorinfo =>$guarantorinfo,
 		#op
 		dateofbirth =>format_date($results->[$i]{'dateofbirth'}),
 		#fi op	

Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.38.2.12
retrieving revision 1.38.2.13
diff -u -b -r1.38.2.12 -r1.38.2.13
--- members/memberentry.pl	14 Nov 2006 15:28:10 -0000	1.38.2.12
+++ members/memberentry.pl	17 Nov 2006 10:53:44 -0000	1.38.2.13
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.38.2.12 2006/11/14 15:28:10 btoumi Exp $
+# $Id: memberentry.pl,v 1.38.2.13 2006/11/17 10:53:44 btoumi Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -76,6 +76,7 @@
 my $nodouble=$input->param('nodouble');
 my $select_city=$input->param('select_city');
 my $nok=$input->param('nok');
+my $guarantorinfo=$input->param('guarantorinfo');
 my @errors;
 my $default_city;
 # $check_categorytype contains the value of duplicate borrowers category type to redirect in good template in step =2
@@ -513,6 +514,7 @@
 		roadpopup	=> $roadpopup,	
 		contacttype	=> $data{'contacttype'},
 	        organisations   => $data{'organisations'},
+		guarantorinfo   => $guarantorinfo,
 		flagloop	=> \@flagdata,
 # 		"contacttype_".$data{'contacttype'} =>" SELECTED ",
 		dateformat      => display_date_format(),





More information about the Koha-cvs mailing list