Skip to content

B
business-java
Commit 735477a2 authored by dpingle's avatar dpingle
Browse files
Options

* updated xml , sql and src file on [20/11/19] 

leave21.xml
d_leave_edit.srd
LeavesIC.java
w_leave_v1.sql


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@212473 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 515508b0
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 77 deletions
webitm-adm/module-resource/SQL/w_leave_v1.sql 0 → 100644
View file @ 735477a2
---------------------------------------------------Dipesh START [18/11/2019]
--------------------------------------------1. No images for actions
update OBJ_ACTIONS set image='ibase/resource/objaction/add.svg' , display_mode=0 where OBJ_NAME='leave' and LINE_NO=1;
update OBJ_ACTIONS set image='ibase/resource/objaction/edit.svg' , display_mode=0 where OBJ_NAME='leave' and LINE_NO=2;
update OBJ_ACTIONS set image='ibase/resource/objaction/Audit-trail.svg' where OBJ_NAME='leave' and LINE_NO=21;
update OBJ_ACTIONS set image='ibase/resource/objaction/exprtExl.svg' where OBJ_NAME='leave' and LINE_NO=22;
-------------------------------------------2. Improper Feed view
update obj_forms set disp_metadata=
'<html>
<span style="white-space: normal !important; word-break: break-word; "> {descr} (<b>{lve_code}</b>) <br/>
Max.Allowed <b>{max_allowed}</b> , Min.Allowed <b>{min_allowed} , Leave unit <b>{lve_unit}</b> </b>
</span>
</html>' where win_name='w_leave';
-------------------------------------------3. Audit trail is not working
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='ald_slab' and LINE_NO=21;
-------------------------------------------4. Export to excel is not working
update OBJ_ACTIONS set image='ibase/resource/objaction/exprtExl.svg', description='Export To Excel', service_code='a', interactive='a', rights_char='B', title='Export2XLS', action_type='S',display_mode=1 where OBJ_NAME='ald_slab' and LINE_NO=22;
-------------------------5.Improper error message if the Leave code field is kept empty,'INVLVEDATA' message not defined
update MESSAGES set MSG_STR='Empty Leave code!!',MSG_DESCR='The leave code cannot be Blank' where MSG_NO='INVLVEDATA';
-------------------------6. If i make duplicate entry it should give proper error message
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 ('INLVEDATA1','Leave code Already existing','Leave code Already existing in the master.Please first define new Leave Code.','E','Y',null,null,null,to_date('24-03-06','DD-MM-RR'),'BASE ','01BASE215 ',null,null);
-------------------------7. Improper error message if Convert to field is kept empty,'VMLVECD4' message not defined
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 ('VMLVECD1 ','Leave Not Found...','Leave code cannot be empty. Please first define it.','E','Y',null,null,null,to_date('22-10-00','DD-MM-RR'),'SUN ','HDP ',null,null);
-------------------------8. Icon Missing
update OBJ_FORMS set THUMB_ALT_COL = 'lve_code', THUMB_IMAGE_COL= 'lve_code', THUMB_OBJ = 'popicon_empleave' where WIN_NAME = 'w_leave';
update TRANSETUP set THUMB_ALT_COL = 'lve_code', THUMB_IMAGE_COL= 'lve_code', THUMB_OBJ = 'popicon_empleave' where TRAN_WINDOW = 'w_leave';
update itm2menu set ICON_PATH='leave.png' , CLOSE_ICON='leavewht.png' where WIN_NAME='w_leave';
---------------------------------------------------Dipesh End [18/11/2019]
webitm-adm/module-resource/metadata/leave21.xml
View file @ 735477a2
...@@ -1270,7 +1270,7 @@ ...@@ -1270,7 +1270,7 @@
<color>33554432</color> <color>33554432</color>
<x>7</x> <x>7</x>
<y>268</y> <y>268</y>
<height>100</height> <height>63</height>
<width>548</width> <width>548</width>
<name>gb_2</name> <name>gb_2</name>
<visible>1</visible> <visible>1</visible>
...@@ -1576,20 +1576,20 @@ ...@@ -1576,20 +1576,20 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>22</id> <id>21</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>210</tabsequence> <tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>113</x> <x>108</x>
<y>317</y> <y>294</y>
<height>16</height> <height>16</height>
<width>55</width> <width>55</width>
<format>[general]</format> <format>[shortdate] [time]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_user</name> <name>chg_date</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>0</limit>
...@@ -1610,29 +1610,21 @@ ...@@ -1610,29 +1610,21 @@
<color>16777215</color> <color>16777215</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<id>23</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>220</tabsequence> <text>Change Date :</text>
<border>0</border> <border>0</border>
<color>0</color> <color>33554432</color>
<x>114</x> <x>30</x>
<y>338</y> <y>294</y>
<height>16</height> <height>16</height>
<width>55</width> <width>75</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_term</name> <name>chg_date_t</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>
...@@ -1642,33 +1634,25 @@ ...@@ -1642,33 +1634,25 @@
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>2</mode> <mode>1</mode>
<color>16777215</color> <color>553648127</color>
</background> </background>
</ColumnObject> </TextObject>
<ColumnObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<id>21</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>200</tabsequence> <text>Change User :</text>
<border>0</border> <border>0</border>
<color>0</color> <color>33554432</color>
<x>112</x> <x>186</x>
<y>294</y> <y>294</y>
<height>16</height> <height>16</height>
<width>55</width> <width>75</width>
<format>[shortdate] [time]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_date</name> <name>chg_user_t</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>
...@@ -1678,25 +1662,33 @@ ...@@ -1678,25 +1662,33 @@
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>2</mode> <mode>1</mode>
<color>16777215</color> <color>553648127</color>
</background> </background>
</ColumnObject> </TextObject>
<TextObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>22</id>
<alignment>0</alignment> <alignment>0</alignment>
<text>Change Date :</text> <tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>0</color>
<x>30</x> <x>264</x>
<y>294</y> <y>294</y>
<height>16</height> <height>16</height>
<width>75</width> <width>55</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_date_t</name> <name>chg_user</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>
...@@ -1706,24 +1698,24 @@ ...@@ -1706,24 +1698,24 @@
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>1</mode> <mode>2</mode>
<color>553648127</color> <color>16777215</color>
</background> </background>
</TextObject> </ColumnObject>
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>0</alignment> <alignment>0</alignment>
<text>Change User :</text> <text>Change Term :</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>30</x> <x>364</x>
<y>317</y> <y>294</y>
<height>16</height> <height>16</height>
<width>75</width> <width>77</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_user_t</name> <name>chg_term_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -1738,21 +1730,29 @@ ...@@ -1738,21 +1730,29 @@
<color>553648127</color> <color>553648127</color>
</background> </background>
</TextObject> </TextObject>
<TextObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>23</id>
<alignment>0</alignment> <alignment>0</alignment>
<text>Change Term :</text> <tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>0</color>
<x>28</x> <x>444</x>
<y>338</y> <y>294</y>
<height>16</height> <height>16</height>
<width>77</width> <width>55</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_term_t</name> <name>chg_term</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>
...@@ -1762,10 +1762,10 @@ ...@@ -1762,10 +1762,10 @@
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>1</mode> <mode>2</mode>
<color>553648127</color> <color>16777215</color>
</background> </background>
</TextObject> </ColumnObject>
<HtmlTable> <HtmlTable>
<border>1</border> <border>1</border>
</HtmlTable> </HtmlTable>
......
webitm-adm/module-resource/srd/d_leave_edit.srd
View file @ 735477a2
...@@ -59,7 +59,7 @@ column(band=detail id=17 alignment="0" tabsequence=20 border="5" color="0" x="38 ...@@ -59,7 +59,7 @@ column(band=detail id=17 alignment="0" tabsequence=20 border="5" color="0" x="38
text(band=detail alignment="1" text="Description :" border="0" color="0" x="293" y="32" height="16" width="89" html.valueishtml="0" name=descr_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="79741120" ) text(band=detail alignment="1" text="Description :" border="0" color="0" x="293" y="32" height="16" width="89" html.valueishtml="0" name=descr_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="79741120" )
column(band=detail id=2 alignment="0" tabsequence=32766 border="5" color="255" x="256" y="127" height="16" width="270" format="[general]" html.valueishtml="0" name=allwdedn_descr 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=2 alignment="0" tabsequence=32766 border="5" color="255" x="256" y="127" height="16" width="270" format="[general]" html.valueishtml="0" name=allwdedn_descr 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" )
text(band=detail alignment="1" text="Accumulate :" border="0" color="0" x="68" y="175" height="16" width="107" html.valueishtml="0" name=accumulate_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="79741120" ) text(band=detail alignment="1" text="Accumulate :" border="0" color="0" x="68" y="175" height="16" width="107" html.valueishtml="0" name=accumulate_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="79741120" )
groupbox(band=detail text="Others"border="2" color="33554432" x="7" y="268" height="100" width="548" name=gb_2 visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" ) groupbox(band=detail text="Others"border="2" color="33554432" x="7" y="268" height="63" width="548" name=gb_2 visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
groupbox(band=detail text="Basic"border="2" color="0" x="8" y="5" height="254" width="544" name=gb_1 visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" ) groupbox(band=detail text="Basic"border="2" color="0" x="8" y="5" height="254" width="544" name=gb_1 visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
text(band=detail alignment="1" text="Min Allowed :" border="0" color="0" x="68" y="200" height="16" width="107" html.valueishtml="0" name=min_allowed_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="79741120" ) text(band=detail alignment="1" text="Min Allowed :" border="0" color="0" x="68" y="200" height="16" width="107" html.valueishtml="0" name=min_allowed_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="79741120" )
text(band=detail alignment="1" text="Allow Advance Leave :" border="0" color="0" x="22" y="224" height="16" width="153" html.valueishtml="0" name=allow_adv_leave_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="79741120" ) text(band=detail alignment="1" text="Allow Advance Leave :" border="0" color="0" x="22" y="224" height="16" width="153" html.valueishtml="0" name=allow_adv_leave_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="79741120" )
...@@ -69,12 +69,12 @@ column(band=detail id=16 alignment="1" tabsequence=170 border="5" color="0" x="3 ...@@ -69,12 +69,12 @@ column(band=detail id=16 alignment="1" tabsequence=170 border="5" color="0" x="3
text(band=detail alignment="1" text="Max Times :" border="0" color="0" x="406" y="200" height="16" width="81" html.valueishtml="0" name=max_times_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="79741120" ) text(band=detail alignment="1" text="Max Times :" border="0" color="0" x="406" y="200" height="16" width="81" html.valueishtml="0" name=max_times_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="79741120" )
column(band=detail id=10 alignment="1" tabsequence=180 border="5" color="0" x="492" y="200" height="16" width="34" format="#0" html.valueishtml="0" name=max_times visible="1" edit.limit=2 edit.case=any edit.format="#0" edit.focusrectangle=no 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=10 alignment="1" tabsequence=180 border="5" color="0" x="492" y="200" height="16" width="34" format="#0" html.valueishtml="0" name=max_times visible="1" edit.limit=2 edit.case=any edit.format="#0" edit.focusrectangle=no 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=15 alignment="1" tabsequence=160 border="5" color="0" x="180" y="200" height="16" width="53" format="#0.0" html.valueishtml="0" name=min_allowed visible="1" edit.limit=5 edit.case=any edit.format="##0.0" edit.focusrectangle=no 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=15 alignment="1" tabsequence=160 border="5" color="0" x="180" y="200" height="16" width="53" format="#0.0" html.valueishtml="0" name=min_allowed visible="1" edit.limit=5 edit.case=any edit.format="##0.0" edit.focusrectangle=no 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=22 alignment="0" tabsequence=210 border="0" color="0" x="113" y="317" height="16" width="55" format="[general]" html.valueishtml="0" name=chg_user 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=21 alignment="0" tabsequence=32766 border="0" color="0" x="108" y="294" height="16" width="55" format="[shortdate] [time]" html.valueishtml="0" name=chg_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" )
column(band=detail id=23 alignment="0" tabsequence=220 border="0" color="0" x="114" y="338" height="16" width="55" format="[general]" html.valueishtml="0" name=chg_term 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=21 alignment="0" tabsequence=200 border="0" color="0" x="112" y="294" height="16" width="55" format="[shortdate] [time]" html.valueishtml="0" name=chg_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="0" text="Change Date :" border="0" color="33554432" x="30" y="294" height="16" width="75" 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="1" background.color="553648127" ) text(band=detail alignment="0" text="Change Date :" border="0" color="33554432" x="30" y="294" height="16" width="75" 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="1" background.color="553648127" )
text(band=detail alignment="0" text="Change User :" border="0" color="33554432" x="30" y="317" height="16" width="75" html.valueishtml="0" name=chg_user_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="1" background.color="553648127" ) text(band=detail alignment="0" text="Change User :" border="0" color="33554432" x="186" y="294" height="16" width="75" html.valueishtml="0" name=chg_user_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="1" background.color="553648127" )
text(band=detail alignment="0" text="Change Term :" border="0" color="33554432" x="28" y="338" height="16" width="77" html.valueishtml="0" name=chg_term_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="1" background.color="553648127" ) column(band=detail id=22 alignment="0" tabsequence=32766 border="0" color="0" x="264" y="294" height="16" width="55" format="[general]" html.valueishtml="0" name=chg_user 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="0" text="Change Term :" border="0" color="33554432" x="364" y="294" height="16" width="77" html.valueishtml="0" name=chg_term_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="1" background.color="553648127" )
column(band=detail id=23 alignment="0" tabsequence=32766 border="0" color="0" x="444" y="294" height="16" width="55" format="[general]" html.valueishtml="0" name=chg_term 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" ) htmltable(border="1" )
htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" ) 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 ) export.xml(headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0 )
......
webitm-adm/src/ibase/webitm/ejb/adm/LeavesIC.java
View file @ 735477a2
...@@ -481,9 +481,10 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal ...@@ -481,9 +481,10 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
if (childNodeName.equalsIgnoreCase("lve_code")) if (childNodeName.equalsIgnoreCase("lve_code"))
{ {
lveCode = checkNull(genericUtility.getColumnValue("lve_code", dom)); lveCode = checkNull(genericUtility.getColumnValue("lve_code", dom));
System.out.println("lveCode::::"+lveCode);
if (lveCode == null || lveCode.trim().length() == 0) if (lveCode == null || lveCode.trim().length() == 0)
{ {
errList.add("INVLVEDATA");//The leave cannot Blank or Already Existed in Leaves Table errList.add("INVLVEDATA");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
else else
...@@ -510,7 +511,7 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal ...@@ -510,7 +511,7 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
} }
if (cnt > 0 && !"E".equalsIgnoreCase(editFlag)) if (cnt > 0 && !"E".equalsIgnoreCase(editFlag))
{ {
errList.add("INVLVEDATA");//The leave cannot Blank or Already Existed in Leaves Table errList.add("INLVEDATA1");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
...@@ -524,11 +525,12 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal ...@@ -524,11 +525,12 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
lveCodeConvert = checkNull(genericUtility.getColumnValue("lve_code__convert", dom)); lveCodeConvert = checkNull(genericUtility.getColumnValue("lve_code__convert", dom));
if (lveCodeConvert == null || lveCodeConvert.trim().length() == 0) if (lveCodeConvert == null || lveCodeConvert.trim().length() == 0)
{ {
errList.add("VMLVECD4"); errList.add("VMLVECD1");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
if (encashable.trim().equalsIgnoreCase("Y")) { if (encashable.trim().equalsIgnoreCase("Y"))
{
adCodeEnch = checkNull(genericUtility.getColumnValue("ad_code__ench", dom)); adCodeEnch = checkNull(genericUtility.getColumnValue("ad_code__ench", dom));
if (adCodeEnch == null || adCodeEnch.trim().length() == 0) { if (adCodeEnch == null || adCodeEnch.trim().length() == 0) {
errList.add("VEADN1"); errList.add("VEADN1");
...@@ -631,7 +633,7 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal ...@@ -631,7 +633,7 @@ public class LeavesIC extends ValidatorEJB implements LeavesRemote, LeavesLocal
} }
} }
else { else {
errList.add("VMLVECD4"); errList.add("VMLVECD1");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
......
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