X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fjs%2Fmembers.js;h=351ffe9d046447e629327ad03deacfc90256905f;hb=04d982571774f1a0fcd0ad30705163ba0218549d;hp=3f2adb1d9b67f21b5a20fa9dd8e06450d5b8e71e;hpb=d08387dd28ccdab969cafc52f262bf1f94652e55;p=koha.git

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/members.js b/koha-tmpl/intranet-tmpl/prog/en/js/members.js
index 3f2adb1d9b..351ffe9d04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/members.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/members.js
@@ -1,46 +1,37 @@
-<script language="JavaScript" type="text/javascript">
-
+// this function checks id date is like DD/MM/YYYY
 function CheckDate(field) {
 var d = field.value;
-if (d!="") {
-       // this function checks id date is like JJ/MM/AAAA
-      var amin = 1900; // ann�e mini
-      var amax = 2100; // ann�e maxi
-      
+if (d!=="") {
+      var amin = 1900;
+      var amax = 2100;
       var date = d.split("/");
-      
       var ok=1;
       var msg;
-      
       if ( (date.length < 2) && (ok==1) ) {
-        msg = _("Separator must be /"); 
-    	alert(msg); ok=0; field.focus();
-    	return;
+        msg = MSG_SEPARATOR+field.name;
+        alert(msg); ok=0; field.focus();
+        return;
       }
-      
       var dd   = date[0];
       var mm   = date[1];
-      var yyyy = date[2]; 
-      
+      var yyyy = date[2];
       // checking days
       if ( ((isNaN(dd))||(dd<1)||(dd>31)) && (ok==1) ) {
-        msg = _("day not correct."); 
-	    alert(msg); ok=0; field.focus();
-	    return;
+        msg = MSG_INCORRECT_DAY+field.name;
+        alert(msg); ok=0; field.focus();
+        return false;
       }
-      
       // checking months
       if ( ((isNaN(mm))||(mm<1)||(mm>12)) && (ok==1) ) {
-        msg = _("month not correct.");
-	    alert(msg); ok=0; field.focus();
-	    return;
+        msg = MSG_INCORRECT_MONTH+field.name;
+        alert(msg); ok=0; field.focus();
+        return false;
       }
-      
       // checking years
       if ( ((isNaN(yyyy))||(yyyy<amin)||(yyyy>amax)) && (ok==1) ) {
-         msg = _("years not correct."); 
-	    alert(msg); ok=0; field.focus();
-	    return;
+        msg = MSG_INCORRECT_YEAR+field.name;
+        alert(msg); ok=0; field.focus();
+        return false;
       }
    }
 }
@@ -50,141 +41,145 @@ function unique() {
 var msg1;
 var msg2;
 if (  document.form.check_member.value==1){
-	if (document.form.categorycode.value != "I"){
-		
-		msg1 += ("Warning  !!!! Duplicate borrower!!!!");
-		alert(msg1);
-	check_form_borrowers(0);
-	document.form.submit();
-	
-	}else{
-		msg2 += ("Warning !!!! Duplicate organisation!!!!");
-		alert(msg2);
-	check_form_borrowers(0);
-	}
+    if (document.form.categorycode.value != "I"){
+
+        msg1 += MSG_DUPLICATE_PATRON;
+        alert(msg1);
+    check_form_borrowers(0);
+    document.form.submit();
+
+    }else{
+        msg2 += MSG_DUPLICATE_ORGANIZATION;
+        alert(msg2);
+    check_form_borrowers(0);
+    }
 }
 else
 {
-	document.form.submit();
+    document.form.submit();
 }
 
 }
 //end function
 //function test if date enrooled < date expiry
+// WARNING: format-specific test.
 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 !='') {
+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]))
-	
-		{ 
-		document.form.dateenrolled.focus();
-		var msg = ("Warning !!! check date expiry  >= date enrolment");
-		alert(msg);
-		}
-	}
-	}
+    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]))
+
+        {
+        document.form.dateenrolled.focus();
+        var msg = MSG_LATE_EXPIRY;
+        alert(msg);
+        }
+    }
+    }
 }
 //end function
 
 
 // function to test all fields in forms and nav in different forms(1 ,2 or 3)
