[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en authoritie...

Joshua Ferraro jmf at liblime.com
Mon Mar 12 02:23:04 CET 2007


CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Joshua Ferraro <kados>	07/03/12 01:23:04

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/authorities: 
	                                             blinddetail-biblio-search.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/errors: 500.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/includes: doc-head-close.inc 
	                                          menu-members.inc 
	                                          menus.inc 
	koha-tmpl/intranet-tmpl/prog/en/members: memberentryA.tmpl 
	                                         memberentryC.tmpl 
	                                         memberentryI.tmpl 
	                                         memberentryP.tmpl 
	                                         moremember.tmpl 
Added files:
	koha-tmpl/intranet-tmpl/prog/en/includes: members.js 
Removed files:
	koha-tmpl/intranet-tmpl/prog/en/includes/javascript: members.js 

Log message:
	reinstating members.js
	minor improvements to error tmpl
	minor improvements to authorities blind search

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/errors/500.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/members.js?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js?cvsroot=koha&r1=1.7&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl?cvsroot=koha&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&r1=1.17&r2=1.18

Patches:
Index: authorities/blinddetail-biblio-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- authorities/blinddetail-biblio-search.tmpl	9 Mar 2007 14:47:38 -0000	1.2
+++ authorities/blinddetail-biblio-search.tmpl	12 Mar 2007 01:23:03 -0000	1.3
@@ -1,13 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<!-- TMPL_IF NAME="TemplateEncoding" -->
-    <meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME="TemplateEncoding" -->">
-<!-- TMPL_ELSE -->
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- /TMPL_IF -->
-
-<body>
-<script language="JavaScript" type="text/javascript">
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<script type="text/javascript">
 
 function go()
 {
@@ -61,5 +53,4 @@
 <script language="javascript" type="text/javascript">
 window.onload = go();
 </script>
-</body>
-</html>
+<!-- TMPL_INCLUDE NAME="intranet-bottom" -->

Index: errors/500.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/errors/500.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- errors/500.tmpl	11 Mar 2007 21:08:12 -0000	1.3
+++ errors/500.tmpl	12 Mar 2007 01:23:03 -0000	1.4
@@ -1,18 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Error</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 
 <div id="mainbloc">
-<h1>An Error has Occurred!</h1>
-<h2>Error 500</h2>
-<div id="main">
-<ul>
-<li>In Koha this typically means that the Koha team is working on new features</li>	
-<li>Wait while system maintenance is being done or <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
-<li>Use top menu bar to navigate to another part of Koha.</li>
-</ul>
-</div>
+    <h1>An Error has Occurred!</h1>
+    <h2>Error 500</h2>
+    <div id="main">
+    <ul>
+        <li>In Koha this typically means that the Koha team is working on new features</li>	
+        <li>Wait while system maintenance is being done or <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
+        <li>Use top menu bar to navigate to another part of Koha.</li>
+    </ul>
+    </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: includes/doc-head-close.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- includes/doc-head-close.inc	9 Mar 2007 14:47:39 -0000	1.3
+++ includes/doc-head-close.inc	12 Mar 2007 01:23:04 -0000	1.4
@@ -1,4 +1,3 @@
-</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/intranet-print.css" />
@@ -13,5 +12,4 @@
     <!-- /TMPL_IF -->
 </style>
 </head>
-
 <body>

Index: includes/menu-members.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- includes/menu-members.inc	9 Mar 2007 14:47:39 -0000	1.4
+++ includes/menu-members.inc	12 Mar 2007 01:23:04 -0000	1.5
@@ -1,4 +1,3 @@
-<!-- TMPL_INCLUDE NAME="javascript/members.js" -->
 <div id="submenu">
  	<a href="/cgi-bin/koha/members/members-home.pl">Search</a>
  	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add adult</a>

Index: includes/menus.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- includes/menus.inc	10 Mar 2007 06:22:52 -0000	1.10
+++ includes/menus.inc	12 Mar 2007 01:23:04 -0000	1.11
@@ -2,8 +2,7 @@
     <a href="#" onclick="javascript:window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[?]</a>
 </div>
 <div id="mainmenu">
-<h3><a href="/cgi-bin/koha/mainpage.pl">Koha
-intranet</a></h3>
+<h3><a href="/cgi-bin/koha/mainpage.pl">Koha Staff Client</a></h3>
     <!-- TMPL_IF NAME="CAN_user_circulate" -->
     <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
     <ul>

Index: members/memberentryA.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- members/memberentryA.tmpl	11 Mar 2007 21:08:13 -0000	1.16
+++ members/memberentryA.tmpl	12 Mar 2007 01:23:04 -0000	1.17
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Adult Borrower Management</title>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/includes/members.js"></script>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->

Index: members/memberentryC.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- members/memberentryC.tmpl	11 Mar 2007 21:08:13 -0000	1.15
+++ members/memberentryC.tmpl	12 Mar 2007 01:23:04 -0000	1.16
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Child Borrower Management</title>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/includes/members.js"></script>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->

Index: members/memberentryI.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- members/memberentryI.tmpl	11 Mar 2007 21:08:13 -0000	1.11
+++ members/memberentryI.tmpl	12 Mar 2007 01:23:04 -0000	1.12
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Organisation Borrower Management</title>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/includes/members.js"></script>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->

Index: members/memberentryP.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- members/memberentryP.tmpl	11 Mar 2007 21:08:13 -0000	1.12
+++ members/memberentryP.tmpl	12 Mar 2007 01:23:04 -0000	1.13
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Professional Borrower Management</title>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/includes/members.js"></script>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->

Index: members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- members/moremember.tmpl	11 Mar 2007 21:08:13 -0000	1.17
+++ members/moremember.tmpl	12 Mar 2007 01:23:04 -0000	1.18
@@ -1,19 +1,11 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Borrower's Details</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
-
 <!-- TMPL_IF NAME="unknowuser" -->
-    <p>
-        <b>
-            This borrower doesn't exist anymore.
-        </b>
-        <br /><br />
-        <a href="javascript:back();">Go Back</a>
-    </p>
+    <p>This borrower doesn't exist anymore.<a href="javascript:back();">Go Back</a></p>
 <!-- TMPL_ELSE -->
 
 <h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h1>
@@ -78,7 +70,6 @@
         <!-- /TMPL_IF -->
     </div>
 </div>
-<br />
 <!-- TMPL_IF NAME="flagged" -->
     <ul>
         <!-- TMPL_IF NAME="debarred" -->
@@ -98,11 +89,11 @@
 
 <fieldset>
 <legend>Borrower information</legend>
-    <!-- TMPL_UNLESS NAME="I" --> <p><label>Title:</label><!-- TMPL_VAR NAME="title" -->&nbsp;</p> 
-    <p><label>First name:</label><!-- TMPL_VAR NAME="firstname" --></p><!-- /TMPL_UNLESS -->
-    <p>
-	<!-- TMPL_IF NAME="I" --><label>Organisation name: </label><!-- TMPL_ELSE --><label>Last name: </label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="surname" -->
-    </p>
+    <!-- TMPL_UNLESS NAME="I" -->
+    <p><label>Title:</label><!-- TMPL_VAR NAME="title" -->&nbsp;</p> 
+    <p><label>First name:</label><!-- TMPL_VAR NAME="firstname" --></p>
+    <!-- /TMPL_UNLESS -->
+    <p><!-- TMPL_IF NAME="I" --><label>Organisation name: </label><!-- TMPL_ELSE --><label>Last name: </label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="surname" --></p>
     <!-- TMPL_UNLESS NAME="I" --><p><label>Other names: </label><!-- TMPL_VAR NAME="othernames" --></p>
     <p><label>Initials: </label><!-- TMPL_VAR NAME="initials" --></p><!-- /TMPL_UNLESS -->
     <p>
@@ -118,12 +109,12 @@
         <!-- TMPL_VAR NAME="address2"-->
     </p>
     <p><label>City: </label><!-- TMPL_VAR NAME="city" --></p>
-    <p><label>Zip Code: </label><!-- TMPL_VAR NAME="zipcode" --></p>
+    <p><label>Zip code: </label><!-- TMPL_VAR NAME="zipcode" --></p>
     <!-- TMPL_UNLESS NAME="I"-->
     	<!-- TMPL_UNLESS NAME="C"-->
-	<p><label>alt address: </label><!-- TMPL_VAR NAME="B_address" --></p>
-    	<p><label>alt city: </label><!-- TMPL_VAR NAME="B_city" --></p>
-    	<p><label>alt zipcode: </label><!-- TMPL_VAR NAME="B_zipcode" --></p>
+	<p><label>Alternate address: </label><!-- TMPL_VAR NAME="B_address" --></p>
+    	<p><label>Alternate city: </label><!-- TMPL_VAR NAME="B_city" --></p>
+    	<p><label>Alternate zipcode: </label><!-- TMPL_VAR NAME="B_zipcode" --></p>
 	<!-- /TMPL_UNLESS -->
     <!-- /TMPL_UNLESS -->
     <!-- TMPL_IF NAME="I" -->
@@ -242,7 +233,7 @@
                 <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
                     <!-- TMPL_VAR NAME="title" -->
                 </a>
-                <br /><!-- TMPL_VAR name="author" -->
+                <!-- TMPL_VAR name="author" -->
             </td>
             <td><!-- TMPL_VAR NAME="date_due" --></td>
             <td>
@@ -322,17 +313,14 @@
 						<!-- TMPL_VAR NAME="title" --> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
 
 						<!-- TMPL_IF name="waiting" -->
-						<br/>
 						<i>This document is available</i>
 						<!-- /TMPL_IF -->
 						<!-- TMPL_IF name="transfered" -->
-						<br/>
 						<i>This document has been transfered from library : 
 						<!-- TMPL_VAR NAME="frombranch" --> the : <!-- TMPL_VAR NAME="datesent" --> </i>
 						<!-- /TMPL_IF -->
 
 						<!-- TMPL_IF name="nottransfered" -->
-						<br/>
 						<i>This document hasn't been transfered yet from library : <!-- TMPL_VAR NAME="nottransferedby" --></i>
 						<!-- /TMPL_IF -->
 				
@@ -348,7 +336,7 @@
 	<!-- /TMPL_IF -->
 </div>
 
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 function confirm_deletion() {
     var is_confirmed = window.confirm('Do you confirm deletion ?');
     var borrowernumbervalue=document.form.borrowernumber.value; 

Index: includes/members.js
===================================================================
RCS file: includes/members.js
diff -N includes/members.js
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ includes/members.js	12 Mar 2007 01:23:04 -0000	1.1
@@ -0,0 +1,187 @@
+function _(s) { return s; }
+
+function CheckDate(field) {
+var d = field.value;
+if (d!="") {
+       // this function checks id date is like JJ/MM/AAAA
+      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;
+      }
+      
+      var dd   = date[0];
+      var mm   = date[1];
+      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;
+      }
+      
+      // checking months
+      if ( ((isNaN(mm))||(mm<1)||(mm>12)) && (ok==1) ) {
+        msg = _("month not correct.");
+	    alert(msg); ok=0; field.focus();
+	    return;
+      }
+      
+      // checking years
+      if ( ((isNaN(yyyy))||(yyyy<amin)||(yyyy>amax)) && (ok==1) ) {
+         msg = _("years not correct."); 
+	    alert(msg); ok=0; field.focus();
+	    return;
+      }
+   }
+}
+
+//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"){
+		
+		msg1 += ("Warning  !!!! Duplicate borrower!!!!");
+		alert(msg1);
+	check_form_borrowers(0);
+	document.form.submit();
+	
+	}else{
+		msg2 += ("Warning !!!! Duplicate organisation!!!!");
+		alert(msg2);
+	check_form_borrowers(0);
+	}
+}
+else
+{
+	document.form.submit();
+}
+
+}
+//end function
+//function test if date enrooled < date expiry
+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]))
+	
+		{ 
+		document.form.dateenrolled.focus();
+		var msg = ("Warning !!! check date expiry  >= date enrolment");
+		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 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');
+}
+
+function Dopopguarantor(link) {
+
+	var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top');
+}

