[Weberp-cvs] SF.net SVN: web-erp:[3615] trunk

[<tim...@us...>]

Revision: 3615
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3615&view=rev
Author:   tim_schofield
Date:     2010-07-13 08:39:55 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
Revert formatting changes till I can ascertain why the numbers only function stopped working

Modified Paths:
--------------
    trunk/doc/Change.log.html
    trunk/javascripts/MiscFunctions.js

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-07-12 21:30:19 UTC (rev 3614)
+++ trunk/doc/Change.log.html	2010-07-13 08:39:55 UTC (rev 3615)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>13/07/10 Tim: MiscFunctions.js - Revert formatting changes till I can ascertain why the numbers only function stopped working</p>
 <p>12/07/10 Tim: MRPCreateDemand.php - Layout changes, sql quoting corrections</p>
 <p>12/07/10 Tim: MRPCalender.php - Layout changes, sql quoting corrections</p>
 <p>12/07/10 Tim: MRP.php - Layout changes, sql quoting corrections</p>

Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js	2010-07-12 21:30:19 UTC (rev 3614)
+++ trunk/javascripts/MiscFunctions.js	2010-07-13 08:39:55 UTC (rev 3615)
@@ -1,248 +1,206 @@
 function defaultControl(c){
-	c.select();
-	c.focus();
+c.select();
+c.focus();
 }
 function ReloadForm(fB){
-	fB.click();
+fB.click();
 }
 function rTN(event){
-	if (event) 
-		k=event.keyCode;
-	else if (event) 
-		var k=event.which;
-	else 
-		return true;
-	var kC=String.fromCharCode(k);
-	if ((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)) 
-		return true;
-	else if ((("0123456789,.-").indexOf(kC)>-1)) 
-		return true;
-	else 
-		return false;
+if (window.event) k=window.event.keyCode;
+else if (event) k=event.which;
+else return true;
+kC=String.fromCharCode(k);
+if ((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)) return true;
+else if ((("0123456789.-").indexOf(kC)>-1)) return true;
+else return false;
 }
 function assignComboToInput(c,i){
-	i.value=c.value;
+i.value=c.value;
 }
 function inArray(v,tA,m){
-	for (i=0;i<tA.length;i++) 
-		if (v==tA[i].value) 
-			return true;
-	alert(m);
-	return false;
+for (i=0;i<tA.length;i++) if (v==tA[i].value) return true;
+alert(m);
+return false;
 }
 function isDate(dS,dF){
-	var mA;
-	if (dF == "Y/m/d"){
-		mA=dS.match(/^(\d{4})(\/|-|.)(\d{1,2})(\/|-|.)(\d{1,2})$/);
-	} else {
-		mA=dS.match(/^(\d{1,2})(\/|-|.)(\d{1,2})(\/|-|.)(\d{4})$/);
-	}
-	if (mA==null){
-		alert("Please enter the date in the format "+dF);
-		return false;
-	}
-	if ((dF == "d/m/Y") || (dF == "d.m.Y")){
-		d = mA[1];
-		m = mA[3];
-		y = mA[5];
-	} else if (dF == "m/d/Y"){
-		d = mA[3];
-		m = mA[1];
-		y = mA[5];
-	} else {
-		d = mA[5];
-		m = mA[3];
-		y = mA[1];
-	}
-	y=mA[5];
-	if (m<1 || m>12){
-		alert("Month must be between 1 and 12");
-		return false;
-	}
-	if (d<1 || d>31){
-		alert("Day must be between 1 and 31");
-		return false;
-	}
-	if ((m==4 || m==6 || m==9 || m==11) && d==31){
-		alert("Month "+m+" doesn`t have 31 days");
-		return false;
-	}
-	if (m==2){
-		var isleap=(y%4==0);
-		if (d>29 || (d==29 && !isleap)){
-			alert("February "+y+" doesn`t have "+d+" days");
-			return false;
-		}
-	}
-	return true;
+var mA=dS.match(/^(\d{1,2})(\/|-|.)(\d{1,2})(\/|-|.)(\d{4})$/);
+if (mA==null){
+alert("Please enter the date in the format "+dF);
+return false;
 }
-
+if (dF=="d/m/Y"){
+d=mA[1];
+m=mA[3];
+}else{
+d=mA[3];
+m=mA[1];
+}
+y=mA[5];
+if (m<1 || m>12){
+alert("Month must be between 1 and 12");
+return false;
+}
+if (d<1 || d>31){
+alert("Day must be between 1 and 31");
+return false;
+}
+if ((m==4 || m==6 || m==9 || m==11) && d==31){
+alert("Month "+m+" doesn`t have 31 days");
+return false;
+}
+if (m==2){
+var isleap=(y%4==0);
+if (d>29 || (d==29 && !isleap)){
+alert("February "+y+" doesn`t have "+d+" days");
+return false;
+}
+}
+return true;
+}
 function eitherOr(o,t){
-	if (o.value!='') 
-		t.value='';
-	else if (o.value=='NaN') 
-		o.value='';
+if (o.value!='') t.value='';
+else if (o.value=='NaN') o.value='';
 }
 /*Renier & Louis (in...@ti...) 25.02.2007
 Copyright 2004-2007 Tillcor International
 */
