Commit 65fffd7d authored by sanashaikh's avatar sanashaikh

Sana S: Modified on 05/12/19

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@213172 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 72c64a3b
...@@ -88,6 +88,7 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -88,6 +88,7 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
String dayFrom="",dayTo="",dayFromDt="",dayToDt=""; String dayFrom="",dayTo="",dayFromDt="",dayToDt="";
Timestamp dateFor = null,dateTo = null,dayFrom1=null,dayTo1=null; Timestamp dateFor = null,dateTo = null,dayFrom1=null,dayTo1=null;
SimpleDateFormat sdf = new SimpleDateFormat("EEEE"); SimpleDateFormat sdf = new SimpleDateFormat("EEEE");
SimpleDateFormat sdf1 = new SimpleDateFormat("dd/MM/yy");//added by Sana S on 03/12/19
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
try try
...@@ -111,10 +112,23 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -111,10 +112,23 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
valueXmlString.append("<Detail1>\r\n"); valueXmlString.append("<Detail1>\r\n");
if (currentColumn.trim().equals("itm_default")) if (currentColumn.trim().equals("itm_default"))
{ {
holDateFor = checkNull(genericUtility.getColumnValue("hol_date_for", dom)); //Modified by Sana S on 03/12/19 [start]
//holDateFor = checkNull(genericUtility.getColumnValue("hol_date_for", dom));
holDateFor= sdf1.format(new java.util.Date());
valueXmlString.append("<hol_date_for><![CDATA[").append(holDateFor).append("]]></hol_date_for>");
System.out.print("Holiday Date For:"+holDateFor); System.out.print("Holiday Date For:"+holDateFor);
if(holDateFor == null || holDateFor.trim().length() == 0) holDateTo = sdf1.format(new java.util.Date());
valueXmlString.append("<hol_date_to><![CDATA[").append(holDateTo).append("]]></hol_date_to>");
dayFrom=sdf.format(new java.util.Date());
dayTo=sdf.format(new java.util.Date());
/*if(holDateFor == null || holDateFor.trim().length() == 0)
{ {
valueXmlString.append("<hol_date_for><![CDATA[").append(holDateFor).append("]]></hol_date_for>"); valueXmlString.append("<hol_date_for><![CDATA[").append(holDateFor).append("]]></hol_date_for>");
} }
...@@ -134,7 +148,8 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -134,7 +148,8 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
{ {
dateTo = Timestamp.valueOf(genericUtility.getValidDateString(holDateTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); dateTo = Timestamp.valueOf(genericUtility.getValidDateString(holDateTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
valueXmlString.append("<hol_date_to><![CDATA[").append(dateTo).append("]]></hol_date_to>"); valueXmlString.append("<hol_date_to><![CDATA[").append(dateTo).append("]]></hol_date_to>");
} }*/
//Modified by Sana S on 03/12/19 [end]
valueXmlString.append("<day_from><![CDATA[").append(dayFrom).append("]]></day_from>"); valueXmlString.append("<day_from><![CDATA[").append(dayFrom).append("]]></day_from>");
valueXmlString.append("<day_to><![CDATA[").append(dayTo).append("]]></day_to>"); valueXmlString.append("<day_to><![CDATA[").append(dayTo).append("]]></day_to>");
......
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