Index: includes/javascript/members.js
===================================================================
RCS file: includes/javascript/members.js
diff -N includes/javascript/members.js
--- includes/javascript/members.js	9 Mar 2007 14:52:58 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,196 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-
-/**
- *  _(s)
- *  This function is used just for localisation
- */
-function _(s) { return s; }
-
-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
-      
-      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;
-      }
-      
-      var dd   = date[0];
-      var mm   = date[1];
-      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;
-      }
-      
-      // checking months
-      if ( ((isNaN(mm))||(mm<1)||(mm>12)) && (ok==1) ) {
-        msg = _("month not correct.");
-	    alert(msg); ok=0; field.focus();
-	    return;
-      }
-      
-      // checking years
-      if ( ((isNaN(yyyy))||(yyyy<amin)||(yyyy>amax)) && (ok==1) ) {
-         msg = _("years not correct."); 
-	    alert(msg); ok=0; field.focus();
-	    return;
-      }
-   }
-}
-
-//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"){
-		
-		msg1 += ("Warning  !!!! Duplicate borrower!!!!");
-		alert(msg1);
-	check_form_borrowers(0);
-	document.form.submit();
-	
-	}else{
-		msg2 += ("Warning !!!! Duplicate organisation!!!!");
-		alert(msg2);
-	check_form_borrowers(0);
-	}
-}
-else
-{
-	document.form.submit();
-}
-
-}
-//end function
-//function test if date enrooled < date expiry
-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]))
-	
-		{ 
-		document.form.dateenrolled.focus();
-		var msg = ("Warning !!! check date expiry  >= date enrolment");
-		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 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');
-}
-
-function Dopopguarantor(link) {
-
-	var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top');
-}
-
-
-</script>





More information about the Koha-cvs mailing list