From: <tim...@us...> - 2011-04-01 12:40:15
|
Revision: 4530 http://web-erp.svn.sourceforge.net/web-erp/?rev=4530&view=rev Author: tim_schofield Date: 2011-04-01 12:40:09 +0000 (Fri, 01 Apr 2011) Log Message: ----------- Corrections to javascript functions Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2011-04-01 09:52:49 UTC (rev 4529) +++ trunk/javascripts/MiscFunctions.js 2011-04-01 12:40:09 UTC (rev 4530) @@ -1,27 +1,18 @@ function defaultControl(c){ - c.select(); - c.focus(); +c.select(); +c.focus(); } function ReloadForm(fB){ - fB.click(); +fB.click(); } function rTN(event){ - if (window.event) { - k=window.event.keyCode; - } - else if (event) { - k=event.which; - } else { - return true; - } + 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; - } + 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; @@ -186,7 +177,7 @@ m=parseInt(dA[0],10)-1; y=parseInt(dA[2],10); break; - } +} return new Date(y,m,d); } function postDate(mydate,dS){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2011-04-01 12:40:15
|
Revision: 4530 http://web-erp.svn.sourceforge.net/web-erp/?rev=4530&view=rev Author: tim_schofield Date: 2011-04-01 12:40:09 +0000 (Fri, 01 Apr 2011) Log Message: ----------- Corrections to javascript functions Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2011-04-01 09:52:49 UTC (rev 4529) +++ trunk/javascripts/MiscFunctions.js 2011-04-01 12:40:09 UTC (rev 4530) @@ -1,27 +1,18 @@ function defaultControl(c){ - c.select(); - c.focus(); +c.select(); +c.focus(); } function ReloadForm(fB){ - fB.click(); +fB.click(); } function rTN(event){ - if (window.event) { - k=window.event.keyCode; - } - else if (event) { - k=event.which; - } else { - return true; - } + 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; - } + 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; @@ -186,7 +177,7 @@ m=parseInt(dA[0],10)-1; y=parseInt(dA[2],10); break; - } +} return new Date(y,m,d); } function postDate(mydate,dS){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2012-01-28 01:24:46
|
Revision: 4846 http://web-erp.svn.sourceforge.net/web-erp/?rev=4846&view=rev Author: tim_schofield Date: 2012-01-28 01:24:40 +0000 (Sat, 28 Jan 2012) Log Message: ----------- Fix in inArray() function, correctly passing the text box value Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2012-01-27 23:22:26 UTC (rev 4845) +++ trunk/javascripts/MiscFunctions.js 2012-01-28 01:24:40 UTC (rev 4846) @@ -19,7 +19,7 @@ } function inArray(v,tA,m){ for (i=0;i<tA.length;i++) { - if (v.value==tA[i].value) { + if (v==tA[i].value) { return true; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2012-01-28 01:24:46
|
Revision: 4846 http://web-erp.svn.sourceforge.net/web-erp/?rev=4846&view=rev Author: tim_schofield Date: 2012-01-28 01:24:40 +0000 (Sat, 28 Jan 2012) Log Message: ----------- Fix in inArray() function, correctly passing the text box value Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2012-01-27 23:22:26 UTC (rev 4845) +++ trunk/javascripts/MiscFunctions.js 2012-01-28 01:24:40 UTC (rev 4846) @@ -19,7 +19,7 @@ } function inArray(v,tA,m){ for (i=0;i<tA.length;i++) { - if (v.value==tA[i].value) { + if (v==tA[i].value) { return true; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ex...@us...> - 2013-04-16 03:43:56
|
Revision: 5842 http://sourceforge.net/p/web-erp/reponame/5842 Author: exsonqu Date: 2013-04-16 03:43:53 +0000 (Tue, 16 Apr 2013) Log Message: ----------- 2013/04/16 Thumb: Fixed the bug of Y-m-d date format error in MiscFunctions.js (this date type is missing) which will display wrong date in Work Order. Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2013-04-14 05:07:45 UTC (rev 5841) +++ trunk/javascripts/MiscFunctions.js 2013-04-16 03:43:53 UTC (rev 5842) @@ -146,6 +146,8 @@ return d+"."+m+"."+y; case "Y/m/d": return y+"/"+m+"/"+d; + case "Y-m-d": + return y+"-"+m+"-"+d; default : return m+"/"+d+"/"+y; } @@ -167,6 +169,7 @@ m=parseInt(dA[1],10)-1; y=parseInt(dA[2],10); break; + case "Y-m-d": case "Y/m/d": d=parseInt(dA[2],10); m=parseInt(dA[1],10)-1; @@ -213,4 +216,4 @@ if (ds[i].className=="number") ds[i].onkeypress=rTN; } } -window.onload=initial; \ No newline at end of file +window.onload=initial; |
From: <ex...@us...> - 2013-07-17 06:25:53
|
Revision: 6091 http://sourceforge.net/p/web-erp/reponame/6091 Author: exsonqu Date: 2013-07-17 06:25:49 +0000 (Wed, 17 Jul 2013) Log Message: ----------- 17/7/2013 Exson: Add space bar as a accepted charcode for number input in MiscFunctions.js Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2013-07-17 04:28:30 UTC (rev 6090) +++ trunk/javascripts/MiscFunctions.js 2013-07-17 06:25:49 UTC (rev 6091) @@ -10,7 +10,7 @@ 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; + if ((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27) || (k==32)) return true; else if ((("0123456789.,-").indexOf(kC)>-1)) return true; else return false; } |
From: <ex...@us...> - 2013-07-18 10:36:58
|
Revision: 6096 http://sourceforge.net/p/web-erp/reponame/6096 Author: exsonqu Date: 2013-07-18 10:36:54 +0000 (Thu, 18 Jul 2013) Log Message: ----------- 07/18/2013 Exson: modify the MisFunctions.js to improve the locale number validation feature. Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2013-07-17 18:05:31 UTC (rev 6095) +++ trunk/javascripts/MiscFunctions.js 2013-07-18 10:36:54 UTC (rev 6096) @@ -5,15 +5,58 @@ function ReloadForm(fB){ fB.click(); } +var kPrev = 'a'; function rTN(event){ 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) || (k==32)) return true; - else if ((("0123456789.,-").indexOf(kC)>-1)) return true; - else return false; + if ((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)){ + return true; + } + else if ((("0123456789., ").indexOf(kC)>-1)){ + if(("., ").indexOf(kC)>-1){ + if(("., ").indexOf(kPrev)>-1){ + return false; + }else{ + kPrev = kC; + return true; + } + }else{ + kPrev = kC; + return true; + } + } + else return false; } +function rLocaleNumber(){ + switch(Lang){ + case 'US': + var patt = /(?:^([1-9]{1,3}(?:,?\d{3})*(?:\.\d{1,})?)$)|(?:^(0\.\d{1,})$)/; + break; + case 'IN': + var patt = /(?:^([1-9]{1,2},)?(\d{2},)*(\d{3})(\.\d+)?$)|(?:^[1-9]{1,3}(\.\d+)?$)|(?:^(0\.\d{1,})$)/; + break; + case 'EE': + var patt = /(?:^[1-9]{1,3}(?:\s?\d{3})*(?:\.\d{1,})?$)|(?:^(0\.\d{1,})$)/; + break; + case 'FR': + var patt = /(?:^[1-9]{1,3}(?:\s?\d{3})*(?:,\d{1,})?$)|(?:^(0,\d{1,})$)/; + break; + case 'GM': + var patt = /(?:^[1-9]{1,3}(?:\.?\d{3})*(?:,\d{1,})?$)|(?:^(0,\d{1,})$)/; + break; + + } + if(patt.test(this.value)){ + this.setCustomValidity(''); + return true; + + }else{ + this.setCustomValidity('The number format is wrong'); + return false; + }; +} function assignComboToInput(c,i){ i.value=c.value; } @@ -214,6 +257,7 @@ ds[i].onchange=changeDate; } if (ds[i].className=="number") ds[i].onkeypress=rTN; + if (ds[i].className=="number") ds[i].onchange=rLocaleNumber; } } window.onload=initial; |
From: <ex...@us...> - 2013-07-18 14:15:04
|
Revision: 6100 http://sourceforge.net/p/web-erp/reponame/6100 Author: exsonqu Date: 2013-07-18 14:14:58 +0000 (Thu, 18 Jul 2013) Log Message: ----------- 07/18/2013: Exson: Fixed the missing negative mark problem reported by Tim. Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2013-07-18 10:40:24 UTC (rev 6099) +++ trunk/javascripts/MiscFunctions.js 2013-07-18 14:14:58 UTC (rev 6100) @@ -14,9 +14,9 @@ if ((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)){ return true; } - else if ((("0123456789., ").indexOf(kC)>-1)){ - if(("., ").indexOf(kC)>-1){ - if(("., ").indexOf(kPrev)>-1){ + else if ((("0123456789.-, ").indexOf(kC)>-1)){ + if((".-, ").indexOf(kC)>-1){ + if((".-, ").indexOf(kPrev)>-1){ return false; }else{ kPrev = kC; @@ -30,21 +30,22 @@ else return false; } function rLocaleNumber(){ + var Lang = document.getElementById('Lang').value; switch(Lang){ case 'US': - var patt = /(?:^([1-9]{1,3}(?:,?\d{3})*(?:\.\d{1,})?)$)|(?:^(0\.\d{1,})$)/; + var patt = /(?:^(-)?([1-9]{1,3}(?:,?\d{3})*(?:\.\d{1,})?)$)|(?:^(-)?(0\.\d{1,})$)/; break; case 'IN': - var patt = /(?:^([1-9]{1,2},)?(\d{2},)*(\d{3})(\.\d+)?$)|(?:^[1-9]{1,3}(\.\d+)?$)|(?:^(0\.\d{1,})$)/; + var patt = /(?:^(-)?([1-9]{1,2},)?(\d{2},)*(\d{3})(\.\d+)?$)|(?:^(-)?[1-9]{1,3}(\.\d+)?$)|(?:^(-)?(0\.\d{1,})$)/; break; case 'EE': - var patt = /(?:^[1-9]{1,3}(?:\s?\d{3})*(?:\.\d{1,})?$)|(?:^(0\.\d{1,})$)/; + var patt = /(?:^(-)?[1-9]{1,3}(?:\s?\d{3})*(?:\.\d{1,})?$)|(?:^(-)?(0\.\d{1,})$)/; break; case 'FR': - var patt = /(?:^[1-9]{1,3}(?:\s?\d{3})*(?:,\d{1,})?$)|(?:^(0,\d{1,})$)/; + var patt = /(?:^(-)?[1-9]{1,3}(?:\s?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0,\d{1,})$)/; break; case 'GM': - var patt = /(?:^[1-9]{1,3}(?:\.?\d{3})*(?:,\d{1,})?$)|(?:^(0,\d{1,})$)/; + var patt = /(?:^(-)?[1-9]{1,3}(?:\.?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0,\d{1,})$)/; break; } |
From: <ex...@us...> - 2013-07-21 08:53:25
|
Revision: 6118 http://sourceforge.net/p/web-erp/reponame/6118 Author: exsonqu Date: 2013-07-21 08:53:19 +0000 (Sun, 21 Jul 2013) Log Message: ----------- 7/21/2013 Exson: Fixed the number class function in MiscFunctions.js prevent character 0 from input for integer. Reported by Icedlava Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2013-07-20 11:31:59 UTC (rev 6117) +++ trunk/javascripts/MiscFunctions.js 2013-07-21 08:53:19 UTC (rev 6118) @@ -42,19 +42,19 @@ var Lang = document.getElementById('Lang').value; switch(Lang){ case 'US': - var patt = /(?:^(-)?([1-9]{1,3}(?:,?\d{3})*(?:\.\d{1,})?)$)|(?:^(-)?(0\.\d{1,})$)/; + var patt = /(?:^(-)?([1-9]{1}\d{0,2}(?:,?\d{3})*(?:\.\d{1,})?)$)|(?:^(-)?(0\.\d{1,})$)/; break; case 'IN': - var patt = /(?:^(-)?([1-9]{1,2},)?(\d{2},)*(\d{3})(\.\d+)?$)|(?:^(-)?[1-9]{1,3}(\.\d+)?$)|(?:^(-)?(0\.\d{1,})$)/; + var patt = /(?:^(-)?([1-9]{1}\d{0,1},)?(\d{2},)*(\d{3})(\.\d+)?$)|(?:^(-)?[1-9]{1}\d{0,2}(\.\d+)?$)|(?:^(-)?(0\.\d{1,})$)/; break; case 'EE': - var patt = /(?:^(-)?[1-9]{1,3}(?:\s?\d{3})*(?:\.\d{1,})?$)|(?:^(-)?(0\.\d{1,})$)/; + var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\s?\d{3})*(?:\.\d{1,})?$)|(?:^(-)?(0\.\d{1,})$)/; break; case 'FR': - var patt = /(?:^(-)?[1-9]{1,3}(?:\s?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0,\d{1,})$)/; + var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\s?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0,\d{1,})$)/; break; case 'GM': - var patt = /(?:^(-)?[1-9]{1,3}(?:\.?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0,\d{1,})$)/; + var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\.?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0,\d{1,})$)/; break; } |
From: <ex...@us...> - 2013-07-21 10:19:13
|
Revision: 6120 http://sourceforge.net/p/web-erp/reponame/6120 Author: exsonqu Date: 2013-07-21 10:19:10 +0000 (Sun, 21 Jul 2013) Log Message: ----------- 7/21/2013 Exson: Fixed the keyChar control to avoid backspace mistake. Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2013-07-21 08:54:33 UTC (rev 6119) +++ trunk/javascripts/MiscFunctions.js 2013-07-21 10:19:10 UTC (rev 6120) @@ -5,29 +5,14 @@ function ReloadForm(fB){ fB.click(); } -var kPrev = 'a'; function rTN(event){ 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)){ - if((".-, ").indexOf(kC)>-1){ - if((".-, ").indexOf(kPrev)>-1){ - return false; - }else{ - kPrev = kC; - return true; - } - }else{ - kPrev = kC; - return true; - } - } - else return false; + 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 rTI(event){ if (window.event) k=window.event.keyCode; |
From: <ex...@us...> - 2013-07-21 11:16:23
|
Revision: 6123 http://sourceforge.net/p/web-erp/reponame/6123 Author: exsonqu Date: 2013-07-21 11:16:20 +0000 (Sun, 21 Jul 2013) Log Message: ----------- 21/07/2013 Exson: allowed the input of numeric format like .5 in MiscFunctions.js rLocalNumber() function. Reported by Tim. Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2013-07-21 10:54:58 UTC (rev 6122) +++ trunk/javascripts/MiscFunctions.js 2013-07-21 11:16:20 UTC (rev 6123) @@ -27,19 +27,19 @@ var Lang = document.getElementById('Lang').value; switch(Lang){ case 'US': - var patt = /(?:^(-)?([1-9]{1}\d{0,2}(?:,?\d{3})*(?:\.\d{1,})?)$)|(?:^(-)?(0\.\d{1,})$)/; + var patt = /(?:^(-)?([1-9]{1}\d{0,2}(?:,?\d{3})*(?:\.\d{1,})?)$)|(?:^(-)?(0?\.\d{1,})$)/; break; case 'IN': - var patt = /(?:^(-)?([1-9]{1}\d{0,1},)?(\d{2},)*(\d{3})(\.\d+)?$)|(?:^(-)?[1-9]{1}\d{0,2}(\.\d+)?$)|(?:^(-)?(0\.\d{1,})$)/; + var patt = /(?:^(-)?([1-9]{1}\d{0,1},)?(\d{2},)*(\d{3})(\.\d+)?$)|(?:^(-)?[1-9]{1}\d{0,2}(\.\d+)?$)|(?:^(-)?(0?\.\d{1,})$)/; break; case 'EE': - var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\s?\d{3})*(?:\.\d{1,})?$)|(?:^(-)?(0\.\d{1,})$)/; + var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\s?\d{3})*(?:\.\d{1,})?$)|(?:^(-)?(0?\.\d{1,})$)/; break; case 'FR': - var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\s?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0,\d{1,})$)/; + var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\s?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0?,\d{1,})$)/; break; case 'GM': - var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\.?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0,\d{1,})$)/; + var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\.?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0?,\d{1,})$)/; break; } |
From: <ex...@us...> - 2013-07-21 16:46:12
|
Revision: 6127 http://sourceforge.net/p/web-erp/reponame/6127 Author: exsonqu Date: 2013-07-21 16:46:09 +0000 (Sun, 21 Jul 2013) Log Message: ----------- 22/7/2013 Thumb: Fixed the onchange overwritten problem for number class in MiscFunctions.js. Reported by Tim for GLJournal.php lost Credit and Debit mutually exclusive feature. Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2013-07-21 12:49:43 UTC (rev 6126) +++ trunk/javascripts/MiscFunctions.js 2013-07-21 16:46:09 UTC (rev 6127) @@ -41,6 +41,9 @@ case 'GM': var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\.?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0?,\d{1,})$)/; break; + default: + alert('something is wrong with your language setting'); + } if(patt.test(this.value)){ @@ -317,7 +320,13 @@ } if (ds[i].className=="number") ds[i].onkeypress=rTN; if (ds[i].className=="integer") ds[i].onkeypress=rTI; - if (ds[i].className=="number") ds[i].onchange=rLocaleNumber; + if (ds[i].className=="number"){ + + ds[i].origonchange=ds[i].onchange; + ds[i].newonchange=rLocaleNumber; + ds[i].onchange=function(){if(this.origonchange) this.origonchange();this.newonchange();}; + + } } } window.onload=initial; |
From: <ex...@us...> - 2013-11-03 01:11:15
|
Revision: 6382 http://sourceforge.net/p/web-erp/reponame/6382 Author: exsonqu Date: 2013-11-03 01:11:07 +0000 (Sun, 03 Nov 2013) Log Message: ----------- 3/11/2013 Exson: Fixed bug in MiscFunctions.js allow '0' input as number. Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2013-11-03 00:26:36 UTC (rev 6381) +++ trunk/javascripts/MiscFunctions.js 2013-11-03 01:11:07 UTC (rev 6382) @@ -27,19 +27,19 @@ var Lang = document.getElementById('Lang').value; switch(Lang){ case 'US': - var patt = /(?:^(-)?([1-9]{1}\d{0,2}(?:,?\d{3})*(?:\.\d{1,})?)$)|(?:^(-)?(0?\.\d{1,})$)/; + var patt = /(?:^(-)?([1-9]{1}\d{0,2}(?:,?\d{3})*(?:\.\d{1,})?)$)|(?:^(-)?(0?\.\d{1,})$)|(?:^0$)/; break; case 'IN': - var patt = /(?:^(-)?([1-9]{1}\d{0,1},)?(\d{2},)*(\d{3})(\.\d+)?$)|(?:^(-)?[1-9]{1}\d{0,2}(\.\d+)?$)|(?:^(-)?(0?\.\d{1,})$)/; + var patt = /(?:^(-)?([1-9]{1}\d{0,1},)?(\d{2},)*(\d{3})(\.\d+)?$)|(?:^(-)?[1-9]{1}\d{0,2}(\.\d+)?$)|(?:^(-)?(0?\.\d{1,})$)|(?:^0$)/; break; case 'EE': - var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\s?\d{3})*(?:\.\d{1,})?$)|(?:^(-)?(0?\.\d{1,})$)/; + var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\s?\d{3})*(?:\.\d{1,})?$)|(?:^(-)?(0?\.\d{1,})$)|(?:^0$)/; break; case 'FR': - var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\s?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0?,\d{1,})$)/; + var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\s?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0?,\d{1,})$)|(?:^0$)/; break; case 'GM': - var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\.?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0?,\d{1,})$)/; + var patt = /(?:^(-)?[1-9]{1}\d{0,2}(?:\.?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0?,\d{1,})$)|(?:^0$)/; break; default: alert('something is wrong with your language setting'); |
From: <ex...@us...> - 2014-02-22 05:58:13
|
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; |
From: <ex...@us...> - 2014-06-23 04:57:42
|
Revision: 6775 http://sourceforge.net/p/web-erp/reponame/6775 Author: exsonqu Date: 2014-06-23 04:57:39 +0000 (Mon, 23 Jun 2014) Log Message: ----------- 23/06/14 Tim: Fixed the GL account validation pop up error in MiscFunctions.js. Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2014-06-23 02:12:53 UTC (rev 6774) +++ trunk/javascripts/MiscFunctions.js 2014-06-23 04:57:39 UTC (rev 6775) @@ -61,7 +61,7 @@ } function inArray(v,tA,m){ for (i=0;i<tA.length;i++) { - if (v==tA[i].value) { + if (v.value==tA[i].value) { return true; } } |
From: <rc...@us...> - 2016-10-17 05:51:17
|
Revision: 7646 http://sourceforge.net/p/web-erp/reponame/7646 Author: rchacon Date: 2016-10-17 05:51:15 +0000 (Mon, 17 Oct 2016) Log Message: ----------- Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2016-10-17 05:34:08 UTC (rev 7645) +++ trunk/javascripts/MiscFunctions.js 2016-10-17 05:51:15 UTC (rev 7646) @@ -1,3 +1,4 @@ +/* $Id: $ */ function defaultControl(c){ c.select(); c.focus(); |
From: <rc...@us...> - 2016-10-17 05:56:22
|
Revision: 7647 http://sourceforge.net/p/web-erp/reponame/7647 Author: rchacon Date: 2016-10-17 05:56:20 +0000 (Mon, 17 Oct 2016) Log Message: ----------- Modified Paths: -------------- trunk/javascripts/MiscFunctions.js Modified: trunk/javascripts/MiscFunctions.js =================================================================== --- trunk/javascripts/MiscFunctions.js 2016-10-17 05:51:15 UTC (rev 7646) +++ trunk/javascripts/MiscFunctions.js 2016-10-17 05:56:20 UTC (rev 7647) @@ -1,4 +1,6 @@ -/* $Id: $ */ +/* $Id: MiscFunctions.js 7645 2016-10-17 05:34:08Z rchacon $ */ +/* Miscellaneous JavaScript functions. */ + function defaultControl(c){ c.select(); c.focus(); |