[Koha-cvs] koha C4Members.pm koha-tmpl/intranet-tmpl/prog/...
Bruno Toumi
btoumi at ouestprovence.fr
Wed Jun 7 16:55:37 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Changes by: Bruno Toumi <btoumi> 06/06/07 14:55:37
Modified files:
C4 : Members.pm
koha-tmpl/intranet-tmpl/prog/en/includes/javascript: members.js
koha-tmpl/intranet-tmpl/prog/en/members: memberentryA.tmpl
moremember.tmpl
members : memberentry.pl
Log message:
members.js :translate javascript message
moremember.tmpl:change wrong url
Members.pm: change wrong field name in sql request(sub newmember)
memberentryA.tmpl : change wrong field name
memberentry.pl:change test condition (checkuniquemember)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.26&r2=1.27
Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- C4/Members.pm 6 Jun 2006 23:36:37 -0000 1.23
+++ C4/Members.pm 7 Jun 2006 14:55:36 -0000 1.24
@@ -19,7 +19,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Members.pm,v 1.23 2006/06/06 23:36:37 bob_lyon Exp $
+# $Id: Members.pm,v 1.24 2006/06/07 14:55:36 btoumi Exp $
use strict;
require Exporter;
@@ -31,7 +31,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.23 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.24 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -465,15 +465,15 @@
. $dbh->quote( $data{'dateexpiry'} )
. ",contactnote="
. $dbh->quote( $data{'contactnote'} )
- . ",b_address="
+ . ",B_address="
. $dbh->quote( $data{'b_address'} )
- . ",b_zipcode="
+ . ",B_zipcode="
. $dbh->quote( $data{'b_zipcode'} )
- . ",b_city="
+ . ",B_city="
. $dbh->quote( $data{'b_city'} )
- . ",b_phone="
+ . ",B_phone="
. $dbh->quote( $data{'b_phone'} )
- . ",b_email="
+ . ",B_email="
. $dbh->quote( $data{'b_email'}, )
. ",password="
. $dbh->quote( $data{'password'} )
@@ -497,9 +497,9 @@
. $dbh->quote( $data{'flags'} )
. ",relationship="
. $dbh->quote( $data{'relationship'} )
- . ",b_streetnumber="
+ . ",B_streetnumber="
. $dbh->quote( $data{'b_streetnumber'})
- . ",b_streettype="
+ . ",B_streettype="
. $dbh->quote( $data{'b_streettype'})
. ",gonenoaddress="
. $dbh->quote( $data{'gonenoaddress'})
@@ -515,8 +515,8 @@
my $sth = $dbh->prepare($query);
$sth->execute;
$sth->finish;
- $data{'borrowerid'} = $dbh->{'mysql_insertid'};
- return $data{'borrowerid'};
+ $data{'borrowernumber'} = $dbh->{'mysql_insertid'};
+ return $data{'borrowernumber'};
}
sub changepassword {
Index: koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js 7 Jun 2006 10:15:58 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js 7 Jun 2006 14:55:36 -0000 1.3
@@ -11,17 +11,21 @@
var m=(d.substring(3,5));
var a=(d.substring(6));
var ok=1;
+ var msg;
if ( ((isNaN(j))||(j<1)||(j>31)) && (ok==1) ) {
- alert("Le jour n'est pas correct."); ok=0;
+ msg = _("day not correct.");
+ alert(msg); ok=0;
}
if ( ((isNaN(m))||(m<1)||(m>12)) && (ok==1) ) {
- alert("Le mois n'est pas correct."); ok=0;
+ msg = _("month not correct.");
+ alert(msg); ok=0;
}
if ( ((isNaN(a))||(a<amin)||(a>amax)) && (ok==1) ) {
- alert("L'année n'est pas correcte."); ok=0;
+ msg = _("years not correct.");
+ alert(msg); ok=0;
}
if ( ((d.substring(2,3)!=separateur)||(d.substring(5,6)!=separateur)) && (ok==1) ) {
- alert("Les séparateurs doivent être des "+separateur); ok=0;
+ alert("Separator must be "+separateur); ok=0;
}
return ok;
}
@@ -32,15 +36,19 @@
//function test if member is unique and if it's right the member is registred
function unique() {
+var msg1;
+var msg2;
if ( document.form.check_member.value==1){
- if (document.form.categorycode.value!="I"){
+ if (document.form.categorycode.value != "I"){
- alert("ATTENTION !!!! Ce Lecteur existe déja");
+ msg1 += _("Warning !!!! Duplicate borrower!!!!");
+ alert(msg1);
check_form_borrowers(0);
document.form.submit();
}else{
- alert("ATTENTION !!!! Cette Collectivité existe déja");
+ msg2 += _("Warning !!!! Duplicate organisation!!!!");
+ alert(msg2);
check_form_borrowers(0);
}
}
@@ -60,7 +68,8 @@
if ((myDate1[2]>myDate2[2])||(myDate1[2]==myDate2[2] && myDate1[1]>myDate2[1])||(myDate1[2]==myDate2[2] && myDate1[1]>=myDate2[1] && myDate1[0]>=myDate2[0]))
{
- alert("ATTENTION !!! Vérifiez la saisie de la date d'éxpiration qui ne doit pas être antérieure ou égale a la date d'inscription");
+ var msg = _("Warning !!! check date expiry > date enrolment");
+ alert(msg);
document.form.dateexpiry.value="";
document.form.dateexpiry.setfocus;
}
@@ -134,7 +143,7 @@
if (!(document.form_double.answernodouble.checked)){
message ="";
- message_champ="Vous devez confirmez que la suspicion de doublon est fausse !!! ";
+ message_champ+=_("Please confirm suspicious duplicate borrower !!! ");
statut=1;
document.form.nodouble.value=0;
}
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 7 Jun 2006 11:38:23 -0000 1.8
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 7 Jun 2006 14:55:37 -0000 1.9
@@ -57,7 +57,7 @@
<input type="hidden" name="type" value="borrowers">
<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
- <input type="hidden" name="guarantor" value="<!-- TMPL_VAR NAME="guarantor" -->">
+ <input type="hidden" name="guarantorid" value="<!-- TMPL_VAR NAME="guarantorid" -->">
<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
@@ -240,7 +240,7 @@
<input type="hidden" name="type" value="borrowers">
<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
- <input type="hidden" name="guarantor" value="<!-- TMPL_VAR NAME="guarantor" -->">
+ <input type="hidden" name="guarantorid" value="<!-- TMPL_VAR NAME="guarantorid" -->">
<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
@@ -466,7 +466,7 @@
<input type="hidden" name="type" value="borrowers">
<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
- <input type="hidden" name="guarantor" value="<!-- TMPL_VAR NAME="guarantor" -->">
+ <input type="hidden" name="guarantorid" value="<!-- TMPL_VAR NAME="guarantorid" -->">
<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
Index: koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 6 Jun 2006 15:51:22 -0000 1.9
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 7 Jun 2006 14:55:37 -0000 1.10
@@ -7,7 +7,7 @@
<ul>
<!-- TMPL_UNLESS name="guarantorborrowernumber" -->
- <a href="/cgi-bin/koha/members/jmemberentry.pl?type=add&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Add child</a>
+ <a href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&category_type=C">Add child</a>
<!-- /TMPL_UNLESS -->
<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="bornum" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- members/memberentry.pl 6 Jun 2006 16:18:00 -0000 1.26
+++ members/memberentry.pl 7 Jun 2006 14:55:37 -0000 1.27
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: memberentry.pl,v 1.26 2006/06/06 16:18:00 btoumi Exp $
+# $Id: memberentry.pl,v 1.27 2006/06/07 14:55:37 btoumi Exp $
# Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
#
@@ -109,16 +109,17 @@
$data{$key}=~ s/\"/\\\"/g;
}
+ # WARN : some tests must be done whatever the step, because the librarian can click on any tab.
#############test for member being unique #############
- if ($op eq 'add' && $step eq 2){
+ if ($op eq 'add'){
(my $category_type_send=$category_type ) if ($category_type eq 'I');
my $check_category; # recover the category code of the doublon suspect borrowers
- ($check_member,$check_category)=checkuniquemember($category_type_send,$data{'surname'},$data{'firstname'},format_date_in_iso($data{'dateofbirth'}));
-# recover the category type if the borrowers is a duplicate
+ ($check_member,$check_category)= checkuniquemember($category_type_send,$data{'surname'},$data{'firstname'},format_date_in_iso($data{'dateofbirth'}));
+
+# recover the category type if the borrowers is a doublon
($check_categorytype,undef)=getcategorytype($check_category);
}
-
-# CHECKS step by step
+ # CHECKS step by step
# STEP 1
if ($step eq 1) {
###############test to take the right zipcode and city name ##############
@@ -211,13 +212,13 @@
push @errors, "ERROR_login_exist";
$nok=1;
} else {
- $borrowerid = &newmember(%data);
+ $borrowernumber = &newmember(%data);
if ($data{'organisations'}){
# need to add the members organisations
my @orgs=split(/\|/,$data{'organisations'});
add_member_orgs($borrowerid,\@orgs);
}
- logaction($loggedinuser,"MEMBERS","add member", $borrowerid, "");
+ logaction($loggedinuser,"MEMBERS","add member", $borrowernumber, "");
}
}
@@ -249,7 +250,7 @@
my $data;
# test to now if u add or modify a borrower (modify =>to take all carateristic of the borrowers)
if (!$op and !$data{'surname'}) {
- $data=borrdata('',$borrowerid);
+ $data=borrdata('',$borrowernumber);
%data=%$data;
}
if (C4::Context->preference("IndependantBranches")) {
@@ -510,9 +511,9 @@
guarantorid => $guarantorid,
ethcatpopup => $ethcatpopup,
sex => $data{'sex'},
- login => $data{'login'},
+ userid => $data{'userid'},
password => $data{'password'},
- opacnotes => $data{'opacnotes'},
+ opacnote => $data{'opacnote'},
contactnotes => $data{'contactnotes'},
borrowernotes => $data{'borrowernotes'},
relshiploop => \@relshipdata,
More information about the Koha-cvs
mailing list