Merged the files which are created or modified at Sun during migration of Admin Module in RCP

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

webitm-adm/clases/cadre_ad11Arg_en_US.properties

+pay_table = Pay Table
+cadre_code = Cadre Code

webitm-adm/clases/cadre_mthad11Arg_en_US.properties

+pay_table = Pay Table
+cadre_code = Cadre Code
+month_code = Month Code

webitm-adm/clases/cadre_perk11Arg_en_US.properties

+pay_table = Pay Table
+cadre_code = Cadre Code

webitm-adm/clases/deputation11Arg_en_US.properties

+ordate_fr = From Date
+ordate_to = To Date

webitm-adm/clases/emp_ad11Arg_en_US.properties

+emp_code = Employee

webitm-adm/clases/emp_induction11Arg_en_US.properties

+emp_code = Employee Code

webitm-adm/clases/emp_marital11Arg_en_US.properties

+frdate = From Date
+todate = To Date

webitm-adm/clases/emp_mthad11Arg_en_US.properties

+emp_code = Employee Code
+month_code = Month Code

webitm-adm/clases/emp_perk11Arg_en_US.properties

+emp_code = Employee

webitm-adm/clases/emp_repchg_trace11Arg_en_US.properties

+from_date = From Date
+from_date = To Date

webitm-adm/clases/emparrears11Arg_en_US.properties

+ad_fr = From Date
+ad_to = To Date

webitm-adm/clases/empleave11Arg_en_US.properties

+frdate = From Date
+todate = To Date

webitm-adm/clases/empleave_empwise11Arg_en_US.properties

+emp_code = Employee
+

webitm-adm/clases/emppayroll11Arg_en_US.properties

+ad_fr = From Date
+ad_to = To Date

webitm-adm/clases/emptranprom11Arg_en_US.properties

+mfrdate = From Date
+mtodate = To Date

webitm-adm/clases/grade_ad11Arg_en_US.properties

+pay_table = Pay Table
+grade_code = Grade Code

webitm-adm/clases/grade_mthad11Arg_en_US.properties

+pay_table = Pay Table
+grade_code = Grade Code
+month_code = Month Code

webitm-adm/clases/grade_perk11Arg_en_US.properties

+pay_table = Pay Table
+cadre_code = Grade Code

webitm-adm/clases/grade_site_ot11Arg_en_US.properties

+site_code = Site Code

webitm-adm/clases/hol_change11Arg_en_US.properties

+as_hol_date_fr = From Date
+as_hol_date_to = To Date

webitm-adm/clases/holiday_tbl11Arg_en_US.properties

+from_date = From Date
+to_date = To Date
+hol_tblno = Table No

webitm-adm/clases/incometax_load11Arg_en_US.properties

+frdate = From Date
+todate = To Date

webitm-adm/clases/leavebal11Arg_en_US.properties

+frdate = From Date
+todate = To Date

webitm-adm/clases/loan_reco11Arg_en_US.properties

+frdate = From Date
+todate = To Date

webitm-adm/clases/loans_interest11Arg_en_US.properties

+fr_date = From Date
+to_date = To Date

webitm-adm/clases/pay_var11Arg_en_US.properties

+prd_code = Period Code

webitm-adm/clases/payroll11Arg_en_US.properties

+prd_code = Period Code

webitm-adm/clases/promotion11Arg_en_US.properties

+ordate_fr = From Date
+ordate_to = To Date

webitm-adm/clases/redesignation11Arg_en_US.properties

+ordate_fr = From Date
+ordate_to = To Date

webitm-adm/clases/shift_rotate11Arg_en_US.properties

+ad_date_fr = From Date
+ad_date_to = To Date

webitm-adm/clases/site_env11Arg_en_US.properties

+site_code = Site Code

webitm-adm/clases/transfer11Arg_en_US.properties

 ordate_fr = From Date
 ordate_to = To Date
-trantype = Tran Type

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

@@ -168,6 +168,13 @@ public class AdmCommon
 		PreparedStatement pstmt = null;
 		Statement stmt = null;
 		ResultSet rs = null;
