[gnue-contrib] r256 - hotline/forms

[reinhard]

Author: reinhard
Date: 2007-01-10 04:37:26 -0600 (Wed, 10 Jan 2007)
New Revision: 256

Modified:
   hotline/forms/hotline.gfd
Log:
More work on hotline form.


Modified: hotline/forms/hotline.gfd
===================================================================
--- hotline/forms/hotline.gfd   2007-01-10 09:57:37 UTC (rev 255)
+++ hotline/forms/hotline.gfd   2007-01-10 10:37:26 UTC (rev 256)
@@ -23,7 +23,6 @@
 
 
 <form title="Hotline">
-  <options/>
   <parameter name="mitarbeiter"/>
   <datasource name="dtsMitarbeiter" connection="hotline"
     table="hotline_mitarbeiter" prequery="Y"/>
@@ -64,17 +63,11 @@
     </staticset>
   </datasource>
 
-  <datasource name="dtsOpenTickets" connection="hotline"
-    table="hotline_ticket">
+  <datasource name="dtsOpenTickets" connection="hotline" 
table="hotline_ticket">
     <condition>
       <or>
-        <ne>
-          <cfield name="hotline_status"/>
-          <cconst value="E"/>
-        </ne>
-        <null>
-          <cfield name="hotline_status"/>
-        </null>
+        <ne><cfield name="hotline_status"/><cconst value="E"/></ne>
+        <null><cfield name="hotline_status"/></null>
       </or>
     </condition>
   </datasource>
@@ -120,7 +113,7 @@
       res = dtsOpenTickets.createResultSet(query = True)
       if res.getRecordCount():
         params = {}
-        activateDialog('selectTicket', params, 1)
+        activateDialog('selectTicket', params, True)
         if params['prm_ticket'] is not None:
           dtsKunde.simpleQuery({'gnue_id': params['prm_kunde']})
           dtsTicket.simpleQuery({'gnue_id': params['prm_ticket']})
@@ -131,14 +124,14 @@
 
     # Nicht eindeutiger Matchcode oder leere Eingabe
     if not selected:
-      params = {'matchcode': blkAuswahl.fldKunde.get() or ''}
-      activateDialog ('selectKunde', params, 1)
-      if params['nummer'] is None:
+      params = {'prm_matchcode': blkAuswahl.fldKunde.value}
+      activateDialog('selectKunde', params, True)
+      if params['prm_nummer'] is None:
         # Leeres Resultset erzeugen, damit die Anzeige gelöscht wird
         dtsKunde.simpleQuery ({'gnue_id': None})
         return
       # Auswahl aktivieren
-      dtsKunde.simpleQuery ({'hotline_nummer': params['nummer']})
+      dtsKunde.simpleQuery ({'hotline_nummer': params['prm_nummer']})
 
     # Kundennummer ins Auswahlfeld setzen
     blkAuswahl.fldKunde.set (blkKunde.fldHotlineNummer)
@@ -240,10 +233,6 @@
             blkLeistung.fldHotlineMitarbeiter.set(mit)
       </trigger>
     </block>
-
-    <block name="blkOpenTickets" datasource="dtsOpenTickets">
-      <field name="fldStatus" field="hotline_status" length="1"/>
-    </block>
   </logic>
 
   <layout xmlns:s="GNUe:Layout:Sizer">
@@ -299,20 +288,15 @@
   <!-- ================================================================= -->
 
   <dialog name="selectKunde" title="Kunde suchen">
-    <parameter name="matchcode" datatype="text"/>
-    <parameter name="nummer"    datatype="text"/>
+    <parameter name="prm_matchcode" datatype="text" length="10"/>
+    <parameter name="prm_nummer"    datatype="text" length="6"/>
 
-    <trigger type="On-Activation">
-      # Bei der Aktivierung des Dialoges werden alle Kunden mit Matchcode lt.
-      # Parameter gelesen
-      condition = ['like',
-              ['field', 'hotline_matchcode'],
-              ['const', getParameter('matchcode') + "%"]]
-      blk.query(condition)
-    </trigger>
+    <datasource name="dts" connection="hotline" table="hotline_kunde">
+      <sortorder>
+        <sortfield name="hotline_matchcode"/>
+      </sortorder>
+    </datasource>
 