- function check_form_borrowers(nav){
-var statut=0;
-if (nav < document.form.step.value) {
-	document.form.step.value=nav;
-	if ((document.form.step.value==0) && document.form.check_member.value == 1 )
-	{
- 	
-		if (document.form_double.answernodouble)	{
-			if( (!(document.form_double.answernodouble.checked))){
-				document.form.nodouble.value=0;
-			}
-			else {
-			document.form.nodouble.value=1;
-			}
- 		}
- 	} 
-	document.form.submit();
-	
-} else {
-	if (document.form.BorrowerMandatoryField.value==''||document.form.FormFieldList.value=='' )
-	{}
-	else
-	{
-	    var champ_verif = document.form.BorrowerMandatoryField.value.split ('|');
- 	    var champ_form= document.form.FormFieldList.value.split('|');
-	    var message ="The following fields are mandatory :\n";
-	    var message_champ="";
-		for (var j=0; j<champ_form.length; j++){ 
-			if (document.getElementsByName(""+champ_form[j]+"")[0]){
-			for (var i=0; i<champ_verif.length; i++) {
-					if (document.getElementsByName(""+champ_verif[i]+"")[0]) {
-					var val_champ=eval("document.form."+champ_verif[i]+".value");
-					var ref_champ=eval("document.form."+champ_verif[i]);
-					var val_form=eval("document.form."+champ_form[j]+".value");
-					if (champ_verif[i] == champ_form[j]){
-						//check if it's a select
-						if (ref_champ.type=='select-one'){
-							if (ref_champ.options[0].selected ){
-								// action if field is empty
-								message_champ+=champ_verif[i]+"\n";
-								//test to konw if you must show a message with error
-								statut=1;
-							}
-						}else {
-							if ( val_champ == '' ) {
-								// action if the field is not empty
-								message_champ+=champ_verif[i]+"\n";
-								statut=1;
-								}	
-							}	
-						}
-					}
-				}
-			}
-		}
-	}
-//borrowers form 2 test if u chcked no to the quetsion of double 
- 	if (document.form.step.value==2 && statut!=1 && document.form.check_member.value > 0 )
-	{
-		
-  		
-			if (!(document.form_double.answernodouble.checked)){
-					
-				message ="";
-					message_champ+=("Please confirm suspicious duplicate borrower !!! ");
-					statut=1;
-					document.form.nodouble.value=0;
-			}
-			else {
-			document.form.nodouble.value=1;
-			}
- 	}
-		
-			if (statut==1){
-			//alert if at least 1 error
-				alert(message+"\n"+message_champ);
-			}
-			else 
-			{
-			document.form.step=nav;
-			document.form.submit();
-			}
-		}
+function check_form_borrowers(nav){
+    var statut=0;
+    var message = "";
+    var message_champ="";
+    if (document.form.check_member.value == 1 )
+    {
+        if (document.form_double.answernodouble) {
+            if( (!(document.form_double.answernodouble.checked))){
+                document.form.nodouble.value=0;
+            } else {
+                document.form.nodouble.value=1;
+            }
+        }
+    }
+
+    if (document.form.BorrowerMandatoryField.value==='')
+    {}
+    else
+    {
+        var champ_verif = document.form.BorrowerMandatoryField.value.split ('|');
+        message += MSG_MISSING_MANDATORY;
+        message += "\n";
+        for (var i=0; i<champ_verif.length; i++) {
+            if (document.getElementsByName(""+champ_verif[i]+"")[0]) {
+                var val_champ=eval("document.form."+champ_verif[i]+".value");
+                var ref_champ=eval("document.form."+champ_verif[i]);
+                //check if it's a select
+                if (ref_champ.type=='select-one'){
+                    // check to see if first option is selected and is blank
+                    if (ref_champ.options[0].selected &&
+                        ref_champ.options[0].text === ''){
+                        // action if field is empty
+                        message_champ+=champ_verif[i]+"\n";
+                        //test to know if you must show a message with error
+                        statut=1;
+                    }
+                } else {
+                    if ( val_champ === '' ) {
+                        // action if the field is not empty
+                        message_champ+=champ_verif[i]+"\n";
+                        statut=1;
+                    }
+                }
+            }
+        }
+    }
+
+    if ( document.form.password.value != document.form.password2.value ){
+            if ( message_champ !== '' ){
+                message_champ += "\n";
+            }
+            message_champ+= MSG_PASSWORD_MISMATCH;
+            statut=1;
+    }
+
+    //patrons form to test if you checked no to the question of double
+    if (statut!=1 && document.form.check_member.value > 0 ) {
+        if (!(document.form_double.answernodouble.checked)){
+            message_champ+= MSG_DUPLICATE_SUSPICION;
+            statut=1;
+            document.form.nodouble.value=0;
+        } else {
+            document.form.nodouble.value=1;
+        }
+    }
+
+    if (statut==1){
+        //alert if at least 1 error
+        alert(message+"\n"+message_champ);
+        return false;
+    } else {
+        document.form.submit();
+    }
 }
 
 function Dopop(link) {
-// // 	var searchstring=document.form.value[i].value;
-	var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=no,top');
+// //   var searchstring=document.form.value[i].value;
+    var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=no,top');
 }
 
 function Dopopguarantor(link) {
 
-	var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top');
+    var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top');
 }
 
-
-</script>
+$(document).ready(function(){
+    if($("#yesdebarred").is(":checked")){
+        $("#debarreduntil").show();
+    } else {
+        $("#debarreduntil").hide();
+    }
+    $("#yesdebarred,#nodebarred").change(function(){
+        if($("#yesdebarred").is(":checked")){
+            $("#debarreduntil").show();
+            $("#datedebarred").focus();
+        } else {
+            $("#debarreduntil").hide();
+        }
+    });
+});
\ No newline at end of file