Skip to content

B
business-java
Commit 6f1df20b authored by dpingle's avatar dpingle
Browse files
Options

* change done in src file and update in srd ,xml 

bu_role_profile11.xml
bu_role_profile21.xml
d_bu_role_profile11.srd
d_bu_role_profile21.srd
BuRoleProfileIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214213 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b80e507d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 290 additions and 296 deletions
webitm-adm/module-resource/metadata/bu_role_profile11.xml
View file @ 6f1df20b
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</Detail> </Detail>
<TableDefinition> <TableDefinition>
<table_column> <table_column>
<type size="10">char</type> <type size="5">char</type>
<update>yes</update> <update>yes</update>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<key>yes</key> <key>yes</key>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<dbname>bu_role_profile.add_user</dbname> <dbname>bu_role_profile.add_user</dbname>
</table_column> </table_column>
<table_column> <table_column>
<type size="300">char</type> <type size="15">char</type>
<update>yes</update> <update>yes</update>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>add_term</name> <name>add_term</name>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<dbname>bu_role_profile.chg_user</dbname> <dbname>bu_role_profile.chg_user</dbname>
</table_column> </table_column>
<table_column> <table_column>
<type size="300">char</type> <type size="15">char</type>
<update>yes</update> <update>yes</update>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>chg_term</name> <name>chg_term</name>
...@@ -125,12 +125,12 @@ ...@@ -125,12 +125,12 @@
<dbname>business_units.descr</dbname> <dbname>business_units.descr</dbname>
</table_column> </table_column>
<table_column> <table_column>
<type size="4000">char</type> <type size="60">char</type>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>descr</name> <name>role_profile_descr</name>
<dbname>descr</dbname> <dbname>role_profile.descr</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;bu_role_profile&quot; ) TABLE(NAME=&quot;business_units&quot; ) TABLE(NAME=&quot;role_profile&quot; ) COLUMN(NAME=&quot;bu_role_profile.bu_code&quot;) COLUMN(NAME=&quot;bu_role_profile.role_profile&quot;) COLUMN(NAME=&quot;bu_role_profile.act_status&quot;) COLUMN(NAME=&quot;bu_role_profile.add_date&quot;) COLUMN(NAME=&quot;bu_role_profile.add_user&quot;) COLUMN(NAME=&quot;bu_role_profile.add_term&quot;) COLUMN(NAME=&quot;bu_role_profile.chg_date&quot;) COLUMN(NAME=&quot;bu_role_profile.chg_user&quot;) COLUMN(NAME=&quot;bu_role_profile.chg_term&quot;) COLUMN(NAME=&quot;business_units.descr&quot;) COMPUTE(NAME=&quot;fn_get_roleprof_descr(bu_role_profile.role_profile) as descr&quot;) JOIN (LEFT=&quot;business_units.bu_code&quot; OP =&quot;=&quot;RIGHT=&quot;bu_role_profile.bu_code&quot; ) JOIN (LEFT=&quot;role_profile.role_profile&quot; OP =&quot;=&quot;RIGHT=&quot;bu_role_profile.role_profile&quot; )) </retrieve> <retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;bu_role_profile&quot; ) TABLE(NAME=&quot;business_units&quot; ) TABLE(NAME=&quot;role_profile&quot; ) COLUMN(NAME=&quot;bu_role_profile.bu_code&quot;) COLUMN(NAME=&quot;bu_role_profile.role_profile&quot;) COLUMN(NAME=&quot;bu_role_profile.act_status&quot;) COLUMN(NAME=&quot;bu_role_profile.add_date&quot;) COLUMN(NAME=&quot;bu_role_profile.add_user&quot;) COLUMN(NAME=&quot;bu_role_profile.add_term&quot;) COLUMN(NAME=&quot;bu_role_profile.chg_date&quot;) COLUMN(NAME=&quot;bu_role_profile.chg_user&quot;) COLUMN(NAME=&quot;bu_role_profile.chg_term&quot;) COLUMN(NAME=&quot;business_units.descr&quot;) COLUMN(NAME=&quot;role_profile.descr&quot;) JOIN (LEFT=&quot;business_units.bu_code&quot; OP =&quot;=&quot;RIGHT=&quot;bu_role_profile.bu_code&quot; ) JOIN (LEFT=&quot;role_profile.role_profile&quot; OP =&quot;=&quot;RIGHT=&quot;bu_role_profile.role_profile&quot; )) </retrieve>
<update>BU_ROLE_PROFILE</update> <update>BU_ROLE_PROFILE</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<text>Role Profile</text> <text>Role Profile</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>215</x> <x>260</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>77</width> <width>77</width>
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
<text>Act Status</text> <text>Act Status</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>515</x> <x>639</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>78</width> <width>78</width>
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
<text>Add Date</text> <text>Add Date</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>595</x> <x>719</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>132</width> <width>132</width>
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
<text>Add User</text> <text>Add User</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>729</x> <x>853</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>70</width> <width>70</width>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
<text>Add Term</text> <text>Add Term</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>801</x> <x>925</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>205</width> <width>205</width>
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
<text>Chg Date</text> <text>Chg Date</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>1008</x> <x>1132</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>132</width> <width>132</width>
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
<text>Chg User</text> <text>Chg User</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>1142</x> <x>1266</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>66</width> <width>66</width>
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
<text>Chg Term</text> <text>Chg Term</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>1210</x> <x>1334</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>157</width> <width>157</width>
...@@ -396,7 +396,7 @@ ...@@ -396,7 +396,7 @@
<x>76</x> <x>76</x>
<y>1</y> <y>1</y>
<height>16</height> <height>16</height>
<width>137</width> <width>182</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -421,14 +421,14 @@ ...@@ -421,14 +421,14 @@
<text>Role Profile Descr</text> <text>Role Profile Descr</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>294</x> <x>339</x>
<y>1</y> <y>1</y>
<height>16</height> <height>16</height>
<width>219</width> <width>298</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>descr_t</name> <name>role_profile_descr_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
</font> </font>
<background> <background>
<mode>1</mode> <mode>1</mode>
<color>553648127</color> <color>536870912</color>
</background> </background>
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
...@@ -466,7 +466,7 @@ ...@@ -466,7 +466,7 @@
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect> <autoselect>yes</autoselect>
<autohscroll>yes</autohscroll> <autohscroll>yes</autohscroll>
<imemode>0</imemode> <imemode>2</imemode>
</EditStyle> </EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
<tabsequence>20</tabsequence> <tabsequence>20</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>215</x> <x>260</x>
<y>2</y> <y>2</y>
<height>19</height> <height>19</height>
<width>77</width> <width>77</width>
...@@ -523,10 +523,10 @@ ...@@ -523,10 +523,10 @@
<band>Detail</band> <band>Detail</band>
<id>3</id> <id>3</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>30</tabsequence> <tabsequence>40</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>515</x> <x>639</x>
<y>2</y> <y>2</y>
<height>19</height> <height>19</height>
<width>78</width> <width>78</width>
...@@ -562,7 +562,7 @@ ...@@ -562,7 +562,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>595</x> <x>719</x>
<y>2</y> <y>2</y>
<height>19</height> <height>19</height>
<width>132</width> <width>132</width>
...@@ -600,7 +600,7 @@ ...@@ -600,7 +600,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>729</x> <x>853</x>
<y>2</y> <y>2</y>
<height>19</height> <height>19</height>
<width>70</width> <width>70</width>
...@@ -638,7 +638,7 @@ ...@@ -638,7 +638,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>801</x> <x>925</x>
<y>2</y> <y>2</y>
<height>19</height> <height>19</height>
<width>205</width> <width>205</width>
...@@ -676,7 +676,7 @@ ...@@ -676,7 +676,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>1008</x> <x>1132</x>
<y>2</y> <y>2</y>
<height>19</height> <height>19</height>
<width>132</width> <width>132</width>
...@@ -714,7 +714,7 @@ ...@@ -714,7 +714,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>1142</x> <x>1266</x>
<y>2</y> <y>2</y>
<height>19</height> <height>19</height>
<width>66</width> <width>66</width>
...@@ -752,7 +752,7 @@ ...@@ -752,7 +752,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>1210</x> <x>1334</x>
<y>2</y> <y>2</y>
<height>19</height> <height>19</height>
<width>157</width> <width>157</width>
...@@ -792,8 +792,8 @@ ...@@ -792,8 +792,8 @@
<color>33554432</color> <color>33554432</color>
<x>76</x> <x>76</x>
<y>1</y> <y>1</y>
<height>16</height> <height>22</height>
<width>137</width> <width>182</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -801,7 +801,7 @@ ...@@ -801,7 +801,7 @@
<name>business_units_descr</name> <name>business_units_descr</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>60</limit>
<case>any</case> <case>any</case>
<autoselect>yes</autoselect> <autoselect>yes</autoselect>
<imemode>0</imemode> <imemode>0</imemode>
...@@ -823,21 +823,21 @@ ...@@ -823,21 +823,21 @@
<band>Detail</band> <band>Detail</band>
<id>11</id> <id>11</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>30</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>294</x> <x>339</x>
<y>1</y> <y>1</y>
<height>16</height> <height>21</height>
<width>219</width> <width>298</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>descr</name> <name>role_profile_descr</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>0</limit> <limit>60</limit>
<case>any</case> <case>any</case>
<autoselect>yes</autoselect> <autoselect>yes</autoselect>
<imemode>0</imemode> <imemode>0</imemode>
......
webitm-adm/src/ibase/webitm/ejb/adm/BuRoleProfileIC.java
View file @ 6f1df20b
...@@ -158,6 +158,7 @@ public class BuRoleProfileIC extends ValidatorEJB implements BuRoleProfileLocal, ...@@ -158,6 +158,7 @@ public class BuRoleProfileIC extends ValidatorEJB implements BuRoleProfileLocal,
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
cnt = rs.getInt("cnt"); cnt = rs.getInt("cnt");
} }
...@@ -489,13 +490,13 @@ public class BuRoleProfileIC extends ValidatorEJB implements BuRoleProfileLocal, ...@@ -489,13 +490,13 @@ public class BuRoleProfileIC extends ValidatorEJB implements BuRoleProfileLocal,
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
valueXmlString.append("<business_units_descr ><![CDATA[").append(buDescr).append("]]></business_units_descr>\r\n"); valueXmlString.append("<business_units_descr><![CDATA[").append(buDescr).append("]]></business_units_descr>\r\n");
} }
else if("role_profile".equalsIgnoreCase(currentColumn)) else if("role_profile".equalsIgnoreCase(currentColumn))
{ {
roleProfile =checkNull(genericUtility.getColumnValue("role_profile", dom)); roleProfile =checkNull(genericUtility.getColumnValue("role_profile", dom));
sql = "select fn_get_roleprof_descr (?) as descr from dual"; sql = "select descr from role_profile where role_profile = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, roleProfile); pstmt.setString(1, roleProfile);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -514,7 +515,7 @@ public class BuRoleProfileIC extends ValidatorEJB implements BuRoleProfileLocal, ...@@ -514,7 +515,7 @@ public class BuRoleProfileIC extends ValidatorEJB implements BuRoleProfileLocal,
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
valueXmlString.append("<descr ><![CDATA[").append(roledescr).append("]]></descr>\r\n"); valueXmlString.append("<role_profile_descr><![CDATA[").append(roledescr).append("]]></role_profile_descr>\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