[Koha-cvs] CVS: koha newimember.pl,1.5,1.6 newjmember.pl,1.5,1.6

[Mike Hansen]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1:/tmp/cvs-serv1249/koha

Modified Files:
        newimember.pl newjmember.pl 
Log Message:


Index: newimember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newimember.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** newimember.pl       10 Feb 2003 07:14:17 -0000      1.5
--- newimember.pl       19 Feb 2003 05:22:01 -0000      1.6
***************
*** 59,64 ****
  }
  
! # FIXME: $ok means "not ok", but $valid really means "valid"
! my $ok=0;
  
  my $string="The following compulsary fields have been left blank. Please push 
the back button
--- 59,63 ----
  }
  
! my $missing=0;
  
  my $string="The following compulsary fields have been left blank. Please push 
the back button
***************
*** 66,91 ****
  if ($data{'cardnumber_institution'} !~ /\S/){
    $string.="Cardnumber<br>";
!   $ok=1;
  }
  if ($data{'institution_name'} !~ /\S/){
    $string.="Institution Name<br>";
!   $ok=1;
  }
  if ($data{'address'} !~ /\S/){
    $string.="Postal Address<br>";
!   $ok=1;
  }
  if ($data{'city'} !~ /\S/){
    $string.="City<br>";
!   $ok=1;
  }
  if ($data{'contactname'} !~ /\S/){
    $string.="Contact Name";
!   $ok=1;
  }
  
! $template->param( missingloop => ($ok==1));
  $template->param( string => $string);
! if ($ok !=1) {
      $data{'cardnumber_institution'} = C4::Members::fixup_cardnumber
            ($data{'cardnumber_institution'});
--- 65,90 ----
  if ($data{'cardnumber_institution'} !~ /\S/){
    $string.="Cardnumber<br>";
!   $missing=1;
  }
  if ($data{'institution_name'} !~ /\S/){
    $string.="Institution Name<br>";
!   $missing=1;
  }
  if ($data{'address'} !~ /\S/){
    $string.="Postal Address<br>";
!   $missing=1;
  }
  if ($data{'city'} !~ /\S/){
    $string.="City<br>";
!   $missing=1;
  }
  if ($data{'contactname'} !~ /\S/){
    $string.="Contact Name";
!   $missing=1;
  }
  
! $template->param( missingloop => ($missing==1));
  $template->param( string => $string);
! if ($missing !=1) {
      $data{'cardnumber_institution'} = C4::Members::fixup_cardnumber
            ($data{'cardnumber_institution'});

Index: newjmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newjmember.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** newjmember.pl       18 Dec 2002 16:58:28 -0000      1.5
--- newjmember.pl       19 Feb 2003 05:22:01 -0000      1.6
***************
*** 46,50 ****
    $data{$key}=$input->param($key);
  }
! my $ok=0;
  
  my $string="The following compulsary fields have been left blank. Please push 
the back button
--- 46,50 ----
    $data{$key}=$input->param($key);
  }
! my $missing=0;
  
  my $string="The following compulsary fields have been left blank. Please push 
the back button
***************
*** 59,85 ****
      if ($i == 0){
        $string.=" Cardnumber<br>";
!       $ok=1;
      }
    } else {
      if ($firstname eq ''){
        $string.=" Given Names<br>";
!       $ok=1;
      }
      if ($surname eq ''){
        $string.=" Surname<br>";
!       $ok=1;
      }
      if ($dob eq ''){
        $string.=" Date Of Birth<br>";
!       $ok=1;
      }
      if ($sex eq ''){
        $string.=" Gender <br>";
!       $ok=1;
      }
      my $valid=checkdigit(\%env,$data{"cardnumber_child_$i"});
      if ($valid != 1){
-       $ok=1;
        $string.=" Invalid Cardnumber $number<br>";
      }
    }
--- 59,85 ----
      if ($i == 0){
        $string.=" Cardnumber<br>";
!       $missing=1;
      }
    } else {
      if ($firstname eq ''){
        $string.=" Given Names<br>";
!       $missing=1;
      }
      if ($surname eq ''){
        $string.=" Surname<br>";
!       $missing=1;
      }
      if ($dob eq ''){
        $string.=" Date Of Birth<br>";
!       $missing=1;
      }
      if ($sex eq ''){
        $string.=" Gender <br>";
!       $missing=1;
      }
      my $valid=checkdigit(\%env,$data{"cardnumber_child_$i"});
      if ($valid != 1){
        $string.=" Invalid Cardnumber $number<br>";
+       $missing=1;
      }
    }
***************
*** 112,116 ****
  
  # FIXME IF main and image are not fetched by HTML::TEMPLATE get them into 
identsloop
! $template->param(     NOK => (ok==1),
                                                                main => $main,
                                                                image => $image,
--- 112,116 ----
  
  # FIXME IF main and image are not fetched by HTML::TEMPLATE get them into 
identsloop
! $template->param(     NOK => ($missing==1),
                                                                main => $main,
                                                                image => $image,