[Koha-cvs] koha koha-tmpl/intranet-tmpl/default/en/members... [R_2-2-7-1]
paul poulain
paul at koha-fr.org
Mon Apr 30 11:06:47 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Branch: R_2-2-7-1
Changes by: paul poulain <tipaul> 07/04/30 09:06:47
Modified files:
koha-tmpl/intranet-tmpl/default/en/members: jmemberentry.tmpl
newjmember.tmpl
members : insertjdata.pl jmemberentry.pl newjmember.pl
Log message:
fix for #1117 : child card craziness
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.13.2.1&r2=1.13.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/members/insertjdata.pl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4.2.1&r2=1.4.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/members/jmemberentry.pl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.4&r2=1.1.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/members/newjmember.pl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4.2.3&r2=1.4.2.3.6.1
Patches:
Index: koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/Attic/jmemberentry.tmpl,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.1.2.1
diff -u -b -r1.13.2.1 -r1.13.2.1.2.1
--- koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl 12 Sep 2006 13:25:51 -0000 1.13.2.1
+++ koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl 30 Apr 2007 09:06:47 -0000 1.13.2.1.2.1
@@ -4,7 +4,7 @@
<form action="/cgi-bin/koha/members/newjmember.pl" method="post">
<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->">
<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
- <input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="zipcode" -->">
+ <input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->">
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
<input type="hidden" name="updtype" value="I">
<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->">
@@ -75,6 +75,15 @@
<td><input type="text" name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" value=""></td>
</tr>
<tr>
+ <th colspan="5" >LIBRARY USE</th>
+ </tr>
+ <tr>
+ <td>Joining date (leave blank for today)</td>
+ <td><input type="text" name="joining_child_<!-- TMPL_VAR NAME="i" -->" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"></td>
+ <td>Expiry date (leave blank for auto calc)</td>
+ <td><input type="text" name="expiry_child_<!-- TMPL_VAR NAME="i" -->" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"></td>
+ </tr>
+ <tr>
<td colspan="5">The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
<tr>
<td>Sorting field 1</td>
Index: koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/Attic/newjmember.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl 6 Dec 2004 21:10:32 -0000 1.4
+++ koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl 30 Apr 2007 09:06:47 -0000 1.4.10.1
@@ -86,6 +86,22 @@
<!-- TMPL_VAR NAME="notes" -->
</td>
</tr>
+ <tr valign="top" bgcolor="white" >
+ <td>
+ <b>Joining date</b>
+ </td>
+ <td>
+ <!-- TMPL_VAR NAME="joining" -->
+ </td>
+ </tr>
+ <tr valign="top" bgcolor="white" >
+ <td>
+ <b>Expiry date</b>
+ </td>
+ <td>
+ <!-- TMPL_VAR NAME="expiry" -->
+ </td>
+ </tr>
</table><p>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
Index: members/insertjdata.pl
===================================================================
RCS file: /sources/koha/koha/members/Attic/insertjdata.pl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.1.2.1
diff -u -b -r1.4.2.1 -r1.4.2.1.2.1
--- members/insertjdata.pl 12 Sep 2006 13:25:51 -0000 1.4.2.1
+++ members/insertjdata.pl 30 Apr 2007 09:06:47 -0000 1.4.2.1.2.1
@@ -25,7 +25,8 @@
use CGI;
use C4::Context;
use C4::Input;
-use Date::Manip;
+# use Date::Manip;
+use C4::Date;
use strict;
my $input= new CGI;
@@ -60,11 +61,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 +79,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: members/jmemberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/Attic/jmemberentry.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.4.2.1
diff -u -b -r1.1.2.4 -r1.1.2.4.2.1
--- members/jmemberentry.pl 12 Sep 2006 13:25:51 -0000 1.1.2.4
+++ members/jmemberentry.pl 30 Apr 2007 09:06:47 -0000 1.1.2.4.2.1
@@ -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 => \@titledata,
Index: members/newjmember.pl
===================================================================
RCS file: /sources/koha/koha/members/Attic/newjmember.pl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.3.6.1
diff -u -b -r1.4.2.3 -r1.4.2.3.6.1
--- members/newjmember.pl 5 Feb 2006 21:59:21 -0000 1.4.2.3
+++ members/newjmember.pl 30 Apr 2007 09:06:47 -0000 1.4.2.3.6.1
@@ -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.3.6.1 2007/04/30 09:06:47 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);
}
}
More information about the Koha-cvs
mailing list