[Web-erp-svn] SF.net SVN: web-erp:[6586] trunk/javascripts/MiscFunctions.js

[<ex...@us...>]

Revision: 6586
          http://sourceforge.net/p/web-erp/reponame/6586
Author:   exsonqu
Date:     2014-02-22 05:58:09 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
22/2/14 Exson: Fixed the wrong error messages displayed while input date data manually in MiscFunctions.js.

Modified Paths:
--------------
    trunk/javascripts/MiscFunctions.js

Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js	2014-02-19 12:16:39 UTC (rev 6585)
+++ trunk/javascripts/MiscFunctions.js	2014-02-22 05:58:09 UTC (rev 6586)
@@ -68,19 +68,36 @@
 	return false;
 }
 function isDate(dS,dF){
-	var mA=dS.match(/^(\d{1,2})(\/|-|.)(\d{1,2})(\/|-|.)(\d{4})$/);
+	switch (dF) {
+		case "d/m/Y":
+		case "d.m.Y":
+		case "m/d/Y":
+		var mA=dS.match(/^(\d{1,2})(\/|-|.)(\d{1,2})(\/|-|.)(\d{4})$/);
+		break;
+		case "Y/m/d":
+		case "Y-m-d":
+		var mA=dS.match(/^(\d{4})(\/|-|.)(\d{1,2})(\/|-|.)(\d{1,2})$/);
+		break;
+	}
+
 	if (mA==null){
 		alert("Please enter the date in the format "+dF);
 		return false;
 	}
-	if (dF=="d/m/Y"){
+	if (dF=="d/m/Y"||dF=="d.m.Y"){
 		d=mA[1];
 		m=mA[3];
+		y=mA[5];
+	}else if(dF=='m/d/Y'){
+		m=mA[1];
+		d=mA[3];
+		y=mA[5];
 	}else{
-		d=mA[3];
-		m=mA[1];
+		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;