-var days=new Array('Su','Mo','Tu','We','Th','Fr','Sa');
-var months=new Array('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
-var dateDivID="calendar";
-
+days=new Array('Su','Mo','Tu','We','Th','Fr','Sa');
+months=new Array('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
+dateDivID="calendar";
 function Calendar(md,dF){
-	var iF=document.getElementsByName(md).item(0);
-	var pB=iF;
-	var x=pB.offsetLeft;
-	var y=pB.offsetTop+pB.offsetHeight;
-	var p=pB;
-	while (p.offsetParent){
-		p=p.offsetParent;
-		x+=p.offsetLeft;
-		y+=p.offsetTop;
-	}
-	var dt=convertDate(iF.value,dF);
-	var nN=document.createElement("div");
-	nN.setAttribute("id",dateDivID);
-	nN.setAttribute("style","visibility:hidden;");
-	document.body.appendChild(nN);
-	var cD=document.getElementById(dateDivID);
-	cD.style.position="absolute";
-	cD.style.left=x+"px";
-	cD.style.top=y+"px";
-	cD.style.visibility=(cD.style.visibility=="visible" ? "hidden" : "visible");
-	cD.style.display=(cD.style.display=="block" ? "none" : "block");
-	cD.style.zIndex=10000;
-	drawCalendar(md,dt.getFullYear(),dt.getMonth(),dt.getDate(),dF);
+iF=document.getElementsByName(md).item(0);
+pB=iF;
+x=pB.offsetLeft;
+y=pB.offsetTop+pB.offsetHeight;
+var p=pB;
+while (p.offsetParent){
+p=p.offsetParent;
+x+=p.offsetLeft;
+y+=p.offsetTop;
 }
-
+dt=convertDate(iF.value,dF);
+nN=document.createElement("div");
+nN.setAttribute("id",dateDivID);
+nN.setAttribute("style","visibility:hidden;");
+document.body.appendChild(nN);
+cD=document.getElementById(dateDivID);
+cD.style.position="absolute";
+cD.style.left=x+"px";
+cD.style.top=y+"px";
+cD.style.visibility=(cD.style.visibility=="visible" ? "hidden" : "visible");
+cD.style.display=(cD.style.display=="block" ? "none" : "block");
+cD.style.zIndex=10000;
+drawCalendar(md,dt.getFullYear(),dt.getMonth(),dt.getDate(),dF);
+}
 function drawCalendar(md,y,m,d,dF){
-	var tD=new Date();
-	if ((m>=0) && (y>0)) 
-		tD=new Date(y,m,1);
-	else {
-		d=tD.getDate();
-		tD.setDate(1);
-	}
-	var TR="<tr>";
-	var xTR="</tr>";
-	var TD="<td class='dpTD' onMouseOut='this.className=\"dpTD\";' onMouseOver='this.className=\"dpTDHover\";'";
-	var xTD="</td>";
-	var html="<table class='dpTbl'>"+TR+"<th colspan=3>"+months[tD.getMonth()]+" "+tD.getFullYear()+"</th>"+"<td colspan=2>"+
-	getButtonCode(md,tD,-1,"&lt;",dF)+xTD+"<td colspan=2>"+getButtonCode(md,tD,1,"&gt;",dF)+xTD+xTR+TR;
-	for(var i=0;i<days.length;i++) 
-		html+="<th>"+days[i]+"</th>";
-	html+=xTR+TR;
-	for (i=0;i<tD.getDay();i++) 
-		html+=TD+"&nbsp;"+xTD;
-	do{
-		var dN=tD.getDate();
-		var TD_onclick=" onclick=\"postDate('"+md+"','"+formatDate(tD,dF)+"');\">";
-		if (dN==d) 
-			html+="<td"+TD_onclick+"<div class='dpDayHighlight'>"+dN+"</div>"+xTD;
-		else 
-			html+=TD+TD_onclick+dN+xTD;
-		if (tD.getDay()==6) 
-			html+=xTR+TR;
-		tD.setDate(tD.getDate()+1);
-	} while (tD.getDate()>1)
-		if (tD.getDay()>0) 
-			for (i=6;i>tD.getDay();i--) 
-				html+=TD+"&nbsp;"+xTD;
-	html+="</table>";
-	document.getElementById(dateDivID).innerHTML=html;
+var tD=new Date();
+if ((m>=0) && (y>0)) tD=new Date(y,m,1);
+else{
+d=tD.getDate();
+tD.setDate(1);
 }
+TR="<tr>";
+xTR="</tr>";
+TD="<td class='dpTD' onMouseOut='this.className=\"dpTD\";' onMouseOver='this.className=\"dpTDHover\";'";
+xTD="</td>";
+html="<table class='dpTbl'>"+TR+"<th colspan=3>"+months[tD.getMonth()]+" "+tD.getFullYear()+"</th>"+"<td colspan=2>"+
+getButtonCode(md,tD,-1,"&lt;",dF)+xTD+"<td colspan=2>"+getButtonCode(md,tD,1,"&gt;",dF)+xTD+xTR+TR;
+for(i=0;i<days.length;i++) html+="<th>"+days[i]+"</th>";
+html+=xTR+TR;
+for (i=0;i<tD.getDay();i++) html+=TD+"&nbsp;"+xTD;
+do{
+dN=tD.getDate();
+TD_onclick=" onclick=\"postDate('"+md+"','"+formatDate(tD,dF)+"');\">";
+if (dN==d) html+="<td"+TD_onclick+"<div class='dpDayHighlight'>"+dN+"</div>"+xTD;
+else html+=TD+TD_onclick+dN+xTD;
+if (tD.getDay()==6) html+=xTR+TR;
+tD.setDate(tD.getDate()+1);
+} while (tD.getDate()>1)
+if (tD.getDay()>0) for (i=6;i>tD.getDay();i--) html+=TD+"&nbsp;"+xTD;
+html+="</table>";
+document.getElementById(dateDivID).innerHTML=html;
+}
 function getButtonCode(mD,dV,a,lb,dF){
-	var nM=(dV.getMonth()+a)%12;
-	var nY=dV.getFullYear()+parseInt((dV.getMonth()+a)/12,10);
-	if (nM<0){
-		nM+=12;
-		nY+=-1;
-	}
-	return "<button onClick='drawCalendar(\""+mD+"\","+nY+","+nM+","+1+",\""+dF+"\");'>"+lb+"</button>";
+nM=(dV.getMonth()+a)%12;
+nY=dV.getFullYear()+parseInt((dV.getMonth()+a)/12,10);
+if (nM<0){
+nM+=12;
+nY+=-1;
 }
-
+return "<button onClick='drawCalendar(\""+mD+"\","+nY+","+nM+","+1+",\""+dF+"\");'>"+lb+"</button>";
+}
 function formatDate(dV,dF){
-	var ds=String(dV.getDate());
-	var ms=String(dV.getMonth()+1);
-	var d=("0"+dV.getDate()).substring(ds.length-1,ds.length+1);
-	var m=("0"+(dV.getMonth()+1)).substring(ms.length-1,ms.length+1);
-	var y=dV.getFullYear();
-	switch (dF) {
-		case "d/m/Y":
-			return d+"/"+m+"/"+y;
-		case "d.m.Y":
-			return d+"."+m+"."+y;
-		case "Y/m/d":
-			return y+"/"+m+"/"+d;
-		default :
-			return m+"/"+d+"/"+y;
-	}
+ds=String(dV.getDate());
+ms=String(dV.getMonth()+1);
+d=("0"+dV.getDate()).substring(ds.length-1,ds.length+1);
+m=("0"+(dV.getMonth()+1)).substring(ms.length-1,ms.length+1);
+y=dV.getFullYear();
+switch (dF) {
+case "d/m/Y":
+return d+"/"+m+"/"+y;
+case "d.m.Y":
+return d+"."+m+"."+y;
+case "Y/m/d":
+return y+"/"+m+"/"+d;
+default :
+return m+"/"+d+"/"+y;
 }
-
+}
 function convertDate(dS,dF){
-	var d,m,y;
-	if (dF=="d.m.Y")
-		dA=dS.split(".")
-	else
-		var dA=dS.split("/");
-	switch (dF){
-		case "d/m/Y":
-			d=parseInt(dA[0],10);
-			m=parseInt(dA[1],10)-1;
-			y=parseInt(dA[2],10);
-			break;
-		case "d.m.Y":
-			d=parseInt(dA[0],10);
-			m=parseInt(dA[1],10)-1;
-			y=parseInt(dA[2],10);
-			break;
-		case "Y/m/d":
-			d=parseInt(dA[2],10);
-			m=parseInt(dA[1],10)-1;
-			y=parseInt(dA[0],10);
-			break;
-		default :
-			d=parseInt(dA[1],10);
-			m=parseInt(dA[0],10)-1;
-			y=parseInt(dA[2],10);
-			break;
-	}
-	return new Date(y,m,d);
+var d,m,y;
+if (dF="d.m.Y")
+dA=dS.split(".")
+else
+dA=dS.split("/");
+switch (dF){
+case "d/m/Y","d.m.Y":
+d=parseInt(dA[0],10);
+m=parseInt(dA[1],10)-1;
+y=parseInt(dA[2],10);
+break;
+case "Y/m/d":
+d=parseInt(dA[2],10);
+m=parseInt(dA[1],10)-1;
+y=parseInt(dA[0],10);
+break;
+default :
+d=parseInt(dA[1],10);
+m=parseInt(dA[0],10)-1;
+y=parseInt(dA[2],10);
+break;
 }
-
+return new Date(y,m,d);
+}
 function postDate(mydate,dS){
-	var iF=document.getElementsByName(mydate).item(0);
-	iF.value=dS;
-	var cD=document.getElementById(dateDivID);
-	cD.style.visibility="hidden";
-	cD.style.display="none";
-	iF.focus();
+var iF=document.getElementsByName(mydate).item(0);
+iF.value=dS;
+var cD=document.getElementById(dateDivID);
+cD.style.visibility="hidden";
+cD.style.display="none";
+iF.focus();
 }
 function clickDate(){
-	Calendar(this.name,this.alt);
+Calendar(this.name,this.alt);
 }
 function changeDate(){
-	isDate(this.value,this.alt);
+isDate(this.value,this.alt);
 }
 function initial(){
-	if (document.getElementsByTagName){
-		var as=document.getElementsByTagName("a");
-		for (var i=0;i<as.length;i++){
-			var a=as[i];
-			if (a.getAttribute("href") &&
-				a.getAttribute("rel")=="external")
-				a.target="_blank";
-		}
-	}
-	var ds=document.getElementsByTagName("input");
-	for (i=0;i<ds.length;i++){
-		if (ds[i].className=="date"){
-			ds[i].onclick=clickDate;
-			ds[i].onchange=changeDate;
-		}
-		if (ds[i].className=="number") 
-			ds[i].onkeypress=rTN;
-	}
+if (document.getElementsByTagName){
+var as=document.getElementsByTagName("a");
+for (i=0;i<as.length;i++){
+var a=as[i];
+if (a.getAttribute("href") &&
+a.getAttribute("rel")=="external")
+a.target="_blank";
+}}
+var ds=document.getElementsByTagName("input");
+for (i=0;i<ds.length;i++){
+if (ds[i].className=="date"){
+ds[i].onclick=clickDate;
+ds[i].onchange=changeDate;
 }
+if (ds[i].className=="number") ds[i].onkeypress=rTN;
+}
+}
 window.onload=initial;
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.