Skip to content

B
business-java
Commit 67e69a30 authored by sghate's avatar sghate
Browse files
Options

Updated component PayarrToProc 

payarr_to_proc11.xml
payarr_to_proc21.xml
w_payarr_to_proc.sql
w_payarr_to_proc_v1.sql


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@212876 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 379fd656
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 226 additions and 196 deletions
webitm-adm/module-resource/SQL/w_payarr_to_proc.sql
View file @ 67e69a30
...@@ -110,13 +110,12 @@ Site Code :<b> {descr} ({site})</b> , Period Code : <b> {prd_code} </b> ...@@ -110,13 +110,12 @@ Site Code :<b> {descr} ({site})</b> , Period Code : <b> {prd_code} </b>
</html>' where win_name='w_payarr_to_proc'; </html>' where win_name='w_payarr_to_proc';
update obj_actions set DISPLAY_MODE=0 where OBJ_NAME='payarr_to_proc' and TITLE in ('Add','Edit');--View on HOMESCREEN,ADD,EDIT,VIEW MODE update obj_actions set DISPLAY_MODE=0 where OBJ_NAME='payarr_to_proc' and TITLE in ('Add','Edit');--View on HOMESCREEN,ADD,EDIT,VIEW MODE
update obj_actions set DISPLAY_MODE=1 where OBJ_NAME='payarr_to_proc' and TITLE in ('Export2XLS','Audit Trail');----View on HOMESCREEN Only.
update obj_actions set image='ibase/resource/objaction/exprtExl.svg',SERVICE_CODE='a',INTERACTIVE='a', RIGHTS_CHAR='B',DISPLAY_MODE='1' ,TITLE='Export2XLS' where OBJ_NAME='payarr_to_proc' and TITLE='Export';
update obj_actions set IMAGE='ibase/resource/objaction/Audit-trail.svg',RIGHTS_CHAR='X',TITLE='Audit Trail',SHOW_IN_PANEL='1',DISPLAY_MODE='1' where OBJ_NAME='payarr_to_proc' and TITLE='View Audit';
--------------------------------------------Added by Shital on 25/10/2019 End-------------
update obj_actions set image='ibase/resource/objaction/exprtExl.svg',SERVICE_CODE='a',INTERACTIVE='a', RIGHTS_CHAR='B',DISPLAY_MODE='1' where OBJ_NAME='payarr_to_proc' and (DESCRIPTION = 'Export Excel' OR DESCRIPTION = 'Export To Excel');----View on HOMESCREEN Only.
update obj_actions set IMAGE='ibase/resource/objaction/Audit-trail.svg',RIGHTS_CHAR='X',TITLE='Audit Trail',SHOW_IN_PANEL='1',DISPLAY_MODE='1' where OBJ_NAME='payarr_to_proc' and DESCRIPTION = 'View Audit Trail';----View on HOMESCREEN Only.
update obj_itemchange set MANDATORY='Y' where OBJ_NAME='payarr_to_proc';
--------------------------------------------Added by Shital on 25/10/2019 End-------------
......
webitm-adm/module-resource/SQL/w_payarr_to_proc_v1.sql 0 → 100644
View file @ 67e69a30
------------------------------------------------------------------Shital [28/11/2019] ---------------------------------Start
---1. If the employee code has chosen from the pop help, the description(EMP_name) of that employee code is displaying instead of employee code. The description(EMP_name) should display in the second line
update POPHELP SET SQL_STR='SELECT EMP_CODE, EMP_FNAME, EMP_MNAME, EMP_LNAME FROM EMPLOYEE' ,THUMB_IMAGE_COL='EMP_CODE',THUMB_ALT_COL='EMP_FNAME',THUMB_OBJ='EmpImages' WHERE FIELD_NAME='EMP_CODE' AND MOD_NAME='W_PAYARR_TO_PROC';
UPDATE POPHELP SET AUTO_FILL_LEN=3,AUTO_MIN_LENGTH='2' WHERE FIELD_NAME='EMP_CODE' AND MOD_NAME='W_PAYARR_TO_PROC';
update TRANSETUP set THUMB_ALT_COL = 'emp_fname', THUMB_IMAGE_COL= 'emp_code', THUMB_OBJ = 'EmpImages' where TRAN_WINDOW = 'w_payarr_to_proc';
update OBJ_FORMS set THUMB_ALT_COL = 'emp_fname', THUMB_IMAGE_COL= 'emp_code', THUMB_OBJ = 'EmpImages' where WIN_NAME = 'w_payarr_to_proc';
update obj_itemchange set MANDATORY='Y' where OBJ_NAME='payarr_to_proc';
---2.Audit trail, Export to Excel and Delete Actions options are missing in the View mode
update obj_actions set DISPLAY_MODE=2 where OBJ_NAME='payarr_to_proc' and TITLE='Add';--View on HOMESCREEN,VIEW MODE
update obj_actions set DISPLAY_MODE=2 where OBJ_NAME='payarr_to_proc' and TITLE='Edit';--View on HOMESCREEN,VIEW MODE
update obj_actions set DISPLAY_MODE=2 where OBJ_NAME='payarr_to_proc' and (DESCRIPTION = 'Export Excel' OR DESCRIPTION = 'Export To Excel');--View on HOMESCREEN,VIEW MODE
update obj_actions set DISPLAY_MODE=2 where OBJ_NAME='payarr_to_proc' and DESCRIPTION = 'View Audit Trail';--View on HOMESCREEN,VIEW MODE
---3. Menu image is not displaying
update itm2menu set ICON_PATH='ArrearsToProcessed.png',CLOSE_ICON='ArrearsToProcessedwht.png' where APPLICATION='ADP' and WIN_NAME='w_payarr_to_proc';
---4. Content not configured
update obj_forms set disp_metadata=
'<html>
<span style="white-space: normal !important; word-break: break-word; "><b>{name} ({emp_code}) </b> <br/>
Site Code :<b> {descr} ({site})</b> , Period Code : <b> {prd_code} </b>
</span>
</html>' where win_name='w_payarr_to_proc';
------------------------------------------------------------------Shital [28/11/2019] ---------------------------------End
webitm-adm/module-resource/metadata/payarr_to_proc21.xml
View file @ 67e69a30
...@@ -69,17 +69,6 @@ ...@@ -69,17 +69,6 @@
<name>prd_code</name> <name>prd_code</name>
<dbname>payarr_to_proc.prd_code</dbname> <dbname>payarr_to_proc.prd_code</dbname>
</table_column> </table_column>
<table_column>
<type size="1">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>status</name>
<dbname>payarr_to_proc.status</dbname>
<values>
<item display="Unprocessed" data="U"/>
<item display="Processed" data="P"/>
</values>
</table_column>
<table_column> <table_column>
<type size="6">char</type> <type size="6">char</type>
<update>yes</update> <update>yes</update>
...@@ -109,7 +98,7 @@ ...@@ -109,7 +98,7 @@
<dbname>payarr_to_proc.chg_user</dbname> <dbname>payarr_to_proc.chg_user</dbname>
</table_column> </table_column>
<table_column> <table_column>
<type size="15">char</type> <type size="300">char</type>
<update>yes</update> <update>yes</update>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>chg_term</name> <name>chg_term</name>
...@@ -146,7 +135,19 @@ ...@@ -146,7 +135,19 @@
<name>psuedo_status</name> <name>psuedo_status</name>
<dbname>psuedo_status</dbname> <dbname>psuedo_status</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;payarr_to_proc&quot; ) TABLE(NAME=&quot;site&quot; ) COLUMN(NAME=&quot;payarr_to_proc.emp_code&quot;) COMPUTE(NAME=&quot;TRIM(EMPLOYEE.PAY_SITE) AS SITE&quot;) COMPUTE(NAME=&quot;TRIM(SITE.DESCR) AS DESCR&quot;) COLUMN(NAME=&quot;payarr_to_proc.prd_code&quot;) COLUMN(NAME=&quot;payarr_to_proc.status&quot;) COLUMN(NAME=&quot;payarr_to_proc.prd_code__acc&quot;) COLUMN(NAME=&quot;payarr_to_proc.proc_date&quot;) COLUMN(NAME=&quot;payarr_to_proc.chg_date&quot;) COLUMN(NAME=&quot;payarr_to_proc.chg_user&quot;) COLUMN(NAME=&quot;payarr_to_proc.chg_term&quot;) COLUMN(NAME=&quot;payarr_to_proc.proc_type&quot;) COLUMN(NAME=&quot;payarr_to_proc.tran_id&quot;) COMPUTE(NAME=&quot;TRIM(EMPLOYEE.EMP_FNAME) || &apos; &apos; || TRIM(EMPLOYEE.EMP_MNAME) || &apos; &apos; || TRIM(EMPLOYEE.EMP_LNAME) AS NAME&quot;) COMPUTE(NAME=&quot;CASE PAYARR_TO_PROC.status WHEN &apos;P&apos; THEN &apos;Processed&apos; ELSE &apos;Unprocessed&apos; END AS psuedo_status&quot;) JOIN (LEFT=&quot;employee.emp_code&quot; OP =&quot;=&quot;RIGHT=&quot;payarr_to_proc.emp_code&quot; ) JOIN (LEFT=&quot;employee.pay_site&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; )WHERE( EXP1 =&quot;~&quot;PAYARR_TO_PROC~&quot;.~&quot;TRAN_ID~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:tran_id&quot; ) ) ARG(NAME = &quot;tran_id&quot; TYPE = string) </retrieve> <table_column>
<type size="1">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>status</name>
<dbname>payarr_to_proc.status</dbname>
<initial>U</initial>
<values>
<item display="Unprocessed" data="U"/>
<item display="Processed" data="P"/>
</values>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;payarr_to_proc&quot; ) TABLE(NAME=&quot;site&quot; ) COLUMN(NAME=&quot;payarr_to_proc.emp_code&quot;) COMPUTE(NAME=&quot;TRIM(EMPLOYEE.PAY_SITE) AS SITE&quot;) COMPUTE(NAME=&quot;TRIM(SITE.DESCR) AS DESCR&quot;) COLUMN(NAME=&quot;payarr_to_proc.prd_code&quot;) COLUMN(NAME=&quot;payarr_to_proc.prd_code__acc&quot;) COLUMN(NAME=&quot;payarr_to_proc.proc_date&quot;) COLUMN(NAME=&quot;payarr_to_proc.chg_date&quot;) COLUMN(NAME=&quot;payarr_to_proc.chg_user&quot;) COLUMN(NAME=&quot;payarr_to_proc.chg_term&quot;) COLUMN(NAME=&quot;payarr_to_proc.proc_type&quot;) COLUMN(NAME=&quot;payarr_to_proc.tran_id&quot;) COMPUTE(NAME=&quot;TRIM(EMPLOYEE.EMP_FNAME) || &apos; &apos; || TRIM(EMPLOYEE.EMP_MNAME) || &apos; &apos; || TRIM(EMPLOYEE.EMP_LNAME) AS NAME&quot;) COMPUTE(NAME=&quot;CASE PAYARR_TO_PROC.status WHEN &apos;P&apos; THEN &apos;Processed&apos; ELSE &apos;Unprocessed&apos; END AS psuedo_status&quot;) COLUMN(NAME=&quot;payarr_to_proc.status&quot;) JOIN (LEFT=&quot;employee.emp_code&quot; OP =&quot;=&quot;RIGHT=&quot;payarr_to_proc.emp_code&quot; ) JOIN (LEFT=&quot;employee.pay_site&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; )WHERE( EXP1 =&quot;~&quot;PAYARR_TO_PROC~&quot;.~&quot;TRAN_ID~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:tran_id&quot; ) ) ARG(NAME = &quot;tran_id&quot; TYPE = string) </retrieve>
<update>PAYARR_TO_PROC</update> <update>PAYARR_TO_PROC</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
...@@ -207,7 +208,7 @@ ...@@ -207,7 +208,7 @@
<band>Detail</band> <band>Detail</band>
<id>1</id> <id>1</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>10</tabsequence>
<border>5</border> <border>5</border>
<color>255</color> <color>255</color>
<x>140</x> <x>140</x>
...@@ -283,7 +284,7 @@ ...@@ -283,7 +284,7 @@
<band>Detail</band> <band>Detail</band>
<id>4</id> <id>4</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>20</tabsequence>
<border>5</border> <border>5</border>
<color>255</color> <color>255</color>
<x>140</x> <x>140</x>
...@@ -318,7 +319,7 @@ ...@@ -318,7 +319,7 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>7</id> <id>6</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
...@@ -353,7 +354,7 @@ ...@@ -353,7 +354,7 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>6</id> <id>5</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
...@@ -419,7 +420,7 @@ ...@@ -419,7 +420,7 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>13</id> <id>12</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
...@@ -494,7 +495,7 @@ ...@@ -494,7 +495,7 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>12</id> <id>11</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
...@@ -616,9 +617,9 @@ ...@@ -616,9 +617,9 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>11</id> <id>10</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>30</tabsequence>
<border>5</border> <border>5</border>
<color>255</color> <color>255</color>
<x>481</x> <x>481</x>
...@@ -651,43 +652,6 @@ ...@@ -651,43 +652,6 @@
<color>536870912</color> <color>536870912</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>5</id>
<alignment>0</alignment>
<tabsequence>10</tabsequence>
<border>5</border>
<color>33554432</color>
<x>481</x>
<y>62</y>
<height>16</height>
<width>87</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>status</name>
<visible>1</visible>
<EditStyle style="ddlb">
<limit>0</limit>
<allowedit>no</allowedit>
<case>any</case>
<useasborder>yes</useasborder>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>536870912</color>
</background>
</ColumnObject>
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
...@@ -718,7 +682,7 @@ ...@@ -718,7 +682,7 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>10</id> <id>9</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
...@@ -757,7 +721,7 @@ ...@@ -757,7 +721,7 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Change On:</text> <text>Changed On:</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>40</x> <x>40</x>
...@@ -784,7 +748,7 @@ ...@@ -784,7 +748,7 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>8</id> <id>7</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
...@@ -823,7 +787,7 @@ ...@@ -823,7 +787,7 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Change By :</text> <text>Changed By :</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>210</x> <x>210</x>
...@@ -850,7 +814,7 @@ ...@@ -850,7 +814,7 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>9</id> <id>8</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
...@@ -998,6 +962,43 @@ ...@@ -998,6 +962,43 @@
<color>536870912</color> <color>536870912</color>
</background> </background>
</TextObject> </TextObject>
<ColumnObject>
<band>Detail</band>
<id>14</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>255</color>
<x>481</x>
<y>61</y>
<height>16</height>
<width>86</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>status</name>
<visible>1</visible>
<EditStyle style="ddlb">
<limit>1</limit>
<allowedit>no</allowedit>
<case>any</case>
<useasborder>yes</useasborder>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>536870912</color>
</background>
</ColumnObject>
<HtmlTable> <HtmlTable>
<border>1</border> <border>1</border>
</HtmlTable> </HtmlTable>
......
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