[gnue-contrib] r255 - hotline/forms

[reinhard]

Author: reinhard
Date: 2007-01-10 03:57:37 -0600 (Wed, 10 Jan 2007)
New Revision: 255

Modified:
   hotline/forms/hotline.gfd
Log:
More work on porting hotline form to latest and greatest forms.


Modified: hotline/forms/hotline.gfd
===================================================================
--- hotline/forms/hotline.gfd   2007-01-09 08:20:54 UTC (rev 254)
+++ hotline/forms/hotline.gfd   2007-01-10 09:57:37 UTC (rev 255)
@@ -101,10 +101,7 @@
     selTicket = True
     updGrund  = True
 
-    if value is None:
-      return
-
-    if len (value):
+    if value is not None:
       # Kundennummer eingegeben?
       dtsKunde.simpleQuery ({'hotline_nummer': value})
       if not blkKunde.isEmpty () and dtsKunde.count () == 1:
@@ -120,13 +117,13 @@
         if dtsKunde.count () == 1:
           selected = True
     else:
-      res = dtsOpenTickets.createResultSet (query = True)
-      if res.getRecordCount ():
-        params = {'ticket': None, 'kunde': None}
-        activateDialog ('selectTicket', params, 1)
-        if params.get ('ticket') is not None:
-          dtsKunde.simpleQuery ({'gnue_id': params ['kunde']})
-          dtsTicket.simpleQuery ({'gnue_id': params ['ticket']})
+      res = dtsOpenTickets.createResultSet(query = True)
+      if res.getRecordCount():
+        params = {}
+        activateDialog('selectTicket', params, 1)
+        if params['prm_ticket'] is not None:
+          dtsKunde.simpleQuery({'gnue_id': params['prm_kunde']})
+          dtsTicket.simpleQuery({'gnue_id': params['prm_ticket']})
           
           selected  = True
           selTicket = False
@@ -150,12 +147,12 @@
     setFocus (blkTicket.fldKontaktName)
 
     # Gibt's für diesen Kunden offene Tickets?
-    if selTicket and blkKunde.fldOffene.get():
+    if selTicket and blkKunde.fldOffene.value:
       # Ja: Auswahldialog öffnen
-      params = {'kunde': blkKunde.fldKundeId.get (), 'ticket': None}
-      activateDialog ('selectTicket', params, 1)
-      if params.get ('ticket'):
-        dtsTicket.simpleQuery ({'gnue_id': params ['ticket']})
+      params = {'prm_kunde': blkKunde.fldKundeId.value}
+      activateDialog('selectTicket', params, 1)
+      if params['prm_ticket'] is not None:
+        dtsTicket.simpleQuery({'gnue_id': params['prm_ticket']})
         updGrund = False
 
     blkAuswahl.fldStart.set (datetime.datetime.now ())
@@ -317,26 +314,26 @@
     <datasource name="dts" connection="hotline" table="hotline_kunde"/>
 
     <logic>
-      <block name="blk" datasource="dts" restrictInsert="Y" restrictDelete="Y">
-        <field name="fldNummer"    field="hotline_nummer"    datatype="text" 
length="6"  editable="N"/>
-        <field name="fldMatchcode" field="hotline_matchcode" datatype="text" 
length="10" editable="N"/>
-        <field name="fldName1"     field="hotline_name1"     datatype="text" 
length="35" editable="N"/>
-        <field name="fldOrt"       field="hotline_ort"       datatype="text" 
length="35" editable="N"/>
+      <block name="blk" datasource="dts" editable="N" deletable="N">
+        <field name="fldNummer"    field="hotline_nummer"    datatype="text" 
length="6"/>
+        <field name="fldMatchcode" field="hotline_matchcode" datatype="text" 
length="10"/>
+        <field name="fldName1"     field="hotline_name1"     datatype="text" 
length="35"/>
+        <field name="fldOrt"       field="hotline_ort"       datatype="text" 
length="35"/>
       </block>
     </logic>
 
     <layout xmlns:s="GNUe:Layout:Sizer">
       <page>
-        <hbox>
+        <vbox>
           <grid block="blk" rows="12">
             <gridline>
               <entry label="Nummer"    field="fldNummer"/>
-              <entry label="Matchcode" field="fldMatchcode" navigable="False"/>
-              <entry label="Name-1"    field="fldName1"     navigable="False"/>
+              <entry label="Matchcode" field="fldMatchcode" navigable="N"/>
+              <entry label="Name-1"    field="fldName1"     navigable="N"/>
             </gridline>
           </grid>
 
-          <vbox>
+          <hbox>
             <button label="Ok">
               <trigger name="Ok" type="On-Action">
                 form.nummer.value = blk.fldNummer.value
@@ -349,93 +346,77 @@
                 close()
               </trigger>
             </button>
