Commit fd75d081 authored by smestry's avatar smestry

Updated the js files for product Wizard changes


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104242 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d32920b6
...@@ -21,8 +21,18 @@ ...@@ -21,8 +21,18 @@
{ {
global_date_format = "dd-M-y"; global_date_format = "dd-M-y";
} }
else if ( global_date_format == "MM/dd/yy" )
{
dateFormat = "m/d/y";
}
else
{
dateFormat = "d/m/y";
}
} }
// Added by parikshit kumbhar on 09/07/15 [to set date format] end // Added by parikshit kumbhar on 09/07/15 [to set date format] end
var currDate = new Date(); var currDate = new Date();
var tommorrowDate = new Date(); var tommorrowDate = new Date();
tommorrowDate.setDate(currDate.getDate() + 1); tommorrowDate.setDate(currDate.getDate() + 1);
...@@ -55,7 +65,25 @@ ...@@ -55,7 +65,25 @@
day = "0" + day; day = "0" + day;
} }
return day +"/"+ month +"/"+ year; // Added by Sneha on 28-12-2016, to display date in appldateformat [Start]
if ( global_date_format == "dd/MM/yy" )
{
return day +"/"+ month +"/"+ year;
}
else if ( global_date_format == "dd-MMM-yyyy" )
{
return day +"-"+ month +"-"+ year;
}
else if ( global_date_format == "MM/dd/yy" )
{
return month +"/"+ day +"/"+ year;
}
else
{
return day +"/"+ month +"/"+ year;
}
//return day +"/"+ month +"/"+ year;
// Added by Sneha on 28-12-2016, to display date in appldateformat [End]
} }
function checkAll(element) function checkAll(element)
......
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
var tommorrowDate = new Date(); var tommorrowDate = new Date();
tommorrowDate.setDate(currDate.getDate() + 1); tommorrowDate.setDate(currDate.getDate() + 1);
function formatDate(d) function formatDate(d)
{ {
var month = d.getMonth(); var month = d.getMonth();
...@@ -90,8 +91,26 @@ ...@@ -90,8 +91,26 @@
{ {
day = "0" + day; day = "0" + day;
} }
return day +"/"+ month +"/"+ year; // Added by Sneha on 28-12-2016, to display date in appl dateformat [Start]
if ( global_date_format == "dd/MM/yy" )
{
return day +"/"+ month +"/"+ year;
}
else if ( global_date_format == "dd-MMM-yyyy" )
{
return day +"-"+ month +"-"+ year;
}
else if ( global_date_format == "MM/dd/yy" )
{
return month +"/"+ day +"/"+ year;
}
else
{
return day +"/"+ month +"/"+ year;
}
//return day +"/"+ month +"/"+ year;
// Added by Sneha on 28-12-2016, to display date in appl dateformat [End]
} }
function checkAll(element) function checkAll(element)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment