Skip to content

B
business-java
Commit 0c384896 authored by dpingle's avatar dpingle
Browse files
Options

updated src, srd, sql and xml file 

cadre_ad21.xml
w_cadre_ad.sql
d_cadre_allwdedn_edit.srd
CadreAdIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215743 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cf85e078
Expand all Show whitespace changes
Inline Side-by-side
Showing with 219 additions and 103 deletions
webitm-adm/module-resource/SQL/w_cadre_ad.sql
View file @ 0c384896
...@@ -152,3 +152,24 @@ Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,IMAGE,DESCRIPTION,SERVICE_CODE,INTERAC ...@@ -152,3 +152,24 @@ Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,IMAGE,DESCRIPTION,SERVICE_CODE,INTERAC
-----------------------------------------------[03/01/2020]End -----------------------------------------------[03/01/2020]End
---------------------------------------------------- Dipesh[27/01/2020]Start
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 ('PAYINVAILD','Invaild Pay table!!','Pay table No not present in master. ','E','Y',null,null,null,to_date('18-03-06','DD-MM-RR'),'TSD ','TSD ',null,null);
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 ('PAYTBLNULL','Empty Pay table!!','Pay table can not be null','E','Y',null,null,null,to_date('18-03-06','DD-MM-RR'),'TSD ','TSD ',null,null);
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 ('CADCODNULL','Empty cadre code!!','cadre code cannot be null','E','Y',null,null,null,to_date('18-03-06','DD-MM-RR'),'TSD ','TSD ',null,null);
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 ('CADINVAILD','Invaild cadre code!!','cadre code No not present in master.','E','Y',null,null,null,to_date('18-03-06','DD-MM-RR'),'TSD ','TSD ',null,null);
---------------------------------------------------- Dipesh[27/01/2020]End
webitm-adm/module-resource/metadata/cadre_ad21.xml
View file @ 0c384896
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<color>536870912</color> <color>536870912</color>
</Footer> </Footer>
<Detail> <Detail>
<height>312</height> <height>384</height>
<color>536870912</color> <color>536870912</color>
</Detail> </Detail>
<TableDefinition> <TableDefinition>
...@@ -198,14 +198,14 @@ ...@@ -198,14 +198,14 @@
</TableDefinition> </TableDefinition>
<GroupBox> <GroupBox>
<band>Detail</band> <band>Detail</band>
<text>Others</text> <text>Basic</text>
<border>2</border> <border>2</border>
<color>0</color> <color>0</color>
<x>14</x> <x>14</x>
<y>179</y> <y>6</y>
<height>110</height> <height>180</height>
<width>552</width> <width>549</width>
<name>gb_2</name> <name>gb_1</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -222,14 +222,14 @@ ...@@ -222,14 +222,14 @@
</GroupBox> </GroupBox>
<GroupBox> <GroupBox>
<band>Detail</band> <band>Detail</band>
<text>Basic</text> <text>Others</text>
<border>2</border> <border>2</border>
<color>0</color> <color>0</color>
<x>15</x> <x>14</x>
<y>7</y> <y>197</y>
<height>162</height> <height>85</height>
<width>549</width> <width>552</width>
<name>gb_1</name> <name>gb_2</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -585,7 +585,7 @@ ...@@ -585,7 +585,7 @@
<name>max_basic</name> <name>max_basic</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>
...@@ -624,7 +624,7 @@ ...@@ -624,7 +624,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>
...@@ -754,7 +754,7 @@ ...@@ -754,7 +754,7 @@
<name>amount</name> <name>amount</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>
...@@ -821,7 +821,7 @@ ...@@ -821,7 +821,7 @@
<name>min_basic</name> <name>min_basic</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>
...@@ -888,7 +888,7 @@ ...@@ -888,7 +888,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>
...@@ -940,17 +940,17 @@ ...@@ -940,17 +940,17 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Cadre Code:</text> <text>Chg Date:</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>39</x> <x>325</x>
<y>200</y> <y>215</y>
<height>20</height> <height>20</height>
<width>106</width> <width>106</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>cadre_code_t</name> <name>chg_date_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -967,32 +967,34 @@ ...@@ -967,32 +967,34 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>2</id> <id>9</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>255</color> <color>255</color>
<x>148</x> <x>434</x>
<y>201</y> <y>216</y>
<height>20</height> <height>20</height>
<width>93</width> <width>93</width>
<format>[general]</format> <format>[shortdate] [time]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>cadre_code</name> <name>chg_date</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>0</limit>
<case>any</case> <case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect> <autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode> <imemode>0</imemode>
</EditStyle> </EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
<weight>400</weight> <weight>400</weight>
<family>2</family> <family>1</family>
<pitch>2</pitch> <pitch>2</pitch>
<charset>0</charset> <charset>0</charset>
</font> </font>
...@@ -1001,59 +1003,57 @@ ...@@ -1001,59 +1003,57 @@
<color>67108864</color> <color>67108864</color>
</background> </background>
</ColumnObject> </ColumnObject>
<TextObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <id>2</id>
<text>Chg Date:</text> <alignment>0</alignment>
<border>0</border> <tabsequence>110</tabsequence>
<color>0</color> <border>5</border>
<x>325</x> <color>255</color>
<y>200</y> <x>154</x>
<y>155</y>
<height>20</height> <height>20</height>
<width>106</width> <width>93</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_date_t</name> <name>cadre_code</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit">
<limit>5</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>
<weight>400</weight> <weight>400</weight>
<family>1</family> <family>2</family>
<pitch>2</pitch> <pitch>2</pitch>
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>2</mode> <mode>2</mode>
<color>79741120</color> <color>67108864</color>
</background> </background>
</TextObject> </ColumnObject>
<ColumnObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<id>9</id> <alignment>1</alignment>
<alignment>0</alignment> <text>Cadre Code:</text>
<tabsequence>32766</tabsequence> <border>0</border>
<border>5</border> <color>0</color>
<color>255</color> <x>45</x>
<x>434</x> <y>154</y>
<y>201</y>
<height>20</height> <height>20</height>
<width>93</width> <width>106</width>
<format>[shortdate] [time]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_date</name> <name>cadre_code_t</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
...@@ -1064,32 +1064,30 @@ ...@@ -1064,32 +1064,30 @@
</font> </font>
<background> <background>
<mode>2</mode> <mode>2</mode>
<color>67108864</color> <color>79741120</color>
</background> </background>
</ColumnObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>11</id> <id>1</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>120</tabsequence>
<border>5</border> <border>5</border>
<color>255</color> <color>255</color>
<x>434</x> <x>441</x>
<y>226</y> <y>155</y>
<height>20</height> <height>20</height>
<width>93</width> <width>93</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_term</name> <name>pay_table</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>15</limit> <limit>5</limit>
<case>any</case> <case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect> <autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode> <imemode>0</imemode>
</EditStyle> </EditStyle>
<font> <font>
...@@ -1108,17 +1106,17 @@ ...@@ -1108,17 +1106,17 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Chg Term:</text> <text>Pay Tbl:</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>325</x> <x>332</x>
<y>225</y> <y>155</y>
<height>20</height> <height>20</height>
<width>106</width> <width>106</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>chg_term_t</name> <name>pay_table_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -1140,8 +1138,8 @@ ...@@ -1140,8 +1138,8 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>255</color> <color>255</color>
<x>148</x> <x>154</x>
<y>226</y> <y>215</y>
<height>20</height> <height>20</height>
<width>93</width> <width>93</width>
<format>[general]</format> <format>[general]</format>
...@@ -1177,8 +1175,8 @@ ...@@ -1177,8 +1175,8 @@
<text>Chg User:</text> <text>Chg User:</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>39</x> <x>45</x>
<y>225</y> <y>215</y>
<height>20</height> <height>20</height>
<width>106</width> <width>106</width>
<html> <html>
...@@ -1202,17 +1200,17 @@ ...@@ -1202,17 +1200,17 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Pay Tbl:</text> <text>Chg Term:</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>39</x> <x>45</x>
<y>250</y> <y>240</y>
<height>20</height> <height>20</height>
<width>106</width> <width>106</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>pay_table_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>
...@@ -1229,25 +1227,27 @@ ...@@ -1229,25 +1227,27 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>1</id> <id>11</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>255</color> <color>255</color>
<x>148</x> <x>154</x>
<y>250</y> <y>241</y>
<height>20</height> <height>20</height>
<width>93</width> <width>93</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>pay_table</name> <name>chg_term</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>15</limit>
<case>any</case> <case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect> <autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode> <imemode>0</imemode>
</EditStyle> </EditStyle>
<font> <font>
......
webitm-adm/src/ibase/webitm/ejb/adm/CadreAdIC.java
View file @ 0c384896
...@@ -232,6 +232,82 @@ public class CadreAdIC extends ValidatorEJB implements CadreAdLocal,CadreAdRemot ...@@ -232,6 +232,82 @@ public class CadreAdIC extends ValidatorEJB implements CadreAdLocal,CadreAdRemot
} }
} }
} }
else if ("cadre_code".equalsIgnoreCase(childNodeName))
{
cadreCode = checkNull(genericUtility.getColumnValue("cadre_code", dom));
if (cadreCode == null || cadreCode.trim().length() == 0)
{
errList.add("CADCODNULL");
errFields.add(childNodeName.toLowerCase());
}
else
{
sql = "select count(*) as cnt from cadre where cadre_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, cadreCode);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt("cnt");
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(cnt == 0)
{
errList.add("CADINVAILD");
errFields.add(childNodeName.toLowerCase());
}
}
}
else if ("pay_table".equalsIgnoreCase(childNodeName))
{
payTable = checkNull(genericUtility.getColumnValue("pay_table", dom));
if (payTable == null || payTable.trim().length() == 0)
{
errList.add("PAYTBLNULL");
errFields.add(childNodeName.toLowerCase());
}
else
{
sql = "select count(*) as cnt from Paytable where pay_table = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, payTable);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt("cnt");
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(cnt == 0)
{
errList.add("PAYINVAILD");
errFields.add(childNodeName.toLowerCase());
}
}
}
} }
break; break;
} }
...@@ -383,9 +459,28 @@ public class CadreAdIC extends ValidatorEJB implements CadreAdLocal,CadreAdRemot ...@@ -383,9 +459,28 @@ public class CadreAdIC extends ValidatorEJB implements CadreAdLocal,CadreAdRemot
if ("itm_default".equalsIgnoreCase(currentColumn)) if ("itm_default".equalsIgnoreCase(currentColumn))
{ {
payTable = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "pay_table"); payTable = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "pay_table");
System.out.println("payTable::::"+payTable);
if(payTable != null && payTable.trim().length() > 0 )
{
valueXmlString.append("<pay_table protect=\"1\"><![CDATA[").append(payTable).append("]]></pay_table>\r\n");
}
else
{
valueXmlString.append("<pay_table protect=\"0\"><![CDATA[").append("").append("]]></pay_table>\r\n");
}
valueXmlString.append("<pay_table ><![CDATA[").append(payTable).append("]]></pay_table>\r\n"); valueXmlString.append("<pay_table ><![CDATA[").append(payTable).append("]]></pay_table>\r\n");
cadreCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "cadre_code"); cadreCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "cadre_code");
System.out.println("cadreCode::::"+cadreCode);
if(cadreCode != null && cadreCode.trim().length() > 0 )
{
valueXmlString.append("<cadre_code protect=\"1\"><![CDATA[").append(cadreCode).append("]]></cadre_code>\r\n");
}
else
{
valueXmlString.append("<cadre_code protect=\"0\"><![CDATA[").append("").append("]]></cadre_code>\r\n");
}
valueXmlString.append("<cadre_code ><![CDATA[").append(cadreCode).append("]]></cadre_code>\r\n"); valueXmlString.append("<cadre_code ><![CDATA[").append(cadreCode).append("]]></cadre_code>\r\n");
effDateStr = admCommon.getEnv("999999", "AD_EFFDATE", conn); effDateStr = admCommon.getEnv("999999", "AD_EFFDATE", 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