r114 - in hotline: forms schema

[johannes]

Author: johannes
Date: 2004-11-17 02:27:55 -0600 (Wed, 17 Nov 2004)
New Revision: 114

Modified:
   hotline/forms/hotline.gfd
   hotline/schema/gnue.gsd
   hotline/schema/hotline-C.gld
   hotline/schema/hotline-de.gld
Log:
Added a 'revert' button and updated language-definitions


Modified: hotline/forms/hotline.gfd
===================================================================
--- hotline/forms/hotline.gfd   2004-11-16 22:00:09 UTC (rev 113)
+++ hotline/forms/hotline.gfd   2004-11-17 08:27:55 UTC (rev 114)
@@ -150,6 +150,16 @@
         setFocus (blkAuswahl.fldKunde)
     </trigger>
 
+    <trigger name="revert_all" type="NAMED" >
+      blkTicket.rollback ()
+      blkAuswahl.clear ()
+      blkKunde.clear ()
+      blkTicket.clear ()
+
+      blkAuswahl.fldMitarbeiter.set (getParameter ('mitarbeiter'))
+      setFocus (blkAuswahl.fldKunde)
+    </trigger>
+
     <block name="blkParameter" datasource="dtsParameter">
       <field name="fldWartungsvertrag" field="hotline_wartungsvertrag"/>
     </block>
@@ -247,7 +257,7 @@
         block="blkAuswahl" field="fldMitarbeiter" style="dropdown"/>
       <entry name="inpKunde" c:height="1" c:width="17" c:x="14" c:y="2"
         block="blkAuswahl" field="fldKunde"/>
-      <button name="btnKunde" c:height="1" c:width="10" c:x="60" c:y="2"
+      <button name="btnKunde" c:height="1" c:width="10" c:x="65" c:y="2"
         label="Suchen">
         <trigger type="ON-ACTION" src="kunde_pruefen"/>
       </button>
@@ -290,7 +300,12 @@
       <entry name="inpStatus" c:height="1" c:width="35" c:x="14" c:y="17"
         block="blkTicket" field="fldHotlineGrund" style="dropdown"/>
 
-      <button name="btnSave" c:height="1" c:width="10" c:x="60" c:y="17"
+      <button name="btnRevert" c:height="1" c:width="10" c:x="54" c:y="17"
+        label="Verwerfen">
+        <trigger type="ON-ACTION" src="revert_all" />
+      </button>
+
+      <button name="btnSave" c:height="1" c:width="10" c:x="65" c:y="17"
         label="Speichern">
         <trigger type="ON-ACTION" src="save_all"/>
       </button>

Modified: hotline/schema/gnue.gsd
===================================================================
--- hotline/schema/gnue.gsd     2004-11-16 22:00:09 UTC (rev 113)
+++ hotline/schema/gnue.gsd     2004-11-17 08:27:55 UTC (rev 114)
@@ -22,7 +22,7 @@
   write to the Free Software Foundation, Inc., 59 Temple Place
   - Suite 330, Boston, MA 02111-1307, USA.
  
-  $Id: gnue.gsd 6406 2004-09-27 19:29:30Z johannes $
+  $Id: gnue.gsd 6590 2004-11-01 08:43:14Z johannes $
 
   Run this file through gnue-schema to create and populate the database -->
 
@@ -65,8 +65,8 @@
                description="Module that defined this class" />
         <field name="gnue_name" type="string" length="35" nullable="N"
                description="Classname without modulename" />
-        <field name="gnue_filter" type="string" length="35"
-               description="Master-Class of the class" />
+        <field name="gnue_filter" type="string" length="32"
+               description="Filter-Class of the class" />
       </fields>
       <indexes/>
       <constraints>
@@ -74,6 +74,10 @@
           <constraintfield name="gnue_module"/>
           <constraintref name="gnue_id" table="gnue_module"/>
         </constraint>
+        <constraint name="fk_gnue_class_gnue_filter" type="foreignkey">
+          <constraintfield name="gnue_filter"/>
+          <constraintref name="gnue_id" table="gnue_class"/>
+        </constraint>
       </constraints>
       <primarykey name="pk_gnue_class">
         <pkfield name="gnue_id"/>
@@ -264,49 +268,6 @@
       </primarykey>
     </table>
 
-    <!-- ============================================================ -->
-    <!-- Company                                                      -->
-    <!-- ============================================================ -->
-    <table name="gnue_company">
-      <fields>
-        <field name="gnue_id" type="string" length="32" nullable="N"
-               description="Object ID"/>
-        <field name="gnue_code" type="string" length="8" nullable="N" 
-               description="Code of the company"/>
-        <field name="gnue_name" type="string" length="35" nullable="N"
-               description="Name of the company"/>
-      </fields>
-      <indexes/>
-      <constraints/>
-      <primarykey name="pk_gnue_company">
-        <pkfield name="gnue_id"/>
-      </primarykey>
-    </table>
-
-    <!-- ============================================================ -->
-    <!-- Year                                                         -->
-    <!-- ============================================================ -->
-    <table name="gnue_year">
-      <fields>
-        <field name="gnue_id" type="string" length="32" nullable="N"
-               description="Object ID"/>
-        <field name="gnue_company" type="string" length="32" nullable="N" 
-               description="Company this year is assigned to"/>
-        <field name="gnue_code" type="string" length="8" nullable="N" 
-               description="Code of the year"/>
-      </fields>
-      <indexes/>
-      <constraints>
-        <constraint name="fk_gnue_year_gnue_company" type="foreignkey">
-          <constraintfield name="gnue_company"/>
-          <constraintref name="gnue_id" table="gnue_company"/>
-        </constraint>
-      </constraints>
-      <primarykey name="pk_gnue_year">
-        <pkfield name="gnue_id"/>
-      </primarykey>
-    </table>
-
   </tables>
   <data>
 
@@ -383,19 +344,6 @@
           <value field="gnue_module">00000000000000000000000000000000</value>
           <value field="gnue_name">message</value>
         </row>
-        <row>
-          <value field="gnue_comment">GNU Enterprise Company</value>
-          <value field="gnue_id">00000000000000000000000000000090</value>
-          <value field="gnue_module">00000000000000000000000000000000</value>
-          <value field="gnue_name">company</value>
-        </row>
-        <row>
-          <value field="gnue_comment">GNU Enterprise Year</value>
-          <value field="gnue_id">000000000000000000000000000000A0</value>
-          <value field="gnue_module">00000000000000000000000000000000</value>
-          <value field="gnue_name">year</value>
-          <value field="gnue_filter">gnue_company</value>
-        </row>
       </rows>
     </tabledata>
 
@@ -495,11 +443,10 @@
           <value field="gnue_module">00000000000000000000000000000000</value>
           <value field="gnue_class">00000000000000000000000000000020</value>
           <value field="gnue_id">00000000000000000000000000000025</value>
-          <value field="gnue_comment">Master-Class of the class</value>
-          <value field="gnue_length">35</value>
+          <value field="gnue_comment">Filter-Class of the class</value>
           <value field="gnue_name">filter</value>
           <value field="gnue_nullable">TRUE</value>
-          <value field="gnue_type">string</value>
+          <value field="gnue_type">gnue_class</value>
         </row>
 
         <!-- ============================================================ -->
@@ -915,70 +862,6 @@
           <value field="gnue_nullable">TRUE</value>
         </row>
 
