[gnue-contrib] r245 - hotline/forms

[reinhard]

Author: reinhard
Date: 2006-10-25 02:39:54 -0500 (Wed, 25 Oct 2006)
New Revision: 245

Modified:
   hotline/forms/hotline.gfd
Log:
Started to convert hotline form to managed layout.


Modified: hotline/forms/hotline.gfd
===================================================================
--- hotline/forms/hotline.gfd   2006-10-11 08:27:18 UTC (rev 244)
+++ hotline/forms/hotline.gfd   2006-10-25 07:39:54 UTC (rev 245)
@@ -1,28 +1,26 @@
-<?xml version="1.0" encoding="iso8859-1"?>
+<?xml version="1.0"?>
 
-<!--
+<!-- Copyright 2004 Free Software Foundation
 
-    Copyright 2004 Free Software Foundation
+     This file is part of GNU Enterprise Hotline.
 
-    This file is part of GNU Enterprise Hotline.
+     GNU Enterprise Hotline is free software; you can redistribute it
+     and/or modify it under the terms of the GNU General Public License
+     as published by the Free Software Foundation; either version 2 of
+     the License, or (at your option) any later version.
 
-    GNU Enterprise Hotline is free software; you can redistribute it
-    and/or modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2 of
-    the License, or (at your option) any later version.
+     GNU Enterprise Hotline is distributed in the hope that it will be
+     useful, but WITHOUT ANY WARRANTY; without even the implied
+     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+     See the GNU General Public License for more details.
 
-    GNU Enterprise Hotline is distributed in the hope that it will be
-    useful, but WITHOUT ANY WARRANTY; without even the implied
-    warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
+     You should have received a copy of the GNU General Public License
+     along with GNU Enterprise Hotline; see the file COPYING.  If not,
+     write to the Free Software Foundation, Inc., 59 Temple Place -
+     Suite 330, Boston, MA 02111-1307, USA.
 
-    You should have received a copy of the GNU General Public License
-    along with GNU Enterprise Hotline; see the file COPYING.  If not,
-    write to the Free Software Foundation, Inc., 59 Temple Place -
-    Suite 330, Boston, MA 02111-1307, USA.
+     $Id$ -->
 
-    $Id$
--->
 
 <form title="Hotline">
   <options/>
@@ -94,7 +92,7 @@
   </trigger>
 
   <trigger name="kunde_pruefen" type="NAMED">
-    # Dieser Trigger versucht, eine Kundennummer f�r den aktuellen Wert des
+    # Dieser Trigger versucht, eine Kundennummer für den aktuellen Wert des
     # Feldes Kunde zu finden
     import datetime
     value     = blkAuswahl.fldKunde.get ()
@@ -102,6 +100,9 @@
     selTicket = True
     updGrund  = True
 
+    if value is None:
+      return
+
     if len (value):
       # Kundennummer eingegeben?
       dtsKunde.simpleQuery ({'hotline_nummer': value})
@@ -134,8 +135,8 @@
     if not selected:
       params = {'matchcode': blkAuswahl.fldKunde.get () or ''}
       activateDialog ('selectKunde', params, 1)
-      if not params.has_key ('nummer'):       # "Abbrechen" gedr�ckt
-        # Leeres Resultset erzeugen, damit die Anzeige gel�scht wird
+      if not params.has_key ('nummer'):       # "Abbrechen" gedrückt
+        # Leeres Resultset erzeugen, damit die Anzeige gelöscht wird
         dtsKunde.simpleQuery ({'gnue_id': None})
         return
       # Auswahl aktivieren
@@ -147,9 +148,9 @@
     # Focus auf den Kontakt
     setFocus (blkTicket.fldKontaktName)
 
-    # Gibt's f�r diesen Kunden offene Tickets?
+    # Gibt's für diesen Kunden offene Tickets?
     if selTicket and blkKunde.fldOffene.get ():
-      # Ja: Auswahldialog �ffnen
+      # Ja: Auswahldialog öffnen
       params = {'kunde': blkKunde.fldKundeId.get (), 'ticket': None}
       activateDialog ('selectTicket', params, 1)
       if params.get ('ticket'):
@@ -158,7 +159,7 @@
 
     blkAuswahl.fldStart.set (datetime.datetime.now ())
 
-    # FIXME: Das geh�rt in die Initialisierung der hotline_ticket Klasse
+    # FIXME: Das gehört in die Initialisierung der hotline_ticket Klasse
     if updGrund and blkKunde.fldVertrag.get ():
       wvgrund = blkParameter.fldWartungsvertrag.get ()
       blkTicket.fldHotlineGrund.set (wvgrund)
@@ -258,77 +259,61 @@
     </block>
   </logic>
 