+
+		//	Modified By Hemlata on [15/09/2014] To Change Functionality as per ITM During migration in Rcp [Start]
+		String expDate = "";
+		String expDateSql = "";
+		java.sql.Date minExpDate = null;
+		//	Modified By Hemlata on [15/09/2014] To Change Functionality as per ITM During migration in Rcp [End]
+
 		try
 		{
 			conn.setAutoCommit(false);
@@ -175,6 +182,43 @@ public class AdmCommon
 			relativeDate = getRelativeDate(effDate,-1);
 			System.out.println("relativeDate...::" + relativeDate);
 
+			//	Modified By Hemlata on [15/09/2014] To Change Functionality as per ITM During migration in Rcp [Start]
+
+			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
+			
+			expDateSql="select min(exp_date) as min_expdate from employee_ad where emp_code = ? and ad_code = ? and eff_date = ? and exp_date <= ? ";
+			pstmt = conn.prepareStatement(expDateSql);
+			pstmt.setString(1,empCode);
+			pstmt.setString(2,adCode);
+			pstmt.setTimestamp(3,java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(effDate,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())));
+			pstmt.setTimestamp(4,java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(relativeDate,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())));
+			rs = pstmt.executeQuery();
+			while(rs.next())
+			{
+				minExpDate = rs.getDate("min_expdate");
+			}
+			
+			if (rs != null)
+			{
+				rs.close();
+				rs = null;
+			}
+			
+			if (pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}
+			
+			System.out.println(" [minExpDate]........:: " + minExpDate);
+			if(minExpDate != null)
+			{
+				expDate = sdf.format(minExpDate);
+				relativeDate = getRelativeDate(expDate,-1);
+				System.out.println(" [relativeDate]........:: " + relativeDate);
+			}
+
+			//	Modified By Hemlata on [15/09/2014] To Change Functionality as per ITM During migration in Rcp [End]
 			updSql = "UPDATE EMPLOYEE_AD SET EXP_DATE = ? " +
 					" WHERE EMP_CODE = '"+empCode+"' AND " +
 					" AD_CODE = '"+adCode+"' AND " +
@@ -250,6 +294,12 @@ public class AdmCommon
 		ResultSet rs = null, rsEmp = null, rsPrd = null, rs1 = null;
 		java.sql.Timestamp joinDate = null;
 
