[gnue-contrib] r252 - hotline/forms

[reinhard]

Author: reinhard
Date: 2006-12-29 05:34:38 -0600 (Fri, 29 Dec 2006)
New Revision: 252

Modified:
   hotline/forms/hotline.gfd
Log:
More work on porting hotline form to gnue-forms 0.6


Modified: hotline/forms/hotline.gfd
===================================================================
--- hotline/forms/hotline.gfd   2006-12-29 10:02:13 UTC (rev 251)
+++ hotline/forms/hotline.gfd   2006-12-29 11:34:38 UTC (rev 252)
@@ -134,14 +134,14 @@
 
     # Nicht eindeutiger Matchcode oder leere Eingabe
     if not selected:
-      params = {'matchcode': blkAuswahl.fldKunde.get () or ''}
+      params = {'matchcode': blkAuswahl.fldKunde.get() or ''}
       activateDialog ('selectKunde', params, 1)
-      if not params.has_key ('nummer'):       # "Abbrechen" gedrückt
+      if params['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['nummer']})
 
     # Kundennummer ins Auswahlfeld setzen
     blkAuswahl.fldKunde.set (blkKunde.fldHotlineNummer)
@@ -150,7 +150,7 @@
     setFocus (blkTicket.fldKontaktName)
 
     # Gibt's für diesen Kunden offene Tickets?
-    if selTicket and blkKunde.fldOffene.get ():
+    if selTicket and blkKunde.fldOffene.get():
       # Ja: Auswahldialog öffnen
       params = {'kunde': blkKunde.fldKundeId.get (), 'ticket': None}
       activateDialog ('selectTicket', params, 1)
@@ -190,73 +190,60 @@
     </block>
 
     <block name="blkAuswahl">
-      <field name="fldMitarbeiter" fk_source="dtsMitarbeiter" fk_key="gnue_id"
-        fk_description="hotline_name"/>
-      <field name="fldStart"/>
-      <field name="fldKunde" case="upper"/>
-      <field name="fldName"/>
+      <field name="fldMitarbeiter" fk_source="dtsMitarbeiter" fk_key="gnue_id" 
fk_description="hotline_name"/>
+      <field name="fldStart" datatype="datetime"/>
+      <field name="fldKunde" datatype="text" case="upper"/>
+      <field name="fldName"  datatype="text"/>
     </block>
 
     <block name="blkKunde" datasource="dtsKunde">
-      <field name="fldHotlineName1" field="hotline_name1" max_length="35"
-        readonly="Y"/>
-      <field name="fldHotlineNummer" field="hotline_nummer" max_length="17"
-        readonly="Y"/>
-      <field name="fldHotlineOrt" field="hotline_ort" max_length="35"
-        readonly="Y"/>
-      <field name="fldTelefon" field="hotline_telefon"
-        max_length="35" readonly="Y"/>
-      <field name="fldKundeId" field="gnue_id" readonly="Y"/>
-      <field name="fldVertrag" field="hotline_vertrag" readonly="Y"/>
-      <field name="fldOffene" field="hotline_offeneTickets" readonly="Y"/>
+      <field name="fldHotlineName1"  field="hotline_name1"         
datatype="text"    length="35" readonly="Y"/>
+      <field name="fldHotlineNummer" field="hotline_nummer"        
datatype="text"    length="17" readonly="Y"/>
+      <field name="fldHotlineOrt"    field="hotline_ort"           
datatype="text"    length="35" readonly="Y"/>
+      <field name="fldTelefon"       field="hotline_telefon"       
datatype="text"    length="35" readonly="Y"/>
+      <field name="fldKundeId"       field="gnue_id"               
datatype="text"                readonly="Y"/>
+      <field name="fldVertrag"       field="hotline_vertrag"       
datatype="boolean"             readonly="Y"/>
+      <field name="fldOffene"        field="hotline_offeneTickets" 
datatype="boolean"             readonly="Y"/>
     </block>
 
     <block name="blkTicket" datasource="dtsTicket">
-      <field name="fldKontaktName" field="hotline_kontakt" fk_key="gnue_id"
-        fk_description="hotline_name" fk_source="dtsKontakt"/>
-      <field name="fldKontaktTelefon" field="hotline_kontakt" fk_key="gnue_id"
-        fk_description="hotline_telefon" fk_source="dtsKontakt"/>
-      <field name="fldKontaktEmail" field="hotline_kontakt" fk_key="gnue_id"
-        fk_description="hotline_email" fk_source="dtsKontakt"/>
-      <field name="fldKontaktName" field="hotline_kontakt" fk_key="gnue_id"
-        fk_description="hotline_name" fk_source="dtsKontakt"/>
-      <field name="fldProdukt" field="hotline_produkt" fk_key="gnue_id"
-        fk_description="hotline_name" fk_source="dtsProdukt"/>
-      <field name="fldHotlineText" field="hotline_text" max_length="70"/>
-      <field name="fldHotlineGrund" field="hotline_grund" fk_key="gnue_id"
-        fk_description="hotline_name" fk_source="dtsGrund"/>
-      <field name="fldHotlineStatus" field="hotline_status" fk_key="key"
-        fk_description="descr" fk_source="dtsStatus"/>
+      <field name="fldKontaktName"    field="hotline_kontakt" fk_key="gnue_id" 
fk_description="hotline_name"    fk_source="dtsKontakt"/>
+      <field name="fldKontaktTelefon" field="hotline_kontakt" fk_key="gnue_id" 
fk_description="hotline_telefon" fk_source="dtsKontakt"/>
+      <field name="fldKontaktEmail"   field="hotline_kontakt" fk_key="gnue_id" 
fk_description="hotline_email"   fk_source="dtsKontakt"/>
+      <field name="fldKontaktName"    field="hotline_kontakt" fk_key="gnue_id" 
fk_description="hotline_name"    fk_source="dtsKontakt"/>
+      <field name="fldProdukt"        field="hotline_produkt" fk_key="gnue_id" 
fk_description="hotline_name"    fk_source="dtsProdukt"/>
+      <field name="fldHotlineText"    field="hotline_text"    datatype="text" 
length="70"/>
+      <field name="fldHotlineGrund"   field="hotline_grund"   fk_key="gnue_id" 
fk_description="hotline_name"    fk_source="dtsGrund"/>
+      <field name="fldHotlineStatus"  field="hotline_status"  fk_key="key"     
fk_description="descr"           fk_source="dtsStatus"/>
     </block>
 
     <block name="blkLeistung" datasource="dtsLeistung">
-      <field name="fldHotlineText" field="hotline_text" max_length="70"/>
-      <field name="fldHotlineStart" field="hotline_start" typecast="date"/>
-      <field name="fldHotlineEnde" field="hotline_ende" typecast="date">
+      <field name="fldHotlineText"  field="hotline_text"  datatype="text" 
length="70"/>
+      <field name="fldHotlineStart" field="hotline_start" datatype="datetime"/>
+      <field name="fldHotlineEnde"  field="hotline_ende"  datatype="datetime">
         <trigger name="TimeUpdate" type="PRE-FOCUSIN">
           import datetime
-          curr = blkLeistung.fldHotlineEnde.get ()
-          if curr is None or curr == '':
-            blkLeistung.fldHotlineEnde.set (datetime.datetime.now ())
+          curr = blkLeistung.fldHotlineEnde.get()
+          if curr is None:
+              blkLeistung.fldHotlineEnde.set(datetime.datetime.now())
         </trigger>
       </field>
       <field name="fldHotlineMitarbeiter" field="hotline_mitarbeiter"/>
-      <field name="fldHotlineTicket" field="hotline_ticket" max_length="32"/>
+      <field name="fldHotlineTicket" field="hotline_ticket" datatype="text" 
length="32"/>
       <trigger name="Startzeit" type="PRE-FOCUSIN">
         import datetime
-        newTime = blkAuswahl.fldStart.get ()
-        if isinstance (newTime, datetime.datetime):
-          if blkLeistung.fldHotlineStart.isEmpty ():
-            blkLeistung.fldHotlineStart.set (blkAuswahl.fldStart.get ())
+        newTime = blkAuswahl.fldStart.get()
+        if blkLeistung.fldHotlineStart.isEmpty():
+            blkLeistung.fldHotlineStart.set(blkAuswahl.fldStart.get())
 
-          if blkLeistung.fldHotlineMitarbeiter.isEmpty ():
-            mit = blkAuswahl.fldMitarbeiter.get ()
-            blkLeistung.fldHotlineMitarbeiter.set (mit)
+        if blkLeistung.fldHotlineMitarbeiter.isEmpty():
+            mit = blkAuswahl.fldMitarbeiter.get()
+            blkLeistung.fldHotlineMitarbeiter.set(mit)
       </trigger>
     </block>
 
     <block name="blkOpenTickets" datasource="dtsOpenTickets">
-      <field name="fldStatus" field="hotline_status" max_length="1" />
+      <field name="fldStatus" field="hotline_status" length="1"/>
     </block>
   </logic>
 
@@ -267,48 +254,32 @@
           block="blkAuswahl" field="fldMitarbeiter" style="dropdown"/>
         <hbox label="Kunde">
           <vbox s:stretch="1">
-            <entry name="inpKunde" label="Kunde:"
-              block="blkAuswahl" field="fldKunde"/>
-            <entry name="inpName1" label="Name-1:"
-              block="blkKunde" field="fldHotlineName1" style="label"/>
-            <entry name="inpOrt" label="Ort:"
-              block="blkKunde" field="fldHotlineOrt" style="label"/>
-            <entry name="inpTelefon" label="Telefon:"
-              block="blkKunde" field="fldTelefon" style="label"/>
+            <entry name="inpKunde"   label="Kunde:"   block="blkAuswahl" 
field="fldKunde"/>
+            <entry name="inpName1"   label="Name-1:"  block="blkKunde"   
field="fldHotlineName1" style="label"/>
+            <entry name="inpOrt"     label="Ort:"     block="blkKunde"   
field="fldHotlineOrt"   style="label"/>
+            <entry name="inpTelefon" label="Telefon:" block="blkKunde"   
field="fldTelefon"      style="label"/>
           </vbox>
           <button name="btnKunde" label="Suchen" s:stretch="0">
             <trigger type="ON-ACTION" src="kunde_pruefen"/>
           </button>
         </hbox>
-        <vbox label="Kontakt">
-          <entry name="inpKontakt" label="Kontakt:"
-          block="blkTicket" field="fldKontaktName" style="dropdown"/>
-          <entry name="inpKTel" label="Telefon:"
-            block="blkTicket" field="fldKontaktTelefon" style="label"/>
-          <entry name="inpMail" label="E-Mail:"
-            block="blkTicket" field="fldKontaktEmail" style="label"/>
-          <entry name="inpProdukt" label="Produkt:"
-            block="blkTicket" field="fldProdukt" style="dropdown"/>
-          <entry name="inpProblem" label="Problem:"
-            block="blkTicket" field="fldHotlineText"/>
+        <vbox label="Kontakt" block="blkTicket">
+          <entry name="inpKontakt" label="Kontakt:" field="fldKontaktName"/>
+          <entry name="inpKTel"    label="Telefon:" field="fldKontaktTelefon" 
style="label"/>
+          <entry name="inpMail"    label="E-Mail:"  field="fldKontaktEmail"   
style="label"/>
+          <entry name="inpProdukt" label="Produkt:" field="fldProdukt"/>
+          <entry name="inpProblem" label="Problem:" field="fldHotlineText"/>
         </vbox>
 
-        <vbox label="Leistung">
-          <entry name="inpAktion" label="Tätigkeit:"
-            block="blkLeistung" field="fldHotlineText"/>
-          <entry name="inpStart" label="Zeit von:"
-            block="blkLeistung" field="fldHotlineStart"
-            inputmask="%x %X" displaymask="%x %X"/>
-          <entry name="inpEnde" label="Zeit bis:"
-            block="blkLeistung" field="fldHotlineEnde"
-            inputmask="%x %X" displaymask="%x %X"/>
+        <vbox label="Leistung" block="blkLeistung">
+          <entry name="inpAktion" label="Tätigkeit:" field="fldHotlineText"/>
+          <entry name="inpStart"  label="Zeit von:"  field="fldHotlineStart" 
inputmask="%x %X" displaymask="%x %X"/>
+          <entry name="inpEnde"   label="Zeit bis:"  field="fldHotlineEnde"  
inputmask="%x %X" displaymask="%x %X"/>
         </vbox>
 
-        <vbox label="Status">
-          <entry name="inpStatus" label="Status:"
-            block="blkTicket" field="fldHotlineStatus" style="dropdown"/>
-          <entry name="inpStatus" label="Grund:"
-            block="blkTicket" field="fldHotlineGrund" style="dropdown"/>
+        <vbox label="Status" block="blkTicket">
+          <entry name="inpStatus" label="Status:" block="blkTicket" 
field="fldHotlineStatus"/>
+          <entry name="inpStatus" label="Grund:"  block="blkTicket" 
field="fldHotlineGrund"/>
         </vbox>
 
         <hbox>
@@ -330,27 +301,26 @@
   <!-- ================================================================= -->
 
   <dialog name="selectKunde" title="Kunde suchen">
-    <trigger type="On-Startup">
-      form.setFeature ('GUI:MENUBAR:SUPPRESS', True)
-      form.setFeature ('GUI:TOOLBAR:SUPPRESS', True)
-      form.setFeature ('GUI:STATUSBAR:SUPPRESS', True)
-    </trigger>
+    <parameter name="matchcode" datatype="text"/>
+    <parameter name="nummer"    datatype="text"/>
 
     <trigger type="On-Activation">
       # Bei der Aktivierung des Dialoges werden alle Kunden mit Matchcode lt.
       # Parameter gelesen
-      match = getParameter ('matchcode') + "%"
-      dts.simpleQuery ({'hotline_matchcode': match})
+      condition = ['like',
+              ['field', 'hotline_matchcode'],
+              ['const', getParameter('matchcode') + "%"]]
+      blk.query(condition)
     </trigger>
 
     <datasource name="dts" connection="hotline" table="hotline_kunde"/>
 
     <logic>
       <block name="blk" datasource="dts" restrictInsert="Y" restrictDelete="Y">
-        <field name="fldNummer"    field="hotline_nummer"    readonly="Y"/>
-        <field name="fldMatchcode" field="hotline_matchcode" readonly="Y"/>
-        <field name="fldName1"     field="hotline_name1"     readonly="Y"/>
-        <field name="fldOrt"       field="hotline_ort"       readonly="Y"/>
+        <field name="fldNummer"    field="hotline_nummer"    datatype="text" 
length="6"  readonly="Y"/>
+        <field name="fldMatchcode" field="hotline_matchcode" datatype="text" 
length="10" readonly="Y"/>
+        <field name="fldName1"     field="hotline_name1"     datatype="text" 
length="35" readonly="Y"/>
+        <field name="fldOrt"       field="hotline_ort"       datatype="text" 
length="35" readonly="Y"/>
       </block>
     </logic>
 
@@ -368,13 +338,14 @@
           <vbox>
             <button label="Ok">
               <trigger name="Ok" type="On-Action">
-                setParameter ('nummer', blk.fldNummer.get ())
-                close ()
+                form.nummer.value = blk.fldNummer.value
+                close()
               </trigger>
             </button>
             <button label="Abbrechen">
               <trigger name="Cancel" type="On-Action">
-                close ()
+                form.nummer.value = None
+                close()
               </trigger>
             </button>
           </vbox>