-
-  <layout xmlns:c="GNUe:Layout:Char" c:height="20" c:width="79" tabbed="top">
+  <layout xmlns:s="GNUe:Layout:Sizer">
     <page name="Hotline">
-      <label c:height="1" c:width="12" c:x="2" c:y="1"  text="Mitarbeiter:"/>
-      <label c:height="1" c:width="6"  c:x="2" c:y="2"  text="Kunde:"/>
-      <label c:height="1" c:width="7"  c:x="2" c:y="3"  text="Name-1:"/>
-      <label c:height="1" c:width="4"  c:x="2" c:y="4"  text="Ort:"/>
-      <label c:height="1" c:width="8"  c:x="2" c:y="5"  text="Telefon:"/>
-      <label c:height="1" c:width="8"  c:x="2" c:y="6"  text="Kontakt:"/>
-      <label c:height="1" c:width="8"  c:x="2" c:y="7"  text="Telefon:"/>
-      <label c:height="1" c:width="7"  c:x="2" c:y="8"  text="E-Mail:"/>
-      <label c:height="1" c:width="8"  c:x="2" c:y="9"  text="Produkt:"/>
-      <label c:height="1" c:width="8"  c:x="2" c:y="10" text="Problem:"/>
+      <vbox>
+        <entry name="inpMitarbeiter" label="Mitarbeiter:"
+          block="blkAuswahl" field="fldMitarbeiter" style="dropdown"/>
+        <entry name="inpKunde" label="Kunde:"
+          block="blkAuswahl" field="fldKunde">
+          <trigger type="PRE-FOCUSOUT" src="kunde_pruefen"/>
+        </entry>
+        <!-- button name="btnKunde" label="Suchen">
+          <trigger type="ON-ACTION" src="kunde_pruefen"/>
+        </button -->
+        <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="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"/>
 
-      <entry name="inpMitarbeiter" c:height="1" c:width="35" c:x="14" c:y="1"
-        block="blkAuswahl" field="fldMitarbeiter" style="dropdown"
-        focusorder="1"/>
-      <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="65" c:y="2"
-        label="Suchen">
-        <trigger type="ON-ACTION" src="kunde_pruefen"/>
-      </button>
-      <entry name="inpName1" c:height="1" c:width="35" c:x="14" c:y="3"
-        block="blkKunde" field="fldHotlineName1" style="label"/>
-      <entry name="inpOrt" c:height="1" c:width="35" c:x="14" c:y="4"
-        block="blkKunde" field="fldHotlineOrt" style="label"/>
-      <entry name="inpTelefon" c:height="1" c:width="35" c:x="14" c:y="5"
-        block="blkKunde" field="fldTelefon" style="label"/>
-      <entry name="inpKontakt" c:height="1" c:width="35" c:x="14" c:y="6"
-        block="blkTicket" field="fldKontaktName" style="dropdown"/>
-      <entry name="inpKTel" c:height="1" c:width="35" c:x="14" c:y="7"
-        block="blkTicket" field="fldKontaktTelefon" style="label"/>
-      <entry name="inpMail" c:height="1" c:width="35" c:x="14" c:y="8"
-        block="blkTicket" field="fldKontaktEmail" style="label"/>
-      <entry name="inpProdukt" c:height="1" c:width="35" c:x="14" c:y="9"
-        block="blkTicket" field="fldProdukt" style="dropdown"/>
-      <entry name="inpProblem" c:height="1" c:width="50" c:x="14" c:y="10"
-        block="blkTicket" field="fldHotlineText"/>
+        <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>
 
-      <box   c:height="5" c:width="76" c:x="0" c:y="11" label="Leistung"/>
-      <label c:height="1" c:width="10" c:x="2" c:y="12" text="T�tigkeit:"/>
-      <label c:height="1" c:width="9"  c:x="2" c:y="13" text="Zeit von:"/>
-      <label c:height="1" c:width="9"  c:x="2" c:y="14" text="Zeit bis:"/>
+        <entry name="inpStatus" label="Status:"
+          block="blkTicket" field="fldHotlineStatus" style="dropdown"/>
+        <entry name="inpStatus" label="Grund:"
+          block="blkTicket" field="fldHotlineGrund" style="dropdown"/>
 
-      <entry name="inpAktion" c:height="1" c:width="60" c:x="14" c:y="12"
-        block="blkLeistung" field="fldHotlineText"/>
-      <entry name="inpStart" c:height="1" c:width="60" c:x="14" c:y="13"
-        block="blkLeistung" field="fldHotlineStart"
-        inputmask="%x %X" displaymask="%x %X"/>
-      <entry name="inpEnde" c:height="1" c:width="60" c:x="14" c:y="14"
-        block="blkLeistung" field="fldHotlineEnde"
-        inputmask="%x %X" displaymask="%x %X"/>
+        <hbox>
+          <button name="btnSave" label="Speichern">
+            <trigger type="ON-ACTION" src="save_all"/>
+          </button>
 
