From 5541ec1e99e818fcd5c9f2d18d24ec55f11c63c4 Mon Sep 17 00:00:00 2001
From: oleonard <oleonard>
Date: Mon, 6 Dec 2004 21:07:30 +0000
Subject: [PATCH] Moving error messages out of script and into template, fix
 for Bug 538

---
 .../default/en/members/newjmember.tmpl        | 17 ++++++-
 members/newjmember.pl                         | 51 ++++++++++++-------
 2 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl
index 44f5c61112..d999acb6d8 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl
@@ -1,7 +1,14 @@
 <!-- TMPL_INCLUDE Name="members-top.inc" -->
 <div id="mainbloc">
 	<!-- TMPL_IF Name="NOK" -->
-		<!-- TMPL_VAR NAME="string" -->
+	<h3>The following fields were entered incorrectly.  Please go back and correct them.</h3>
+	<ul>
+		<!-- TMPL_IF NAME="cardnumber_missing" --><li>Please enter a library card number.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="firstname_missing" --><li>Please enter the patron's first name.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="surname_missing" --><li>Please enter the patron's last name.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="dob_missing" --><li>Please enter the patron's date of birth.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="gender_missing" --><li>Please enter the patron's gender.</li><!-- /TMPL_IF -->
+	</ul>
 	<!-- TMPL_ELSE -->
 		<h1> Confirm Record </h1>
 		<!-- TMPL_LOOP Name="identsloop" -->
@@ -39,6 +46,14 @@
 						<!-- TMPL_VAR NAME="bornum" -->
 						</td>
 					</tr>
+					<tr valign="top" bgcolor="white" >
+						<td>
+						<b>Barcode Number</b>
+						</td>
+						<td>
+						<!-- TMPL_VAR NAME="cardchild" -->
+						</td>
+					</tr>					
 					<tr valign="top" bgcolor="white" >
 						<td>
 						<b>Date of birth</b>
diff --git a/members/newjmember.pl b/members/newjmember.pl
index 2300922fdf..ee010e236b 100755
--- a/members/newjmember.pl
+++ b/members/newjmember.pl
@@ -58,8 +58,6 @@ foreach my $key (@names){
 }
 my $missing=0;
 
-my $string="The following compulsary fields have been left blank. Please push the back button
-and try again<p>";
 for (my $i=0;$i<3;$i++){
   my $number=$data{"cardnumber_child_$i"};
   my $firstname=$data{"firstname_child_$i"};
@@ -68,37 +66,54 @@ for (my $i=0;$i<3;$i++){
   my $sex=$data{"sex_child_$i"};
   if ($number eq ''){
     if ($i == 0){
-      $string.=" Cardnumber<br>";
-      $missing=1;
+		$template->param(cardnumber_missing => 1);
+		$missing=1;
+		    if ($firstname eq ''){
+		$template->param(firstname_missing => 1);
+		$missing=1;
+    }
+    if ($surname eq ''){
+		$template->param(surname_missing => 1);
+		$missing=1;
+    }
+    if ($dob eq ''){
+		$template->param(dob_missing => 1);
+		$missing=1;
+    }
+    if ($sex eq ''){
+		$template->param(gender_missing => 1);
+		$missing=1;
+    }
     }
   } else {
     if ($firstname eq ''){
-      $string.=" Given Names<br>";
-      $missing=1;
+		$template->param(firstname_missing => 1);
+		$missing=1;
     }
     if ($surname eq ''){
-      $string.=" Surname<br>";
-      $missing=1;
+		$template->param(surname_missing => 1);
+		$missing=1;
     }
     if ($dob eq ''){
-      $string.=" Date Of Birth<br>";
-      $missing=1;
+		$template->param(dob_missing => 1);
+		$missing=1;
     }
     if ($sex eq ''){
-      $string.=" Gender <br>";
-      $missing=1;
+		$template->param(gender_missing => 1);
+		$missing=1;
     }
     #check cardnumber is valid
     my $nounique;
     if ( $data{'type'} ne "Add" )    {
-	$nounique = 0;
+		$nounique = 0;
     } else {
-	$nounique = 1;
+		$nounique = 1;
     }
     my $valid=checkdigit(\%env,$number, $nounique);
     if ($valid != 1){
-      $string.=" Invalid Cardnumber $number<br>";
-      $missing=1;
+		$template->param(missing =>1);
+		$template->param(invalid_cardnumber => 1);
+		$missing=1;
     }
   }
 }
@@ -107,7 +122,7 @@ for (my $i=0;$i<3;$i++){
 		my %ident;
 #		$ident{'main'}=$main;
 #		$ident{'image'}=$image;
-		$ident{'cardchild'}=($data{"cardnumber_child_$i"} ne '');
+		$ident{'cardchild'}=$data{"cardnumber_child_$i"};
 		if ($data{"cardnumber_child_$i"} ne ''){
 			my $name=$data{"firstname_child_$i"} . " " . $data{"surname_child_$i"};
 			$ident{'name'}=$name;
@@ -132,6 +147,6 @@ for (my $i=0;$i<3;$i++){
 $template->param( 	NOK => ($missing==1),
 								identsloop => \@identsloop,
 								inputsloop => \@inputsloop,
-								string => $string);
+								);
 
 output_html_with_http_headers $input, $cookie, $template->output;
-- 
2.39.5