[Koha-cvs] koha/members insertjdata.pl jmemberentry.pl new... [rel_2_2]

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     paul poulain <tipaul>   07/04/30 10:02:30

Modified files:
        members        : insertjdata.pl jmemberentry.pl newjmember.pl 

Log message:
        fix for #1117, child card craziness (from R_2_2_7_1 branch)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/members/insertjdata.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.1&r2=1.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/members/jmemberentry.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/members/newjmember.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.3&r2=1.4.2.4

Patches:
Index: insertjdata.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/Attic/insertjdata.pl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- insertjdata.pl      12 Sep 2006 13:25:51 -0000      1.4.2.1
+++ insertjdata.pl      30 Apr 2007 10:02:30 -0000      1.4.2.2
@@ -25,7 +25,7 @@
 use CGI;
 use C4::Context;
 use C4::Input;
-use Date::Manip;
+use C4::Date;
 use strict;
 
 my $input= new CGI;
@@ -60,11 +60,9 @@
                where borrowernumber=$data{'borrowernumber'}";
                #  print $query;
        }elsif ($data{"cardnumber_child_$i"} ne ''){
-               my $dob=$data{"dateofbirth_child_$i"};
-               $dob=ParseDate($dob);
-               $dob=UnixDate($dob,'%Y-%m-%d');
-               $data{'joining'}=ParseDate("today");
-               $data{'joining'}=UnixDate($data{'joining'},'%Y-%m-%d');
+               my $dob=format_date_in_iso($data{"dateofbirth_child_$i"});
+               $data{'joining'}=format_date_in_iso($data{"joining_child_$i"});
+               my $expiry=format_date_in_iso($data{"expiry_child_$i"});
                my $cardnumber=$data{"cardnumber_child_$i"};
                my $bornum=$data{"bornumber_child_$i"};
                my $firstname=$data{"firstname_child_$i"};
@@ -80,7 +78,7 @@
                
firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity,
                
altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
                
initials,ethnicity,borrowernumber,guarantor,school,physstreet,sort1,sort2, 
branchcode)
-               values ('','$data{'expiry'}',
+               values ('','$expiry',
                '$cardnumber',
                
'$sex','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
                
'$firstname','$data{'altnotes'}','$dob','$data{'contactname'}','$data{'emailaddress'}',

Index: jmemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/Attic/jmemberentry.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- jmemberentry.pl     12 Sep 2006 13:25:51 -0000      1.1.2.4
+++ jmemberentry.pl     30 Apr 2007 10:02:30 -0000      1.1.2.5
@@ -94,7 +94,7 @@
                        contactname     => $data->{'contactname'},
                        altphone        => $data->{'altphone'},
                        branchcode     => $data->{'branchcode'},
-                       expiry        => $data->{'expiry'},
+                       expiry        => format_date($data->{'expiry'}),
                        zipcode        => $data->{'zipcode'},
                        dateformat      => display_date_format(),
                        titleloop       => address@hidden,

Index: newjmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/Attic/newjmember.pl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -b -r1.4.2.3 -r1.4.2.4
--- newjmember.pl       5 Feb 2006 21:59:21 -0000       1.4.2.3
+++ newjmember.pl       30 Apr 2007 10:02:30 -0000      1.4.2.4
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: newjmember.pl,v 1.4.2.3 2006/02/05 21:59:21 kados Exp $
+# $Id: newjmember.pl,v 1.4.2.4 2007/04/30 10:02:30 tipaul Exp $
 
 # script to print confirmation screen, then if accepted calls itself to insert 
data
 # FIXME - Yes, but what does it _do_?
@@ -131,6 +131,8 @@
                        ($data{"sex_child_$i"} eq 'M') ? ($ident{'sex'}="Male") 
: ($ident{'sex'}="Female") ;
                        $ident{'school'}=$data{"school_child_$i"};
                        $ident{'notes'}=$data{"altnotes_child_$i"};
+                       $ident{'joining'}=$data{"joining_child_$i"};
+                       $ident{'expiry'}=$data{"expiry_child_$i"};
                        push(@identsloop, \%ident);
                }
        }