Changes done in itemchange method of SepClose to set description of separation...

Changes done in itemchange method of SepClose to set description of separation mode against Req.ID: AD01SUN040

Changes done in process method of ShiftProcess to handle dates when calling from ITM.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91509 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-adm/ibase/webitm/ejb/adm/SepClose.java

@@ -512,6 +512,7 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
 						//String reliveDateStr="";//Remarked by Raj (AD90SUN017)- 13/05/2010
 						String firstName="";
 						String lastName="";
+						String sepmodeDescr = "";
 						String approverfirstName = ""; //Added by Raj (AD90SUN017)- 13/05/2010
 						String approverlastName = ""; //Added by Raj (AD90SUN017)- 13/05/2010
 						Object date = null;
@@ -524,7 +525,15 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
 						//sql = "SELECT RESI_DATE  FROM SEPARATION WHERE  EMP_CODE = '"+columnValue.trim()+"'"; // Remarked by Raj - Req. ID. ADM5000192 - 27/05/08
 						sepFound = "N"; // Added by Raj - Req.ID: ADM5000192 - 27/05/08
 						//sql = "SELECT RESI_DATE FROM SEPARATION WHERE  EMP_CODE = '"+columnValue.trim()+"' AND STATUS = 'C'";  // Added STATUS CLAUSE IN WHERE CONDITION by Raj - Req.ID: ADM5000192 - 27/05/08 ////Remarked by Raj (AD90SUN017)- 08/05/2010
-						sql = "SELECT RESI_DATE, STATUS, RELIEVE_DATE, SEPARATION_MODE, REASON, VAC_NO__CREATED, CONF_DATE, EMP_CODE__CONF FROM SEPARATION WHERE  EMP_CODE = '"+columnValue.trim()+"' AND STATUS = 'C'"; //Added by Raj (AD90SUN017)- 08/05/2010
+						
+						/*Comment By Rupesh [14/10/11] [CCF. No.- AD01SUN040] Start*/
+						//sql = "SELECT RESI_DATE, STATUS, RELIEVE_DATE, SEPARATION_MODE, REASON, VAC_NO__CREATED, CONF_DATE, EMP_CODE__CONF FROM SEPARATION WHERE  EMP_CODE = '"+columnValue.trim()+"' AND STATUS = 'C'"; //Added by Raj (AD90SUN017)- 08/05/2010
+						/*Comment By Rupesh [14/10/11] [CCF. No.- AD01SUN040] End*/
+
+						//Added By Rupesh on [14/10/11] [CCF. No.- AD01SUN040] [To display separation description] Start 
+						sql = "SELECT RESI_DATE, STATUS, RELIEVE_DATE, SEPARATION_MODE, REASON, VAC_NO__CREATED, CONF_DATE, EMP_CODE__CONF, FN_GET_DESCR_GENCODES('SEPARATION_MODE' , 'W_EMP_SEPARATION' , SEPARATION.SEPARATION_MODE) SEPMODE_DESCR FROM SEPARATION WHERE  EMP_CODE = '"+columnValue.trim()+"' AND STATUS = 'C'";
+						//Added By Rupesh on [14/10/11] [CCF. No.- AD01SUN040] End						
+
 						System.out.println("Sql For Separation Details :::["+sql+"]"); 
 						stmtSep = connSep.createStatement();
 						rsSep = stmtSep.executeQuery(sql);
@@ -543,6 +552,7 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
 							confDate	= checkNull(rsSep.getString("CONF_DATE"));
 							empCodeConf = checkNull(rsSep.getString("EMP_CODE__CONF"));
 							reliveDate	= checkNull(rsSep.getString("RELIEVE_DATE"));
+							sepmodeDescr = checkNull(rsSep.getString("SEPMODE_DESCR")); //Added By Rupesh on [14/10/11] [CCF. No.- AD01SUN040]
 							//Addition ended by Raj (AD90SUN017)- 08/05/2010
 						}
 						rsSep.close();
@@ -593,6 +603,9 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
 						}//Changed by Pawan on 4/21/2011 [AD01SUN009] for date formating.
 						valueXmlString.append("<sep_status>").append(status).append("</sep_status>\r\n");
 						valueXmlString.append("<separation_mode>").append(sepMode).append("</separation_mode>\r\n");
+						//Added by rupesh on 13/10/11 [AD01SUN040] Start						
+						valueXmlString.append("<sepmode_descr>").append(sepmodeDescr == null ? "" : sepmodeDescr).append("</sepmode_descr>\r\n");
+						//Added by rupesh on 13/10/11 [AD01SUN040] End
 						valueXmlString.append("<reason>").append(reason).append("</reason>\r\n");
 						valueXmlString.append("<vac_no__created>").append(vacNoCreated).append("</vac_no__created>\r\n");
 						valueXmlString.append("<conf_date_sep>").append(confDate).append("</conf_date_sep>\r\n");

webitm-adm/ibase/webitm/ejb/adm/ShiftProcess.java

@@ -284,7 +284,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
 			{
 				siteCodeTo = "ZZ";
 			}
-
+			
 			patternCodeFilt = genericUtility.getColumnValue("pattern_code",headerDom);
 			fromDate = genericUtility.getColumnValue("date__fr",headerDom);
 			
@@ -295,6 +295,16 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
 				errString = itmdbAccessLocal.getErrorString("","INVFRMDATE","","",conn);
 				return errString;
 			}
+			//Added By Rupesh on [14-10-11] [CCF No.:-AD01SUN0018] [Reason :- Convert Date format from ITM format to ApplDateFormat] Start 
+			else
+			{
+				if( xtraParams.indexOf("user_lang=") <= 0 )						
+				{
+					fromDate = genericUtility.getValidDateString(fromDate, "yy-MM-dd" , genericUtility.getApplDateFormat());
+				}
+			}
+			//Added By Rupesh on [14-10-11] [CCF No.:-AD01SUN0018] [Reason :- Convert Date format from ITM format to ApplDateFormat] End
+
 			//Changed by Pawan on 5/11/2011 [AD01SUN008].end
 			toDate = genericUtility.getColumnValue("date__to",headerDom );
 			//Changed by Pawan on 5/11/2011 [AD01SUN008].start
@@ -303,6 +313,16 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
 				errString = itmdbAccessLocal.getErrorString("","INVDTODATE","","",conn);
 				return errString;
 			}
+			//Added By Rupesh on [14-10-11] [CCF No.:-AD01SUN0018] [Reason :- Convert Date format from ITM format to ApplDateFormat] Start 
+			else
+			{
+				if( xtraParams.indexOf("user_lang=") <= 0 )						
+				{
+					toDate = genericUtility.getValidDateString(fromDate, "yy-MM-dd" , genericUtility.getApplDateFormat());
+				}
+			}
+			//Added By Rupesh on [14-10-11] [CCF No.:-AD01SUN0018] [Reason :- Convert Date format from ITM format to ApplDateFormat] End
+
 			//Changed by Pawan on 5/11/2011 [AD01SUN008].end
 			System.out.println("ToDate:::[" +toDate+"]");
 			System.out.println("empCodeFr :"+empCodeFr+" empCodeTo :"+empCodeTo+" deptCodeFr :"+deptCodeFr+" siteCodeFr  :"+siteCodeFr);