Skip to content

B
business-java
Commit 307b9366 authored by dpingle's avatar dpingle
Browse files
Options

* Changes done in leave table on [09/09/19] 

lvetable11.xml
lvetable21.xml
w_lvetable.sql
d_lvetable_brow.srd
d_lvetable_edit.srd
LeaveTableIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@207022 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9912f167
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 186 deletions
webitm-adm/module-resource/SQL/w_lvetable.sql
View file @ 307b9366
......@@ -171,4 +171,14 @@ values ('lvetable',39,'ibase/resource/objaction/exprtExl.svg','Export To Excel',
---------------------------------------------------Dipesh [04/09/2019]End
----------------------------------------------------- Dipesh [09/09/2019] Start
update obj_forms set disp_metadata=
'<html>
<span style="white-space: normal !important; word-break: break-word; "> Leave Table No : {lve_tblno} (<b>{lve_code}</b>), Encashable : (<b>{encashable}</b>) <br/>
Max.Allowed :(<b> {max_allowed}</b>) ,Min.Allowed :(<b>{min_allowed}</b>)
</span>
<br/> <span style="float:right;"></span>
</html>' where win_name='w_lvetable';
----------------------------------------------------- Dipesh [09/09/2019] Start
webitm-adm/module-resource/metadata/lvetable11.xml
View file @ 307b9366
......@@ -618,6 +618,62 @@
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Min Allowed :</text>
<border>0</border>
<color>0</color>
<x>1288</x>
<y>1</y>
<height>16</height>
<width>213</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>min_allowed_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>553648127</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Max Allowed :</text>
<border>0</border>
<color>0</color>
<x>1503</x>
<y>1</y>
<height>16</height>
<width>213</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>max_allowed_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>553648127</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>1</id>
......@@ -636,7 +692,7 @@
<name>lve_tblno</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>5</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
......@@ -673,7 +729,7 @@
<name>leaves_descr</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>20</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
......@@ -709,7 +765,7 @@
<name>max_days</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>6</limit>
<case>any</case>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
......@@ -746,7 +802,7 @@
<name>encashable</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>1</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
......@@ -782,7 +838,7 @@
<name>avail</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>1</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
......@@ -818,7 +874,7 @@
<name>avail_lt</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>2</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
......@@ -890,7 +946,7 @@
<name>chg_user</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>10</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
......@@ -964,7 +1020,7 @@
<name>can_combine</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>1</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
......@@ -1073,7 +1129,7 @@
<name>chg_term</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>300</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
......@@ -1170,15 +1226,22 @@
<tabsequence>130</tabsequence>
<border>0</border>
<color>0</color>
<x>1289</x>
<x>1288</x>
<y>1</y>
<height>16</height>
<width>213</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>min_allowed</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>6</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
......@@ -1192,34 +1255,6 @@
<color>1090519039</color>
</background>
</ColumnObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Min Allowed :</text>
<border>0</border>
<color>0</color>
<x>1288</x>
<y>1</y>
<height>16</height>
<width>214</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>min_allowed_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>553648127</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>19</id>
......@@ -1227,15 +1262,22 @@
<tabsequence>140</tabsequence>
<border>0</border>
<color>0</color>
<x>1505</x>
<x>1503</x>
<y>1</y>
<height>16</height>
<width>213</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>max_allowed</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>6</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
......@@ -1249,34 +1291,6 @@
<color>1090519039</color>
</background>
</ColumnObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Max Allowed :</text>
<border>0</border>
<color>0</color>
<x>1504</x>
<y>1</y>
<height>16</height>
<width>214</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>max_allowed_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>553648127</color>
</background>
</TextObject>
<HtmlTable>
<border>1</border>
</HtmlTable>
......
webitm-adm/module-resource/metadata/lvetable21.xml
View file @ 307b9366
......@@ -597,7 +597,7 @@
<name>earn_new</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>1</limit>
<case>any</case>
<format></format>
<focusrectangle>no</focusrectangle>
......@@ -663,7 +663,7 @@
<name>abs_mth</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>1</limit>
<case>any</case>
<format></format>
<focusrectangle>no</focusrectangle>
......@@ -760,7 +760,7 @@
<y>191</y>
<height>17</height>
<width>59</width>
<format>[general]</format>
<format>[Yes/No]</format>
<html>
<valueishtml>0</valueishtml>
</html>
......@@ -769,7 +769,6 @@
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<format>(Yes/No)</format>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
<imemode>0</imemode>
......@@ -885,7 +884,7 @@
<band>Detail</band>
<id>18</id>
<alignment>1</alignment>
<tabsequence>180</tabsequence>
<tabsequence>170</tabsequence>
<border>5</border>
<color>0</color>
<x>143</x>
......@@ -979,7 +978,7 @@
<band>Detail</band>
<id>19</id>
<alignment>1</alignment>
<tabsequence>190</tabsequence>
<tabsequence>180</tabsequence>
<border>5</border>
<color>0</color>
<x>144</x>
......@@ -1045,7 +1044,7 @@
<band>Detail</band>
<id>20</id>
<alignment>1</alignment>
<tabsequence>200</tabsequence>
<tabsequence>190</tabsequence>
<border>5</border>
<color>0</color>
<x>145</x>
......@@ -1059,7 +1058,7 @@
<name>enc_for_ffs</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>1</limit>
<case>any</case>
<format></format>
<focusrectangle>no</focusrectangle>
......@@ -1111,7 +1110,7 @@
<band>Detail</band>
<id>21</id>
<alignment>1</alignment>
<tabsequence>210</tabsequence>
<tabsequence>200</tabsequence>
<border>5</border>
<color>0</color>
<x>496</x>
......@@ -1125,7 +1124,7 @@
<name>can_combine</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>1</limit>
<case>any</case>
<format></format>
<focusrectangle>no</focusrectangle>
......@@ -1149,7 +1148,7 @@
<band>Detail</band>
<id>23</id>
<alignment>1</alignment>
<tabsequence>230</tabsequence>
<tabsequence>220</tabsequence>
<border>5</border>
<color>0</color>
<x>474</x>
......@@ -1163,7 +1162,7 @@
<name>holidaylverule</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>1</limit>
<case>any</case>
<format></format>
<focusrectangle>no</focusrectangle>
......@@ -1215,7 +1214,7 @@
<band>Detail</band>
<id>22</id>
<alignment>1</alignment>
<tabsequence>220</tabsequence>
<tabsequence>210</tabsequence>
<border>5</border>
<color>0</color>
<x>145</x>
......@@ -1229,7 +1228,7 @@
<name>wofflverule</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>1</limit>
<case>any</case>
<format></format>
<focusrectangle>no</focusrectangle>
......@@ -1373,7 +1372,7 @@
<band>Detail</band>
<id>27</id>
<alignment>1</alignment>
<tabsequence>240</tabsequence>
<tabsequence>230</tabsequence>
<border>5</border>
<color>0</color>
<x>496</x>
......@@ -1387,7 +1386,7 @@
<name>allow_adv_leave</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>1</limit>
<case>any</case>
<format></format>
<focusrectangle>no</focusrectangle>
......@@ -1556,7 +1555,7 @@
<name>max_days</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>5</limit>
<limit>6</limit>
<case>any</case>
<format>#0.0</format>
<focusrectangle>no</focusrectangle>
......@@ -1789,7 +1788,7 @@
<name>no_days</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>5</limit>
<limit>6</limit>
<case>any</case>
<format>#0.0</format>
<focusrectangle>no</focusrectangle>
......@@ -2193,7 +2192,7 @@
<band>Detail</band>
<id>28</id>
<alignment>1</alignment>
<tabsequence>250</tabsequence>
<tabsequence>240</tabsequence>
<border>5</border>
<color>0</color>
<x>282</x>
......@@ -2207,7 +2206,7 @@
<name>max_allowed</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>6</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
......@@ -2229,7 +2228,7 @@
<band>Detail</band>
<id>29</id>
<alignment>1</alignment>
<tabsequence>260</tabsequence>
<tabsequence>250</tabsequence>
<border>5</border>
<color>0</color>
<x>137</x>
......@@ -2243,7 +2242,7 @@
<name>min_allowed</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>6</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
......@@ -2265,7 +2264,7 @@
<band>Detail</band>
<id>30</id>
<alignment>1</alignment>
<tabsequence>280</tabsequence>
<tabsequence>260</tabsequence>
<border>5</border>
<color>0</color>
<x>146</x>
......@@ -2279,7 +2278,7 @@
<name>min_balance</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>4</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
......@@ -2329,7 +2328,7 @@
<band>Detail</band>
<id>32</id>
<alignment>1</alignment>
<tabsequence>290</tabsequence>
<tabsequence>270</tabsequence>
<border>5</border>
<color>0</color>
<x>541</x>
......@@ -2343,7 +2342,7 @@
<name>max_allowed_unit</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<limit>1</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
......@@ -2393,13 +2392,13 @@
<band>Detail</band>
<id>33</id>
<alignment>0</alignment>
<tabsequence>300</tabsequence>
<tabsequence>32766</tabsequence>
<border>0</border>
<color>255</color>
<x>121</x>
<x>113</x>
<y>396</y>
<height>16</height>
<width>50</width>
<width>75</width>
<format>[shortdate] [time]</format>
<html>
<valueishtml>0</valueishtml>
......@@ -2425,29 +2424,21 @@
<color>79741120</color>
</background>
</ColumnObject>
<ColumnObject>
<TextObject>
<band>Detail</band>
<id>34</id>
<alignment>0</alignment>
<tabsequence>310</tabsequence>
<text>Change Date :</text>
<border>0</border>
<color>255</color>
<x>122</x>
<y>418</y>
<color>33554432</color>
<x>34</x>
<y>396</y>
<height>16</height>
<width>50</width>
<format>[general]</format>
<width>75</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_user</name>
<name>chg_date_t</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
......@@ -2457,33 +2448,25 @@
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>79741120</color>
<mode>1</mode>
<color>553648127</color>
</background>
</ColumnObject>
<ColumnObject>
</TextObject>
<TextObject>
<band>Detail</band>
<id>35</id>
<alignment>0</alignment>
<tabsequence>320</tabsequence>
<text>Change User :</text>
<border>0</border>
<color>255</color>
<x>122</x>
<y>440</y>
<color>33554432</color>
<x>224</x>
<y>396</y>
<height>16</height>
<width>50</width>
<format>[general]</format>
<width>75</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_term</name>
<name>chg_user_t</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
......@@ -2493,25 +2476,33 @@
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>79741120</color>
<mode>1</mode>
<color>553648127</color>
</background>
</ColumnObject>
<TextObject>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>34</id>
<alignment>0</alignment>
<text>Change Date :</text>
<tabsequence>32766</tabsequence>
<border>0</border>
<color>33554432</color>
<x>34</x>
<color>255</color>
<x>302</x>
<y>396</y>
<height>16</height>
<width>75</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_date_t</name>
<name>chg_user</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>
......@@ -2521,25 +2512,33 @@
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>553648127</color>
<mode>2</mode>
<color>79741120</color>
</background>
</TextObject>
<TextObject>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>35</id>
<alignment>0</alignment>
<text>Change User :</text>
<tabsequence>32766</tabsequence>
<border>0</border>
<color>33554432</color>
<x>33</x>
<y>417</y>
<color>255</color>
<x>491</x>
<y>396</y>
<height>16</height>
<width>75</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_user_t</name>
<name>chg_term</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>300</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
......@@ -2549,18 +2548,18 @@
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>553648127</color>
<mode>2</mode>
<color>79741120</color>
</background>
</TextObject>
</ColumnObject>
<TextObject>
<band>Detail</band>
<alignment>0</alignment>
<text>Change Term :</text>
<border>0</border>
<color>33554432</color>
<x>33</x>
<y>439</y>
<x>410</x>
<y>396</y>
<height>16</height>
<width>77</width>
<html>
......
webitm-adm/src/ibase/webitm/ejb/adm/LeaveTableIC.java
View file @ 307b9366
......@@ -460,7 +460,7 @@ public class LeaveTableIC extends ValidatorEJB implements LeaveTableRemote, Leav
lsLveUnit = checkNull(genericUtility.getColumnValue("lve_unit", dom));
lsLveCode = checkNull(genericUtility.getColumnValue("lve_code", dom));
if(lsLveUnit == null || lsLveUnit.trim().length() == 0)
if(lsLveCode != null && lsLveCode.trim().length() > 0)
{
sql="select case when lve_unit is null then 'D' else lve_unit END as lve_unit from leaves where lve_code=?";
pstmt = conn.prepareStatement(sql);
......@@ -492,6 +492,7 @@ public class LeaveTableIC extends ValidatorEJB implements LeaveTableRemote, Leav
noDaysUnit = checkNull(genericUtility.getColumnValue("no_days_unit", dom));
maxAllowedUnit = checkNull(genericUtility.getColumnValue("max_allowed_unit", dom));
maxAccumulateUnit = checkNull(genericUtility.getColumnValue("max_accumulate_unit", dom));
System.out.println("lsLveUnit111111111:::::"+lsLveUnit);
if(lsLveUnit.equalsIgnoreCase("D"))
{
valueXmlString.append("<max_days_unit protect=\"1\"><![CDATA[").append("D").append("]]></max_days_unit>\r\n");
......
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