-    <datasource name="dts" connection="hotline" table="hotline_kunde"/>
-
     <logic>
       <block name="blk" datasource="dts" editable="N" deletable="N">
         <field name="fldNummer"    field="hotline_nummer"    datatype="text" 
length="6"/>
@@ -322,7 +306,29 @@
       </block>
     </logic>
 
-    <layout xmlns:s="GNUe:Layout:Sizer">
+    <trigger type="On-Activation">
+      # Bei der Aktivierung des Dialoges werden alle Kunden mit Matchcode lt.
+      # Parameter gelesen
+      matchcode = prm_matchcode.value
+      if matchcode is None:
+          matchcode = u""
+      condition = ['like',
+              ['field', 'hotline_matchcode'],
+              ['const', matchcode + u"%"]]
+      blk.query(condition)
+    </trigger>
+
+    <action name="act_ok">
+      prm_nummer.value = blk.fldNummer.value
+      form.close()
+    </action>
+
+    <action name="act_cancel">
+      prm_nummer.value = None
+      form.close()
+    </action>
+
+    <layout>
       <page>
         <vbox>
           <grid block="blk" rows="12">
@@ -330,22 +336,13 @@
               <entry label="Nummer"    field="fldNummer"/>
               <entry label="Matchcode" field="fldMatchcode" navigable="N"/>
               <entry label="Name-1"    field="fldName1"     navigable="N"/>
+              <entry label="Ort"       field="fldOrt"       navigable="N"/>
             </gridline>
           </grid>
 
           <hbox>
-            <button label="Ok">
-              <trigger name="Ok" type="On-Action">
-                form.nummer.value = blk.fldNummer.value
-                close()
-              </trigger>
-            </button>
-            <button label="Abbrechen">
-              <trigger name="Cancel" type="On-Action">
-                form.nummer.value = None
-                close()
-              </trigger>
-            </button>
+            <button label="Ok" action="act_ok"/>
+            <button label="Abbrechen" action="act_cancel"/>
           </hbox>
         </vbox>
       </page>
@@ -358,8 +355,8 @@
   <!-- ================================================================= -->
 
   <dialog name="selectTicket" title="Offenes Ticket wählen">
-    <parameter name="prm_kunde"/>
-    <parameter name="prm_ticket"/>
+    <parameter name="prm_kunde"  datatype="text" length="32"/>
+    <parameter name="prm_ticket" datatype="text" length="32"/>
 
     <datasource name="dts" connection="hotline" table="hotline_ticket">
       <condition>
@@ -368,6 +365,10 @@
           <null><cfield name="hotline_status"/></null>
         </or>
       </condition>
+      <sortorder>
+        <sortfield name="hotline_status"/>
+        <sortfield name="gnue_createdate"/>
+      </sortorder>
     </datasource>
 
     <logic>
@@ -390,7 +391,19 @@
           blk.query()
     </trigger>
 
-    <layout xmlns:s="GNUe:Layout:Sizer">
+    <action name="act_ok">
+      prm_ticket.value = blk.fld_id.value
+      prm_kunde.value = blk.fld_kunde.value
+      form.close()
+    </action>
+
+    <action name="act_cancel">
+      prm_ticket.value = None
+      prm_kunde.value = None
+      form.close()
+    </action>
+
+    <layout>
       <page>
         <vbox>
           <grid block="blk" rows="12">
@@ -402,18 +415,8 @@
           </grid>
 
           <hbox>
-            <button label="Ok">
-              <trigger name="Ok" type="On-Action">
-                prm_ticket.value = blk.fld_id.value
-                prm_kunde.value = blk.fld_kunde.value
-                form.close()
-              </trigger>
-            </button>
-            <button label="Abbrechen">
-              <trigger name="Cancel" type="On-Action">
-                form.close()
-              </trigger>
-            </button>
+            <button label="Ok" action="act_ok"/>
+            <button label="Abbrechen" action="act_cancel"/>
           </hbox>
         </vbox>
       </page>