gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
This commit is contained in:
btoumi 2006-06-07 14:55:36 +00:00
parent c5f7394fcb
commit d7526b7044
5 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
C4/Members.pm
View File

@ -465,15 +465,15 @@ sub newmember {
. $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 @@ sub newmember {
. $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 @@ sub newmember {
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 {

27
koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js
View File

@ -11,17 +11,21 @@ function CheckDate(d) {
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 CheckDate(d) {
//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 @@ var myDate2=document.form.dateexpiry.value.split ('/');
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 (nav< document.form.step.value) {
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;
}

6
koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
View File

@ -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" -->" />

2
koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
View File

@ -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"-->">

21
members/memberentry.pl
View File

@ -109,16 +109,17 @@ if ($op eq 'add' or $op eq 'modify') {
$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 @@ SELECT upperagelimit,
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 @@ if ($delete){
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 @@ if ($delete){
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,