Commit 5543dd16 authored by smestry's avatar smestry

Updated the js for product wizard changes


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104158 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d4152c8e
...@@ -845,7 +845,7 @@ ...@@ -845,7 +845,7 @@
"</td>"+*/ "</td>"+*/
"<td class='td_leftAlign'>" + "<td class='td_leftAlign'>" +
"<input type='text' id=dtFrom"+no+" class='input_editable' size='8' style='text-align: left;' disabled />" + "<input type='text' id=dtFrom"+no+" class='input_editable' size='8' style='text-align: left;' disabled />" +
"<img src='/ibase/webitm/images/calender.png' id='dtFrom"+no+"' name='dtFrom"+no+"' onClick=javascript:setDate('dtFrom"+no+"'); border='0' style='margin-bottom: -5px;' /> " + "<img src='/ibase/webitm/images/calender.png' id='dtFrom"+no+"' name='dtFrom"+no+"' onClick=javascript:setDate('dtFrom"+no+"'); border='0' style='margin-bottom: -5px;' /> " +
"</td>"+ "</td>"+
...@@ -1450,12 +1450,12 @@ ...@@ -1450,12 +1450,12 @@
"</td>" + "</td>" +
"<td class='td_leftAlign'>" + "<td class='td_leftAlign'>" +
"<input type='text' class='input_editable' id=SuppDtFrom"+num+" size='8' style='text-align: left;' readonly='1' />" + "<input type='text' class='input_editable' id=SuppDtFrom"+num+" size='8' style='text-align: left;' disabled />" +
"<img src='/ibase/webitm/images/calender.png' id='SuppDtFrom"+num+"' name='SuppDtFrom"+num+"' onClick=javascript:setDate('SuppDtFrom"+num+"'); border='0' style='margin-bottom: -5px;' /> " + "<img src='/ibase/webitm/images/calender.png' id='SuppDtFrom"+num+"' name='SuppDtFrom"+num+"' onClick=javascript:setDate('SuppDtFrom"+num+"'); border='0' style='margin-bottom: -5px;' /> " +
"</td>"+ "</td>"+
"<td class='td_leftAlign'>" + "<td class='td_leftAlign'>" +
"<input type='text' class='input_editable' id=SuppDtTo"+num+" size='8' style='text-align: left;' readonly='1' />" + "<input type='text' class='input_editable' id=SuppDtTo"+num+" size='8' style='text-align: left;' disabled />" +
"<img src='/ibase/webitm/images/calender.png' id='SuppDtTo"+num+"' name='SuppDtTo"+num+"' onClick=javascript:setDate('SuppDtTo"+num+"'); border='0' style='margin-bottom: -5px;' /> " + "<img src='/ibase/webitm/images/calender.png' id='SuppDtTo"+num+"' name='SuppDtTo"+num+"' onClick=javascript:setDate('SuppDtTo"+num+"'); border='0' style='margin-bottom: -5px;' /> " +
"</td>"+ "</td>"+
...@@ -2688,10 +2688,32 @@ ...@@ -2688,10 +2688,32 @@
} }
function showcalender(id) function showcalender(id)
{ {
var date_format = "d/m/y"; var dateFormat = "";
if (document.getElementById('date_format') != null)
{
global_date_format = document.getElementById("date_format").value;
}
if ( global_date_format == "dd/MM/yy" )
{
dateFormat = "d/m/y";
}
else if ( global_date_format == "dd-MMM-yyyy" )
{
dateFormat = "d/M/y";
}
else if ( global_date_format == "MM/dd/yy" )
{
dateFormat = "m/d/y";
}
else
{
dateFormat = "d/m/y";
}
$( "#"+id).datetimepicker({ $( "#"+id).datetimepicker({
timepicker:false, timepicker:false,
format:date_format, format:dateFormat,
defaultTime:'10:00', defaultTime:'10:00',
minDate:0, minDate:0,
step:1 step:1
......
...@@ -959,10 +959,32 @@ ...@@ -959,10 +959,32 @@
} }
function showcalender(id) function showcalender(id)
{ {
var date_format = "d/m/y"; var dateFormat = "";
if (document.getElementById('date_format') != null)
{
global_date_format = document.getElementById("date_format").value;
}
if ( global_date_format == "dd/MM/yy" )
{
dateFormat = "d/m/y";
}
else if ( global_date_format == "dd-MMM-yyyy" )
{
dateFormat = "d/M/y";
}
else if ( global_date_format == "MM/dd/yy" )
{
dateFormat = "m/d/y";
}
else
{
dateFormat = "d/m/y";
}
$( "#"+id).datetimepicker({ $( "#"+id).datetimepicker({
timepicker:false, timepicker:false,
format:date_format, format:dateFormat,
defaultTime:'10:00', defaultTime:'10:00',
minDate:0, minDate:0,
step:1 step:1
......
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