+		// Modified by chetna on [06-09-2014][To incorporate changes of ITM in RCP Migration].Start
+		String workSite ="";
+		String empSite="";
+		String paySite ="";
+		// Modified by chetna on [06-09-2014][To incorporate changes of ITM in RCP Migration].End
+		
 		try
 		{
 			GenericUtility genericUtility = GenericUtility.getInstance();
@@ -298,7 +348,10 @@ public class AdmCommon
 			rs = null;
 			stmt.close();
 			stmt = null;
-			sqlEmp = "SELECT EMP_CODE, DATE_JOIN FROM EMPLOYEE WHERE EMP_CODE >= '"+empCodeFr+"' AND EMP_CODE <= '"+empCodeTo+"'";
+
+			// Modified by chetna on [06-09-2014][To incorporate changes of ITM in RCP Migration. Added emp_site,pay_site,work_site]
+			// sqlEmp = "SELECT EMP_CODE, DATE_JOIN FROM EMPLOYEE WHERE EMP_CODE >= '"+empCodeFr+"' AND EMP_CODE <= '"+empCodeTo+"'";
+			sqlEmp = "SELECT EMP_CODE, DATE_JOIN, EMP_SITE, WORK_SITE, PAY_SITE FROM EMPLOYEE WHERE EMP_CODE >= '"+empCodeFr+"' AND EMP_CODE <= '"+empCodeTo+"'";
 			System.out.println("sqlEmp In [payarrToProcUpdation][sqlEmp][3]........:: " + sqlEmp);
 			stmtEmp = conn.createStatement();
 			rsEmp = stmtEmp.executeQuery(sqlEmp);
@@ -306,6 +359,13 @@ public class AdmCommon
 			{
 				currEmpCode = rsEmp.getString("EMP_CODE");
 				joinDate	= rsEmp.getTimestamp("DATE_JOIN");
+
+				// Modified by chetna on [06-09-2014][To incorporate changes of ITM in RCP Migration. Added emp_site,pay_site,work_site].Start
+				empSite  =   rsEmp.getString("EMP_SITE");
+				workSite  =   rsEmp.getString("WORK_SITE");
+				paySite  =    rsEmp.getString("PAY_SITE");
+				// Modified by chetna on [06-09-2014][To incorporate changes of ITM in RCP Migration. Added emp_site,pay_site,work_site].End
+
 				sqlPrd = "SELECT CODE FROM PERIOD WHERE CODE >= '"+periodFrom+"' AND CODE >= '"+startPeriod+"'";
 				System.out.println("sqlPrd In [payarrToProcUpdation][sqlPrd][4]........:: " + sqlPrd);
 				stmtPrd = conn.createStatement();
@@ -318,14 +378,19 @@ public class AdmCommon
 						break;
 					}
 					voucherNo = "";
-					sqlStr = "SELECT VOUCHER_NO FROM PAYROLL WHERE PRD_CODE = '"+currPeriod+"' AND EMP_CODE = '"+currEmpCode+"' AND VOUCHER_NO <> 'PAYROLL'";
+
+					// Modified by chetna on [06-09-2014][To incorporate changes of ITM in RCP Migration]
+					// sqlStr = "SELECT VOUCHER_NO FROM PAYROLL WHERE PRD_CODE = '"+currPeriod+"' AND EMP_CODE = '"+currEmpCode+"' AND VOUCHER_NO <> 'PAYROLL'";
+					sqlStr = "SELECT VOUCHER_NO FROM PAYROLL WHERE PRD_CODE = '"+currPeriod+"' AND EMP_CODE = '"+currEmpCode+"' AND (CASE WHEN VOUCHER_NO is null THEN ' ' ELSE VOUCHER_NO END) <> 'PAYROLL'";
 					System.out.println("sqlStr In [payarrToProcUpdation][sqlStr][5]........:: " + sqlStr);
 					stmt = conn.createStatement();
 					rs = stmt.executeQuery(sqlStr);
 					if (rs.next())
 					{
 						voucherNo = rs.getString("VOUCHER_NO");
-						if ((voucherNo != null && voucherNo.trim().length() > 0) || procType.equals("PY"))
+						// Modified by chetna on [06-09-2014][To incorporate changes of ITM in RCP Migration]
+						// if ((voucherNo != null && voucherNo.trim().length() > 0) || procType.equals("PY"))
+						if ((voucherNo != null && voucherNo.trim().length() > 0) || procType.equals("PY") || winName.equals("W_ATTD_PROC_NORULE") || winName.equals("W_ATTD_MON"))
 						{
 							sqlStr = "SELECT COUNT(*) AS COUNT FROM PAYARR_TO_PROC WHERE EMP_CODE = '"+currEmpCode+"'" +
 									" AND PRD_CODE = '"+currPeriod+"' AND STATUS = 'U' AND PROC_TYPE = '"+procType+"'" ;
@@ -343,8 +408,15 @@ public class AdmCommon
 							System.out.println("COUNT(*) FROM PAYARR_TO_PROC.....::[count1]:: "+ count1);
 							if (count1 == 0)
 							{
+								// Modified by chetna on [06-09-2014][To incorporate changes of ITM in RCP Migration. Added emp_site,pay_site,work_site].Start
+								/*
 								String XMLString = "<?xml version=\"1.0\"?>\r\n<Root>\r\n<header>"+
 								"\r\n</header><Detail1></Detail1></Root>";
+								*/
+								String XMLString = "<?xml version=\"1.0\"?>\r\n<Root>\r\n<header>"+
+								"\r\n</header><Detail1><work_site><![CDATA[" + workSite.trim() + "]]></work_site><pay_site><![CDATA[" + paySite.trim() + "]]></pay_site><emp_site><![CDATA[" + empSite.trim() + "]]></emp_site></Detail1></Root>";
+								// Modified by chetna on [06-09-2014][To incorporate changes of ITM in RCP Migration. Added emp_site,pay_site,work_site].End
+
 								CommonConstants.setIBASEHOME();
 								TransIDGenerator tg = new TransIDGenerator(XMLString, userId, CommonConstants.DB_NAME);
 								tranID = tg.generateTranSeqID("PAYARR", "tran_id", keyString, conn);

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

@@ -78,6 +78,7 @@ public class CopyCadreAdParamPrs extends ValidatorEJB implements CopyCadreAdPara
 		String cadre_code="",new_cadre_code="";
 		String ad_code="",type="";
 		String prop_yn="";
+		String cadreCode ="";
 		
 		String exp_date=null,eff_date=null;
 		
@@ -102,6 +103,7 @@ public class CopyCadreAdParamPrs extends ValidatorEJB implements CopyCadreAdPara
 			//varName = genericUtility.getColumnValue("var_name",dom);
 			new_pay_table = genericUtility.getColumnValue("new_pay_table",dom);
 			new_cadre_code = genericUtility.getColumnValue("new_cadre_code",dom);
+			cadreCode = genericUtility.getColumnValue("cadre_code",dom);
 			String currAppdate ="";
 			java.sql.Timestamp currDate = null;
 			Object date = null;
@@ -176,9 +178,10 @@ public class CopyCadreAdParamPrs extends ValidatorEJB implements CopyCadreAdPara
 			System.out.println("BEFORE PAYTABLE CADRE CHECK ............");
 			System.out.println("----------- pay_table : "+pay_table+" grade_code : "+cadre_code);
 			
-			sql =	"SELECT * FROM CADRE_AD WHERE PAY_TABLE=?"; 
+			sql =	"SELECT * FROM CADRE_AD WHERE PAY_TABLE=? AND CADRE_CODE = ?"; 
 			pstmt =  conn.prepareStatement(sql);
 			pstmt.setString(1,pay_table);
+			pstmt.setString(2,cadreCode);
 			//pstmt.setString(2,varName);
 			rs = pstmt.executeQuery();
 			while(rs.next())

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

@@ -72,6 +72,7 @@ public class CopyCadreMthadParamPrs extends ValidatorEJB implements CopyCadreMth
 		PreparedStatement pstmt = null,pstmt1 = null,pstmtInser = null;
 		ResultSet rs = null ,rs1 = null;
 		String pay_table = "",new_pay_table="";
+		String cadreCode = "";
 		String sql = "",sql1 = "",sqlInser;
 		String chgUser = "",chgTerm = "" ;
 		String cadre_code="",new_cadre_code="";
@@ -103,6 +104,7 @@ public class CopyCadreMthadParamPrs extends ValidatorEJB implements CopyCadreMth
 			new_pay_table = genericUtility.getColumnValue("new_pay_table",dom);
 			new_cadre_code = genericUtility.getColumnValue("new_cadre_code",dom);
 			new_month_code = genericUtility.getColumnValue("new_month_code",dom);
+			cadreCode = genericUtility.getColumnValue("cadre_code",dom);
 			String currAppdate ="";
 			java.sql.Timestamp currDate = null;
 			Object date = null;
@@ -192,9 +194,11 @@ public class CopyCadreMthadParamPrs extends ValidatorEJB implements CopyCadreMth
 				return errString;
 			}	*/
 				
-			sql =	"SELECT * FROM CADRE_MTHAD WHERE PAY_TABLE=?"; 
+			sql =	"SELECT * FROM CADRE_MTHAD WHERE PAY_TABLE=? AND CADRE_CODE = ? AND MONTH_CODE = ?"; 
 			pstmt =  conn.prepareStatement(sql);
 			pstmt.setString(1,pay_table);
+			pstmt.setString(2,cadreCode);
+			pstmt.setString(3,new_month_code);
 			//pstmt.setString(2,varName);
 			rs = pstmt.executeQuery();
 			while(rs.next())

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

@@ -96,6 +96,7 @@ public class CopyCadrePerkParamPrs extends ValidatorEJB implements CopyCadrePerk
 		GenericUtility genericUtility = GenericUtility.getInstance();		
 		ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
 		String errString = "";
+		String cadreCode = "";
 		boolean insertFlag=false;
 		try
 		{	
@@ -106,6 +107,8 @@ public class CopyCadrePerkParamPrs extends ValidatorEJB implements CopyCadrePerk
 			//varName = genericUtility.getColumnValue("var_name",dom);
 			new_pay_table = genericUtility.getColumnValue("new_pay_table",dom);
 			new_cadre_code = genericUtility.getColumnValue("new_cadre_code",dom);
+			cadreCode = genericUtility.getColumnValue("cadre_code",dom);
+
 			String currAppdate ="";
 			java.sql.Timestamp currDate = null;
 			Object date = null;
@@ -171,6 +174,11 @@ public class CopyCadrePerkParamPrs extends ValidatorEJB implements CopyCadrePerk
         		return errString;
 			}
 			
+			if (new_cadre_code == null || new_cadre_code.trim().length() == 0)
+			{
+				errString = itmDBAccessEJB.getErrorString("","VTCPCPRK01","");
+        		return errString;
+			}
 			if( new_cadre_code!=null && checkValidity(new_cadre_code, "CADRE_CODE", "CADRE", conn)<=0){
 				//insertFlag=true;
 				errString = itmDBAccessEJB.getErrorString("","CCNOEXIST","");
@@ -182,9 +190,11 @@ public class CopyCadrePerkParamPrs extends ValidatorEJB implements CopyCadrePerk
 			System.out.println("----------- pay_table : "+pay_table+" grade_code : "+cadre_code);	
 			
 				
-			sql =	"SELECT * FROM CADRE_PERK WHERE PAY_TABLE=?"; 
+			// sql =	"SELECT * FROM CADRE_PERK WHERE PAY_TABLE=?"; 
+			sql =	"SELECT * FROM CADRE_PERK WHERE PAY_TABLE=? AND CADRE_CODE = ?"; 
 			pstmt =  conn.prepareStatement(sql);
 			pstmt.setString(1,pay_table);
+			pstmt.setString(2,cadreCode);
 			//pstmt.setString(2,varName);
 			rs = pstmt.executeQuery();
 			while(rs.next())
@@ -205,11 +215,18 @@ public class CopyCadrePerkParamPrs extends ValidatorEJB implements CopyCadrePerk
 				last_proc_for=rs.getString("last_proc_for");
 				
 				java.sql.Timestamp last_proc_forChg = null;
+				if (last_proc_for != null && last_proc_for.trim().length() > 0)
+				{
 					last_proc_forChg=getTimestamp(last_proc_for);
+				}
+
 				next_proc_date=rs.getString("next_proc_date");
 				
 				java.sql.Timestamp next_proc_dateChg = null;
+				if (next_proc_date != null && next_proc_date.trim().length() > 0)
+				{
 					next_proc_dateChg=getTimestamp(next_proc_date);
+				}
 				validity_period=rs.getDouble("validity_period");
 				
 				//sql1 = "SELECT count(*) FROM CADRE_PERK WHERE prd_code = ? and var_name = ? ";

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

@@ -78,6 +78,7 @@ public class CopyGradeAdParamPrs extends ValidatorEJB implements CopyGradeAdPara
 		String limit_type="";
 		String ad_code="",type="";
 		String prop_yn="";
+		String gradeCode ="";
 		
 		String exp_date=null,eff_date=null;
 		
@@ -103,6 +104,7 @@ public class CopyGradeAdParamPrs extends ValidatorEJB implements CopyGradeAdPara
 			//varName = genericUtility.getColumnValue("var_name",dom);
 			new_pay_table = genericUtility.getColumnValue("new_pay_table",dom);
 			new_grade_code = genericUtility.getColumnValue("new_grade_code",dom);
+			gradeCode = genericUtility.getColumnValue("grade_code",dom);
 			String currAppdate ="";
 			java.sql.Timestamp currDate = null;
 			Object date = null;
@@ -176,9 +178,10 @@ public class CopyGradeAdParamPrs extends ValidatorEJB implements CopyGradeAdPara
 			System.out.println("BEFORE PAYTABLE GRADE_AD CHECK ............");
 			System.out.println("----------- pay_table : "+pay_table+" grade_code : "+grade_code);
 				
-			sql =	"SELECT * FROM GRADE_AD WHERE PAY_TABLE=?"; 
+			sql =	"SELECT * FROM GRADE_AD WHERE PAY_TABLE=? AND GRADE_CODE = ?"; 
 			pstmt =  conn.prepareStatement(sql);
 			pstmt.setString(1,pay_table);
+			pstmt.setString(2,gradeCode);
 			//pstmt.setString(2,varName);
 			rs = pstmt.executeQuery();
 			while(rs.next())

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

@@ -79,6 +79,7 @@ public class CopyGradeMthad extends ValidatorEJB implements CopyGradeMthadLocal,
 		
 		String month_code="",new_month_code="";
 		String pay_table="";
+		String gradeCode="";
 		String new_pay_table="";
 		String ad_code="";
 		String eff_date="";
@@ -108,6 +109,7 @@ public class CopyGradeMthad extends ValidatorEJB implements CopyGradeMthadLocal,
 			new_pay_table = genericUtility.getColumnValue("new_pay_table",dom);
 			new_grade_code = genericUtility.getColumnValue("new_grade_code",dom);
 			new_month_code = genericUtility.getColumnValue("new_month_code",dom);
+			gradeCode = genericUtility.getColumnValue("grade_code",dom);
 			String currAppdate ="";
 			java.sql.Timestamp currDate = null;
 			Object date = null;
@@ -187,9 +189,11 @@ public class CopyGradeMthad extends ValidatorEJB implements CopyGradeMthadLocal,
 			{	
 			//sql = " SELECT var_name,var_type,var_value,descr,var_subs FROM payrparm WHERE prd_code = ? ";   // and var_name = ?";
 				
-			sql =	"SELECT * FROM GRADE_MTHAD WHERE PAY_TABLE=?"; 
+			sql =	"SELECT * FROM GRADE_MTHAD WHERE PAY_TABLE=? AND GRADE_CODE = ? AND MONTH_CODE = ?"; 
 			pstmt =  conn.prepareStatement(sql);
 			pstmt.setString(1,pay_table);
+			pstmt.setString(2,gradeCode);
+			pstmt.setString(3,new_month_code);
 			//pstmt.setString(2,varName);
 			rs = pstmt.executeQuery();
 			while(rs.next())

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

@@ -86,6 +86,8 @@ public class CopyGradePerkParamPrs extends ValidatorEJB implements CopyGradePerk
 
 		int cnt = 0,updCnt = 0;
 
+		String gradeCode = "";
+
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 		GenericUtility genericUtility = GenericUtility.getInstance();		
 		ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
@@ -100,6 +102,7 @@ public class CopyGradePerkParamPrs extends ValidatorEJB implements CopyGradePerk
 			grade_code = genericUtility.getColumnValue("grade_code",dom);
 			new_pay_table = genericUtility.getColumnValue("new_pay_table",dom);
 			new_grade_code = genericUtility.getColumnValue("new_grade_code",dom);
+			gradeCode = genericUtility.getColumnValue("grade_code",dom);
 			String currAppdate ="";
 			java.sql.Timestamp currDate = null;
 			Object date = null;
@@ -148,6 +151,11 @@ public class CopyGradePerkParamPrs extends ValidatorEJB implements CopyGradePerk
 				return errString;
 			}
 
+			if (new_grade_code == null || new_grade_code.trim().length() == 0)
+			{
+				errString = itmDBAccessEJB.getErrorString("","VTCPGPRK01","");
+        		return errString;
+			}
 			if( new_grade_code!=null && checkValidity(new_grade_code, "GRADE_CODE", "GRADE", conn)<=0){
 				//insertFlag=true;
 				errString = itmDBAccessEJB.getErrorString("","GCNOEXIST","");
@@ -175,9 +183,11 @@ public class CopyGradePerkParamPrs extends ValidatorEJB implements CopyGradePerk
 
 			System.out.println("BEFORE PAYTABLE GRADE CHECK ............");
 			System.out.println("----------- pay_table : "+pay_table+" grade_code : "+grade_code);	
-			sql =	"SELECT * FROM GRADE_PERK WHERE PAY_TABLE=? "; 
+			// sql =	"SELECT * FROM GRADE_PERK WHERE PAY_TABLE=? "; 
+			sql =	"SELECT * FROM GRADE_PERK WHERE PAY_TABLE=? AND GRADE_CODE = ?"; 
 			pstmt =  conn.prepareStatement(sql);
 			pstmt.setString(1,pay_table);
+			pstmt.setString(2,gradeCode);
 			//	pstmt.setString(2,grade_code);
 			rs = pstmt.executeQuery();
 			while(rs.next())

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

+package ibase.webitm.ejb.adm;
+import java.rmi.RemoteException;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+
+@javax.ejb.Local
+
+
+public interface EmpBasicInfoLocal 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/EmpBasicInfoRemote.java

+package ibase.webitm.ejb.adm;
+
+import java.rmi.RemoteException;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+
+@javax.ejb.Remote
+
+public interface EmpBasicInfoRemote 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/EmpPayrollInfoLocal.java

+package ibase.webitm.ejb.adm;
+import java.rmi.RemoteException;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+
+@javax.ejb.Local
+
+
+public interface EmpPayrollInfoLocal 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/EmpPayrollInfoRemote.java

+package ibase.webitm.ejb.adm;
+
+import java.rmi.RemoteException;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+
+@javax.ejb.Remote
+
+public interface EmpPayrollInfoRemote 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/EmpPersonalInfoLocal.java

+package ibase.webitm.ejb.adm;
+import java.rmi.RemoteException;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+
+@javax.ejb.Local
+
+
+public interface EmpPersonalInfoLocal 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/EmpPersonalInfoRemote.java

+package ibase.webitm.ejb.adm;
+
+import java.rmi.RemoteException;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+
+@javax.ejb.Remote
+
+public interface EmpPersonalInfoRemote 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/EmpWorkInfoLocal.java

+package ibase.webitm.ejb.adm;
+import java.rmi.RemoteException;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+
+@javax.ejb.Local
+
+
+public interface EmpWorkInfoLocal 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/EmpWorkInfoRemote.java

+package ibase.webitm.ejb.adm;
+
+import java.rmi.RemoteException;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+
+@javax.ejb.Remote
+
+public interface EmpWorkInfoRemote 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/Form16Payment1.java

@@ -117,6 +117,14 @@ public class Form16Payment1 extends ValidatorEJB implements Form16Payment1Local,
 						if (childNodeName.equals("site_code"))
 						{
 							siteCode = getColumnValue("site_code",dom);
+							// Modified by Piyush on 07/11/2014 [For not to allow null or empty site code].Start
+							if (siteCode == null || siteCode.trim().length() == 0)
+							{
+								errCode = "VTF16PT101";
+								errString = getErrorString("site_code",errCode,loginCode);
+								break;
+							}
+							// Modified by Piyush on 07/11/2014 [For not to allow null or empty site code].End
 							System.out.println("site_code:::"+ siteCode);
 							sql = "SELECT COUNT(*) AS COUNT FROM SITE WHERE SITE_CODE = '"+ siteCode + "'";
 							System.out.println("sql:::"+ sql);
@@ -127,7 +135,9 @@ public class Form16Payment1 extends ValidatorEJB implements Form16Payment1Local,
 								cnt = rs.getInt("COUNT");
 								if (cnt == 0)
 								{
-									errCode = "VMSITE1";
+									// Modified by Piyush on 07/11/2014[To seperate the mesage id from common message id]
+									// errCode = "VMSITE1";
+									errCode = "VTF16PT102";
 									errString = getErrorString("site_code",errCode,loginCode);
 									break;
 								}
@@ -148,7 +158,9 @@ public class Form16Payment1 extends ValidatorEJB implements Form16Payment1Local,
 									cnt = rs.getInt("COUNT");
 									if (cnt == 0)
 									{
-										errCode = "VMEMPORD2";
+										// Modified by Piyush on 07/11/2014[To seperate the mesage id from common message id]
+										// errCode = "VMEMPORD2";
+										errCode = "VTF16PT103";
 										errString = getErrorString("emp_code",errCode,loginCode);
 										break;
 									}
@@ -166,7 +178,9 @@ public class Form16Payment1 extends ValidatorEJB implements Form16Payment1Local,
 									cnt = rs.getInt("COUNT");
 									if (cnt != 0)
 									{
-										errCode = "VMPDEM2";
+										// Modified by Piyush on 07/11/2014[To seperate the mesage id from common message id]
+										// errCode = "VMPDEM2";
+										errCode = "VTF16PT104";
 										errString = getErrorString("emp_code",errCode,loginCode);
 										break;
 									}
@@ -195,7 +209,9 @@ public class Form16Payment1 extends ValidatorEJB implements Form16Payment1Local,
 									cnt = rs.getInt("COUNT");
 									if (cnt == 0)
 									{
-										errCode = "VMPRD1";
+										// Modified by Piyush on 07/11/2014[To seperate the mesage id from common message id]
+										// errCode = "VMPRD1";
+										errCode = "VTF16PT105";
 										errString = getErrorString("prd_code",errCode,loginCode);
 										break;
 									}
@@ -213,7 +229,9 @@ public class Form16Payment1 extends ValidatorEJB implements Form16Payment1Local,
 						{
 							if (childNode.getFirstChild() == null)
 							{
-								errCode = "INVBANKNAM";
+								// Modified by Piyush on 07/11/2014[To seperate the mesage id from common message id]
+								// errCode = "INVBANKNAM";
+								errCode = "VTF16PT106";
 								errString = getErrorString("bank_name",errCode,loginCode);
 								break;
 							}

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

+package ibase.webitm.ejb.adm;
+
+/*Created by Chetna on [25/08/2014] For Shift Rotate Change [Start]
+ * */
+import java.rmi.RemoteException;
+import javax.ejb.Local;
+import org.w3c.dom.*;
+
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.ejb.ProcessLocal;
+import ibase.webitm.ejb.ValidatorLocal;
+
+
+
+public interface ShiftChangeIcLocal  extends ValidatorLocal{
+	
+
+	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String wfValData(Document dom, Document dom1, Document dom2, 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;
+	public String itemChanged(Document dom, Document dom1, Document dom2,String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
+}
+/*Created by Chetna on [25/08/2014] For Shift Rotate Change [END]
+ * */
\ No newline at end of file

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

+package ibase.webitm.ejb.adm;
+/*Created by Chetna on [25/08/2014] For Shift Rotate Change [Start]
+ * */
+import java.rmi.RemoteException;
+import javax.ejb.Remote;
+import org.w3c.dom.*;
+
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.ejb.ProcessRemote;
+import ibase.webitm.ejb.ValidatorRemote;
+
+@javax.ejb.Remote
+
+public interface ShiftChangeIcRemote extends ValidatorRemote	 {
+	
+	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String wfValData(Document dom, Document dom1, Document dom2, 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;
+	public String itemChanged(Document dom, Document dom1, Document dom2,String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	
+}
+/*Created by Chetna on [25/08/2014] For Shift Rotate Change [END]
+ * */
\ No newline at end of file

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

+package ibase.webitm.ejb.adm;
+
+/*Created by Chetna on [25/08/2014] For Shift Rotate Change [Start]
+ * */
+import java.rmi.RemoteException;
+import javax.ejb.Local;
+import org.w3c.dom.*;
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.ejb.ProcessLocal;
+
+@javax.ejb.Local
+
+
+public interface ShiftChangePrcLocal  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;
+	public String process() throws RemoteException,ITMException;
+	public String process(Document dom, Document dom2, String windowName, String xtraParams) throws RemoteException,ITMException;
+	public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException;
+}
+/*Created by Chetna on [25/08/2014] For Shift Rotate Change [END]
+ * */
\ No newline at end of file

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

+package ibase.webitm.ejb.adm;
+/*Created by Chetna on [25/08/2014] For Shift Rotate Change [Start]
+ * */
+import java.rmi.RemoteException;
+import javax.ejb.Remote;
+import org.w3c.dom.*;
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.ejb.ProcessRemote;
+
+@javax.ejb.Remote
+
+public interface ShiftChangePrcRemote 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;
+	public String process() throws RemoteException,ITMException;
+	public String process(Document dom, Document dom2, String windowName, String xtraParams) throws RemoteException,ITMException;
+	public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException;
+}
+/*Created by Chetna on [25/08/2014] For Shift Rotate Change [END]
+ * */
\ No newline at end of file

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

@@ -87,7 +87,7 @@ public class ShiftPatternProcIC extends ValidatorEJB implements ShiftPatternProc
 				
 				String shiftPattern = getColumnValue("shift_pattern",dom);
 				String shiftTo = getColumnValue("shift_to",dom);
-				valueXmlString.append("<shift_pattern protect = '1'> ").append(shiftPattern == null ? "":shiftPattern).append("</shift_pattern>\r\n");
+				valueXmlString.append("<shift_pattern protect = '1'> ").append(shiftPattern == null ? "N":shiftPattern).append("</shift_pattern>\r\n");
 				valueXmlString.append("<shift_to protect = '1'> ").append(shiftTo == null ? "" : shiftTo).append("</shift_to>\r\n");
 					
 				loginSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSite");

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

+
+/*
+* PURPOSE : Local interface for WorkLocationMaster  to lookup Localy Contain only Validation function.
+* AUTHOR : Changed By CHETNA SHAHU On 03-SEP-2014
+*/  
+
+package ibase.webitm.ejb.adm;
+
+import java.rmi.RemoteException;
+import org.w3c.dom.*;
+
+import javax.ejb.EJBObject;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+import javax.ejb.*;
+import java.sql.Connection;
+import java.util.ArrayList;
+
+@javax.ejb.Local
+public interface WorkLocationMasterLocal extends ValidatorLocal {
+
+	
+public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
+public String wfValData(Document dom, Document dom1, Document dom2, 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;
+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/WorkLocationMasterRemote.java

+
+/*
+* PURPOSE : Local interface for WorkLocationMaster to lookup remote Contain only Validation function.
+* AUTHOR : Changed By CHETNA SHAHU On 03-SEP-2014
+*/  
+
+package ibase.webitm.ejb.adm;
+
+
+import java.rmi.RemoteException;
+import org.w3c.dom.*;
+
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+import javax.ejb.*;
+import java.sql.Connection;
+import java.util.ArrayList;
+
+@javax.ejb.Remote
+public interface WorkLocationMasterRemote extends ValidatorRemote {
+	
+	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String wfValData(Document dom, Document dom1, Document dom2, 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;
+	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/adv/EmpTranPromCancLocal.java

+package ibase.webitm.ejb.adm.adv;
+
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.ejb.*;
+import java.rmi.RemoteException;
+import java.sql.*;
+import org.w3c.dom.*;
+import javax.xml.parsers.*;
+import javax.ejb.*;
+import ibase.webitm.ejb.ActionHandlerLocal;
+import javax.ejb.Local; // adde
+
+@Local // added for ejb3
+
+public interface  EmpTranPromCancLocal  extends ActionHandlerLocal
+{
+	public String actionHandler() throws RemoteException,ITMException;
+	public String actionHandler(String tranID, String xtraParams, String forcedFlag) throws RemoteException,ITMException;
+}	

webitm-adm/ibase/webitm/ejb/adm/adv/EmpTranPromCancRemote.java

+package ibase.webitm.ejb.adm.adv;
+
+
+import java.rmi.RemoteException;
+import org.w3c.dom.*;
+import javax.xml.parsers.*;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+import java.sql.*;
+import ibase.webitm.ejb.ActionHandlerRemote;
+import javax.ejb.Remote;
+
+@Remote 
+
+public interface  EmpTranPromCancRemote   extends ActionHandlerRemote
+{
+	public String actionHandler() throws RemoteException,ITMException;
+	public String actionHandler(String tranID, String xtraParams, String forcedFlag) throws RemoteException,ITMException;
+}

webitm-adm/ibase/webitm/ejb/adm/adv/HolChangeCancLocal.java

+package ibase.webitm.ejb.adm.adv;
+
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.ejb.*;
+import java.rmi.RemoteException;
+import java.sql.*;
+import org.w3c.dom.*;
+import javax.xml.parsers.*;
+import javax.ejb.*;
+import ibase.webitm.ejb.ActionHandlerLocal;
+import javax.ejb.Local; // added for ejb3
+
+@Local // added for ejb3
+
+public interface  HolChangeCancLocal  extends ActionHandlerLocal 
+{
+	public String actionHandler() throws RemoteException,ITMException;
+	public String actionHandler(String tranID, String xtraParams, String forcedFlag) throws RemoteException,ITMException;
+}	
+

webitm-adm/module-resource/jboss-resource/cadre_ad11Arg_en_US.properties

+pay_table = Pay Table
+cadre_code = Cadre Code

webitm-adm/module-resource/jboss-resource/cadre_mthad11Arg_en_US.properties

+pay_table = Pay Table
+cadre_code = Cadre Code
+month_code = Month Code

webitm-adm/module-resource/jboss-resource/cadre_perk11Arg_en_US.properties

+pay_table = Pay Table
+cadre_code = Cadre Code

webitm-adm/module-resource/jboss-resource/deputation11Arg_en_US.properties

+ordate_fr = From Date
+ordate_to = To Date

webitm-adm/module-resource/jboss-resource/emp_ad11Arg_en_US.properties

+emp_code = Employee

webitm-adm/module-resource/jboss-resource/emp_induction11Arg_en_US.properties

+emp_code = Employee Code

webitm-adm/module-resource/jboss-resource/emp_marital11Arg_en_US.properties

+frdate = From Date
+todate = To Date

webitm-adm/module-resource/jboss-resource/emp_mthad11Arg_en_US.properties

+emp_code = Employee Code
+month_code = Month Code

webitm-adm/module-resource/jboss-resource/emp_perk11Arg_en_US.properties

+emp_code = Employee

webitm-adm/module-resource/jboss-resource/grade_site_ot11Arg_en_US.properties

+site_code = Site Code