Skip to content

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

updated on[26-12-2019] 

emp_complete21.xml
emp_complete27.xml
emp_other_detail2Bank Detail.xml
emp_temp11.xml
emp_temp12.xml
emp_temp13.xml
emp_temp14.xml
emp_temp15.xml
emp_temp16.xml
emp_temp17.xml
emp_temp21.xml
emp_temp22.xml
emp_temp23.xml
emp_temp24.xml
emp_temp25.xml
emp_temp26.xml
emp_temp27.xml
w_emp_complete.sql
EmployeeEJB.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214116 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fa5fee7c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 7152 additions and 6935 deletions
webitm-adm/module-resource/metadata/emp_complete27.xml
View file @ eccfec02
......@@ -321,7 +321,7 @@
<band>Detail</band>
<id>3</id>
<alignment>0</alignment>
<tabsequence>20</tabsequence>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>116</x>
......@@ -387,7 +387,7 @@
<band>Detail</band>
<id>9</id>
<alignment>0</alignment>
<tabsequence>30</tabsequence>
<tabsequence>20</tabsequence>
<border>5</border>
<color>33554432</color>
<x>310</x>
......@@ -452,7 +452,7 @@
<band>Detail</band>
<id>10</id>
<alignment>0</alignment>
<tabsequence>40</tabsequence>
<tabsequence>30</tabsequence>
<border>5</border>
<color>33554432</color>
<x>116</x>
......@@ -517,7 +517,7 @@
<band>Detail</band>
<id>4</id>
<alignment>0</alignment>
<tabsequence>50</tabsequence>
<tabsequence>40</tabsequence>
<border>5</border>
<color>33554432</color>
<x>116</x>
......@@ -713,7 +713,7 @@
<band>Detail</band>
<id>5</id>
<alignment>1</alignment>
<tabsequence>60</tabsequence>
<tabsequence>50</tabsequence>
<border>5</border>
<color>33554432</color>
<x>280</x>
......
webitm-adm/module-resource/metadata/emp_temp13.xml
View file @ eccfec02
......@@ -60,6 +60,7 @@
<type size="10">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>language</name>
<dbname>emplang.language</dbname>
</table_column>
......@@ -69,6 +70,7 @@
<updatewhereclause>yes</updatewhereclause>
<name>read</name>
<dbname>emplang.read</dbname>
<initial>Y</initial>
<values>
<item display="Yes" data="Y"/>
<item display="No" data="N"/>
......@@ -80,6 +82,7 @@
<updatewhereclause>yes</updatewhereclause>
<name>write</name>
<dbname>emplang.write</dbname>
<initial>Y</initial>
<values>
<item display="Yes" data="Y"/>
<item display="No" data="N"/>
......@@ -91,6 +94,7 @@
<updatewhereclause>yes</updatewhereclause>
<name>speak</name>
<dbname>emplang.speak</dbname>
<initial>Y</initial>
<values>
<item display="Yes" data="Y"/>
<item display="No" data="N"/>
......@@ -100,10 +104,8 @@
<type precision="0">decimal</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>line_no</name>
<dbname>emplang.line_no</dbname>
<initial>0</initial>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;emplang&quot; ) COLUMN(NAME=&quot;emplang.emp_code&quot;) COLUMN(NAME=&quot;emplang.language&quot;) COLUMN(NAME=&quot;emplang.read&quot;) COLUMN(NAME=&quot;emplang.write&quot;) COLUMN(NAME=&quot;emplang.speak&quot;) COLUMN(NAME=&quot;emplang.line_no&quot;)WHERE( EXP1 =&quot;emplang.emp_code&quot; OP =&quot;=&quot; EXP2 =&quot;:as_empcode&quot; ) ) ARG(NAME = &quot;as_empcode&quot; TYPE = string) </retrieve>
<update>EMPLANG</update>
......@@ -116,7 +118,7 @@
</TableDefinition>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<alignment>2</alignment>
<text>Employee Code</text>
<border>6</border>
<color>0</color>
......@@ -144,7 +146,7 @@
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<alignment>2</alignment>
<text>Language</text>
<border>6</border>
<color>0</color>
......@@ -172,7 +174,7 @@
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<alignment>2</alignment>
<text>Read</text>
<border>6</border>
<color>0</color>
......@@ -200,7 +202,7 @@
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<alignment>2</alignment>
<text>Write</text>
<border>6</border>
<color>0</color>
......@@ -228,7 +230,7 @@
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<alignment>2</alignment>
<text>Speak</text>
<border>6</border>
<color>0</color>
......@@ -256,13 +258,13 @@
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Line No</text>
<alignment>2</alignment>
<text>Sequence No</text>
<border>6</border>
<color>0</color>
<x>372</x>
<y>2</y>
<height>16</height>
<height>19</height>
<width>65</width>
<html>
<valueishtml>0</valueishtml>
......@@ -367,14 +369,14 @@
<y>1</y>
<height>18</height>
<width>57</width>
<format>[general]</format>
<format>[YES/NO]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>read</name>
<visible>1</visible>
<EditStyle style="ddlb">
<limit>0</limit>
<limit>1</limit>
<allowedit>no</allowedit>
<case>any</case>
<imemode>0</imemode>
......@@ -403,14 +405,14 @@
<y>1</y>
<height>18</height>
<width>51</width>
<format>[general]</format>
<format>[YES/NO]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>write</name>
<visible>1</visible>
<EditStyle style="ddlb">
<limit>0</limit>
<limit>1</limit>
<allowedit>no</allowedit>
<case>any</case>
<imemode>0</imemode>
......@@ -439,14 +441,14 @@
<y>1</y>
<height>18</height>
<width>55</width>
<format>[general]</format>
<format>[YES/NO]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>speak</name>
<visible>1</visible>
<EditStyle style="ddlb">
<limit>0</limit>
<limit>1</limit>
<allowedit>no</allowedit>
<case>any</case>
<imemode>0</imemode>
......@@ -485,7 +487,8 @@
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font>
......
webitm-adm/module-resource/metadata/emp_temp16.xml
View file @ eccfec02
......@@ -149,7 +149,6 @@
<key>yes</key>
<name>line_no</name>
<dbname>empexperience.line_no</dbname>
<initial>0</initial>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;empexperience&quot; ) COLUMN(NAME=&quot;empexperience.emp_code&quot;) COLUMN(NAME=&quot;empexperience.organisation&quot;) COLUMN(NAME=&quot;empexperience.designation&quot;) COLUMN(NAME=&quot;empexperience.from_date&quot;) COLUMN(NAME=&quot;empexperience.to_date&quot;) COLUMN(NAME=&quot;empexperience.gross_amt&quot;) COLUMN(NAME=&quot;empexperience.curr_code&quot;) COLUMN(NAME=&quot;empexperience.chg_date&quot;) COLUMN(NAME=&quot;empexperience.chg_term&quot;) COLUMN(NAME=&quot;empexperience.chg_user&quot;) COLUMN(NAME=&quot;empexperience.print_seq&quot;) COLUMN(NAME=&quot;empexperience.count_code__work&quot;) COMPUTE(NAME=&quot;FN_GET_COUNT_DESCR(empexperience.count_code__work) as work_country_descr&quot;) COLUMN(NAME=&quot;empexperience.line_no&quot;)WHERE( EXP1 =&quot;empexperience.emp_code&quot; OP =&quot;=&quot; EXP2 =&quot;:as_empcode&quot; ) ) ARG(NAME = &quot;as_empcode&quot; TYPE = string) </retrieve>
<update>EMPEXPERIENCE</update>
......@@ -530,12 +529,12 @@
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Line No</text>
<text>Sequence No</text>
<border>6</border>
<color>33554432</color>
<x>1436</x>
<y>2</y>
<height>16</height>
<height>17</height>
<width>59</width>
<html>
<valueishtml>0</valueishtml>
......@@ -1054,7 +1053,8 @@
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font>
......
webitm-adm/module-resource/metadata/emp_temp17.xml
View file @ eccfec02
......@@ -272,7 +272,7 @@
<TextObject>
<band>Header</band>
<alignment>2</alignment>
<text>Amt Type</text>
<text>Amount Type</text>
<border>6</border>
<color>33554432</color>
<x>458</x>
......@@ -328,7 +328,7 @@
<TextObject>
<band>Header</band>
<alignment>2</alignment>
<text>Chg Date</text>
<text>Changed On</text>
<border>6</border>
<color>33554432</color>
<x>590</x>
......@@ -356,7 +356,7 @@
<TextObject>
<band>Header</band>
<alignment>2</alignment>
<text>Chg Term</text>
<text>Changed From</text>
<border>6</border>
<color>33554432</color>
<x>658</x>
......@@ -384,7 +384,7 @@
<TextObject>
<band>Header</band>
<alignment>2</alignment>
<text>Chg User</text>
<text>Changed By</text>
<border>6</border>
<color>33554432</color>
<x>726</x>
......
webitm-adm/module-resource/metadata/emp_temp26.xml
View file @ eccfec02
......@@ -69,6 +69,7 @@
<type>datetime</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>from_date</name>
<dbname>empexperience.from_date</dbname>
</table_column>
......@@ -141,13 +142,11 @@
<type precision="0">decimal</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>line_no</name>
<dbname>empexperience.line_no</dbname>
<initial>0</initial>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;empexperience&quot; ) COLUMN(NAME=&quot;empexperience.emp_code&quot;) COLUMN(NAME=&quot;empexperience.organisation&quot;) COLUMN(NAME=&quot;empexperience.designation&quot;) COLUMN(NAME=&quot;empexperience.from_date&quot;) COLUMN(NAME=&quot;empexperience.to_date&quot;) COLUMN(NAME=&quot;empexperience.gross_amt&quot;) COLUMN(NAME=&quot;empexperience.curr_code&quot;) COLUMN(NAME=&quot;empexperience.chg_date&quot;) COLUMN(NAME=&quot;empexperience.chg_term&quot;) COLUMN(NAME=&quot;empexperience.chg_user&quot;) COLUMN(NAME=&quot;empexperience.print_seq&quot;) COLUMN(NAME=&quot;empexperience.count_code__work&quot;) COMPUTE(NAME=&quot;FN_GET_COUNT_DESCR(empexperience.count_code__work) as work_country_descr&quot;) COLUMN(NAME=&quot;empexperience.line_no&quot;)WHERE( EXP1 =&quot;empexperience.emp_code&quot; OP =&quot;=&quot; EXP2 =&quot;:as_empcode&quot; ) ) ARG(NAME = &quot;as_empcode&quot; TYPE = string) </retrieve>
<update>empexperience</update>
<update>EMPEXPERIENCE</update>
<updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace>
<argument>
......@@ -238,13 +237,13 @@
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>Print Seq :</text>
<text>Print Sequence :</text>
<border>5</border>
<color>0</color>
<x>250</x>
<x>230</x>
<y>34</y>
<height>16</height>
<width>66</width>
<width>86</width>
<html>
<valueishtml>0</valueishtml>
</html>
......@@ -1041,10 +1040,11 @@
<name>line_no</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<limit>3</limit>
<case>upper</case>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font>
......
webitm-adm/src/ibase/webitm/ejb/adm/EmployeeEJB.java
View file @ eccfec02
......@@ -137,7 +137,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
String dateJoinStr ="",status ="",emailIdOff = "",language="",keyFlag="";
String gratPerc="", pfPerc="", penPerc="",qlfCode="",grossAmt="",phyHand="",suppCode="";
String editFlg="";
String fromDate = "";
String fromDate = "" ;
String toDate = "" ; //Added by PoonamB[24-12-2019]
String errFldName="";
StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
java.util.Date joinDate = null;
......@@ -2416,7 +2417,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
retirementDate1= sdf.parse(retirementDate);
}
//Added by Poonam B on[16.07.2019].END.to check date format
if(birthDate1 != null && retirementDate1 != null && retirementDate1.before(birthDate1))
//Modified By Poonam B[26-12-2019][START]
//if(birthDate1 != null && retirementDate1 != null && retirementDate1.before(birthDate1))
if(birthDate1 != null && retirementDate1 != null && retirementDate1.after(birthDate1))
//Modified By Poonam B[26-12-2019][END]
{
errList.add("VMEMPRET02");
errFields.add(childNodeName.toLowerCase());
......@@ -2729,7 +2733,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
}
//Added By Poonam B on[30-07-2019][END]
}
break;
case 5 :
......@@ -2783,7 +2786,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
break;
}
}
}
if(childNodeName.equalsIgnoreCase("duration"))
{
......@@ -3008,6 +3010,22 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
}
}
}
// Added By Poonam[24/12/2019].start
if(childNodeName.equalsIgnoreCase("to_date"))
{
toDate = checkNull(genericUtility.getColumnValue("to_date", dom));
if(toDate == null || toDate.trim().length() == 0)
{
errList.add("VMEMPTO08");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMEMPTO08");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
// Added By Poonam[24/12/2019].end
if(childNodeName.equalsIgnoreCase("print_seq"))
{
// Modified by Yashwant on 26/06/2019.Start
......@@ -4030,10 +4048,16 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
}
}
valueXmlString.append("<emp_fname>").append("<![CDATA[" + fname + "]]>").append("</emp_fname>");
/*valueXmlString.append("<emp_fname>").append("<![CDATA[" + fname + "]]>").append("</emp_fname>");
valueXmlString.append("<emp_mname>").append("<![CDATA[" + mName + "]]>").append("</emp_mname>");
valueXmlString.append("<emp_lname>").append("<![CDATA[" + lname +"]]>").append("</emp_lname>");
valueXmlString.append("<emp_lname>").append("<![CDATA[" + lname +"]]>").append("</emp_lname>");*/
//Modified By Poonam B[26-12-2019][START]
System.out.println("Employee name::::"+ fname +"\t"+mName+"\t"+lname+"......");
valueXmlString.append("<emp_fname_long>").append("<![CDATA[" + fname + "]]>").append("</emp_fname_long>");
valueXmlString.append("<emp_mname_long>").append("<![CDATA[" + mName + "]]>").append("</emp_mname_long>");
valueXmlString.append("<emp_lname_long>").append("<![CDATA[" + lname +"]]>").append("</emp_lname_long>");
//Modified By Poonam B[26-12-2019][END]
// Modified by Yashwant on 26/06/2019.Start
//empCode=genericUtility.getColumnValue("emp_code", dom);
empCode=checkNull(genericUtility.getColumnValue("emp_code", dom));
......
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