Commited by radheshyam[30/06/2015][According to piyush sir merge all data in cvs at base office]

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

webitm-adm/clases/advance_add11Arg_en_US.properties

+prd_code = Period

webitm-adm/clases/allowdedn_drop11Arg_en_US.properties

+ad_from_date = From Date
+ad_to_date = To Date

webitm-adm/clases/attd_daily11Arg_en_US.properties

+MFR_DATE = From Date
+MTO_DATE = To Date

webitm-adm/clases/attd_mon11Arg_en_US.properties

+prd_code = Period

webitm-adm/clases/emp_overtime11Arg_en_US.properties

+prd_code = Period

webitm-adm/clases/emp_repchg_trace11Arg_en_US.properties

 from_date = From Date
-from_date = To Date
+to_date = To Date

webitm-adm/clases/emp_status11Arg_en_US.properties

+date_from = From Date
+date_to = To Date

webitm-adm/clases/empperk11Arg_en_US.properties

+m_fr_date = From Date
+m_to_date = To Date

webitm-adm/clases/mpreqmnt11Arg_en_US.properties

+date_fr = From Date
+date_to = To Date

webitm-adm/clases/payarr_to_proc11Arg_en_US.properties

+EMP_CODE = Employee Code

webitm-adm/clases/perk_claim11Arg_en_US.properties

+ad_ret1 = From Date
+ad_ret2 = To Date

webitm-adm/clases/sales_comm11Arg_en_US.properties

+mfr_date = From Date
+mto_date = To Date

webitm-adm/clases/tour11Arg_en_US.properties

+frdate = From Date
+todate = To Date

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

