Sarita: Done changes for Connection and nfcheckperiod on 16APR2018

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

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

@@ -10,7 +10,6 @@ import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.ejb.fin.FinCommon;
-
 import java.sql.*;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -123,8 +122,11 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe
 		
 		try 
 		{
-			ConnDriver connDriver = new ConnDriver();
-			conn = connDriver.getConnectDB("DriverITM");
+			//changes by sarita on 16APR2018 for getting connection [start]
+			/*ConnDriver connDriver = new ConnDriver();
+			conn = connDriver.getConnectDB("DriverITM");*/
+			conn = getConnection();
+			//changes by sarita on 16APR2018 for getting connection [end]
 			userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode"); 
 			loginSite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
 			
@@ -184,8 +186,10 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe
 								
 							}
 							close(pstmt, rs);
-							errorCode = nfCheckPeriod("ADM",tranDate,wrkSite);
-							
+							//changes by sarita on 16APR2018 [start]- added conn parameter in nfCheckPeriod method
+							//errorCode = nfCheckPeriod("ADM",tranDate,wrkSite);
+							errorCode = nfCheckPeriod("ADM",tranDate,wrkSite,conn);
+							//changes by sarita on 16APR2018 [end]- added conn parameter in nfCheckPeriod method
 							if(errorCode != null && errorCode.trim().length() > 0)
 							{
 								System.out.println("Inside error code of tran_date");
@@ -219,7 +223,6 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe
 								if (rs.next())
 								{
 									wrkSite = checkNull(rs.getString("WORK_SITE"));									
-									
 								}
 								else
 								{
@@ -418,6 +421,26 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe
 								}
 							
 							}
+							//Added by sarita on 16APRIL2018 [start] for invalid relieve_date validation
+							else
+							{
+								try
+								{
+									relieveDate = sdf.parse(relieveDateStr);
+								}
+								catch(Exception e)
+								{
+									errorCode = "VMINVDATE ";
+									errList.add(errorCode);
+									errFields.add( childNodeName.toLowerCase() );
+									msgType =  errorType( conn , errorCode );
+									if ( msgType.equalsIgnoreCase("E"))
+									{
+										break;
+									}
+								}
+							}
+							//Added by sarita on 16APRIL2018 [end] for invalid relieve_date validation
 						}
 						else if(childNodeName.equalsIgnoreCase("separation_mode"))
 						{
@@ -617,8 +640,11 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe
 			{
 				currentFormNo = Integer.parseInt(objContext);
 			}
-			connDriver = new ConnDriver();
-			conn = connDriver.getConnectDB("Driver");
+			//changes by sarita on 16APR2018 for getting connection [start]
+			/*ConnDriver connDriver = new ConnDriver();
+			conn = connDriver.getConnectDB("DriverITM");*/
+			conn = getConnection();
+			//changes by sarita on 16APR2018 for getting connection [end]
 			GenericUtility genericUtility = GenericUtility.getInstance();
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());	
 			//SimpleDateFormat dbsdf = new SimpleDateFormat(genericUtility.getDBDateFormat());