-      <label c:height="1" c:width="7" c:x="2" c:y="16" text="Status:"/>
-      <label c:height="1" c:width="6" c:x="2" c:y="17" text="Grund:"/>
-
-      <entry name="inpStatus" c:height="1" c:width="15" c:x="14" c:y="16"
-        block="blkTicket" field="fldHotlineStatus" style="dropdown"/>
-      <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="54" c:y="17"
-        label="Speichern">
-        <trigger type="ON-ACTION" src="save_all"/>
-      </button>
-
-      <button name="btnRevert" c:height="1" c:width="10" c:x="65" c:y="17"
-        label="Verwerfen">
-        <trigger type="ON-ACTION" src="revert_all" />
-      </button>
+          <button name="btnRevert" label="Verwerfen">
+            <trigger type="ON-ACTION" src="revert_all"/>
+          </button>
+        </hbox>
+      </vbox>
     </page>
   </layout>
 
@@ -337,7 +322,7 @@
   <!-- Dialog zur Auswahl eines Kunden                                   -->
   <!-- ================================================================= -->
 
-  <dialog xmlns:c="GNUe:Layout:Char" name="selectKunde" title="Kunde suchen">
+  <dialog name="selectKunde" title="Kunde suchen">
     <trigger type="On-Startup">
       form.setFeature ('GUI:MENUBAR:SUPPRESS', True)
       form.setFeature ('GUI:TOOLBAR:SUPPRESS', True)
@@ -354,8 +339,7 @@
     <datasource name="dts" connection="hotline" table="hotline_kunde"/>
 
     <logic>
-      <block name="blk" datasource="dts" rows="12"
-        restrictInsert="Y" restrictDelete="Y">
+      <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"/>
@@ -363,41 +347,42 @@
       </block>
     </logic>
 
-    <layout xmlns:c="GNUe:Layout:Char" c:width="66" c:height="15">
+    <layout xmlns:s="GNUe:Layout:Sizer">
       <page>
-        <label c:x="1"  c:y="0" c:width="6" c:height="1" text="Nummer"   />
-        <label c:x="12" c:y="0" c:width="9" c:height="1" text="Matchcode"/>
-        <label c:x="30" c:y="0" c:width="6" c:height="1" text="Name-1"   />
+        <hbox>
+          <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"/>
+            </gridline>
+          </grid>
 
-        <entry c:x="1"  c:y="1" c:width="10" block="blk" field="fldNummer"
-          focusorder="1" />
-        <entry c:x="12" c:y="1" c:width="17" block="blk" field="fldMatchcode"
-          navigable="False"/>
-        <entry c:x="30" c:y="1" c:width="35" block="blk" field="fldName1"
-          navigable="False"/>
-
-        <button c:x="1" c:y="14" c:width="10" c:height="1" label="Ok">
-          <trigger name="Ok" type="On-Action">
-            setParameter ('nummer', blk.fldNummer.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>
+          <vbox>
+            <button label="Ok">
+              <trigger name="Ok" type="On-Action">
+                setParameter ('nummer', blk.fldNummer.get ())
+                close ()
+              </trigger>
+            </button>
+            <button label="Abbrechen">
+              <trigger name="Cancel" type="On-Action">
+                close ()
+              </trigger>
+            </button>
+          </vbox>
+        </hbox>
       </page>
     </layout>
   </dialog>
 
 
   <!-- ================================================================= -->
-  <!-- Dialog zur Auswahl eines Calls f�r einen Kunden                   -->
+  <!-- Dialog zur Auswahl eines Calls für einen Kunden                   -->
   <!-- ================================================================= -->
 
   <dialog xmlns:c="GNUe:Layout:Char" name="selectTicket"
-    title="Offenes Ticket w�hlen">
+    title="Offenes Ticket wählen">
 
     <parameter name="kunde" />
     <parameter name="ticket" />
@@ -411,10 +396,10 @@
     <trigger type="On-Activation">
       kunde = getParameter ('kunde')
       if kunde:
-        form.setTitle ('Offenes Ticket f�r Kunde w�hlen')
+        form.setTitle ('Offenes Ticket für Kunde wählen')
         dts.simpleQuery ({'hotline_kontakt.hotline_kunde': kunde})
       else:
-        form.setTitle ('Offenes Ticket w�hlen')
+        form.setTitle ('Offenes Ticket wählen')
         dts.simpleQuery ({})
     </trigger>