Skip to content

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

Updated On [24/10/2019] 

emp_ad11.xml
emp_ad21.xml
w_emp_ad.sql
d_emp_allwdedn_brow.srd
d_emp_allwdedn_edit.srd
EmployeeAdIC.java

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@210546 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 49389d42
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 737 additions and 494 deletions
webitm-adm/module-resource/SQL/w_emp_ad.sql
View file @ faf632c6
...@@ -127,5 +127,12 @@ update POPHELP set THUMB_ALT_COL = 'descr', THUMB_IMAGE_COL= 'ad_code',THUMB_OBJ ...@@ -127,5 +127,12 @@ update POPHELP set THUMB_ALT_COL = 'descr', THUMB_IMAGE_COL= 'ad_code',THUMB_OBJ
----------------------------------------------------[21/10/19][END] ----------------------------------------------------[21/10/19][END]
----------------------------------------------------[24/10/19][START]
update OBJ_FORMS set TRAN_ID_COL = 'TRAN_ID' where WIN_NAME = 'w_emp_ad';
update transetup set tran_id_col = 'TRAN_ID' where tran_window = 'w_emp_ad';
----------------------------------------------------[24/10/19][END]
webitm-adm/module-resource/metadata/emp_ad11.xml
View file @ faf632c6
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
<type size="10">char</type> <type size="10">char</type>
<update>yes</update> <update>yes</update>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>emp_code</name> <name>emp_code</name>
<dbname>employee_ad.emp_code</dbname> <dbname>employee_ad.emp_code</dbname>
</table_column> </table_column>
...@@ -60,21 +59,18 @@ ...@@ -60,21 +59,18 @@
<type size="5">char</type> <type size="5">char</type>
<update>yes</update> <update>yes</update>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>ad_code</name> <name>ad_code</name>
<dbname>employee_ad.ad_code</dbname> <dbname>employee_ad.ad_code</dbname>
</table_column> </table_column>
<table_column> <table_column>
<type>datetime</type> <type>datetime</type>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>eff_date</name> <name>eff_date</name>
<dbname>employee_ad.eff_date</dbname> <dbname>employee_ad.eff_date</dbname>
</table_column> </table_column>
<table_column> <table_column>
<type>datetime</type> <type>datetime</type>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>exp_date</name> <name>exp_date</name>
<dbname>employee_ad.exp_date</dbname> <dbname>employee_ad.exp_date</dbname>
</table_column> </table_column>
...@@ -154,7 +150,7 @@ ...@@ -154,7 +150,7 @@
<dbname>employee_ad.chg_term</dbname> <dbname>employee_ad.chg_term</dbname>
</table_column> </table_column>
<table_column> <table_column>
<type size="10">char</type> <type size="40">char</type>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>descr</name> <name>descr</name>
<dbname>allwdedn.descr</dbname> <dbname>allwdedn.descr</dbname>
...@@ -195,7 +191,15 @@ ...@@ -195,7 +191,15 @@
<name>emp_lname</name> <name>emp_lname</name>
<dbname>employee.emp_lname</dbname> <dbname>employee.emp_lname</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;employee_ad&quot; ) TABLE(NAME=&quot;allwdedn&quot; ) TABLE(NAME=&quot;employee&quot; ) COLUMN(NAME=&quot;employee_ad.emp_code&quot;) COLUMN(NAME=&quot;employee_ad.ad_code&quot;) COLUMN(NAME=&quot;employee_ad.eff_date&quot;) COLUMN(NAME=&quot;employee_ad.exp_date&quot;) COLUMN(NAME=&quot;employee_ad.type&quot;) COLUMN(NAME=&quot;employee_ad.amount&quot;) COLUMN(NAME=&quot;employee_ad.min_basic&quot;) COLUMN(NAME=&quot;employee_ad.max_basic&quot;) COLUMN(NAME=&quot;employee_ad.min_amt&quot;) COLUMN(NAME=&quot;employee_ad.max_amt&quot;) COLUMN(NAME=&quot;employee_ad.prop_yn&quot;) COLUMN(NAME=&quot;employee_ad.chg_date&quot;) COLUMN(NAME=&quot;employee_ad.chg_user&quot;) COLUMN(NAME=&quot;employee_ad.chg_term&quot;) COLUMN(NAME=&quot;allwdedn.descr&quot;) COLUMN(NAME=&quot;employee.pay_site&quot;) COLUMN(NAME=&quot;employee_ad.confirmed&quot;) COLUMN(NAME=&quot;employee_ad.conf_date&quot;) COLUMN(NAME=&quot;employee_ad.emp_code__aprv&quot;) COLUMN(NAME=&quot;employee.emp_fname&quot;) COLUMN(NAME=&quot;employee.emp_lname&quot;) JOIN (LEFT=&quot;employee_ad.ad_code&quot; OP =&quot;=&quot;RIGHT=&quot;allwdedn.ad_code&quot; ) JOIN (LEFT=&quot;employee_ad.emp_code&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; )WHERE( EXP1 =&quot;employee_ad.emp_code&quot; OP =&quot;=&quot; EXP2 =&quot;:emp_code&quot; ) ) ORDER(NAME=&quot;employee_ad.emp_code&quot; ASC=yes ) ORDER(NAME=&quot;employee_ad.ad_code&quot; ASC=yes ) ARG(NAME = &quot;emp_code&quot; TYPE = string) </retrieve> <table_column>
<type size="10">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>tran_id</name>
<dbname>employee_ad.tran_id</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;employee_ad&quot; ) TABLE(NAME=&quot;allwdedn&quot; ) TABLE(NAME=&quot;employee&quot; ) COLUMN(NAME=&quot;employee_ad.emp_code&quot;) COLUMN(NAME=&quot;employee_ad.ad_code&quot;) COLUMN(NAME=&quot;employee_ad.eff_date&quot;) COLUMN(NAME=&quot;employee_ad.exp_date&quot;) COLUMN(NAME=&quot;employee_ad.type&quot;) COLUMN(NAME=&quot;employee_ad.amount&quot;) COLUMN(NAME=&quot;employee_ad.min_basic&quot;) COLUMN(NAME=&quot;employee_ad.max_basic&quot;) COLUMN(NAME=&quot;employee_ad.min_amt&quot;) COLUMN(NAME=&quot;employee_ad.max_amt&quot;) COLUMN(NAME=&quot;employee_ad.prop_yn&quot;) COLUMN(NAME=&quot;employee_ad.chg_date&quot;) COLUMN(NAME=&quot;employee_ad.chg_user&quot;) COLUMN(NAME=&quot;employee_ad.chg_term&quot;) COLUMN(NAME=&quot;allwdedn.descr&quot;) COLUMN(NAME=&quot;employee.pay_site&quot;) COLUMN(NAME=&quot;employee_ad.confirmed&quot;) COLUMN(NAME=&quot;employee_ad.conf_date&quot;) COLUMN(NAME=&quot;employee_ad.emp_code__aprv&quot;) COLUMN(NAME=&quot;employee.emp_fname&quot;) COLUMN(NAME=&quot;employee.emp_lname&quot;) COLUMN(NAME=&quot;employee_ad.tran_id&quot;) JOIN (LEFT=&quot;employee_ad.ad_code&quot; OP =&quot;=&quot;RIGHT=&quot;allwdedn.ad_code&quot; ) JOIN (LEFT=&quot;employee_ad.emp_code&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; )WHERE( EXP1 =&quot;employee_ad.emp_code&quot; OP =&quot;=&quot; EXP2 =&quot;:emp_code&quot; ) ) ARG(NAME = &quot;emp_code&quot; TYPE = string) </retrieve>
<update>employee_ad</update> <update>employee_ad</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
...@@ -792,6 +796,34 @@ ...@@ -792,6 +796,34 @@
<color>12632256</color> <color>12632256</color>
</background> </background>
</TextObject> </TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Tran Id</text>
<border>0</border>
<color>33554432</color>
<x>1761</x>
<y>1</y>
<height>16</height>
<width>118</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>tran_id_t</name>
<visible>1</visible>
<font>
<face>Liberation Sans</face>
<height>-11</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>2</id> <id>2</id>
...@@ -1561,6 +1593,42 @@ ...@@ -1561,6 +1593,42 @@
<color expression="if(ad_date &lt; eff_date or ad_date &gt; exp_date, rgb(255,128,64), rgb(255,255,255))">16777215</color> <color expression="if(ad_date &lt; eff_date or ad_date &gt; exp_date, rgb(255,128,64), rgb(255,255,255))">16777215</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>22</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<color>0</color>
<x>1761</x>
<y>1</y>
<height>15</height>
<width>118</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>tran_id</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>10</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>16777215</color>
</background>
</ColumnObject>
<HtmlTable> <HtmlTable>
<border>1</border> <border>1</border>
</HtmlTable> </HtmlTable>
......
webitm-adm/src/ibase/webitm/ejb/adm/EmployeeAdIC.java
View file @ faf632c6
...@@ -937,7 +937,7 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl ...@@ -937,7 +937,7 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
valueXmlString.append("<pay_site>").append("<![CDATA["+paySite+"]]>").append("</pay_site>"); valueXmlString.append("<pay_site>").append("<![CDATA["+paySite+"]]>").append("</pay_site>");
valueXmlString.append("<ref_type protect=\"0\" ><![CDATA[").append(refType).append("]]></ref_type>\r\n"); //valueXmlString.append("<ref_type protect=\"0\" ><![CDATA[").append(refType).append("]]></ref_type>\r\n");
valueXmlString.append("<ref_no protect=\"0\" ><![CDATA[").append(refNo).append("]]></ref_no>\r\n"); valueXmlString.append("<ref_no protect=\"0\" ><![CDATA[").append(refNo).append("]]></ref_no>\r\n");
ls_empad_aprv = admCommon.getEnv("999999", "EMP_AD_APRV", conn); ls_empad_aprv = admCommon.getEnv("999999", "EMP_AD_APRV", conn);
......
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