+/**
+* PURPOSE : Local Interface 
+* AUTHOR  : Kunal Mandhre  
+* Date    : 11/10/2012
+*/
+
+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.utility.ITMException;
+
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+@javax.ejb.Local
+public interface AdvanceAddPosLocal 
+{
+	public String postSave()throws RemoteException,ITMException;
+	public String postSave( String tranId, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;	
+}
\ No newline at end of file

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

+/**
+* PURPOSE : Remote Interface 
+* AUTHOR  : Kunal Mandhre  
+* Date    : 10/10/2012
+*/
+
+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.ejb.*;
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+@javax.ejb.Remote
+public interface AdvanceAddPosRemote
+{
+	public String postSave()throws RemoteException,ITMException;
+	public String postSave( String tranId, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;
+
+}

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

+/**
+ * PURPOSE : Post Save to create loans against adhoc advance given to employee
+ * AUTHOR : Abhishek Jaiswal
+ * DATE : 20/02/2015
+ */
+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.GenericUtility;
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.ejb.ITMDBAccessEJB;
+import ibase.webitm.ejb.adm.AdmCommon;
+import ibase.webitm.ejb.dis.DistCommon;
+import ibase.webitm.ejb.fin.FinCommon;
+import ibase.webitm.ejb.sys.CreateRCPXML;
+import ibase.webitm.utility.TransIDGenerator;
+import ibase.utility.CommonConstants;
+import java.rmi.RemoteException;
+import java.sql.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+
+import org.w3c.dom.*;
+
+
+@javax.ejb.Stateless
+public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, AttdDailyPosRemote
+{
+	public String postSave()throws RemoteException,ITMException
+	{
+		return "";
+	}
+	public String postSave(String xmlString, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException
+	{
+
+		String empCode = "";
+		String loginEmpCode = "";
+		String paySite = "";
+		String errString = "";
+		String sql = "";
+		String errCode = "";
+		String userId = "";
+		String chgTerm = "";
+		String attdDateStr = "";
+		String prevInTime = "";
+		String newInTime = "";
+		String prevOutTime = "";
+		String newOutTime = "";
+		String punchStr = "";
+		
+		int attdUpdCnt = 0;
+		Timestamp attdDate = null ;
+		Timestamp  currDate = null;
+
+		PreparedStatement pstmt = null;		
+		ResultSet rs = null;
+
+		boolean toUpdate = false;
+
+		ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();		
+		AdmCommon admCommon = new AdmCommon();
+		GenericUtility genericUtility = GenericUtility.getInstance();
+
+		SimpleDateFormat sdfAppl = null;
+
+		Document headerDom = null;
+
+		try
+		{
+
+			System.out.println("XML String :"+xmlString);
+			headerDom = genericUtility.parseString(xmlString); 				
+
+			currDate = new java.sql.Timestamp(System.currentTimeMillis());
+			userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
+			chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
+			loginEmpCode  = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
+
+			empCode = checkNullAndTrim(genericUtility.getColumnValue("emp_code",headerDom));
+			attdDateStr = checkNullAndTrim(genericUtility.getColumnValue("attd_date",headerDom));
+			prevInTime = checkNullAndTrim(genericUtility.getColumnValue("prev_in_time",headerDom));
+			newInTime = checkNullAndTrim(genericUtility.getColumnValue("in_time",headerDom));
+			prevOutTime = checkNullAndTrim(genericUtility.getColumnValue("prev_out_time",headerDom));
+			newOutTime = checkNullAndTrim(genericUtility.getColumnValue("out_time",headerDom));
+			punchStr = checkNullAndTrim(genericUtility.getColumnValue("punch_str",headerDom));
+
+			if (!prevInTime.equalsIgnoreCase(newInTime))
+			{
+				punchStr = "*-" + newInTime + "," + punchStr;
+				toUpdate = true;
+			}
+			if (!prevOutTime.equalsIgnoreCase(newOutTime))
+			{
+				if (punchStr.length() > 0 && punchStr.substring(punchStr.length()-1) != ",")
+				{
+					punchStr = punchStr + ",";
+				}
+				punchStr = punchStr + "*-" + newOutTime;
+				toUpdate = true;
+			}
+			if (toUpdate)
+			{
+				attdDateStr = genericUtility.getValidDateString(attdDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
+				attdDate = java.sql.Timestamp.valueOf(attdDateStr + " 00:00:00");
+				sql = "UPDATE ATTENDANCE_DAY SET PUNCH_STR = ? WHERE EMP_CODE = ? AND ATTD_DATE = ?";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1 , punchStr);
+				pstmt.setString(2 , empCode);
+				pstmt.setTimestamp(3 , attdDate);
+				attdUpdCnt = pstmt.executeUpdate();
+				System.out.println("AttdDailyPos - ATTENDANCE_DAY UPDATE COUNT [" + attdUpdCnt + "]");
+			}
+			if (rs != null)
+			{
+				rs.close();
+				rs = null;
+			}
+			if (pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}
+
+		}
+		catch(Exception e)
+		{
+			try
+			{
+
+				System.out.println("Exception IN AttdDailyPos::::"+e.getMessage());
+				e.printStackTrace();			
+				throw new ITMException(e);
+			}
+			catch (Exception e1)
+			{
+				e1.printStackTrace();
+				throw new ITMException(e1);
+			}
+		}
+		finally
+		{
+			try
+			{	
+				if(errString != null && errString.trim().length() > 0)
+				{
+					{
+						conn.rollback();
+					}
+				}
+
+				if( rs != null )
+				{
+					rs.close();
+					rs = null;
+				}
+				if( pstmt != null )
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+			}
+			catch(Exception e)
+			{
+				System.out.println("Exception "+e.getMessage());
+				e.printStackTrace();
+				throw new ITMException(e);
+			}
+		}
+		return errString;
+	}
+
+	private String checkNull( String inputVal )
+	{
+		if ( inputVal == null )
+		{
+			inputVal = "";
+		}
+		return inputVal;
+	}
+	private String checkNullAndTrim( String inputVal )
+	{
+		if ( inputVal == null )
+		{
+			inputVal = "";
+		}
+		return inputVal.trim();
+	}
+}
+

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

+/**
+* PURPOSE : Local Interface 
+* AUTHOR  : Kunal Mandhre  
+* Date    : 11/10/2012
+*/
+
+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.utility.ITMException;
+
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+@javax.ejb.Local
+public interface AttdDailyPosLocal 
+{
+	public String postSave()throws RemoteException,ITMException;
+	public String postSave( String tranId, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;	
+}
\ No newline at end of file

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

+/**
+* PURPOSE : Remote Interface 
+* AUTHOR  : Kunal Mandhre  
+* Date    : 10/10/2012
+*/
+
+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.ejb.*;
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+@javax.ejb.Remote
+public interface AttdDailyPosRemote
+{
+	public String postSave()throws RemoteException,ITMException;
+	public String postSave( String tranId, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;
+
+}

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

@@ -325,8 +325,14 @@ public class AttdProcess extends ProcessEJB implements  AttdProcessLocal ,AttdPr
 					System.out.println("Commit transaction**********");
 					if(conn!=null)
 						conn.commit();
+					// Modified by Piyush on 19/03/2015 [To show message in RCP].Start
+					// errString = "";
+					if( xtraParams.indexOf("user_lang=") == -1)						
+					{
 						errString = "";
 					}
+					// Modified by Piyush on 19/03/2015 [To show message in RCP].Start
+				}
 				else{
 					//System.out.println("Not Successful************** ");
 					//errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
@@ -546,7 +552,9 @@ public class AttdProcess extends ProcessEJB implements  AttdProcessLocal ,AttdPr
 			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); //Added by jaimin on 13/06/2008 (AD89SUN013)
 			tranId = getExistTranId(empCode,procDate,conn); // gets Tran_id from empotime - Jiten
 			if(tranId == null)
-			 tranId = getTranId(conn);
+			 // Modified by Piyush on 19/03/2015 [To pass required parameters to generate tran id as per transetup. Issues resolved during RCP migration]
+			 // tranId = getTranId(conn); 
+			 tranId = getTranId(empCode,procDate,conn);
 			else
 				isExist=true;
 		
@@ -1602,7 +1610,9 @@ public class AttdProcess extends ProcessEJB implements  AttdProcessLocal ,AttdPr
 					tranId = getExistTranId(empCode,stDate,conn); // gets Tran_id from empotime - Jiten
 					System.out.println("tranId from getExistTranId :::: " + tranId);  //SOP BY ALKA 01/08/07
 					if(tranId == null)
-						tranId = getTranId(conn);
+						// Modified by Piyush on 19/03/2015 [To pass required parameters to generate tran id as per transetup. Issues resolved during RCP migration]
+						// tranId = getTranId(conn);
+						tranId = getTranId(empCode,stDate,conn);
 					else
 						isExist = true;
 					System.out.println("stDate : "+stDate);
@@ -2016,6 +2026,88 @@ private static int getDayOfWeek(String str)
 	return  dno;
 }//end of getDayOfWeek .
 
+
+// Modified by Piyush on 19/03/2015 [To generated tran id as per transetup].Start
+private String getTranId(String empCode , Timestamp otDate , Connection conn )
+{
+	String tranSer = "";
+	String keyString = "";
+	String keyCol = "";
+	String keyStringQuery = "";
+	String xmlValues="";
+	Statement crstmt = null;
+	String tranId="";
+	String workSite="";
+	String empSite="";
+	String paySite="";
+	
+	try
+	{ 
+
+		SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
+		String otDateStr = sdf1.format(otDate);
+		System.out.println("getTranId otDate :: " + otDate);
+		System.out.println("getTranId otDateStr :: " + otDateStr);
+
+		keyStringQuery = "SELECT WORK_SITE, EMP_SITE, PAY_SITE "   
+			+ "FROM  EMPLOYEE "
+			+ "WHERE EMP_CODE = '" + empCode + "'";
+		
+		System.out.println("Employee fetch site sql from getTranId :::"+keyStringQuery); 
+		crstmt = conn.createStatement();
+		rsn20 = crstmt.executeQuery(keyStringQuery);	
+		if (rsn20.next())
+		{
+			workSite = rsn20.getString("WORK_SITE");
+			empSite = rsn20.getString("EMP_SITE");
+			paySite = rsn20.getString("PAY_SITE");
+		}
+		rsn20.close();
+		rsn20 = null;
+		crstmt.close();
+		crstmt=null;
+		keyStringQuery = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = 'w_emp_overtime'";
+		System.out.println("keyStringQuery::"+keyStringQuery);
+		crstmt = conn.createStatement();
+		rsn20 = crstmt.executeQuery(keyStringQuery);
+
+		if (rsn20.next())
+		{
+			keyString = rsn20.getString(1);
+			keyCol = rsn20.getString(2);
+			tranSer = rsn20.getString(3);				
+		}
+		crstmt.close();
+		crstmt=null;
+		rsn20.close();
+		rsn20=null;
+		xmlValues = "";
+		xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
+		xmlValues = xmlValues + "<Header></Header>";
+		xmlValues = xmlValues + "<Detail1>";
+		xmlValues = xmlValues + "<site_code>" + workSite + "</site_code>";
+		xmlValues = xmlValues + "<work_site>" + workSite + "</work_site>";
+		xmlValues = xmlValues + "<emp_site>" + empSite + "</emp_site>";
+		xmlValues = xmlValues + "<pay_site>" + paySite + "</pay_site>";
+		xmlValues = xmlValues + "<ot_date>" + otDateStr + "</ot_date>";
+		xmlValues = xmlValues +"</Detail1></Root>";
+		System.out.println("xmlValues  :["+xmlValues+"]");
+		TransIDGenerator tg = new TransIDGenerator(xmlValues, "SUN", CommonConstants.DB_NAME);
+	    tranId = tg.generateTranSeqID(tranSer, keyCol, keyString, conn);
+	}
+	catch(SQLException se)
+	{				
+		System.out.println("SQLException :Generating id[failed] : " + "\n" +se.getMessage());
+	}
+	catch(Exception ex)
+	{
+		System.out.println("Exception8:Generating id [failed]:" + "\n" +ex.getMessage());
+	}
+	return tranId;
+}//end of getTranId function .
+
+// Modified by Piyush on 19/03/2015 [To generated tran id as per transetup].End
+
 private String getTranId(Connection conn )
 {
 	String tranSer = "";

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

@@ -91,18 +91,18 @@ public class AttendancePrc extends ValidatorEJB implements  AttendancePrcLocal,A
 		Node childNode = null;
 		System.out.println("itemChanged  called");
 		String loginSite = "";
-		String empCode = null;
-		String siteCode = null;
-		String procGroup = null;
-		String frProcGr = null;
-		String prdCode = null;
-		String pdCode = null;
-		String prdCodeDescr = null;
-		String todate = null;
-		String dateTo = null;
-		String toSiteCodeDescr = null;
-		String frSiteCodeDescr = null;
-		String pdDescr = null;
+		String empCode = "";
+		String siteCode = "";
+		String procGroup = "";
+		String frProcGr = "";
+		String prdCode = "";
+		String pdCode = "";
+		String prdCodeDescr = "";
+		String todate = "";
+		String dateTo = "";
+		String toSiteCodeDescr = "";
+		String frSiteCodeDescr = "";
+		String pdDescr = "";
 		StringBuffer valueXmlString = null; 
 		int currentFormNo = 0;
 
@@ -199,9 +199,20 @@ public class AttendancePrc extends ValidatorEJB implements  AttendancePrcLocal,A
 							}
 							stmt.close();
 							rs.close();
+							// Modified by Piyush on 19/03/2015 [During RCP Migration].Start
+							String cutOffDate = "";
+							cutOffDate = todate;
+							if( xtraParams.indexOf("user_lang=") != -1)						
+							{
+								cutOffDate = genericUtility.getValidDateString(todate, genericUtility.getDBDateFormat() , genericUtility.getApplDateFormat());
+							}
 							valueXmlString.append("<fr_prd_descr><![CDATA[").append(prdCodeDescr).append("]]></fr_prd_descr>\r\n");
-							valueXmlString.append("<cutoff_date><![CDATA[").append(todate).append("]]></cutoff_date>\r\n");
-							valueXmlString.append("<no_days protect=\"1\"></no_days>\r\n");
+							//valueXmlString.append("<cutoff_date><![CDATA[").append(todate).append("]]></cutoff_date>\r\n");
+							valueXmlString.append("<cutoff_date><![CDATA[").append(cutOffDate).append("]]></cutoff_date>\r\n");
+							//valueXmlString.append("<no_days protect=\"1\"></no_days>\r\n");
+							valueXmlString.append("<no_days protect=\"1\"><![CDATA[").append("0").append("]]></no_days>\r\n");
+							// Modified by Piyush on 19/03/2015 [During RCP Migration].End
+
 						}
 						else if(currentColumn.trim().equals("emp_code__fr"))
 						{

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

@@ -11,8 +11,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.text.SimpleDateFormat;
 import java.sql.Timestamp;
-
-import org.jboss.ejb3.statistics.InvocationStatistics.TimeStatistic;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;

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

@@ -33,6 +33,7 @@ public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemo
 	public void ejbPassivate() 
 	{
 	}*/
+
     public String preSaveRec() throws RemoteException,ITMException
 	{
 		return "";

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

+package ibase.webitm.ejb.adm;
+import java.rmi.RemoteException;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+
+@javax.ejb.Local
+
+
+public interface EmpAddressInfoLocal extends ValidatorLocal
+{
+	public String wfValData() throws RemoteException,ITMException;
+	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
+}
\ No newline at end of file

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

+package ibase.webitm.ejb.adm;
+
+import java.rmi.RemoteException;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+
+@javax.ejb.Remote
+
+public interface EmpAddressInfoRemote extends ValidatorRemote
+{
+	public String wfValData() throws RemoteException,ITMException;
+	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
+}

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

+
+package ibase.webitm.ejb.adm;
+
+import java.rmi.RemoteException;
+import java.util.*;
+import java.util.Date;
+import java.text.DateFormat;
+import java.sql.*;
+import javax.ejb.*;
+import javax.naming.InitialContext;
+import org.w3c.dom.*;
+import javax.xml.parsers.*;
+import java.text.SimpleDateFormat;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.*;
+import ibase.system.config.*;
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.utility.GenericUtility;
+import ibase.utility.CommonConstants;
+
+@javax.ejb.Stateless
+public class EmpBasicInfoPos extends ValidatorEJB implements EmpBasicInfoPosLocal, EmpBasicInfoPosRemote
+{	
+	public String postSave()throws RemoteException,ITMException
+	{
+		return "";
+	}
+
+	public String postSave( String domString, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException
+	{
+		PreparedStatement pStmt = null;
+		Document dom = null;		
+		
+		boolean isError = false;
+		boolean isLocalConn = false;
+		ResultSet rs = null; 
+		int count;
+        String empCode = "";
+		String posCode = "";
+		String deptCode = "";
+		String posCodeOld ="";
+		String deptCodeOld = "";
+		String dateJoinOld = "";
+		String sql = "";
+		Date dateJoin = null;
+		String errString = "";
+
+		// Modified by Piyush on 27/01/2015.Start
+		String empUpdSql = "";
+		
+		// Modified by Piyush on 27/01/2015.End
+		try
+		{
+			conn.setAutoCommit( false );
+
+			GenericUtility genericUtility = GenericUtility.getInstance();
+			
+			System.out.println("domString EmpBasicInfoPos ["+domString+"]");	
+			dom = genericUtility.parseString(domString);
+			
+			String userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
+			String chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
+			
+			SimpleDateFormat sdf = new SimpleDateFormat(getApplDateFormat());
+			
+			
+		    
+			if(editFlag.equalsIgnoreCase("E"))
+			{
+				empCode =  checkNull(genericUtility.getColumnValue("emp_code", dom));
+				posCode =  checkNull(genericUtility.getColumnValue("pos_code", dom));
+				deptCode =  checkNull(genericUtility.getColumnValue("dept_code", dom));
+				posCodeOld =  checkNull(genericUtility.getColumnValue("pos_code_old", dom));
+				deptCodeOld =  checkNull(genericUtility.getColumnValue("dept_code_old", dom));
+				dateJoinOld =  checkNull(genericUtility.getColumnValue("date_join_old", dom));
+				
+				System.out.println("empCode::::::"+empCode);
+				System.out.println("posCode::::::"+posCode);
+				System.out.println("deptCode::::::"+deptCode);
+				System.out.println("posCodeOld::::::"+posCodeOld);
+				System.out.println("deptCodeOld::::::"+deptCodeOld);
+				System.out.println("dateJoinOld::::::"+dateJoinOld);
+				
+				sql = " SELECT DATE_JOIN FROM EMPLOYEE  WHERE EMP_CODE = ? ";
+				pStmt = conn.prepareStatement(sql);
+				pStmt.setString(1,empCode);
+				rs = pStmt.executeQuery();
+				if(rs.next())
+				{
+					dateJoin = rs.getDate("DATE_JOIN");
+				}
+				if( rs != null)
+				{
+					rs.close();
+					rs = null;
+				}
+				if( pStmt != null)
+				{
+					pStmt.close();
+					pStmt = null;
+				}
+				if ((((posCode != null && posCode.trim().length() > 0) || (posCodeOld != null && posCodeOld.trim().length() > 0)) && dateJoin != null ))
+				{
+					AdmCommon ad = new AdmCommon();
+					errString = ad.updateOrgStructure( domString,  empCode,  posCode,  deptCode, dateJoin, posCodeOld, deptCodeOld,  dateJoinOld, userId, chgTerm,  "EMPMST" , conn ) ;
+				}
+			}
+			// Modified by Piyush on 27/01/2015 [To set default values for other tabs - Based on Sun HR feedback].Start
+			else
+			{
+				String citizen = "";
+				String updSql = "";
+				empUpdSql = "UPDATE EMPLOYEE SET CITIZEN = ? WHERE EMP_CODE = ? ";
+				empCode =  checkNull(genericUtility.getColumnValue("emp_code", dom));
+
+				sql = " SELECT CITIZEN FROM EMPLOYEE  WHERE EMP_CODE = ? ";
+				pStmt = conn.prepareStatement(sql);
+				pStmt.setString(1,empCode);
+				rs = pStmt.executeQuery();
+				if(rs.next())
+				{
+					citizen = checkNull(rs.getString("CITIZEN"));
+				}
+				if( rs != null)
+				{
+					rs.close();
+					rs = null;
+				}
+				if( pStmt != null)
+				{
+					pStmt.close();
+					pStmt = null;
+				}
+				if (citizen.trim().length() == 0)
+				{
+					citizen = "Y";
+				}
+				pStmt = conn.prepareStatement(empUpdSql);
+				pStmt.setString(1,citizen);
+				pStmt.setString(2,empCode);
+				pStmt.executeUpdate();
+				if( pStmt != null)
+				{
+					pStmt.close();
+					pStmt = null;
+				}
+
+			}
+			// Modified by Piyush on 27/01/2015 [To set default values for other tabs - Based on Sun HR feedback].End
+		}
+		catch(Exception e)
+		{
+			System.out.println("Exception :EmpBasicInfoPos : :==>\n"+e.getMessage());
+			e.printStackTrace();
+			isError = true;
+			throw new ITMException(e);
+		}
+		finally
+		{
+			try
+			{
+				System.out.println("isError ["+isError+"]");
+				System.out.println("isLocalConn ["+isLocalConn+"]");
+				if( conn != null )
+				{
+
+					if( isError )
+					{
+						conn.rollback();
+					}
+					if (rs != null)
+					{
+						rs.close();
+						rs = null;
+					}
+					if(pStmt != null)
+					{
+						pStmt.close();
+						pStmt = null;
+					}
+				}
+			}
+			catch(Exception e)
+			{
+				System.out.println("Exception :EmpBasicInfoPos : :==>\n"+e.getMessage());
+			
+				try
+				{
+					System.out.println("Before rollback");
+					conn.rollback();
+				}
+				catch(SQLException sqle)
+				{
+                    System.out.println(sqle);
+				}
+				throw new ITMException(e);
+			
+			}
+		}
+		System.out.println("Return Error string :"+errString);
+		return errString;		
+	}
+
+	public String checkNull(String input)
+	{
+		if (input == null || "null".equalsIgnoreCase(input))
+		{
+			input= "";
+		}
+		return input.trim();
+	}
+	
+}

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

+
+package ibase.webitm.ejb.adm;
+
+
+import ibase.webitm.ejb.*;
+
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+import ibase.webitm.utility.ITMException;
+@javax.ejb.Local
+
+public interface EmpBasicInfoPosLocal extends ValidatorLocal//, EJBObject
+{
+	public String postSave()throws RemoteException,ITMException;
+	public String postSave( String domString, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;
+}
\ No newline at end of file

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

+
+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.*;
+import java.rmi.RemoteException;
+import java.sql.Connection;
+import ibase.webitm.utility.ITMException;
+
+@javax.ejb.Remote
+
+public interface EmpBasicInfoPosRemote extends ValidatorRemote//, EJBObject
+{
+	public String postSave()throws RemoteException,ITMException;
+	public String postSave( String domString, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;
+}
\ No newline at end of file

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

+
+package ibase.webitm.ejb.adm;
+
+import java.rmi.RemoteException;
+import java.sql.*;
+import java.text.SimpleDateFormat;
+
+import org.w3c.dom.*;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+import ibase.utility.E12GenericUtility;
+import ibase.system.config.*;
+import javax.naming.InitialContext;
+import java.util.*;
+
+@javax.ejb.Stateless
+
+public class EmpCompletePrs extends ValidatorEJB implements EmpCompletePrsLocal, EmpCompletePrsRemote 
+{	
+	public String preSave()throws RemoteException,ITMException
+	{
+		return "";
+	}
+
+	public String preSave( String domString, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException
+	{
+		String retString = "";
+		String objName = "";
+		String empCode = "";
+		java.util.Date dateJoin = null;
+		String joinDate = "";
+		String deptCode = "";
+		String posCode = "";
+		java.util.Date dateJoindb = null;
+		String dateJoinOld = "";
+		String deptCodeOld = "";
+		String posCodeOld = "";
+		
+		String sql = "";
+		PreparedStatement pstmt = null;
+		ResultSet rs = null; 
+		boolean isError = false;
+
+		Document dom = null;		
+
+		// Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].Start
+		String userIdDom = "";
+		String userIdDB = "";
+		ITMDBAccessLocal itmdbAccessLocal = null ;
+		// Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].End
+
+		try
+		{
+
+			// Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].Start
+			AppConnectParm appConnect = new AppConnectParm();
+			Properties p = appConnect.getProperty();
+			InitialContext ctx = new InitialContext(p);
+			itmdbAccessLocal = (ITMDBAccessLocal)ctx.lookup("ibase/ITMDBAccessEJB/local");
+			// Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].End
+
+			conn.setAutoCommit( false );
+
+			E12GenericUtility genericUtility = new E12GenericUtility();
+			dom = genericUtility.parseString(domString);
+			
+			objName  = getObjNameFromDom( dom, "objName");
+			System.out.println("objName["+objName+"]");
+			
+			String userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
+			String chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
+			
+			System.out.println("domString EmpWorkInfoPrs ["+domString+"]");		
+			
+			SimpleDateFormat sdf = new SimpleDateFormat(getApplDateFormat());
+			
+			empCode =  checkNull(genericUtility.getColumnValue("emp_code", dom));
+			posCode =  checkNull(genericUtility.getColumnValue("pos_code", dom));
+			deptCode =  checkNull(genericUtility.getColumnValue("dept_code", dom));
+			joinDate =  checkNull(genericUtility.getColumnValue("date_join", dom));
+
+			// Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004]
+			userIdDom =  checkNull(genericUtility.getColumnValue("user_id", dom));
+
+			System.out.println("empCode:::::::: ["+empCode+"]");	
+			System.out.println("posCode:::::::: ["+posCode+"]");	
+			System.out.println("deptCode:::::::: ["+deptCode+"]");	
+			System.out.println("joinDate:::::::: ["+joinDate+"]");	
+			
+			if(joinDate != null && joinDate.length() > 0)
+			{
+			dateJoin =  sdf.parse(joinDate);
+			}
+			System.out.println("dateJoin:::::::: ["+dateJoin+"]");	
+			
+			// Modified by Piyush on 08/12/2014 [Added user id to update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004]
+			//sql = "SELECT DEPT_CODE , POS_CODE , DATE_JOIN FROM EMPLOYEE WHERE EMP_CODE = ?";
+			sql = "SELECT DEPT_CODE , POS_CODE , DATE_JOIN , USER_ID FROM EMPLOYEE WHERE EMP_CODE = ?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1,empCode);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				deptCodeOld = checkNull(rs.getString("DEPT_CODE"));
+				posCodeOld = checkNull(rs.getString("POS_CODE"));
+				dateJoindb = rs.getDate("DATE_JOIN");
+				// Modified by Piyush on 08/12/2014 [Added user id to update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004]
+				userIdDB = checkNull(rs.getString("USER_ID"));
+			}
+			if( rs != null)
+			{
+				rs.close();
+				rs = null;
+			}
+			if( pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}
+
+			// Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].Start
+			System.out.println("userIdDom:::::::: ["+userIdDom+"]");	
+			System.out.println("userIdDB:::::::: ["+userIdDB+"]");	
+			if (!userIdDom.equals(userIdDB))
+			{
+				int usrCnt = 0;
+				sql = "SELECT COUNT(1) AS USER_CNT FROM USERS WHERE EMP_CODE = ?";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1,empCode);
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					usrCnt = rs.getInt("USER_CNT");
+				}
+				if( rs != null)
+				{
+					rs.close();
+					rs = null;
+				}
+				if( pstmt != null)
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+				if (usrCnt > 0)
+				{
+					int usrUpdateCnt = 0;
+					sql = "UPDATE USERS SET USER_ID = ? WHERE EMP_CODE = ?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1,userIdDom);
+					pstmt.setString(2,empCode);
+					usrUpdateCnt = pstmt.executeUpdate();
+					if( pstmt != null)
+					{
+						pstmt.close();
+						pstmt = null;
+					}
+					if (usrUpdateCnt != usrCnt)
+					{
+						retString = itmdbAccessLocal.getErrorString("","VTEMPUID01","");
+						return retString;		
+					}
+				}
+			}
+			// Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].End
+
+			System.out.println("deptCodeOld:::::::: ["+deptCodeOld+"]");	
+			System.out.println("posCodeOld:::::::: ["+posCodeOld+"]");		
+			System.out.println("dateJoindb:::::::: ["+dateJoindb+"]");	
+			
+			if(dateJoindb != null )
+			{
+			dateJoinOld = sdf.format(dateJoindb);
+			}
+			System.out.println("dateJoinOld:::::::: ["+dateJoinOld+"]");	
+			
+			if((posCode != null && posCode.length() > 0 ) && dateJoindb != null)
+			{
+				AdmCommon ad = new AdmCommon();
+				retString = ad.updateOrgStructure( domString,  empCode,  posCode,  deptCode, dateJoin, posCodeOld, deptCodeOld,  dateJoinOld, userId, chgTerm,  "EMPMST", conn ) ;
+			}
+		}
+		catch(Exception e)
+		{
+			System.out.println("Exception :EmpCompletePrs : :==>\n"+e.getMessage());
+			e.printStackTrace();
+			isError = true;
+			throw new ITMException(e);
+		}
+		finally
+		{
+			try
+			{
+				if( conn != null )
+				{
+					if (rs != null)
+					{
+						rs.close();
+						rs = null;
+					}
+					if(pstmt != null)
+					{
+						pstmt.close();
+						pstmt = null;
+					}
+					if( conn != null )
+					{
+						if( isError )
+						{
+							conn.rollback();
+						}
+					}
+				}
+			}
+			catch(Exception e)
+			{
+				System.out.println("Exception :EmpCompletePrs : :==>\n"+e.getMessage());
+				try
+				{
+					System.out.println("Before rollback");
+					conn.rollback();
+				}
+			
+				catch(SQLException sqle)
+				{
+                    System.out.println(sqle);
+				}
+				throw new ITMException(e);
+			
+			}
+		}
+		System.out.println("Return string :"+retString);
+		return retString;		
+	}
+
+	private String getObjNameFromDom( Document dom, String attribute ) throws RemoteException,ITMException
+	{
+		String objName = "";
+		try
+		{
+			NodeList detailList = null;
+			Node currDetail = null,reqDetail = null;			
+			int	detailListLength = 0;
+
+			detailList = dom.getElementsByTagName("Detail1");
+			detailListLength = detailList.getLength();
+			for (int ctr = 0;ctr < detailListLength;ctr++)
+			{
+				currDetail = detailList.item(ctr);
+				objName = currDetail.getAttributes().getNamedItem(attribute).getNodeValue();
+						
+			}
+		}
+		catch(Exception e)
+		{
+			e.printStackTrace();
+		}
+		return objName;
+	}
+
+	public String checkNull(String input)
+	{
+		if (input == null || "null".equalsIgnoreCase(input))
+		{
+			input= "";
+		}
+		return input.trim();
+	}
+	
+}

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.*;
+
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+import ibase.webitm.utility.ITMException;
+@javax.ejb.Local
+
+public interface EmpCompletePrsLocal extends ValidatorLocal//, EJBObject
+{
+	public String preSave()throws RemoteException,ITMException;
+	public String preSave( String domString, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;
+}
\ No newline at end of file

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.*;
+
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+import ibase.webitm.utility.ITMException;
+@javax.ejb.Remote
+
+public interface EmpCompletePrsRemote extends ValidatorRemote//, EJBObject
+{
+	public String preSave()throws RemoteException,ITMException;
+	public String preSave( String domString, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;
+}
\ No newline at end of file

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

@@ -67,7 +67,7 @@ public class EmpITDeclMultiPrc extends ProcessEJB implements EmpITDeclMultiPrcLo
 	{
 		Document headerDom = null;
 		Document detailDom = null;
-		System.out.println("windowName::::::::::::: Declaration multi"+ windowName);
+		System.out.println("windowName:::::::::::::;"+ windowName);
 		String  rtrStr ="";
 		try
 		{
@@ -123,7 +123,6 @@ public class EmpITDeclMultiPrc extends ProcessEJB implements EmpITDeclMultiPrcLo
 		StringBuffer retTabSepStrBuff = new StringBuffer();
 		AdmCommon admCommon = new AdmCommon();
 		HashMap empAllDednMap = new HashMap();
-		System.out.println("view data called: before try");
 		try
 		{
 			ConnDriver connDriver = new ConnDriver();
@@ -135,7 +134,6 @@ public class EmpITDeclMultiPrc extends ProcessEJB implements EmpITDeclMultiPrcLo
 		} 
 		try
 		{
-			System.out.println("view data called:");
 			empCode = genericUtility.getColumnValue("emp_code",headerDom);
 			acctPrd = genericUtility.getColumnValue("acct_prd",headerDom);
 			chgUser	= genericUtility.getValueFromXTRA_PARAMS(xtraParams,"userId");
@@ -345,7 +343,6 @@ public class EmpITDeclMultiPrc extends ProcessEJB implements EmpITDeclMultiPrcLo
 			try
 			{
 				System.out.println("Closing Connection..............");
-				System.out.println("iam inside declaration getdate in finally");
 				retTabSepStrBuff = null;
 				if (rs != null)
 				{
@@ -388,11 +385,8 @@ public class EmpITDeclMultiPrc extends ProcessEJB implements EmpITDeclMultiPrcLo
 			String retStr = "";
 			Document detailDom = null;
 			Document headerDom = null;
-			System.out.println("below genericUtility--------------->>>>>>>>>declaration");
 			try
 			{	
-				System.out.println("Process Method xmlString = "+xmlString);
-				System.out.println("Process Method xmlString22 = "+xmlString2);
 				if(xmlString != null && xmlString.trim().length()!=0)
 				{
 					headerDom = genericUtility.parseString(xmlString); 
@@ -462,7 +456,7 @@ public class EmpITDeclMultiPrc extends ProcessEJB implements EmpITDeclMultiPrcLo
 		PreparedStatement pstmt = null;
 		Statement stmt = null; 
 		String errString = "";
-		System.out.println("executing process method of declaration method ++++++");
+
 		while (true)
 		{
 			try

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

@@ -5,13 +5,12 @@ import ibase.webitm.ejb.ProcessLocal;
 import java.rmi.RemoteException;
 //import javax.ejb.EJBObject;
 import org.w3c.dom.*;
-
 import javax.ejb.Local; // added for ejb3
 
-@javax.ejb.Local// added for ejb3
-public interface EmpITDeclMultiPrcLocal extends ProcessLocal		//, EJBObject
+@Local // added for ejb3
+public interface EmpITDeclMultiPrcLocal extends ibase.webitm.ejb.ProcessLocal		//, EJBObject
 {
-	public String process(String xmlString, String xmlString2, String objcontext, String xtraParams) throws RemoteException,ITMException;
-	public String process(Document headerDom, Document detailDom, String objcontext, String xtraParams) throws RemoteException,ITMException;
+	public String process() throws RemoteException,ITMException;
+	public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException;
 	public String getData(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException;
 }

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

@@ -5,13 +5,12 @@ import ibase.webitm.ejb.ProcessRemote;
 import java.rmi.RemoteException;
 //import javax.ejb.EJBObject;
 import org.w3c.dom.*;
-
 import javax.ejb.Remote; // added for ejb3
 
-@javax.ejb.Remote // added for ejb3
-public interface EmpITDeclMultiPrcRemote extends ProcessRemote	//, EJBObject
+@Remote // added for ejb3
+public interface EmpITDeclMultiPrcRemote extends ibase.webitm.ejb.ProcessRemote	//, EJBObject
 {
-	public String process(String xmlString, String xmlString2, String objcontext, String xtraParams) throws RemoteException,ITMException;
-	public String process(Document headerDom, Document detailDom, String objcontext, String xtraParams) throws RemoteException,ITMException;
+	public String process() throws RemoteException,ITMException;
+	public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException;
 	public String getData(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException;
 }

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

+/**
+ * PURPOSE : Post Save to update header from detail
+ * AUTHOR : Abhishek Jaiswal
+ * DATE : 20/02/2015
+ */
+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.GenericUtility;
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.ejb.ITMDBAccessEJB;
+import ibase.webitm.ejb.adm.AdmCommon;
+import ibase.webitm.ejb.dis.DistCommon;
+import ibase.webitm.ejb.fin.FinCommon;
+import ibase.webitm.ejb.sys.CreateRCPXML;
+import ibase.webitm.utility.TransIDGenerator;
+import ibase.utility.CommonConstants;
+import java.rmi.RemoteException;
+import java.sql.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+
+import org.w3c.dom.*;
+
+
+@javax.ejb.Stateless
+public class EmpOvertimePos extends ValidatorEJB implements EmpOvertimePosLocal, EmpOvertimePosRemote
+{
+	public String postSave()throws RemoteException,ITMException
+	{
+		return "";
+	}
+	public String postSave(String tranId, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException
+	{
+
+		String errCode = "";
+		String userId = "";
+		String chgTerm = "";
+		String loginEmpCode = "";
+		String sql = "";
+		String errString = "";
+
+		int totOtMinutes = 0;
+		int totCalOtMinutes = 0;
+		int empoTimeUpdCnt = 0;
+
+		double totOtHours = 0d;
+		double totCalOtHours = 0d;
+
+		Timestamp  currDate = null;
+
+		PreparedStatement pstmt = null;		
+		ResultSet rs = null;
+
+		ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();		
+		AdmCommon admCommon = new AdmCommon();
+		GenericUtility genericUtility = GenericUtility.getInstance();
+
+		try
+		{
+
+			currDate = new java.sql.Timestamp(System.currentTimeMillis());
+			userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
+			chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
+			loginEmpCode  = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
+
+			sql = "SELECT FN_HRS_TO_MIN(A.OT_HOURS_TIME) AS OT_HOURS_TIME, FN_HRS_TO_MIN(A.CAL_OT_HRS_TIME) AS CAL_OT_HRS_TIME FROM EMPOTIME_DET A WHERE A.TRAN_ID = ?";
+
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, tranId);
+			rs = pstmt.executeQuery();
+			while (rs.next())
+			{
+				totOtMinutes = totOtMinutes + rs.getInt("OT_HOURS_TIME");
+				totCalOtMinutes = totCalOtMinutes + rs.getInt("CAL_OT_HRS_TIME");
+			}
+			if (rs != null)
+			{
+				rs.close();
+				rs = null;
+			}
+			if (pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}
+			sql = "SELECT FN_MIN_TO_DEC_HRS(?) AS TOT_OT_HOURS_TIME, FN_MIN_TO_DEC_HRS(?) AS TOT_CAL_OT_HRS_TIME FROM DUAL";
+
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setInt(1, totOtMinutes);
+			pstmt.setInt(2, totCalOtMinutes);
+			rs = pstmt.executeQuery();
+			if (rs.next())
+			{
+				totOtHours = rs.getDouble("TOT_OT_HOURS_TIME");
+				totCalOtHours = rs.getDouble("TOT_CAL_OT_HRS_TIME");
+			}
+			if (rs != null)
+			{
+				rs.close();
+				rs = null;
+			}
+			if (pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}
+
+			sql = "UPDATE EMPOTIME SET OT_HOURS = ROUND(? / 60 , 2) , CAL_OT_HOURS = ROUND(? / 60 , 2) , OT_HOURS_TIME = ? , CAL_OT_HRS_TIME = ? , CHG_DATE = ? , CHG_USER = ? , CHG_TERM = ? WHERE TRAN_ID = ?";
+			pstmt = conn.prepareStatement(sql);
+
+			pstmt.setDouble(1 , totOtMinutes);
+			pstmt.setDouble(2 , totCalOtMinutes);
+			pstmt.setDouble(3 , totOtHours);
+			pstmt.setDouble(4 , totCalOtHours);
+			pstmt.setTimestamp(5 , currDate);
+			pstmt.setString(6 , userId);
+			pstmt.setString(7, chgTerm);
+			pstmt.setString(8 , tranId);
+
+			empoTimeUpdCnt = pstmt.executeUpdate();
+			System.out.println("EmpOvertimePos - EMPOTIME UPDATE COUNT [" + empoTimeUpdCnt + "]");
+
+			if (pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}
+		}
+		catch(Exception e)
+		{
+			try
+			{
+
+				System.out.println("Exception IN EmpOvertimePos::::"+e.getMessage());
+				e.printStackTrace();			
+				throw new ITMException(e);
+			}
+			catch (Exception e1)
+			{
+				e1.printStackTrace();
+				throw new ITMException(e1);
+			}
+		}
+		finally
+		{
+			try
+			{	
+				if(errString != null && errString.trim().length() > 0)
+				{
+					{
+						conn.rollback();
+					}
+				}
+
+				if( rs != null )
+				{
+					rs.close();
+					rs = null;
+				}
+				if( pstmt != null )
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+			}
+			catch(Exception e)
+			{
+				System.out.println("Exception "+e.getMessage());
+				e.printStackTrace();
+				throw new ITMException(e);
+			}
+		}
+		return errString;
+	}
+
+	private String checkNull( String inputVal )
+	{
+		if ( inputVal == null )
+		{
+			inputVal = "";
+		}
+		return inputVal;
+	}
+	private String checkNullAndTrim( String inputVal )
+	{
+		if ( inputVal == null )
+		{
+			inputVal = "";
+		}
+		return inputVal.trim();
+	}
+
+}
+

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

+/**
+* PURPOSE : Local Interface 
+* AUTHOR  : Kunal Mandhre  
+* Date    : 11/10/2012
+*/
+
+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.utility.ITMException;
+
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+@javax.ejb.Local
+public interface EmpOvertimePosLocal 
+{
+	public String postSave()throws RemoteException,ITMException;
+	public String postSave( String tranId, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;	
+}
\ No newline at end of file

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

+/**
+* PURPOSE : Remote Interface 
+* AUTHOR  : Kunal Mandhre  
+* Date    : 10/10/2012
+*/
+
+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.ejb.*;
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+@javax.ejb.Remote
+public interface EmpOvertimePosRemote
+{
+	public String postSave()throws RemoteException,ITMException;
+	public String postSave( String tranId, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;
+
+}

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

 package ibase.webitm.ejb.adm;
 
 import ibase.system.config.ConnDriver;
+import ibase.utility.E12GenericUtility;//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ]
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
 import java.sql.Connection;
@@ -10,11 +10,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;  
-import java.util.Calendar;
-import java.util.Date;
-
 import javax.ejb.Stateless;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -32,8 +28,10 @@ public class EmpPayrollInfo extends ValidatorEJB implements EmpPayrollInfoLocal
 		Document dom2 = null;
 		
 		String errString = null;
-
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][Start]
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		 E12GenericUtility genericUtility = new E12GenericUtility();
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][End]
 		try
 		{
 			System.out.println("EmpPayrollInfo xmlString in itemChanged..::["+xmlString+"]");
@@ -93,11 +91,14 @@ public class EmpPayrollInfo extends ValidatorEJB implements EmpPayrollInfoLocal
 		//Variable defined  . End
 
 		int currentFormNo = 0;
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][Start]
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		 E12GenericUtility genericUtility = new E12GenericUtility();
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][End]
 		 
 		//To get login Employee Code And Login Site
 		String loginEmpCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode"));
-		String loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode"));
 
 		StringBuffer valueXmlString = new StringBuffer();
 		
@@ -123,7 +124,6 @@ public class EmpPayrollInfo extends ValidatorEJB implements EmpPayrollInfoLocal
 
 			objNameDefault  = checkNull(getObjName(dom ,"1"));
 			System.out.println("objNameDefault ..:: ["+objNameDefault+"]");
-			SimpleDateFormat sdf = new SimpleDateFormat(getApplDateFormat());
 			
 			switch (currentFormNo)
 			{
@@ -312,7 +312,11 @@ public class EmpPayrollInfo extends ValidatorEJB implements EmpPayrollInfoLocal
 	public String wfValData(String xmlString, String xmlString1,String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
 	{
 		System.out.println("Came Inside 1 wfValData:::");
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][Start]
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		 E12GenericUtility genericUtility = new E12GenericUtility();
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][End]
 		
 		Document dom = null;
 		Document dom1 = null;
@@ -407,7 +411,11 @@ public class EmpPayrollInfo extends ValidatorEJB implements EmpPayrollInfoLocal
 
 		int ctr = 0;		
 		int count = 0;	
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][Start]
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		 E12GenericUtility genericUtility = new E12GenericUtility();
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][End]
 		
 		Connection conn = null;
 		try
@@ -422,7 +430,6 @@ public class EmpPayrollInfo extends ValidatorEJB implements EmpPayrollInfoLocal
 				currentFormNo = Integer.parseInt(objContext);
 			}
 			userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
-			SimpleDateFormat sdf = new SimpleDateFormat(getApplDateFormat());
 			
 			switch(currentFormNo)
 			{
@@ -690,7 +697,7 @@ public class EmpPayrollInfo extends ValidatorEJB implements EmpPayrollInfoLocal
 							{
 								if( payMode.trim().equalsIgnoreCase("D") || payMode.trim().equalsIgnoreCase("T") )
 								{
-									if(bankCode == null || bankCode.trim().length() == 0)
+									if(bankCode == null || bankCode.length() == 0)
 									{
 										System.out.println("Bank code can not be blank when paymode Demand Draft or transfer::::");
 										

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

 package ibase.webitm.ejb.adm;
 
 import ibase.system.config.ConnDriver;
+import ibase.utility.E12GenericUtility;//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ]
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
 import java.sql.Connection;
@@ -10,11 +10,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;  
-import java.util.Calendar;
-import java.util.Date;
-
 import javax.ejb.Stateless;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -32,7 +28,10 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 		
 		String errString = null;
 
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][Start]
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		 E12GenericUtility genericUtility = new E12GenericUtility();
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][End]
 		try
 		{
 			System.out.println("EmpPersonalInfo xmlString in itemChanged..::["+xmlString+"]");
@@ -100,7 +99,11 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 		//Variable defined  . End
 
 		int currentFormNo = 0;
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][Start]
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		 E12GenericUtility genericUtility = new E12GenericUtility();
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][End]
 		
 		StringBuffer valueXmlString = new StringBuffer();
 		
@@ -125,7 +128,6 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 
 			objNameDefault  = checkNull(getObjName(dom ,"1"));
 			System.out.println("objNameDefault ..:: ["+objNameDefault+"]");
-			SimpleDateFormat sdf = new SimpleDateFormat(getApplDateFormat());
 			
 			switch (currentFormNo)
 			{
@@ -153,6 +155,10 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 									sex = checkNull(rs.getString("SEX"));
 									namePrefix = checkNull(rs.getString("NAME_PREFIX"));
 									citizen = checkNull(rs.getString("CITIZEN"));
+									if (citizen.trim().length() == 0)
+									{
+										citizen = "Y";
+									}
 									contactCity = checkNull(rs.getString("CONTACT_CITY"));
 									contactState = checkNull(rs.getString("CONTACT_STATE"));
 									physicalHandicap = checkNull(rs.getString("PHYSICAL_HANDICAP"));
@@ -520,7 +526,10 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 	public String wfValData(String xmlString, String xmlString1,String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
 	{
 		System.out.println("Came Inside 1 wfValData:::");
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][Start]
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		 E12GenericUtility genericUtility = new E12GenericUtility();
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][End]
 
 		Document dom = null;
 		Document dom1 = null;
@@ -609,7 +618,11 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 
 		int ctr = 0;		
 		int count = 0;	
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][Start]
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		 E12GenericUtility genericUtility = new E12GenericUtility();
+		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][End]
 		
 		Connection conn = null;
 		try

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.*;
+
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+import ibase.webitm.utility.ITMException;
+@javax.ejb.Local
+
+public interface EmpWorkInfoPrsLocal extends ValidatorLocal//, EJBObject
+{
+	public String preSave()throws RemoteException,ITMException;
+	public String preSave( String domString, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;
+}
\ No newline at end of file

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.*;
+
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+import ibase.webitm.utility.ITMException;
+@javax.ejb.Remote
+
+public interface EmpWorkInfoPrsRemote extends ValidatorRemote//, EJBObject
+{
+	public String preSave()throws RemoteException,ITMException;
+	public String preSave( String domString, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;
+}
\ No newline at end of file

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.ValidatorLocal;
+import ibase.webitm.utility.ITMException;
+import java.rmi.RemoteException;
+import javax.ejb.Local;
+import org.w3c.dom.Document;
+
+@Local
+public interface EmployeeEJBLocal extends ValidatorLocal {
+	public String wfValData() throws RemoteException, ITMException;
+	public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException;
+	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException;
+	public String itemChanged() throws RemoteException, ITMException;
+	public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException;
+	public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException;
+
+}

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.ValidatorRemote;
+import ibase.webitm.utility.ITMException;
+import java.rmi.RemoteException;
+import javax.ejb.Remote;
+import org.w3c.dom.Document;
+
+@Remote
+public interface EmployeeEJBRemote extends ValidatorRemote {
+	
+	public String wfValData() throws RemoteException, ITMException;
+	public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException;
+	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException;
+	public String itemChanged() throws RemoteException, ITMException;
+	public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException;
+	public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException;
+}

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+
+import java.rmi.RemoteException;
+import javax.ejb.Local;
+import org.w3c.dom.*;
+import javax.xml.parsers.*;
+import java.util.*;
+import java.sql.*;
+import java.io.File;
+
+@Local
+public interface MiscRcpLoanAdjICLocal extends ValidatorLocal
+{
+	
+	public String itemChanged() throws RemoteException,ITMException;
+	public String itemChanged(String xmlString, String xmlString1,String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String itemChanged(Document dom, Document dom1,Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
+
+}
\ No newline at end of file

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+
+import java.rmi.RemoteException;
+import javax.ejb.Remote;
+import org.w3c.dom.*;
+import javax.xml.parsers.*;
+import java.util.*;
+import java.sql.*;
+import java.io.File;
+
+@Remote
+public interface MiscRcpLoanAdjICRemote extends ValidatorRemote
+{
+	
+	public String itemChanged() throws RemoteException,ITMException;
+	public String itemChanged(String xmlString, String xmlString1,String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;//23/Mar/2005
+	public String itemChanged(Document dom, Document dom1,Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;//23/Mar/2005
+}
\ No newline at end of file

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+import java.rmi.RemoteException;
+import javax.ejb.Local;
+import org.w3c.dom.*;
+import javax.xml.parsers.*;
+
+@Local
+public interface MiscRcpLoanAdjPrcLocal extends ibase.webitm.ejb.ProcessLocal
+{
+	public String getData(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException;
+	public String getData(Document dom, Document dom2, String windowNamem, String xtraParams) throws RemoteException,ITMException;
+
+}
\ No newline at end of file

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+import java.rmi.RemoteException;
+import javax.ejb.Remote;
+import org.w3c.dom.*;
+import javax.xml.parsers.*;
+
+@Remote
+public interface MiscRcpLoanAdjPrcRemote extends ibase.webitm.ejb.ProcessRemote
+{
+	public String getData(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException;
+	public String getData(Document dom, Document dom2, String windowNamem, String xtraParams) throws RemoteException,ITMException;
+
+}
\ No newline at end of file

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.utility.ITMException;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.Local;
+
+import org.w3c.dom.Document;
+
+@Local
+public interface PayarrToProcLocal 
+{
+	public String wfValData() throws RemoteException, ITMException;
+	public String itemChanged() throws RemoteException, ITMException;
+	public String itemChanged(String xmlString, String xmlString1,String xmlString2, String objContext, String currentColumn,String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String itemChanged(Document dom, Document dom1, Document dom2,String objContext, String currentColumn, String editFlag,String xtraParams) throws RemoteException, ITMException;
+
+}

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.utility.ITMException;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.Remote;
+
+import org.w3c.dom.Document;
+
+@Remote
+public interface PayarrToProcRemote 
+{
+	public String wfValData() throws RemoteException, ITMException ;
+	public String itemChanged() throws RemoteException, ITMException;
+	public String itemChanged(String xmlString, String xmlString1,String xmlString2, String objContext, String currentColumn,String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String itemChanged(Document dom, Document dom1, Document dom2,String objContext, String currentColumn, String editFlag,String xtraParams) throws RemoteException, ITMException;
+}

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.utility.ITMException;
+
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+public interface PerkClaimProcessCommLocal
+{
+	public String postSave()throws RemoteException,ITMException;
+	public String postSave( String domString,String tranId, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;	
+
+}

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

+package ibase.webitm.ejb.adm;
+
+import ibase.webitm.utility.ITMException;
+
+import java.rmi.RemoteException;
+import java.sql.Connection;
+
+public interface PerkClaimProcessCommRemote
+{
+	public String postSave()throws RemoteException,ITMException;
+	public String postSave( String domString,String tranId, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;	
+
+}