Skip to content

B
business-java
Commit 90692db4 authored by pbhosale's avatar pbhosale
Browse files
Options

updated on[03-01-2020] 

emp_separation21.xml
mpreqmnt21.xml
w_emp_separation.sql
d_emp_separation_edit.srd
d_mprequire_edit.srd
EmployeeEJB.java
MPReqmtnIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214484 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9ec7e979
Expand all Show whitespace changes
Inline Side-by-side
Showing with 250 additions and 128 deletions
webitm-adm/module-resource/SQL/w_emp_separation.sql
View file @ 90692db4
......@@ -33,7 +33,6 @@ Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,IMAGE,DESCRIPTION,SERVICE_CODE,INTERAC
----------------------------------------------------- OBJ_LINKS
Insert into OBJ_LINKS (OBJ_NAME,FORM_NO,FIELD_NAME,TARGET_OBJ_NAME,LINK_FORM_NAME,LINK_TITLE,LINK_URI,LINK_TYPE,LINK_ARG,UPDATE_FLAG,LINK_NAME,RIGHTS_CHAR,IMAGE,SHOW_IN_PANEL,SHORTCUT_CHAR,AUTO_INVOKE,SWIPE_POSITION,TITLE,DESCR,SHOW_CONFIRM,DISPLAY_MODE,LINE_NO,LINK_ID,REC_SPECIFIC) values ('emp_separation','1','emp_code','mpreqmnt','mpreqmnt21','Manpower Requirement',null,'4','emp_code.String:emp_code__prev','1',null,'*',null,null,null,null,null,null,null,null,'1',11,null,null);
Insert into OBJ_LINKS (OBJ_NAME,FORM_NO,FIELD_NAME,TARGET_OBJ_NAME,LINK_FORM_NAME,LINK_TITLE,LINK_URI,LINK_TYPE,LINK_ARG,UPDATE_FLAG,LINK_NAME,RIGHTS_CHAR,IMAGE,SHOW_IN_PANEL,SHORTCUT_CHAR,AUTO_INVOKE,SWIPE_POSITION,TITLE,DESCR,SHOW_CONFIRM,DISPLAY_MODE,LINE_NO,LINK_ID,REC_SPECIFIC) values ('emp_separation','1','home_upload',' ',' ','Upload Utility','/ibase/webitm/jsp/E12UploadTemplate.jsp?reset=true','3','emp_separation.String:OBJ_NAME,Separation.String:OBJ_DESC,fromHomePage.String:FROM_HOMEPAGE',null,null,'U',null,'3',null,null,null,null,'Upload Utility',null,'3',12,null,1);
----------------------------------------------------- OBJ_ITEMCHANGE
......@@ -126,4 +125,76 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
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 ('VTEMPUID01','Failed to update user id!','Failed to update user id in users table','E','Y',null,null,null,to_date('17-08-15','DD-MM-RR'),'BASE ','BASE ',null,null);
------------------------------------------------------- [14/11/2019][START]
Insert into SYSTEM_EVENTS (OBJ_NAME,EVENT_CODE,EVENT_CONTEXT,SERVICE_CODE,METHOD_RULE,CHG_DATE,CHG_USER,CHG_TERM,RESULT_HANDLE,OVERWRITE_CORE,COMP_TYPE,COMP_NAME,COMM_FORMAT) values ('emp_separation','export_excel','1','export_excel_adm',null,to_date('2018-02-03','RRRR-MM-DD'),'VAIBHAV ','VAIBHAV',null,null,null,null,null);
------------------------------------------------------- [31/12/2019][START]
update OBJ_LINKS set FIELD_NAME = 'home_1' where OBJ_NAME ='emp_separation' and TARGET_OBJ_NAME = 'mpreqmnt';
------------------------------------------------------- [31/12/2019][END]
------------------------------------------------------- [02/01/2020][START]
update TRANSETUP set TABLE_NAME = 'separation' where TRAN_WINDOW = 'w_emp_separation';
update OBJ_ACTIONS set DISPLAY_MODE = 1 where OBJ_NAME = 'emp_separation' and TITLE = 'Export2XLS';
update OBJ_ACTIONS set REC_SPECIFIC = '' where OBJ_NAME = 'emp_separation' and TITLE = 'Export2XLS';
update OBJ_ACTIONS set SERVICE_HANDLER = 1,PLACEMENT = 1 where OBJ_NAME = 'emp_separation' and TITLE = 'Export2XLS';
update POPHELP set AUTO_FILL_LEN = '3', AUTO_MIN_LENGTH = 2 , HELP_OPTION = 2 where MOD_NAME = 'W_MPREQMNT';
update POPHELP set THUMB_OBJ = 'EmpImages',THUMB_IMAGE_COL = 'emp_code' ,THUMB_ALT_COL = 'EMPLOYEE_NAME' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'EMP_CODE__HOD';
update POPHELP set THUMB_OBJ = 'SiteImages',THUMB_IMAGE_COL = 'SITE_CODE' ,THUMB_ALT_COL = 'DESCR' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'SITE_CODE';
update POPHELP set THUMB_OBJ = 'EmpImages',THUMB_IMAGE_COL = 'CODE' ,THUMB_ALT_COL = 'FIRST_NAME' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'EMP__INITIATOR';
update POPHELP set THUMB_OBJ = 'EmpImages',THUMB_IMAGE_COL = 'CODE' ,THUMB_ALT_COL = 'FIRST_NAME' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'EMP_CODE__RA2';
update POPHELP set THUMB_OBJ = 'EmpImages',THUMB_IMAGE_COL = 'CODE' ,THUMB_ALT_COL = 'FIRST_NAME' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'EMP_CODE__RA3';
update POPHELP set THUMB_OBJ = 'EmpImages',THUMB_IMAGE_COL = 'CODE' ,THUMB_ALT_COL = 'FIRST_NAME' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'EMP_CODE__APRV';
update POPHELP set THUMB_OBJ = 'EmpImages',THUMB_IMAGE_COL = 'CODE' ,THUMB_ALT_COL = 'FIRST_NAME' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'EMP_CODE__APRV1';
update POPHELP set THUMB_OBJ = 'EmpImages',THUMB_IMAGE_COL = 'CODE' ,THUMB_ALT_COL = 'FIRST_NAME' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'EMP_CODE__APRV2';
update POPHELP set THUMB_OBJ = 'EmpImages',THUMB_IMAGE_COL = 'CODE' ,THUMB_ALT_COL = 'FIRST_NAME' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'EMP_CODE__APRV3';
update POPHELP set THUMB_OBJ = 'LocImages',THUMB_IMAGE_COL = 'LOC_CODE' ,THUMB_ALT_COL = 'DESCR' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'LOC_CODE';
update POPHELP set THUMB_OBJ = 'DeptImages',THUMB_IMAGE_COL = 'DEPT_CODE' ,THUMB_ALT_COL = 'DESCR' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'DEPT_CODE';
update POPHELP set THUMB_OBJ = 'DesignImages',THUMB_IMAGE_COL = 'DESIGN_CODE' ,THUMB_ALT_COL = 'DESIGNATION' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'DESIGN_CODE';
update POPHELP set THUMB_OBJ = 'GradeImages',THUMB_IMAGE_COL = 'GRADE_CODE' ,THUMB_ALT_COL = 'DESCR' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'GRADE_CODE';
update POPHELP set THUMB_OBJ = 'CadreImages',THUMB_IMAGE_COL = 'CADRE_CODE' ,THUMB_ALT_COL = 'DESCR' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'CADRE_CODE';
update POPHELP set THUMB_OBJ = 'QlfImages',THUMB_IMAGE_COL = 'QLF_CODE' ,THUMB_ALT_COL = 'DESCR' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'QLF_CODE__MIN';
update POPHELP set THUMB_OBJ = 'QlfImages',THUMB_IMAGE_COL = 'QLF_CODE' ,THUMB_ALT_COL = 'DESCR' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'QLF_CODE__ALT1';
update POPHELP set THUMB_OBJ = 'QlfImages',THUMB_IMAGE_COL = 'QLF_CODE' ,THUMB_ALT_COL = 'DESCR' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'QLF_CODE__ALT2';
update POPHELP set THUMB_OBJ = 'QlfImages',THUMB_IMAGE_COL = 'QLF_CODE' ,THUMB_ALT_COL = 'DESCR' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'QLF_CODE__ALT3';
update POPHELP set THUMB_OBJ = 'QlfImages',THUMB_IMAGE_COL = 'QLF_CODE' ,THUMB_ALT_COL = 'DESCR' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'QLF_CODE__ALT4';
update POPHELP set THUMB_OBJ = 'QlfImages',THUMB_IMAGE_COL = 'QLF_CODE' ,THUMB_ALT_COL = 'DESCR' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'QLF_CODE__ALT5';
update POPHELP set THUMB_OBJ = 'EmpImages',THUMB_IMAGE_COL = 'CODE' ,THUMB_ALT_COL = 'FIRST_NAME' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'REPORT_TO__ADMIN';
update POPHELP set THUMB_OBJ = 'EmpImages',THUMB_IMAGE_COL = 'CODE' ,THUMB_ALT_COL = 'FIRST_NAME' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'EMP_CODE__OLD';
update POPHELP set THUMB_OBJ = 'EmpImages',THUMB_IMAGE_COL = 'CODE' ,THUMB_ALT_COL = 'FIRST_NAME' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'EMP_CODE__REP';
update POPHELP set THUMB_OBJ = 'EmpImages',THUMB_IMAGE_COL = 'CODE' ,THUMB_ALT_COL = 'FIRST_NAME' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'EMP_CODE__PREV';
update POPHELP set THUMB_OBJ = 'MprImages',THUMB_IMAGE_COL = 'MPR_NO' ,THUMB_ALT_COL = 'MPR_NO' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'MPR_NO';
update POPHELP set THUMB_OBJ = 'BudImages',THUMB_IMAGE_COL = 'BUDGET_ID' ,THUMB_ALT_COL = 'DESCR' where MOD_NAME = 'W_MPREQMNT' and FIELD_NAME = 'BUDGET_ID';
update OBJ_ACTIONS set DISPLAY_MODE = 1 where OBJ_NAME = 'emp_separation'and LINE_NO = '5';
update OBJ_ACTIONS set SHOW_IN_PANEL = 1 where OBJ_NAME = 'emp_separation'and LINE_NO in('40');
update OBJ_ACTIONS set SHOW_CONFIRM = '000' where OBJ_NAME = 'emp_separation'and LINE_NO = '5';
update OBJ_ACTIONS set DISPLAY_MODE = 1 , SHOW_CONFIRM = '000' where OBJ_NAME = 'emp_separation'and LINE_NO in('7');
update OBJ_ACTIONS set DISPLAY_MODE = 1 where OBJ_NAME = 'emp_separation'and LINE_NO = '17';
update OBJ_ACTIONS set SHOW_CONFIRM = '000' where OBJ_NAME = 'emp_separation'and LINE_NO in('44');
update OBJ_ACTIONS set TITLE = 'View Audit' where OBJ_NAME = 'emp_separation'and LINE_NO in('40');
update OBJ_ACTIONS set SHOW_CONFIRM = '000' where OBJ_NAME = 'emp_separation'and LINE_NO in('45');
------------------------------------------------------- [02/01/2020][END]
------------------------------------------------------- [03/01/2020][START]
UPDATE obj_forms
SET disp_metadata= '<html><span style="white-space: normal !important; word-break: break-word;"> <b>{emp_fname_long} {emp_lname_long} ({emp_code})</b> , Site: <b>{emp_site}</b><span style="float:right;"> Resigned On: <b>{resi_date}</b></span><br/><span class = "optional" style="margin-left: 1%;"> Reason: <b>{reason}</b> , Mode: <b>{sepmode_descr}</b> , Status: <b>{status}</b></span><span style="float:right;">Relieving On: <b>{relieve_date}</b></span></html>'
WHERE win_name ='w_emp_separation';
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','W_EMP_SEPARATION','select emp_code from employee order by emp_code',null,'Perk Code',null,null,to_date('22-10-00','DD-MM-RR'),'BASE ',null,null,null,null,null,null,null,null,null,null,null,'2',null,'3','EmpCodeImages','emp_code','emp_code','2 ',null,null,null,null,null,null,null);
update POPHELP set AUTO_MIN_LENGTH = 2,AUTO_FILL_LEN = 3 ,HELP_OPTION = 2 , DIST_OPT = ''where MOD_NAME = 'W_EMP_SEPARATION';
------------------------------------------------------- [03/01/2020][END]
webitm-adm/module-resource/metadata/emp_separation21.xml
View file @ 90692db4
......@@ -1147,20 +1147,20 @@
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>16</id>
<alignment>0</alignment>
<tabsequence>60</tabsequence>
<id>11</id>
<alignment>1</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>0</color>
<x>218</x>
<y>31</y>
<height>15</height>
<width>114</width>
<format>[general]</format>
<color>255</color>
<x>391</x>
<y>52</y>
<height>16</height>
<width>60</width>
<format>#,##,##,###.####</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>emp_fname_long</name>
<name>notice_prd</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
......@@ -1178,26 +1178,26 @@
</font>
<background>
<mode>2</mode>
<color>16777215</color>
<color>79741120</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>11</id>
<alignment>1</alignment>
<id>9</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>255</color>
<x>391</x>
<y>52</y>
<x>138</x>
<y>291</y>
<height>16</height>
<width>60</width>
<format>#,##,##,###.####</format>
<width>114</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>notice_prd</name>
<visible>1</visible>
<name>emp_fname</name>
<visible>0</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
......@@ -1219,21 +1219,21 @@
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>17</id>
<id>10</id>
<alignment>0</alignment>
<tabsequence>70</tabsequence>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>0</color>
<x>339</x>
<y>31</y>
<height>15</height>
<color>255</color>
<x>274</x>
<y>292</y>
<height>16</height>
<width>114</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>emp_lname_long</name>
<visible>1</visible>
<name>emp_lname</name>
<visible>0</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
......@@ -1250,26 +1250,26 @@
</font>
<background>
<mode>2</mode>
<color>16777215</color>
<color>79741120</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>9</id>
<id>16</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>255</color>
<x>138</x>
<y>291</y>
<height>16</height>
<x>218</x>
<y>31</y>
<height>15</height>
<width>114</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>emp_fname</name>
<visible>0</visible>
<name>emp_fname_long</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
......@@ -1286,26 +1286,26 @@
</font>
<background>
<mode>2</mode>
<color>79741120</color>
<color>16777215</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>10</id>
<id>17</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>255</color>
<x>274</x>
<y>292</y>
<height>16</height>
<x>339</x>
<y>31</y>
<height>15</height>
<width>114</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>emp_lname</name>
<visible>0</visible>
<name>emp_lname_long</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
......@@ -1322,7 +1322,7 @@
</font>
<background>
<mode>2</mode>
<color>79741120</color>
<color>16777215</color>
</background>
</ColumnObject>
<HtmlTable>
......
webitm-adm/module-resource/srd/d_emp_separation_edit.srd
View file @ 90692db4
......@@ -54,11 +54,11 @@ column(band=detail id=7 alignment="0" tabsequence=32766 border="5" color="0" x="
column(band=detail id=8 alignment="0" tabsequence=32766 border="5" color="0" x="138" y="245" height="16" width="71" format="[general]" html.valueishtml="0" name=chg_term tag="Last row modified terminal, for system purpose" visible="0" edit.limit=15 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=13 alignment="0" tabsequence=32766 border="5" color="255" x="138" y="268" height="16" width="54" format="[general]" html.valueishtml="0" name=emp_site visible="0" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
column(band=detail id=1 alignment="0" tabsequence=10 border="5" color="0" x="138" y="31" height="16" width="73" format="[general]" html.valueishtml="0" name=emp_code tag="Unique code of employee who is to be separated" visible="1" edit.limit=10 edit.case=upper edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=16 alignment="0" tabsequence=60 border="5" color="0" x="218" y="31" height="15" width="114" format="[general]" html.valueishtml="0" name=emp_fname_long visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=11 alignment="1" tabsequence=32766 border="5" color="255" x="391" y="52" height="16" width="60" format="#,##,##,###.####" html.valueishtml="0" name=notice_prd visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
column(band=detail id=17 alignment="0" tabsequence=70 border="5" color="0" x="339" y="31" height="15" width="114" format="[general]" html.valueishtml="0" name=emp_lname_long visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=9 alignment="0" tabsequence=32766 border="5" color="255" x="138" y="291" height="16" width="114" format="[general]" html.valueishtml="0" name=emp_fname visible="0" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
column(band=detail id=10 alignment="0" tabsequence=32766 border="5" color="255" x="274" y="292" height="16" width="114" format="[general]" html.valueishtml="0" name=emp_lname visible="0" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
column(band=detail id=16 alignment="0" tabsequence=32766 border="5" color="255" x="218" y="31" height="15" width="114" format="[general]" html.valueishtml="0" name=emp_fname_long visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=17 alignment="0" tabsequence=32766 border="5" color="255" x="339" y="31" height="15" width="114" format="[general]" html.valueishtml="0" name=emp_lname_long visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
htmltable(border="1" )
htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" )
export.xml(headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0 )
......
webitm-adm/src/ibase/webitm/ejb/adm/EmployeeEJB.java
View file @ 90692db4
......@@ -161,7 +161,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
//Modified by Anjali R. on [30/05/2019][End]
userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode");
//Modified By Poonam B[31-12-2019][START]
//userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode");
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
//Modified By Poonam B[31-12-2019][END]
//loginSite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
//Commented by Poonam B. on [18/07/2019][Start]
//GenericUtility genericUtility = GenericUtility.getInstance();
......@@ -331,7 +334,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
}
close(pstmt, rs);
}
else if(childNodeName.equalsIgnoreCase("emp_fname"))
/*else if(childNodeName.equalsIgnoreCase("emp_fname"))
{
System.out.println(" Validaion for field "+childNodeName);
// Modified by Yashwant on 26/06/2019.Start
......@@ -350,7 +353,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
break;
}
}
}
}*/
/*else if(childNodeName.equalsIgnoreCase("emp_mname"))
{
System.out.println(" Validaion for field "+childNodeName);
......@@ -375,7 +378,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
}
}*/
else if(childNodeName.equalsIgnoreCase("emp_lname"))
/*else if(childNodeName.equalsIgnoreCase("emp_lname"))
{
System.out.println(" Validaion for field "+childNodeName);
// Modified by Yashwant on 26/06/2019.Start
......@@ -393,7 +396,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
break;
}
}
}
}*/
// Added By Poonam B on[09/07/2019].start
else if(childNodeName.trim().equalsIgnoreCase("emp_lname_long"))
{
......@@ -3709,7 +3712,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
paySite = checkNull(genericUtility.getColumnValue("pay_site", dom));
if (paySite == null || paySite.trim().length() == 0)
{
paySite = getValueFromXTRA_PARAMS(xtraParams, "loginSite");
//paySite = getValueFromXTRA_PARAMS(xtraParams, "loginSite");
paySite = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSite");
if (paySite == null || paySite.trim().length() == 0)
{
paySite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
......@@ -3729,10 +3733,12 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
workSite = checkNull(genericUtility.getColumnValue("work_site", dom));
if (workSite == null || workSite.trim().length() == 0)
{
workSite = getValueFromXTRA_PARAMS(xtraParams, "loginSite");
//workSite = getValueFromXTRA_PARAMS(xtraParams, "loginSite");
workSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSite");
if (workSite == null || workSite.trim().length() == 0)
{
workSite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
//workSite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
workSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
}
}
if (workSite == null || workSite.trim().length() == 0)
......@@ -4112,7 +4118,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
rs = pstmt.executeQuery();
if(rs.next())
{
valueXmlString.append("<sex>").append("<![CDATA[" + rs.getString("SEX") + "]]>").append("</sex>");
//valueXmlString.append("<sex>").append("<![CDATA[" + rs.getString("SEX") + "]]>").append("</sex>");
valueXmlString.append("<sex>").append("<![CDATA[" + checkNull(rs.getString("SEX")) + "]]>").append("</sex>");
valueXmlString.append("<nationality>").append("<![CDATA[" + rs.getString("NATIONALITY") + "]]>").append("</nationality>");
}
close(pstmt,rs);
......
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