Skip to content

B
business-java
Commit 71f65ed2 authored by pbhosale's avatar pbhosale
Browse files
Options

Updated on [20-02-2020] 

emp_complete21.xml
emp_temp21.xml
emp_temp25.xml
w_emp_complete.sql
w_emp_other_detail.sql
w_emp_temp.sql
d_emp_temp21.srd
d_empfull_edit.srd
EmployeeEJB.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216884 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3aa824e2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4014 additions and 4403 deletions
webitm-adm/module-resource/SQL/w_emp_other_detail.sql
View file @ 71f65ed2
...@@ -208,7 +208,7 @@ Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGH ...@@ -208,7 +208,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 ('RELATION','W_EMP_OTHER_DETAIL','SELECT FLD_VALUE AS RELATION FROM GENCODES WHERE MOD_NAME = ''X'' AND FLD_NAME = ''RELATION'' ORDER BY FLD_VALUE',null,'Relation',0,0,to_date('11-07-17','DD-MM-RR'),'VAIBHAV ','VAIBHAV ','0',null,null,null,null,null,null,null,null,null,'0',null,null,null,null,null,null,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 ('RELATION','W_EMP_OTHER_DETAIL','SELECT FLD_VALUE AS RELATION FROM GENCODES WHERE MOD_NAME = ''X'' AND FLD_NAME = ''RELATION'' ORDER BY FLD_VALUE',null,'Relation',0,0,to_date('11-07-17','DD-MM-RR'),'VAIBHAV ','VAIBHAV ','0',null,null,null,null,null,null,null,null,null,'0',null,null,null,null,null,null,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 ('COURSE_TYPE','W_EMP_OTHER_DETAIL','SELECT FLD_VALUE AS Course_Type,DESCR AS Description FROM GENCODES WHERE FLD_NAME=''COURSE_TYPE'' AND MOD_NAME IN (''W_EMP_COMPLETE'',''X'') AND CASE WHEN ACTIVE IS NULL THEN ''Y'' ELSE ACTIVE END = ''Y'' ORDER BY FLD_VALUE',null,'Qualification',0,0,to_date('21-07-15','DD-MM-RR'),'BASE ','BASE ','1',null,null,null,null,null,'0',null,null,null,'1',null,null,null,null,null,null,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 ('COURSE_TYPE','W_EMP_OTHER_DETAIL','SELECT FLD_VALUE AS Course_Type,DESCR AS Description FROM GENCODES WHERE FLD_NAME=''COURSE_TYPE'' AND MOD_NAME IN (''W_EMP_COMPLETE'',''X'') AND CASE WHEN ACTIVE IS NULL THEN ''Y'' ELSE ACTIVE END = ''Y'' ORDER BY FLD_VALUE',null,'Qualification',0,0,to_date('21-07-15','DD-MM-RR'),'BASE ','BASE ','1',null,null,null,null,null,'0',null,null,null,'1',null,null,null,null,null,null,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__QUAL','W_EMP_OTHER_DETAIL','select '''' COUNT_CODE__QUAL,''Enter minimum three characters'' description from dual where length(nvl(''?'','' '')) < 3 union all SELECT RTRIM(COUNT_CODE) COUNT_CODE__QUAL, DESCR as description FROM COUNTRY WHERE DESCR LIKE ''%?%'' AND LENGTH(''?'')>=3 ORDER BY description',null,'Qualification Code',0,0,to_date('15-11-00','DD-MM-RR'),'SUN ','NILESH12 ','1',null,':count_code__qual,:count_code__qual,:count_code__qual',null,'C',null,'0',null,null,null,'1',null,null,null,null,null,null,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__QUAL','W_EMP_OTHER_DETAIL','select '''' COUNT_CODE__QUAL,''Enter minimum three characters'' description from dual where length(nvl(''?'','' '')) < 3 union all SELECT RTRIM(COUNT_CODE) COUNT_CODE__QUAL, DESCR as description FROM COUNTRY WHERE DESCR LIKE ''%?%'' AND LENGTH(''?'')>=3 ORDER BY description',null,'Qualification Code',0,0,to_date('15-11-00','DD-MM-RR'),'SUN ','NILESH12 ','1',null,':count_code__qual,:count_code__qual,:count_code__qual',null,'C',null,'0',null,null,null,'1',null,null,null,null,null,null,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 ('TRAIN_NO','W_EMP_OTHER_DETAIL','SELECT TRAIN_NO, TRAIN_CODE, DESCR, VENUE FROM TRAINDET',null,'TRAIN NO',0,0,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ','0',null,null,null,null,null,null,null,null,null,'2',null,'3',null,null,null,'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 ('TRAIN_NO','W_EMP_COMPLETE','SELECT LTRIM(RTRIM(TRAIN_NO)) AS TRAIN_NO, TRAIN_CODE, DESCR, VENUE FROM TRAINDET',null,'TRAIN NO',0,0,to_date('05-11-19','DD-MM-RR'),'VAIBHAV ','VAIBHAV','0',null,null,null,null,null,null,null,null,null,'2',null,'3','TrainImages','train_no','descr','2 ',null,null,null,null,null,null,null);
update POPHELP set AUTO_FILL_LEN = '3', AUTO_MIN_LENGTH = 2 , HELP_OPTION = 2 where MOD_NAME = 'W_EMP_OTHER_DETAIL'; update POPHELP set AUTO_FILL_LEN = '3', AUTO_MIN_LENGTH = 2 , HELP_OPTION = 2 where MOD_NAME = 'W_EMP_OTHER_DETAIL';
update POPHELP set THUMB_ALT_COL = 'language',THUMB_IMAGE_COL= 'language',THUMB_OBJ = 'LangImages' where MOD_NAME = 'W_EMP_OTHER_DETAIL' and FIELD_NAME= 'LANGUAGE'; update POPHELP set THUMB_ALT_COL = 'language',THUMB_IMAGE_COL= 'language',THUMB_OBJ = 'LangImages' where MOD_NAME = 'W_EMP_OTHER_DETAIL' and FIELD_NAME= 'LANGUAGE';
...@@ -241,6 +241,15 @@ Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGH ...@@ -241,6 +241,15 @@ Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,DW_OBJECT,MSG_TITLE,WIDTH,HEIGH
------------------------------------------------------- [10/01/2020][END] ------------------------------------------------------- [10/01/2020][END]
------------------------------------------------------- [05/02/2020][START]
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values ('VMEMPTO08 ','Invalid To Date','To Date cannot be blank,please enter it','E','Y',null,null,null,null,null,null,null,null);
------------------------------------------------------- [05/02/2020][END]
------------------------------------------------------- [13-02-2020][START]
update obj_actions set image='ibase/resource/objaction/Audit-trail.svg', DISPLAY_MODE=2 , Rights_Char='X', title='View Audit', SHOW_IN_PANEL=1 where OBJ_NAME='emp_other_detail' and (title='Audit Trail' or title='View Audit');
------------------------------------------------------- [13-02-2020][END]
webitm-adm/module-resource/srd/d_emp_temp21.srd
View file @ 71f65ed2
This source diff could not be displayed because it is too large. You can view the blob instead.
webitm-adm/src/ibase/webitm/ejb/adm/EmployeeEJB.java
View file @ 71f65ed2
...@@ -2387,8 +2387,12 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2387,8 +2387,12 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else if(childNodeName.equalsIgnoreCase("retirement_age")) else if(childNodeName.equalsIgnoreCase("retirement_age"))
{ {
String retirementAge = checkNull(genericUtility.getColumnValue("retirement_age",dom)); String retirementAge = checkNull(genericUtility.getColumnValue("retirement_age",dom));
//Modified by Poonam B[19-02-2020][Start][To validate negative age]
if(retirementAge != null && retirementAge.trim().length() < 0) if(retirementAge != null && retirementAge.trim().length() > 0)
{
int retirementAgeInt = Integer.parseInt(retirementAge);
System.out.println("retirementAgeInt:::" +retirementAgeInt);
if(retirementAgeInt != 0 && retirementAgeInt < 0)
{ {
errList.add("VMEMPRET01"); errList.add("VMEMPRET01");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -2399,6 +2403,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2399,6 +2403,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
//Modified by Poonam B[19-02-2020][End][To validate negative age]
}
//retirement_date //retirement_date
else if(childNodeName.equalsIgnoreCase("retirement_date")) else if(childNodeName.equalsIgnoreCase("retirement_date"))
...@@ -5446,7 +5452,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -5446,7 +5452,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
if(posCode != null && posCode.trim().length() > 0) if(posCode != null && posCode.trim().length() > 0)
{ {
//Modified by Poonam B[18-02-2020][START][Changed as per Nvo] //Modified by Poonam B[18-02-2020][START][Changed to display pos code description]
String sqlPc = "SELECT fn_get_pos_descr4(?,?,?,?) AS POS_DESCR FROM DUAL"; String sqlPc = "SELECT fn_get_pos_descr4(?,?,?,?) AS POS_DESCR FROM DUAL";
pstmt = connection.prepareStatement(sqlPc); pstmt = connection.prepareStatement(sqlPc);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
...@@ -5475,8 +5481,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -5475,8 +5481,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
close(pstmt, rs); close(pstmt, rs);
}
//Modified by Poonam B[18-02-2020][END][Changed as per Nvo]
if(descr != null && descr.trim().length() > 0) if(descr != null && descr.trim().length() > 0)
{ {
valueXmlString.append("<pos_code_descr>").append("<![CDATA[").append(descr).append( "]]>").append("</pos_code_descr>"); valueXmlString.append("<pos_code_descr>").append("<![CDATA[").append(descr).append( "]]>").append("</pos_code_descr>");
...@@ -5486,6 +5490,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -5486,6 +5490,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
valueXmlString.append("<pos_code_descr>").append("<![CDATA[]]>").append("</pos_code_descr>"); valueXmlString.append("<pos_code_descr>").append("<![CDATA[]]>").append("</pos_code_descr>");
} }
} }
//Modified by Poonam B[18-02-2020][END][Changed to display pos code description]
}
else if(currentColumn.trim().equalsIgnoreCase("driv_lic_no")) else if(currentColumn.trim().equalsIgnoreCase("driv_lic_no"))
{ {
System.out.println("ItemChange of:::::"+currentColumn); System.out.println("ItemChange of:::::"+currentColumn);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment