[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en includes/j... [rel_3_0]
Bruno Toumi
btoumi at ouestprovence.fr
Fri Oct 13 16:56:21 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Bruno Toumi <btoumi> 06/10/13 14:56:21
Modified files:
koha-tmpl/intranet-tmpl/prog/en/includes/javascript: members.js
koha-tmpl/intranet-tmpl/prog/en/members: memberentryA.tmpl
memberentryC.tmpl
memberentryI.tmpl
memberentryP.tmpl
Log message:
modify test for date enrolled and date expiry validity
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.2&r2=1.4.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.11.2.5&r2=1.11.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9.2.6&r2=1.9.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.6&r2=1.6.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.6&r2=1.7.2.7
Patches:
Index: includes/javascript/members.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- includes/javascript/members.js 19 Sep 2006 07:44:13 -0000 1.4.2.2
+++ includes/javascript/members.js 13 Oct 2006 14:56:21 -0000 1.4.2.3
@@ -1,6 +1,6 @@
<script language="JavaScript" type="text/javascript">
function CheckDate(d) {
- if (d!="")
+if (d!="")
{
// Cette fonction vérifie le format JJ/MM/AAAA saisi et la validité de la date.
// Le séparateur est défini dans la variable separateur
@@ -13,21 +13,22 @@
var ok=1;
var msg;
if ( ((isNaN(j))||(j<1)||(j>31)) && (ok==1) ) {
- msg = _("day not correct.");
+ msg = ("day not correct.");
alert(msg); ok=0;
}
if ( ((isNaN(m))||(m<1)||(m>12)) && (ok==1) ) {
- msg = _("month not correct.");
+ msg = ("month not correct.");
alert(msg); ok=0;
}
if ( ((isNaN(a))||(a<amin)||(a>amax)) && (ok==1) ) {
- msg = _("years not correct.");
+ msg =("years not correct.");
alert(msg); ok=0;
}
if ( ((d.substring(2,3)!=separateur)||(d.substring(5,6)!=separateur)) && (ok==1) ) {
- alert("Separator must be "+separateur); ok=0;
+ msg = ("Separator must be "+separateur);
+ alert(msg); ok=0;
}
- return ok;
+
}
}
@@ -41,13 +42,13 @@
if ( document.form.check_member.value==1){
if (document.form.categorycode.value != "I"){
- msg1 += _("Warning !!!! Duplicate borrower!!!!");
+ msg1 += ("Warning !!!! Duplicate borrower!!!!");
alert(msg1);
check_form_borrowers(0);
document.form.submit();
}else{
- msg2 += _("Warning !!!! Duplicate organisation!!!!");
+ msg2 += ("Warning !!!! Duplicate organisation!!!!");
alert(msg2);
check_form_borrowers(0);
}
@@ -63,15 +64,16 @@
function check_manip_date(status) {
if (status=='verify'){
// this part of function('verify') is used to check if dateenrolled<date expiry
+if (document.form.dateenrolled != '' && document.form.dateexpiry.value !='') {
var myDate1=document.form.dateenrolled.value.split ('/');
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]))
{
- var msg = _("Warning !!! check date expiry > date enrolment");
+ document.form.dateenrolled.focus();
+ var msg = ("Warning !!! check date expiry >= date enrolment");
alert(msg);
- document.form.dateexpiry.value="";
- document.form.dateexpiry.setfocus;
+ }
}
}
}
@@ -144,7 +146,7 @@
if (!(document.form_double.answernodouble.checked)){
message ="";
- message_champ+=_("Please confirm suspicious duplicate borrower !!! ");
+ message_champ+=("Please confirm suspicious duplicate borrower !!! ");
statut=1;
document.form.nodouble.value=0;
}
Index: members/memberentryA.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -b -r1.11.2.5 -r1.11.2.6
--- members/memberentryA.tmpl 13 Oct 2006 08:45:24 -0000 1.11.2.5
+++ members/memberentryA.tmpl 13 Oct 2006 14:56:21 -0000 1.11.2.6
@@ -515,7 +515,7 @@
<label>
<!-- /TMPL_IF-->
Arrival date</label>
- <input type="text" name="dateenrolled" maxlength="10" size="10" onblur="CheckDate(document.form.dateenrolled.value);" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+ <input type="text" name="dateenrolled" maxlength="10" size="10" onchange="CheckDate(document.form.dateenrolled.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
</p>
<p>
<!-- TMPL_IF NAME="mandatorydateexpiry" -->
@@ -525,7 +525,7 @@
<!-- /TMPL_IF-->
Expiry date</label>
<input type="text" name="dateexpiry" maxlength="10" size="10"
- onblur="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+ onchange="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
</p>
<p>
<!-- TMPL_IF NAME="mandatoryopacnote" -->
Index: members/memberentryC.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl,v
retrieving revision 1.9.2.6
retrieving revision 1.9.2.7
diff -u -b -r1.9.2.6 -r1.9.2.7
--- members/memberentryC.tmpl 13 Oct 2006 08:45:24 -0000 1.9.2.6
+++ members/memberentryC.tmpl 13 Oct 2006 14:56:21 -0000 1.9.2.7
@@ -561,7 +561,7 @@
<label>
<!-- /TMPL_IF-->
Arrival date</label>
- <input type="text" name="dateenrolled" maxlength="10" size="10" onblur="CheckDate(document.form.dateenrolled.value);" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+ <input type="text" name="dateenrolled" maxlength="10" size="10" onchange="CheckDate(document.form.dateenrolled.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
</p>
<p>
<!-- TMPL_IF NAME="mandatorydateexpiry" -->
@@ -571,7 +571,7 @@
<!-- /TMPL_IF-->
Expiry date</label>
<input type="text" name="dateexpiry" maxlength="10" size="10"
- onblur="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+ onchange="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
</p>
<p>
<!-- TMPL_IF NAME="mandatoryopacnote" -->
Index: members/memberentryI.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -u -b -r1.6.2.6 -r1.6.2.7
--- members/memberentryI.tmpl 13 Oct 2006 08:45:24 -0000 1.6.2.6
+++ members/memberentryI.tmpl 13 Oct 2006 14:56:21 -0000 1.6.2.7
@@ -370,7 +370,7 @@
<label>
<!-- /TMPL_IF-->
Arrival date</label>
- <input type="text" name="dateenrolled" maxlength="10" size="10" onblur="CheckDate(document.form.dateenrolled.value);" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+ <input type="text" name="dateenrolled" maxlength="10" size="10" onchange="CheckDate(document.form.dateenrolled.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
</p>
<p>
<!-- TMPL_IF NAME="mandatorydateexpiry" -->
@@ -380,7 +380,7 @@
<!-- /TMPL_IF-->
Expiry date</label>
<input type="text" name="dateexpiry" maxlength="10" size="10"
- onblur="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+ onchange="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
</p>
<p>
<!-- TMPL_IF NAME="mandatoryopacnote" -->
Index: members/memberentryP.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -u -b -r1.7.2.6 -r1.7.2.7
--- members/memberentryP.tmpl 13 Oct 2006 08:45:24 -0000 1.7.2.6
+++ members/memberentryP.tmpl 13 Oct 2006 14:56:21 -0000 1.7.2.7
@@ -566,7 +566,7 @@
<label>
<!-- /TMPL_IF-->
Arrival date</label>
- <input type="text" name="dateenrolled" maxlength="10" size="10" onblur="CheckDate(document.form.dateenrolled.value);" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+ <input type="text" name="dateenrolled" maxlength="10" size="10" onchange="CheckDate(document.form.dateenrolled.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
</p>
<p>
<!-- TMPL_IF NAME="mandatorydateexpiry" -->
@@ -576,7 +576,7 @@
<!-- /TMPL_IF-->
Expiry date</label>
<input type="text" name="dateexpiry" maxlength="10" size="10"
- onblur="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+ onchange="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
</p>
<p>
<!-- TMPL_IF NAME="mandatoryopacnote" -->
More information about the Koha-cvs
mailing list