-        <!-- ============================================================ -->
-        <!-- Properties of gnue_company                                   -->
-        <!-- ============================================================ -->
-        <row>
-          <value field="gnue_module">00000000000000000000000000000000</value>
-          <value field="gnue_class">00000000000000000000000000000090</value>
-          <value field="gnue_id">00000000000000000000000000000091</value>
-          <value field="gnue_comment">Object ID</value>
-          <value field="gnue_name">id</value>
-          <value field="gnue_nullable">FALSE</value>
-          <value field="gnue_type">id</value>
-        </row>
-        <row>
-          <value field="gnue_module">00000000000000000000000000000000</value>
-          <value field="gnue_class">00000000000000000000000000000090</value>
-          <value field="gnue_id">00000000000000000000000000000092</value>
-          <value field="gnue_comment">Code of the company</value>
-          <value field="gnue_name">code</value>
-          <value field="gnue_nullable">FALSE</value>
-          <value field="gnue_type">string</value>
-          <value field="gnue_length">8</value>
-        </row>
-        <row>
-          <value field="gnue_module">00000000000000000000000000000000</value>
-          <value field="gnue_class">00000000000000000000000000000090</value>
-          <value field="gnue_id">00000000000000000000000000000093</value>
-          <value field="gnue_comment">Name of the company</value>
-          <value field="gnue_name">name</value>
-          <value field="gnue_nullable">FALSE</value>
-          <value field="gnue_type">string</value>
-          <value field="gnue_length">35</value>
-        </row>
-
-        <!-- ============================================================ -->
-        <!-- Properties of gnue_year                                      -->
-        <!-- ============================================================ -->
-        <row>
-          <value field="gnue_module">00000000000000000000000000000000</value>
-          <value field="gnue_class">000000000000000000000000000000A0</value>
-          <value field="gnue_id">000000000000000000000000000000A1</value>
-          <value field="gnue_comment">Object ID</value>
-          <value field="gnue_name">id</value>
-          <value field="gnue_nullable">FALSE</value>
-          <value field="gnue_type">id</value>
-        </row>
-        <row>
-          <value field="gnue_module">00000000000000000000000000000000</value>
-          <value field="gnue_class">000000000000000000000000000000A0</value>
-          <value field="gnue_id">000000000000000000000000000000A2</value>
-          <value field="gnue_comment">Code of the year</value>
-          <value field="gnue_name">code</value>
-          <value field="gnue_nullable">FALSE</value>
-          <value field="gnue_type">string</value>
-          <value field="gnue_length">8</value>
-        </row>
-        <row>
-          <value field="gnue_module">00000000000000000000000000000000</value>
-          <value field="gnue_class">000000000000000000000000000000A0</value>
-          <value field="gnue_id">000000000000000000000000000000A3</value>
-          <value field="gnue_comment">Company this year is assigned to</value>
-          <value field="gnue_name">company</value>
-          <value field="gnue_nullable">FALSE</value>
-          <value field="gnue_type">gnue_company</value>
-        </row>
       </rows>
     </tabledata>
 
@@ -1010,12 +893,10 @@
           <value field="gnue_nullable">TRUE</value>
           <value field="gnue_type">string</value>
           <value field="gnue_code">
-            from gnue.appserver import labels
-            labels.find  = find
-            labels.abort = abort
-            formGen = labels.FormGenerator (self, language, connection,
-                                            formwidth, formheight)
-            return formGen.generateForm ()
+            from gnue.appserver.generator.form import FormGenerator
+            formGen = FormGenerator (session, self, language, connection,
+                                     formwidth, formheight)
+            return formGen.run ()
           </value>
         </row>
       </rows>

Modified: hotline/schema/hotline-C.gld
===================================================================
--- hotline/schema/hotline-C.gld        2004-11-16 22:00:09 UTC (rev 113)
+++ hotline/schema/hotline-C.gld        2004-11-17 08:27:55 UTC (rev 114)
@@ -23,7 +23,7 @@
 
 -->
 
-<labels module="hotline" language="C">
+<module name="hotline" language="C">
 
   <class name="grund">
     <property name="name" pos="100" search="100" label="Name"/>
@@ -97,4 +97,4 @@
     <procedure name="getgesamtzeit" pos="900" label="Total time"/>
   </class>
 
-</labels>
+</module>

Modified: hotline/schema/hotline-de.gld
===================================================================
--- hotline/schema/hotline-de.gld       2004-11-16 22:00:09 UTC (rev 113)
+++ hotline/schema/hotline-de.gld       2004-11-17 08:27:55 UTC (rev 114)
@@ -23,7 +23,7 @@
 
 -->
 
-<labels module="hotline" language="de">
+<module name="hotline" language="de">
 
   <class name="grund">
     <property name="name" pos="100" search="100" label="Name"/>
@@ -97,5 +97,5 @@
     <procedure name="getgesamtzeit" pos="900" label="Gesamtzeit"/>
   </class>
 
-</labels>
+</module>