Skip to content

B
business-java
Commit 0642735c authored by rtelang's avatar rtelang
Browse files
Options

EmployeeEJB.java 

EmpWorkInfo.java
-Changes done to get Retirement age in terms of months.

emp_master21.xml
emp_temp21.xml
emp_work_info21.xml
d_emp_master21.srd
d_emp_temp21.srd
d_emp_work_info21.srd
-Changed lable name from Retirement Age to Retirement Age (Months).

EmployeeServicePrdAmdIC.java
-Changes done to set retirement age old and retirement age new in terms of months.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@200141 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 662371ce
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1230 additions and 1327 deletions
webitm-adm/ibase/webitm/ejb/adm/EmpWorkInfo.java
View file @ 0642735c
...@@ -641,7 +641,10 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -641,7 +641,10 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
{ {
retAge = genericUtility.getColumnValue("retirement_age", dom); retAge = genericUtility.getColumnValue("retirement_age", dom);
retirementAge = Integer.parseInt(retAge); retirementAge = Integer.parseInt(retAge);
retireAge = retirementAge * 12; //Modified by Rohini T on 26/04/19 [start]
//retireAge = retirementAge * 12;
retireAge = retirementAge ;
//Modified by Rohini T on 26/04/19 [end]
empCode = genericUtility.getColumnValue("emp_code", dom); empCode = genericUtility.getColumnValue("emp_code", dom);
System.out.println("empCode:::::::"+empCode); System.out.println("empCode:::::::"+empCode);
......
webitm-adm/ibase/webitm/ejb/adm/EmployeeEJB.java
View file @ 0642735c
...@@ -4263,7 +4263,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -4263,7 +4263,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
retAge = genericUtility.getColumnValue("retirement_age", dom); retAge = genericUtility.getColumnValue("retirement_age", dom);
retirementAge = Integer.parseInt(retAge); retirementAge = Integer.parseInt(retAge);
System.out.println("retAge:::::::"+retAge); System.out.println("retAge:::::::"+retAge);
retireAge = retirementAge * 12; //Modified by Rohini T on 26/04/19 [start][]
//retireAge = retirementAge * 12;
retireAge = retirementAge ;
//Modified by Rohini T on 26/04/19 [start]
empCode = genericUtility.getColumnValue("emp_code", dom); empCode = genericUtility.getColumnValue("emp_code", dom);
System.out.println("empCode:::::::"+empCode); System.out.println("empCode:::::::"+empCode);
......
webitm-adm/ibase/webitm/ejb/adm/EmployeeServicePrdAmdIC.java
View file @ 0642735c
...@@ -532,7 +532,10 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer ...@@ -532,7 +532,10 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
System.out.println("retirementDate"); System.out.println("retirementDate");
if("E".equalsIgnoreCase(amendmentType)) if("E".equalsIgnoreCase(amendmentType))
{ {
retAgeNew = retAgeOld + (periodAmd / 12); //Modified by Rohini T on [25/04/19][start]
//retAgeNew = retAgeOld + (periodAmd / 12);
retAgeNew = retAgeOld + periodAmd;
//Modified by Rohini T on [25/04/19][end]
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy");
...@@ -558,7 +561,10 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer ...@@ -558,7 +561,10 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
} }
else else
{ {
retAgeNew = retAgeOld - (periodAmd / 12); //Modified by Rohini T on [25/04/19][start]
//retAgeNew = retAgeOld - (periodAmd / 12);
retAgeNew = retAgeOld - periodAmd;
//Modified by Rohini T on [25/04/19][start]
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy");
......
webitm-adm/module-resource/metadata/emp_work_info21.xml
View file @ 0642735c
...@@ -3104,15 +3104,22 @@ ...@@ -3104,15 +3104,22 @@
<tabsequence>290</tabsequence> <tabsequence>290</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>171</x> <x>172</x>
<y>469</y> <y>469</y>
<height>16</height> <height>16</height>
<width>93</width> <width>93</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>retirement_age</name> <name>retirement_age</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
...@@ -3133,15 +3140,22 @@ ...@@ -3133,15 +3140,22 @@
<tabsequence>300</tabsequence> <tabsequence>300</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>171</x> <x>172</x>
<y>489</y> <y>489</y>
<height>15</height> <height>15</height>
<width>93</width> <width>93</width>
<format>[shortdate] [time]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>retirement_date</name> <name>retirement_date</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
...@@ -3158,13 +3172,13 @@ ...@@ -3158,13 +3172,13 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Retirement Age :</text> <text>Retirement Age(Months) :</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>59</x> <x>9</x>
<y>469</y> <y>469</y>
<height>16</height> <height>17</height>
<width>109</width> <width>159</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
......
webitm-adm/module-resource/srd/d_emp_master21.srd
View file @ 0642735c
This source diff could not be displayed because it is too large. You can view the blob instead.
webitm-adm/module-resource/srd/d_emp_work_info21.srd
View file @ 0642735c
...@@ -139,9 +139,9 @@ column(band=detail id=1 alignment="0" tabsequence=32766 border="5" color="0" x=" ...@@ -139,9 +139,9 @@ column(band=detail id=1 alignment="0" tabsequence=32766 border="5" color="0" x="
column(band=detail id=48 alignment="0" tabsequence=32766 border="5" color="0" x="248" y="27" height="15" width="95" 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=48 alignment="0" tabsequence=32766 border="5" color="0" x="248" y="27" height="15" width="95" 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=49 alignment="0" tabsequence=32766 border="5" color="0" x="347" y="27" height="15" width="95" format="[general]" html.valueishtml="0" name=emp_mname_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=49 alignment="0" tabsequence=32766 border="5" color="0" x="347" y="27" height="15" width="95" format="[general]" html.valueishtml="0" name=emp_mname_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=50 alignment="0" tabsequence=32766 border="5" color="0" x="446" y="27" height="15" width="95" 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=50 alignment="0" tabsequence=32766 border="5" color="0" x="446" y="27" height="15" width="95" 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=52 alignment="0" tabsequence=290 border="5" color="0" x="171" y="469" height="16" width="93" html.valueishtml="0" name=retirement_age visible="1" 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=52 alignment="0" tabsequence=290 border="5" color="0" x="172" y="469" height="16" width="93" format="[general]" html.valueishtml="0" name=retirement_age 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=53 alignment="0" tabsequence=300 border="5" color="0" x="171" y="489" height="15" width="93" html.valueishtml="0" name=retirement_date visible="1" 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=53 alignment="0" tabsequence=300 border="5" color="0" x="172" y="489" height="15" width="93" format="[shortdate] [time]" html.valueishtml="0" name=retirement_date 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" )
text(band=detail alignment="1" text="Retirement Age :" border="0" color="0" x="59" y="469" height="16" width="109" html.valueishtml="0" name=retirement_age_t visible="1" font.face="Liberation Sans" font.height="-11" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" ) text(band=detail alignment="1" text="Retirement Age(Months) :" border="0" color="0" x="9" y="469" height="17" width="159" html.valueishtml="0" name=retirement_age_t visible="1" font.face="Liberation Sans" font.height="-11" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
text(band=detail alignment="1" text="Retirement Date :" border="0" color="0" x="59" y="488" height="16" width="109" html.valueishtml="0" name=retirement_date_t visible="1" font.face="Liberation Sans" font.height="-11" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" ) text(band=detail alignment="1" text="Retirement Date :" border="0" color="0" x="59" y="488" height="16" width="109" html.valueishtml="0" name=retirement_date_t visible="1" font.face="Liberation Sans" font.height="-11" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
text(band=detail alignment="1" text="Chg Date :" border="0" color="33554432" x="69" y="509" height="16" width="99" html.valueishtml="0" name=chg_date_t visible="1" 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" ) text(band=detail alignment="1" text="Chg Date :" border="0" color="33554432" x="69" y="509" height="16" width="99" html.valueishtml="0" name=chg_date_t visible="1" 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=15 alignment="0" tabsequence=32766 border="5" color="255" x="172" y="509" height="16" width="91" format="[general]" html.valueishtml="0" name=chg_date visible="1" edit.limit=0 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="67108864" ) column(band=detail id=15 alignment="0" tabsequence=32766 border="5" color="255" x="172" y="509" height="16" width="91" format="[general]" html.valueishtml="0" name=chg_date visible="1" edit.limit=0 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="67108864" )
......
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