-          </vbox>
-        </hbox>
+          </hbox>
+        </vbox>
       </page>
     </layout>
   </dialog>
 
 
   <!-- ================================================================= -->
-  <!-- Dialog zur Auswahl eines Calls für einen Kunden                   -->
+  <!-- Dialog zur Auswahl eines Tickets für einen Kunden                 -->
   <!-- ================================================================= -->
 
-  <dialog xmlns:c="GNUe:Layout:Char" name="selectTicket"
-    title="Offenes Ticket wählen">
+  <dialog name="selectTicket" title="Offenes Ticket wählen">
+    <parameter name="prm_kunde"/>
+    <parameter name="prm_ticket"/>
 
-    <parameter name="kunde" />
-    <parameter name="ticket" />
-
-    <trigger type="On-Startup">
-      form.setFeature('GUI:MENUBAR:SUPPRESS', 1)
-      form.setFeature('GUI:TOOLBAR:SUPPRESS', 1)
-      form.setFeature('GUI:STATUSBAR:SUPPRESS', 1)
-    </trigger>
-
-    <trigger type="On-Activation">
-      kunde = getParameter ('kunde')
-      if kunde:
-        form.setTitle ('Offenes Ticket für Kunde wählen')
-        dts.simpleQuery ({'hotline_kontakt.hotline_kunde': kunde})
-      else:
-        form.setTitle ('Offenes Ticket wählen')
-        dts.simpleQuery ({})
-    </trigger>
-
     <datasource name="dts" 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>
 
     <logic>
-      <block name="blk" datasource="dts" rows="12"
-        restrictInsert="Y" restrictDelete="Y">
-        <field name="fldId"      field="gnue_id"        editable="N"/>
-        <field name="fldStatus"  field="hotline_status" editable="N"/>
-        <field name="fldText"    field="hotline_text"   editable="N"/>
-        <field name="fldKontakt" field="hotline_kontakt.hotline_name"
-          editable="N"/>
-        <field name="fldKunde" field="hotline_kontakt.hotline_kunde"
-          editable="N"/>
+      <block name="blk" datasource="dts" editable="N" deletable="N">
+        <field name="fld_id"      field="gnue_id"                       
datatype="text" length="32"/>
+        <field name="fld_status"  field="hotline_status"                
datatype="text" length="1"/>
+        <field name="fld_text"    field="hotline_text"                  
datatype="text" length="35"/>
+        <field name="fld_kontakt" field="hotline_kontakt.hotline_name"  
datatype="text" length="35"/>
+        <field name="fld_kunde"   field="hotline_kontakt.hotline_kunde" 
datatype="text" length="32"/>
       </block>
     </logic>
 
-    <layout xmlns:c="GNUe:Layout:Char" c:width="76" c:height="15">
+    <trigger type="On-Activation">
+      kunde = prm_kunde.value
+      if kunde is not None:
+          form.setTitle('Offenes Ticket für Kunde wählen')
+          blk.query(fld_kunde=kunde)
+      else:
+          form.setTitle('Offenes Ticket wählen')
+          blk.query()
+    </trigger>
+
+    <layout xmlns:s="GNUe:Layout:Sizer">
       <page>
-        <label c:x="1"  c:y="0" c:width="7" c:height="1" text="Kontakt"/>
-        <label c:x="21" c:y="0" c:width="6" c:height="1" text="Text"   />
-        <label c:x="69" c:y="0" c:width="6" c:height="1" text="Status" />
+        <vbox>
+          <grid block="blk" rows="12">
+            <gridline>
+              <entry label="Kontakt" field="fld_kontakt"/>
+              <entry label="Text"    field="fld_text"   navigable="N"/>
+              <entry label="Status"  field="fld_status" navigable="N"/>
+            </gridline>
+          </grid>
 
-        <entry c:x="1"  c:y="1" c:width="19" block="blk" field="fldKontakt"
-          focusorder="1" />
-        <entry c:x="21" c:y="1" c:width="50" block="blk" field="fldText"
-          navigable="False"/>
-        <entry c:x="72" c:y="1" c:width="3"  block="blk" field="fldStatus"
-          navigable="False"/>
-
-        <button c:x="1" c:y="14" c:width="10" c:height="1" label="Ok">
-          <trigger name="Ok" type="On-Action">
-            setParameter ('ticket', blk.fldId.get ())
-            setParameter ('kunde', blk.fldKunde.get ())
-            close ()
-          </trigger>
-        </button>
-        <button c:x="12" c:y="14" c:width="10" c:height="1" label="Abbrechen">
-          <trigger name="Cancel" type="On-Action">
-            close ()
-          </trigger>
-        </button>
+          <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>
+          </hbox>
+        </vbox>
       </page>
     </layout>
   </dialog>
-
 </form>