*Updated components of employee detail change[28-02-2020]

emp_det_chg21.xml
w_emp_det_chg.sql
d_emp_det_chg_edit.srd
EmpDetChgConfirm.java
EmpDetChg.java


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

webitm-adm/module-resource/SQL/w_emp_det_chg.sql

@@ -120,7 +120,7 @@ Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGH
 Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,FILTER_STRING,SQL_INPUT,DEFAULT_COL,POP_ALIGN,QUERY_MODE,PAGE_CONTEXT,POPHELP_COLS,POPHELP_SOURCE,MULTI_OPT,HELP_OPTION,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,FILTER_EXPR,LAYOUT) values ('RELIGION','W_EMP_DET_CHG','SELECT fld_value as Religion, LTRIM(RTRIM(DESCR)) AS Description FROM GENCODES WHERE FLD_NAME =''RELIGION'' order by DESCR',null,'Religion',0,0,to_date('21-05-19','DD-MM-RR'),'SYSADMIN  ','BASE','0',null,null,1,null,null,null,null,null,null,'2',null,'3','ReligionImages','Religion','Religion','2    ',null,null,null,'Religion:religion',null,null,null);
 Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,FILTER_STRING,SQL_INPUT,DEFAULT_COL,POP_ALIGN,QUERY_MODE,PAGE_CONTEXT,POPHELP_COLS,POPHELP_SOURCE,MULTI_OPT,HELP_OPTION,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,FILTER_EXPR,LAYOUT) values ('WORK_LOC_CODE__N','W_EMP_DET_CHG','SELECT WORK_LOC_CODE AS Location_Code, DESCR AS DESCRIPTION FROM WORK_LOCATIONS WHERE ACTIVE = ''Y'' ',null,'Work Locations',0,0,to_date('05-11-19','DD-MM-RR'),'VAIBHAV   ','VAIBHAV','0',null,null,null,null,null,'0',null,null,null,'2',null,'3','LocImages','Location_Code','description','2    ',null,null,null,null,null,null,null);
 Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,FILTER_STRING,SQL_INPUT,DEFAULT_COL,POP_ALIGN,QUERY_MODE,PAGE_CONTEXT,POPHELP_COLS,POPHELP_SOURCE,MULTI_OPT,HELP_OPTION,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,FILTER_EXPR,LAYOUT) values ('EMP_CODE__FUNCHEAD','W_EMP_DET_CHG','select emp_code as code,emp_fname as first_name,emp_mname as middle_name,emp_lname as last_name,emp_site as site_code from employee order by emp_code',null,'Employee Master',0,0,to_date('12-08-09','DD-MM-RR'),'VISHAL    ','VISHAL         ','0',null,null,null,null,null,null,null,null,null,'2',null,'3','EmpImages','code','first_name','2    ',null,null,null,null,null,null,null);
-Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,FILTER_STRING,SQL_INPUT,DEFAULT_COL,POP_ALIGN,QUERY_MODE,PAGE_CONTEXT,POPHELP_COLS,POPHELP_SOURCE,MULTI_OPT,HELP_OPTION,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,FILTER_EXPR,LAYOUT) values ('STATE_CODE__DOMICILE','W_EMP_DET_CHG','SELECT STATE_CODE,DESCR,COUNT_CODE FROM STATE','Hotel Data','State Code',0,0,to_date('20-05-13','DD-MM-RR'),'VENKAT    ','BASE           ','1',null,null,null,null,null,null,null,null,null,'2',null,'3','StateImages','state_code','descr','2    ',null,null,null,null,null,null,null);
+Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,FILTER_STRING,SQL_INPUT,DEFAULT_COL,POP_ALIGN,QUERY_MODE,PAGE_CONTEXT,POPHELP_COLS,POPHELP_SOURCE,MULTI_OPT,HELP_OPTION,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,FILTER_EXPR,LAYOUT) values ('STATE_CODE__','W_EMP_DET_CHG','SELECT STATE_CODE,DESCR,COUNT_CODE FROM STATE','Hotel Data','State Code',0,0,to_date('20-05-13','DD-MM-RR'),'VENKAT    ','BASE           ','1',null,null,null,null,null,null,null,null,null,'2',null,'3','StateImages','state_code','descr','2    ',null,null,null,null,null,null,null);
 Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,FILTER_STRING,SQL_INPUT,DEFAULT_COL,POP_ALIGN,QUERY_MODE,PAGE_CONTEXT,POPHELP_COLS,POPHELP_SOURCE,MULTI_OPT,HELP_OPTION,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,FILTER_EXPR,LAYOUT) values ('COUNT_CODE__BIRTH','W_EMP_DET_CHG','SELECT COUNT_CODE, DESCR FROM COUNTRY ORDER BY DESCR',null,'Country List',null,null,to_date('05-11-19','DD-MM-RR'),'VAIBHAV   ','VAIBHAV','1',null,null,null,null,null,null,null,null,null,'2',null,'3','CountryImages','count_code','descr','2    ',null,null,null,null,null,null,null);
 Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,FILTER_STRING,SQL_INPUT,DEFAULT_COL,POP_ALIGN,QUERY_MODE,PAGE_CONTEXT,POPHELP_COLS,POPHELP_SOURCE,MULTI_OPT,HELP_OPTION,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,FILTER_EXPR,LAYOUT) values ('EMP_CODE__LINK','W_EMP_DET_CHG','select emp_code as code,emp_fname as first_name,emp_mname as middle_name,emp_lname as last_name,emp_site as site_code from employee order by emp_code',null,'Employee Master',0,0,to_date('12-08-09','DD-MM-RR'),'VISHAL    ','VISHAL         ','0',null,null,null,null,null,null,null,null,null,'2',null,'3','EmpImages','code','first_name','2    ',null,null,null,null,null,null,null);
 Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,FILTER_STRING,SQL_INPUT,DEFAULT_COL,POP_ALIGN,QUERY_MODE,PAGE_CONTEXT,POPHELP_COLS,POPHELP_SOURCE,MULTI_OPT,HELP_OPTION,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,FILTER_EXPR,LAYOUT) values ('NATIONALITY','W_EMP_DET_CHG','SELECT COUNT_CODE AS nationality, DESCR AS country_name FROM COUNTRY',null,'Country List',0,0,to_date('05-11-19','DD-MM-RR'),'VAIBHAV   ','VAIBHAV','0',null,null,0,null,null,null,null,null,null,'2',null,'3','CountryImages','nationality','country_name','2    ',null,null,null,null,null,null,null);

webitm-adm/src/ibase/webitm/ejb/adm/EmpDetChg.java

@@ -1163,7 +1163,7 @@ public class EmpDetChg extends ValidatorEJB implements EmpDetChgLocal,EmpDetChgR
 					pstmt.setString(1, lsContactCity);
 					rs = pstmt.executeQuery();
 					if (rs.next())
-					{
+				 	{
 						lsContactState = checkNull(rs.getString("state_code"));
 					}
 					if (rs != null)
@@ -3060,7 +3060,7 @@ public class EmpDetChg extends ValidatorEJB implements EmpDetChgLocal,EmpDetChgR
 					{
 						System.out.println("::::validation of handicap_category::::");
 
-						handicapCategory=checkNull(genericUtility.getColumnValue("handicap_category", dom));
+						handicapCategory = checkNull(genericUtility.getColumnValue("handicap_category", dom));
 
 						cnt = 0;
 						if(handicapCategory != null && handicapCategory.trim().length() > 0)
@@ -3084,6 +3084,7 @@ public class EmpDetChg extends ValidatorEJB implements EmpDetChgLocal,EmpDetChgR
 								pstmt.close();
 								pstmt = null;
 							}
+							System.out.println("cnt ****"+cnt);
 							if(cnt == 0)
 							{
 								errList.add("VMEMPHCTG1");