Commit e204af96 authored by arane's avatar arane

Make grouping

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@209512 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1fbffe32
...@@ -113,12 +113,12 @@ ...@@ -113,12 +113,12 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>0</alignment> <alignment>0</alignment>
<text>Chg Date</text> <text>Change Date</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>436</x> <x>436</x>
<y>1</y> <y>1</y>
<height>16</height> <height>17</height>
<width>68</width> <width>68</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -141,12 +141,12 @@ ...@@ -141,12 +141,12 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>0</alignment> <alignment>0</alignment>
<text>Chg User</text> <text>Change User</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>506</x> <x>506</x>
<y>1</y> <y>1</y>
<height>16</height> <height>17</height>
<width>66</width> <width>66</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -169,12 +169,12 @@ ...@@ -169,12 +169,12 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>0</alignment> <alignment>0</alignment>
<text>Chg Term</text> <text>Change Terminal</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>574</x> <x>574</x>
<y>1</y> <y>1</y>
<height>16</height> <height>17</height>
<width>69</width> <width>69</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>add_date_t</name> <name>add_date_t</name>
<visible>1</visible> <visible>0</visible>
<font> <font>
<face>Arial</face> <face>Arial</face>
<height>-11</height> <height>-11</height>
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>add_user_t</name> <name>add_user_t</name>
<visible>1</visible> <visible>0</visible>
<font> <font>
<face>Arial</face> <face>Arial</face>
<height>-11</height> <height>-11</height>
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>add_term_t</name> <name>add_term_t</name>
<visible>1</visible> <visible>0</visible>
<font> <font>
<face>Arial</face> <face>Arial</face>
<height>-11</height> <height>-11</height>
...@@ -309,12 +309,12 @@ ...@@ -309,12 +309,12 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>2</alignment> <alignment>2</alignment>
<text>Enterprise Descr</text> <text>Description</text>
<border>2</border> <border>2</border>
<color>33554432</color> <color>33554432</color>
<x>104</x> <x>104</x>
<y>2</y> <y>2</y>
<height>15</height> <height>16</height>
<width>122</width> <width>122</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
......
...@@ -154,10 +154,10 @@ ...@@ -154,10 +154,10 @@
<text>Resource ID</text> <text>Resource ID</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>346</x> <x>402</x>
<y>1</y> <y>1</y>
<height>15</height> <height>15</height>
<width>75</width> <width>125</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -179,12 +179,12 @@ ...@@ -179,12 +179,12 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>0</alignment> <alignment>0</alignment>
<text>Resources Description</text> <text> Description</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>423</x> <x>529</x>
<y>1</y> <y>1</y>
<height>15</height> <height>16</height>
<width>94</width> <width>94</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -207,13 +207,13 @@ ...@@ -207,13 +207,13 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>0</alignment> <alignment>0</alignment>
<text>Enterprise Description</text> <text> Description</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>208</x> <x>208</x>
<y>1</y> <y>1</y>
<height>16</height> <height>17</height>
<width>136</width> <width>192</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -314,10 +314,10 @@ ...@@ -314,10 +314,10 @@
<tabsequence>30</tabsequence> <tabsequence>30</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>346</x> <x>402</x>
<y>0</y> <y>0</y>
<height>15</height> <height>15</height>
<width>75</width> <width>125</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
<tabsequence>40</tabsequence> <tabsequence>40</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>423</x> <x>529</x>
<y>0</y> <y>0</y>
<height>15</height> <height>15</height>
<width>94</width> <width>94</width>
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
<x>208</x> <x>208</x>
<y>0</y> <y>0</y>
<height>15</height> <height>15</height>
<width>136</width> <width>192</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<dbname>entp_users_licence.lic_users</dbname> <dbname>entp_users_licence.lic_users</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;entp_users_licence&quot; ) COLUMN(NAME=&quot;entp_users_licence.enterprise&quot;) COLUMN(NAME=&quot;entp_users_licence.line_no&quot;) COLUMN(NAME=&quot;entp_users_licence.user_lic_type&quot;) COLUMN(NAME=&quot;entp_users_licence.lic_users&quot;)WHERE( EXP1 =&quot;entp_users_licence.enterprise&quot; OP =&quot;=&quot; EXP2 =&quot;:enterprise&quot; ) ) ARG(NAME = &quot;enterprise&quot; TYPE = string) </retrieve> <retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;entp_users_licence&quot; ) COLUMN(NAME=&quot;entp_users_licence.enterprise&quot;) COLUMN(NAME=&quot;entp_users_licence.line_no&quot;) COLUMN(NAME=&quot;entp_users_licence.user_lic_type&quot;) COLUMN(NAME=&quot;entp_users_licence.lic_users&quot;)WHERE( EXP1 =&quot;entp_users_licence.enterprise&quot; OP =&quot;=&quot; EXP2 =&quot;:enterprise&quot; ) ) ARG(NAME = &quot;enterprise&quot; TYPE = string) </retrieve>
<update>entp_users_licence</update> <update>ENTP_USERS_LICENCE</update>
<updatewhere>1</updatewhere> <updatewhere>1</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
<argument> <argument>
...@@ -146,12 +146,12 @@ ...@@ -146,12 +146,12 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>2</alignment> <alignment>2</alignment>
<text>User Lic Type</text> <text>Licence Type</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>144</x> <x>144</x>
<y>2</y> <y>2</y>
<height>15</height> <height>16</height>
<width>80</width> <width>80</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -174,12 +174,12 @@ ...@@ -174,12 +174,12 @@
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>2</alignment> <alignment>2</alignment>
<text>Lic Users</text> <text>Licence Users</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>226</x> <x>226</x>
<y>2</y> <y>2</y>
<height>15</height> <height>16</height>
<width>72</width> <width>72</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<color>536870912</color> <color>536870912</color>
</Footer> </Footer>
<Detail> <Detail>
<height>348</height> <height>210</height>
<color>536870912</color> <color>536870912</color>
</Detail> </Detail>
<TableDefinition> <TableDefinition>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<border>2</border> <border>2</border>
<color>33554432</color> <color>33554432</color>
<x>2</x> <x>2</x>
<y>2</y> <y>1</y>
<height>40</height> <height>40</height>
<width>597</width> <width>597</width>
<name>gb_1</name> <name>gb_1</name>
...@@ -600,7 +600,7 @@ ...@@ -600,7 +600,7 @@
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>10</limit> <limit>10</limit>
<case>any</case> <case>upper</case>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect> <autoselect>yes</autoselect>
<autohscroll>yes</autohscroll> <autohscroll>yes</autohscroll>
...@@ -622,12 +622,12 @@ ...@@ -622,12 +622,12 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Enterprise Description:</text> <text>Description:</text>
<border>2</border> <border>2</border>
<color>33554432</color> <color>33554432</color>
<x>203</x> <x>203</x>
<y>21</y> <y>18</y>
<height>15</height> <height>16</height>
<width>135</width> <width>135</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -654,8 +654,8 @@ ...@@ -654,8 +654,8 @@
<tabsequence>20</tabsequence> <tabsequence>20</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>343</x> <x>342</x>
<y>21</y> <y>19</y>
<height>16</height> <height>16</height>
<width>250</width> <width>250</width>
<format>[general]</format> <format>[general]</format>
...@@ -666,7 +666,7 @@ ...@@ -666,7 +666,7 @@
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>60</limit> <limit>60</limit>
<case>any</case> <case>upper</case>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect> <autoselect>yes</autoselect>
<autohscroll>yes</autohscroll> <autohscroll>yes</autohscroll>
......
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</TableDefinition> </TableDefinition>
<GroupBox> <GroupBox>
<band>Detail</band> <band>Detail</band>
<text>Detail</text> <text>Basic</text>
<border>2</border> <border>2</border>
<color>33554432</color> <color>33554432</color>
<x>6</x> <x>6</x>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<color>536870912</color> <color>536870912</color>
</Footer> </Footer>
<Detail> <Detail>
<height>134</height> <height>191</height>
<color>536870912</color> <color>536870912</color>
</Detail> </Detail>
<TableDefinition> <TableDefinition>
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>user_lic_type</name> <name>user_lic_type</name>
<dbname>entp_users_licence.user_lic_type</dbname> <dbname>entp_users_licence.user_lic_type</dbname>
<initial>E</initial>
<values> <values>
<item display="ENTERPRISE" data="E"/> <item display="ENTERPRISE" data="E"/>
<item display="PORTAL" data="P"/> <item display="PORTAL" data="P"/>
...@@ -80,7 +81,7 @@ ...@@ -80,7 +81,7 @@
<dbname>entp_users_licence.lic_users</dbname> <dbname>entp_users_licence.lic_users</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;entp_users_licence&quot; ) COLUMN(NAME=&quot;entp_users_licence.enterprise&quot;) COLUMN(NAME=&quot;entp_users_licence.line_no&quot;) COLUMN(NAME=&quot;entp_users_licence.user_lic_type&quot;) COLUMN(NAME=&quot;entp_users_licence.lic_users&quot;)WHERE( EXP1 =&quot;entp_users_licence.enterprise&quot; OP =&quot;=&quot; EXP2 =&quot;:enterprise&quot; ) ) ARG(NAME = &quot;enterprise&quot; TYPE = string) </retrieve> <retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;entp_users_licence&quot; ) COLUMN(NAME=&quot;entp_users_licence.enterprise&quot;) COLUMN(NAME=&quot;entp_users_licence.line_no&quot;) COLUMN(NAME=&quot;entp_users_licence.user_lic_type&quot;) COLUMN(NAME=&quot;entp_users_licence.lic_users&quot;)WHERE( EXP1 =&quot;entp_users_licence.enterprise&quot; OP =&quot;=&quot; EXP2 =&quot;:enterprise&quot; ) ) ARG(NAME = &quot;enterprise&quot; TYPE = string) </retrieve>
<update>entp_users_licence</update> <update>ENTP_USERS_LICENCE</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
<argument> <argument>
...@@ -88,14 +89,38 @@ ...@@ -88,14 +89,38 @@
<type>string</type> <type>string</type>
</argument> </argument>
</TableDefinition> </TableDefinition>
<GroupBox>
<band>Detail</band>
<text>Basic</text>
<border>2</border>
<color>33554432</color>
<x>226</x>
<y>4</y>
<height>168</height>
<width>407</width>
<name>gb_1</name>
<visible>1</visible>
<font>
<face>Arial</face>
<height>-11</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>1073741824</color>
</background>
</GroupBox>
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Enterprise:</text> <text>Enterprise:</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>10</x> <x>316</x>
<y>1</y> <y>29</y>
<height>15</height> <height>15</height>
<width>84</width> <width>84</width>
<html> <html>
...@@ -116,31 +141,21 @@ ...@@ -116,31 +141,21 @@
<color>536870912</color> <color>536870912</color>
</background> </background>
</TextObject> </TextObject>
<ColumnObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<id>1</id> <alignment>1</alignment>
<alignment>0</alignment> <text>Line No:</text>
<tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>98</x> <x>317</x>
<y>1</y> <y>63</y>
<height>18</height> <height>15</height>
<width>78</width> <width>84</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>enterprise</name> <name>line_no_t</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit">
<limit>10</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Arial</face> <face>Arial</face>
<height>-10</height> <height>-10</height>
...@@ -153,21 +168,21 @@ ...@@ -153,21 +168,21 @@
<mode>1</mode> <mode>1</mode>
<color>536870912</color> <color>536870912</color>
</background> </background>
</ColumnObject> </TextObject>
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Line No:</text> <text> Licence Type:</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>11</x> <x>316</x>
<y>35</y> <y>95</y>
<height>15</height> <height>16</height>
<width>84</width> <width>86</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>line_no_t</name> <name>user_lic_type_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Arial</face> <face>Arial</face>
...@@ -182,31 +197,21 @@ ...@@ -182,31 +197,21 @@
<color>536870912</color> <color>536870912</color>
</background> </background>
</TextObject> </TextObject>
<ColumnObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<id>2</id>
<alignment>1</alignment> <alignment>1</alignment>
<tabsequence>32766</tabsequence> <text> Licence Users:</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>99</x> <x>310</x>
<y>35</y> <y>129</y>
<height>18</height> <height>16</height>
<width>67</width> <width>91</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>line_no</name> <name>lic_users_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>Arial</face> <face>Arial</face>
<height>-10</height> <height>-10</height>
...@@ -219,22 +224,32 @@ ...@@ -219,22 +224,32 @@
<mode>1</mode> <mode>1</mode>
<color>536870912</color> <color>536870912</color>
</background> </background>
</ColumnObject> </TextObject>
<TextObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <id>1</id>
<text>User Lic Type:</text> <alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>11</x> <x>404</x>
<y>68</y> <y>29</y>
<height>15</height> <height>18</height>
<width>84</width> <width>78</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>user_lic_type_t</name> <name>enterprise</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit">
<limit>10</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Arial</face> <face>Arial</face>
<height>-10</height> <height>-10</height>
...@@ -247,28 +262,30 @@ ...@@ -247,28 +262,30 @@
<mode>1</mode> <mode>1</mode>
<color>536870912</color> <color>536870912</color>
</background> </background>
</TextObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>3</id> <id>2</id>
<alignment>0</alignment> <alignment>1</alignment>
<tabsequence>10</tabsequence> <tabsequence>32766</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>99</x> <x>405</x>
<y>68</y> <y>63</y>
<height>18</height> <height>18</height>
<width>69</width> <width>67</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>user_lic_type</name> <name>line_no</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="ddlb"> <EditStyle style="edit">
<limit>0</limit> <limit>0</limit>
<allowedit>no</allowedit>
<case>any</case> <case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode> <imemode>0</imemode>
</EditStyle> </EditStyle>
<font> <font>
...@@ -284,21 +301,29 @@ ...@@ -284,21 +301,29 @@
<color>536870912</color> <color>536870912</color>
</background> </background>
</ColumnObject> </ColumnObject>
<TextObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <id>3</id>
<text>Lic Users:</text> <alignment>0</alignment>
<tabsequence>10</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>11</x> <x>405</x>
<y>101</y> <y>96</y>
<height>15</height> <height>18</height>
<width>84</width> <width>69</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>lic_users_t</name> <name>user_lic_type</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="ddlb">
<limit>0</limit>
<allowedit>no</allowedit>
<case>any</case>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Arial</face> <face>Arial</face>
<height>-10</height> <height>-10</height>
...@@ -311,7 +336,7 @@ ...@@ -311,7 +336,7 @@
<mode>1</mode> <mode>1</mode>
<color>536870912</color> <color>536870912</color>
</background> </background>
</TextObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>4</id> <id>4</id>
...@@ -319,8 +344,8 @@ ...@@ -319,8 +344,8 @@
<tabsequence>20</tabsequence> <tabsequence>20</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>99</x> <x>405</x>
<y>101</y> <y>129</y>
<height>18</height> <height>18</height>
<width>68</width> <width>68</width>
<format>[general]</format> <format>[general]</format>
......
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