Skip to content

B
business-java
Commit 572d13c8 authored by dpingle's avatar dpingle
Browse files
Options

* changes done in Ald Slabs on [31/08/2019] 

ald_slab21.xml
w_ald_slab.sql
d_aldslab_edit.srd
AldSlabIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@206627 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8cba988d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 96 deletions
webitm-adm/module-resource/SQL/w_ald_slab.sql
View file @ 572d13c8
...@@ -151,8 +151,20 @@ update TRANSETUP set ref_ser='E-LOAN' where TRAN_WINDOW='w_ald_slab'; ...@@ -151,8 +151,20 @@ update TRANSETUP set ref_ser='E-LOAN' where TRAN_WINDOW='w_ald_slab';
----------------------------------------------------- Dipesh [30/08/2019] End ----------------------------------------------------- Dipesh [30/08/2019] End
----------------------------------------------------- Dipesh [31/08/2019] Start
Insert into TRANS_COPY_SETUP (OBJ_NAME,FORM_NO,FIELD_NAME,DEF_VALUE,COPY_FLAG) values ('ald_slab','1','allwdedn_descr',null,'N');
update obj_forms set disp_metadata=
'<html>
<span style="white-space: normal !important; word-break: break-word; ">Ad Code: {ad_code} (<b>{allwdedn_descr}</b>) , Slab No : {slab_no} <br/>
Max.Base Amount : {max_base_amt} , Min.Base Amount: {min_base_amt}
</span>
<br/> <span style="float:right;"> <b> {chg_date} </b></span>
</html>' where win_name='w_ald_slab';
----------------------------------------------------- Dipesh [31/08/2019] End
......
webitm-adm/module-resource/metadata/ald_slab21.xml
View file @ 572d13c8
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<BaseDefinition> <BaseDefinition>
<units>1</units> <units>1</units>
<timer_interval>0</timer_interval> <timer_interval>0</timer_interval>
<color>79741120</color> <color>67108864</color>
<processing>0</processing> <processing>0</processing>
<HTMLDW>no</HTMLDW> <HTMLDW>no</HTMLDW>
<print> <print>
...@@ -51,14 +51,6 @@ ...@@ -51,14 +51,6 @@
<name>ad_code</name> <name>ad_code</name>
<dbname>ad_slabs.ad_code</dbname> <dbname>ad_slabs.ad_code</dbname>
</table_column> </table_column>
<table_column>
<type size="6">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>slab_no</name>
<dbname>ad_slabs.slab_no</dbname>
</table_column>
<table_column> <table_column>
<type>datetime</type> <type>datetime</type>
<update>yes</update> <update>yes</update>
...@@ -146,13 +138,6 @@ ...@@ -146,13 +138,6 @@
<dbname>ad_slabs.max_amt</dbname> <dbname>ad_slabs.max_amt</dbname>
<initial>0</initial> <initial>0</initial>
</table_column> </table_column>
<table_column>
<type precision="3">decimal</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>extra_1</name>
<dbname>ad_slabs.extra_1</dbname>
</table_column>
<table_column> <table_column>
<type precision="3">decimal</type> <type precision="3">decimal</type>
<update>yes</update> <update>yes</update>
...@@ -166,7 +151,22 @@ ...@@ -166,7 +151,22 @@
<name>allwdedn_descr</name> <name>allwdedn_descr</name>
<dbname>allwdedn.descr</dbname> <dbname>allwdedn.descr</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;ad_slabs&quot; ) TABLE(NAME=&quot;allwdedn&quot; ) COLUMN(NAME=&quot;ad_slabs.ad_code&quot;) COLUMN(NAME=&quot;ad_slabs.slab_no&quot;) COLUMN(NAME=&quot;ad_slabs.eff_date&quot;) COLUMN(NAME=&quot;ad_slabs.exp_date&quot;) COLUMN(NAME=&quot;ad_slabs.type&quot;) COLUMN(NAME=&quot;ad_slabs.chg_date&quot;) COLUMN(NAME=&quot;ad_slabs.chg_user&quot;) COLUMN(NAME=&quot;ad_slabs.chg_term&quot;) COLUMN(NAME=&quot;ad_slabs.min_base_amt&quot;) COLUMN(NAME=&quot;ad_slabs.max_base_amt&quot;) COLUMN(NAME=&quot;ad_slabs.amount&quot;) COLUMN(NAME=&quot;ad_slabs.min_amt&quot;) COLUMN(NAME=&quot;ad_slabs.max_amt&quot;) COLUMN(NAME=&quot;ad_slabs.extra_1&quot;) COLUMN(NAME=&quot;ad_slabs.extra_2&quot;) COLUMN(NAME=&quot;allwdedn.descr&quot;) JOIN (LEFT=&quot;allwdedn.ad_code&quot; OP =&quot;=&quot;RIGHT=&quot;ad_slabs.ad_code&quot; )WHERE( EXP1 =&quot;ad_slabs.ad_code&quot; OP =&quot;=&quot; EXP2 =&quot;:madcode&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;ad_slabs.slab_no&quot; OP =&quot;=&quot; EXP2 =&quot;:mslabno&quot; ) ) ARG(NAME = &quot;madcode&quot; TYPE = string) ARG(NAME = &quot;mslabno&quot; TYPE = string) </retrieve> <table_column>
<type size="6">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>slab_no</name>
<dbname>ad_slabs.slab_no</dbname>
</table_column>
<table_column>
<type precision="3">decimal</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>extra_1</name>
<dbname>ad_slabs.extra_1</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;ad_slabs&quot; ) TABLE(NAME=&quot;allwdedn&quot; ) COLUMN(NAME=&quot;ad_slabs.ad_code&quot;) COLUMN(NAME=&quot;ad_slabs.eff_date&quot;) COLUMN(NAME=&quot;ad_slabs.exp_date&quot;) COLUMN(NAME=&quot;ad_slabs.type&quot;) COLUMN(NAME=&quot;ad_slabs.chg_date&quot;) COLUMN(NAME=&quot;ad_slabs.chg_user&quot;) COLUMN(NAME=&quot;ad_slabs.chg_term&quot;) COLUMN(NAME=&quot;ad_slabs.min_base_amt&quot;) COLUMN(NAME=&quot;ad_slabs.max_base_amt&quot;) COLUMN(NAME=&quot;ad_slabs.amount&quot;) COLUMN(NAME=&quot;ad_slabs.min_amt&quot;) COLUMN(NAME=&quot;ad_slabs.max_amt&quot;) COLUMN(NAME=&quot;ad_slabs.extra_2&quot;) COLUMN(NAME=&quot;allwdedn.descr&quot;) COLUMN(NAME=&quot;ad_slabs.slab_no&quot;) COLUMN(NAME=&quot;ad_slabs.extra_1&quot;) JOIN (LEFT=&quot;allwdedn.ad_code&quot; OP =&quot;=&quot;RIGHT=&quot;ad_slabs.ad_code&quot; )WHERE( EXP1 =&quot;ad_slabs.ad_code&quot; OP =&quot;=&quot; EXP2 =&quot;:madcode&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;ad_slabs.slab_no&quot; OP =&quot;=&quot; EXP2 =&quot;:mslabno&quot; ) ) ARG(NAME = &quot;madcode&quot; TYPE = string) ARG(NAME = &quot;mslabno&quot; TYPE = string) </retrieve>
<update>AD_SLABS</update> <update>AD_SLABS</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>2</id> <id>15</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>10</tabsequence> <tabsequence>10</tabsequence>
<border>5</border> <border>5</border>
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>4</id> <id>3</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>30</tabsequence> <tabsequence>30</tabsequence>
<border>5</border> <border>5</border>
...@@ -400,7 +400,7 @@ ...@@ -400,7 +400,7 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>3</id> <id>2</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>20</tabsequence> <tabsequence>20</tabsequence>
<border>5</border> <border>5</border>
...@@ -491,7 +491,7 @@ ...@@ -491,7 +491,7 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>9</id> <id>8</id>
<alignment>1</alignment> <alignment>1</alignment>
<tabsequence>40</tabsequence> <tabsequence>40</tabsequence>
<border>5</border> <border>5</border>
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
<name>min_base_amt</name> <name>min_base_amt</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>13</limit> <limit>12</limit>
<case>any</case> <case>any</case>
<format>#########0.00</format> <format>#########0.00</format>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>10</id> <id>9</id>
<alignment>1</alignment> <alignment>1</alignment>
<tabsequence>50</tabsequence> <tabsequence>50</tabsequence>
<border>5</border> <border>5</border>
...@@ -574,7 +574,7 @@ ...@@ -574,7 +574,7 @@
<name>max_base_amt</name> <name>max_base_amt</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>13</limit> <limit>12</limit>
<case>any</case> <case>any</case>
<format>#########0.00</format> <format>#########0.00</format>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
...@@ -597,7 +597,7 @@ ...@@ -597,7 +597,7 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>5</id> <id>4</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>70</tabsequence> <tabsequence>70</tabsequence>
<border>5</border> <border>5</border>
...@@ -662,7 +662,7 @@ ...@@ -662,7 +662,7 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>11</id> <id>10</id>
<alignment>1</alignment> <alignment>1</alignment>
<tabsequence>60</tabsequence> <tabsequence>60</tabsequence>
<border>5</border> <border>5</border>
...@@ -757,7 +757,7 @@ ...@@ -757,7 +757,7 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>12</id> <id>11</id>
<alignment>1</alignment> <alignment>1</alignment>
<tabsequence>80</tabsequence> <tabsequence>80</tabsequence>
<border>5</border> <border>5</border>
...@@ -773,7 +773,7 @@ ...@@ -773,7 +773,7 @@
<name>min_amt</name> <name>min_amt</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>13</limit> <limit>12</limit>
<case>any</case> <case>any</case>
<format>#########0.00</format> <format>#########0.00</format>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
...@@ -824,12 +824,12 @@ ...@@ -824,12 +824,12 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>13</id> <id>12</id>
<alignment>1</alignment> <alignment>1</alignment>
<tabsequence>90</tabsequence> <tabsequence>90</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>356</x> <x>357</x>
<y>134</y> <y>134</y>
<height>17</height> <height>17</height>
<width>82</width> <width>82</width>
...@@ -840,7 +840,7 @@ ...@@ -840,7 +840,7 @@
<name>max_amt</name> <name>max_amt</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>13</limit> <limit>12</limit>
<case>any</case> <case>any</case>
<format>#########0.00</format> <format>#########0.00</format>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
...@@ -863,7 +863,7 @@ ...@@ -863,7 +863,7 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>15</id> <id>13</id>
<alignment>1</alignment> <alignment>1</alignment>
<tabsequence>110</tabsequence> <tabsequence>110</tabsequence>
<border>5</border> <border>5</border>
...@@ -879,7 +879,7 @@ ...@@ -879,7 +879,7 @@
<name>extra_2</name> <name>extra_2</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>13</limit> <limit>12</limit>
<case>any</case> <case>any</case>
<format>#########.###</format> <format>#########.###</format>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
...@@ -928,45 +928,6 @@ ...@@ -928,45 +928,6 @@
<color>79741120</color> <color>79741120</color>
</background> </background>
</TextObject> </TextObject>
<ColumnObject>
<band>Detail</band>
<id>14</id>
<alignment>1</alignment>
<tabsequence>100</tabsequence>
<border>5</border>
<color>0</color>
<x>142</x>
<y>158</y>
<height>17</height>
<width>82</width>
<format>#########.###</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>extra_1</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>13</limit>
<case>any</case>
<format>#########.###</format>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<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>
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
...@@ -997,7 +958,7 @@ ...@@ -997,7 +958,7 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>16</id> <id>14</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
...@@ -1085,7 +1046,7 @@ ...@@ -1085,7 +1046,7 @@
</TextObject> </TextObject>
<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>
...@@ -1151,7 +1112,7 @@ ...@@ -1151,7 +1112,7 @@
</TextObject> </TextObject>
<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>
...@@ -1217,7 +1178,7 @@ ...@@ -1217,7 +1178,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>
...@@ -1253,6 +1214,42 @@ ...@@ -1253,6 +1214,42 @@
<color>67108864</color> <color>67108864</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>16</id>
<alignment>0</alignment>
<tabsequence>120</tabsequence>
<border>5</border>
<color>0</color>
<x>143</x>
<y>158</y>
<height>16</height>
<width>87</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>extra_1</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>12</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/AldSlabIC.java
View file @ 572d13c8
...@@ -219,7 +219,7 @@ public class AldSlabIC extends ValidatorEJB implements AldSlabLocal,AldSlabRemot ...@@ -219,7 +219,7 @@ public class AldSlabIC extends ValidatorEJB implements AldSlabLocal,AldSlabRemot
{ {
Date effDate = sdf.parse( effDateStr ); Date effDate = sdf.parse( effDateStr );
Date expDate = sdf.parse( expDateStr ); Date expDate = sdf.parse( expDateStr );
if(effDate.before(expDate)) if(effDate.after(expDate))
{ {
errList.add("VMEXPDATE"); errList.add("VMEXPDATE");
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