lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try a change to allow to input month/day with one digit.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-05-05 00:18:23 +00:00
parent aec77ab1e9
commit c917cad328
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/lib/lib_head.js
View File

@ -501,6 +501,8 @@ function getDateFromFormat(val,format)
var seconde=now.getSeconds(); var seconde=now.getSeconds();
var i=0; var i=0;
var d=0; // -d- follows the date string while -i- follows the format string
while (i < format.length) while (i < format.length)
{ {
c=format.charAt(i); // Recupere char du format c=format.charAt(i); // Recupere char du format
@ -512,7 +514,7 @@ function getDateFromFormat(val,format)
} }
//alert('substr='+substr); //alert('substr='+substr);
if (substr == "yyyy") year=getIntegerInString(val,i,4,4); /* if (substr == "yyyy") year=getIntegerInString(val,i,4,4);
if (substr == "yy") year=""+(getIntegerInString(val,i,2,2)-0+1900); if (substr == "yy") year=""+(getIntegerInString(val,i,2,2)-0+1900);
if (substr == "MM") month=getIntegerInString(val,i,2,2); if (substr == "MM") month=getIntegerInString(val,i,2,2);
if (substr == "M") month=getIntegerInString(val,i,1,2); if (substr == "M") month=getIntegerInString(val,i,1,2);
@ -521,8 +523,36 @@ function getDateFromFormat(val,format)
if (substr == "HH") hour=getIntegerInString(val,i,1,2); if (substr == "HH") hour=getIntegerInString(val,i,1,2);
if (substr == "mm") minute=getIntegerInString(val,i,1,2); if (substr == "mm") minute=getIntegerInString(val,i,1,2);
if (substr == "ss") seconde=getIntegerInString(val,i,1,2); if (substr == "ss") seconde=getIntegerInString(val,i,1,2);
*/
if (substr == "yyyy") year=getIntegerInString(val,d,4,4);
if (substr == "yy") year=""+(getIntegerInString(val,d,2,2)-0+1900);
if (substr == "MM" ||substr == "M")
{
month=getIntegerInString(val,d,1,2);
d -= 2- month.length;
}
if (substr == "dd")
{
day=getIntegerInString(val,d,1,2);
d -= 2- day.length;
}
if (substr == "HH" ||substr == "hh" )
{
hour=getIntegerInString(val,d,1,2);
d -= 2- hour.length;
}
if (substr == "mm"){
minute=getIntegerInString(val,d,1,2);
d -= 2- minute.length;
}
if (substr == "ss")
{
seconde=getIntegerInString(val,d,1,2);
d -= 2- seconde.length;
}
i+=substr.length; i+=substr.length;
d+=substr.length;
} }
// Check if format param are ok // Check if format param are ok