r198 - hotline/forms

[reinhard]

Author: reinhard
Date: 2005-01-06 07:43:16 -0600 (Thu, 06 Jan 2005)
New Revision: 198

Modified:
   hotline/forms/hotline-en.gfd
   hotline/forms/hotline.gfd
Log:
Updated form for new dropdown logic, and exchanged "Save" and "Discard"
buttons.


Modified: hotline/forms/hotline-en.gfd
===================================================================
--- hotline/forms/hotline-en.gfd        2005-01-06 13:41:15 UTC (rev 197)
+++ hotline/forms/hotline-en.gfd        2005-01-06 13:43:16 UTC (rev 198)
@@ -147,7 +147,7 @@
       blkSelect.fldKunde.set (blkCustomer.fldHotlineNummer)
 
       # Focus on the contact
-      setFocus (blkTicket.fldKontakt)
+      setFocus (blkTicket.fldKontaktName)
 
       # Are there open tickets for this customer?
       if selTicket and blkCustomer.fldOffene.get ():
@@ -203,10 +203,6 @@
       <field name="fldName"/>
     </block>
 
-    <block name="blkContributor" datasource="dtsContributor">
-      <field name="fldName" field="hotline_name"/>
-    </block>
-
     <block name="blkCustomer" datasource="dtsCustomer">
       <field name="fldHotlineName1" field="hotline_name1" max_length="35"
         readonly="Y"/>
@@ -222,8 +218,12 @@
     </block>
 
     <block name="blkTicket" datasource="dtsTicket">
-      <field name="fldKontakt" field="hotline_kontakt" fk_key="gnue_id"
+      <field name="fldKontaktName" field="hotline_kontakt" fk_key="gnue_id"
         fk_description="hotline_name" fk_source="dtsContact"/>
+      <field name="fldKontaktTelefon" field="hotline_kontakt" fk_key="gnue_id"
+        fk_description="hotline_telefon" fk_source="dtsContact"/>
+      <field name="fldKontaktEmail" field="hotline_kontakt" fk_key="gnue_id"
+        fk_description="hotline_email" fk_source="dtsContact"/>
       <field name="fldProdukt" field="hotline_produkt" fk_key="gnue_id"
         fk_description="hotline_name" fk_source="dtsProduct"/>
       <field name="fldHotlineText" field="hotline_text" max_length="70"/>
@@ -259,17 +259,6 @@
       </trigger>
     </block>
 
-    <block name="blkContact" datasource="dtsContact">
-      <field name="fldHotlineBemerkung" field="hotline_bemerkung"
-             max_length="25"/>
-      <field name="fldHotlineEmail" field="hotline_email" max_length="25"/>
-      <field name="fldHotlineHandy" field="hotline_handy" max_length="25"/>
-      <field name="fldHotlineKunde" field="hotline_kunde" max_length="25"/>
-      <field name="fldHotlineName" field="hotline_name" max_length="25"/>
-      <field name="fldHotlineTelefax" field="hotline_telefax" max_length="25"/>
-      <field name="fldHotlineTelefon" field="hotline_telefon" max_length="25"/>
-    </block>
-
     <block name="blkOpenTickets" datasource="dtsOpenTickets">
       <field name="fldStatus" field="hotline_status" max_length="1" />
     </block>
@@ -305,11 +294,11 @@
       <entry name="inpTelefon" c:height="1" c:width="35" c:x="14" c:y="5"
         block="blkCustomer" field="fldTelefon" style="label"/>
       <entry name="inpKontakt" c:height="1" c:width="35" c:x="14" c:y="6"
-        block="blkTicket" field="fldKontakt" style="dropdown"/>
+        block="blkTicket" field="fldKontaktName" style="dropdown"/>
       <entry name="inpKTel" c:height="1" c:width="35" c:x="14" c:y="7"
-        block="blkContact" field="fldHotlineTelefon" style="label"/>
+        block="blkTicket" field="fldKontaktTelefon" style="label"/>
       <entry name="inpMail" c:height="1" c:width="35" c:x="14" c:y="8"
-        block="blkContact" field="fldHotlineEmail" style="label"/>
+        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"
@@ -337,15 +326,15 @@
       <entry name="inpStatus" c:height="1" c:width="35" c:x="14" c:y="17"
         block="blkTicket" field="fldHotlineGrund" style="dropdown"/>
 
-      <button name="btnRevert" c:height="1" c:width="10" c:x="54" c:y="17"
-        label="Revert">
-        <trigger type="ON-ACTION" src="revert_all" />
-      </button>
-
-      <button name="btnSave" c:height="1" c:width="10" c:x="60" c:y="17"
+      <button name="btnSave" c:height="1" c:width="10" c:x="54" c:y="17"
         label="Store">
         <trigger type="ON-ACTION" src="save_all"/>
       </button>
+
+      <button name="btnRevert" c:height="1" c:width="10" c:x="65" c:y="17"
+        label="Revert">
+        <trigger type="ON-ACTION" src="revert_all" />
+      </button>
     </page>
   </layout>
 

Modified: hotline/forms/hotline.gfd
===================================================================
--- hotline/forms/hotline.gfd   2005-01-06 13:41:15 UTC (rev 197)
+++ hotline/forms/hotline.gfd   2005-01-06 13:43:16 UTC (rev 198)
@@ -147,7 +147,7 @@
       blkAuswahl.fldKunde.set (blkKunde.fldHotlineNummer)
 
       # Focus auf den Kontakt
-      setFocus (blkTicket.fldKontakt)
+      setFocus (blkTicket.fldKontaktName)
 
       # Gibt's f�r diesen Kunden offene Tickets?
       if selTicket and blkKunde.fldOffene.get ():
@@ -203,10 +203,6 @@
       <field name="fldName"/>
     </block>
 
-    <block name="blkMitarbeiter" datasource="dtsMitarbeiter">
-      <field name="fldName" field="hotline_name"/>
-    </block>
-
     <block name="blkKunde" datasource="dtsKunde">
       <field name="fldHotlineName1" field="hotline_name1" max_length="35"
         readonly="Y"/>
@@ -222,8 +218,14 @@
     </block>
 
     <block name="blkTicket" datasource="dtsTicket">
-      <field name="fldKontakt" field="hotline_kontakt" fk_key="gnue_id"
+      <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"/>
@@ -259,17 +261,6 @@
       </trigger>
     </block>
 
-    <block name="blkKontakt" datasource="dtsKontakt">
-      <field name="fldHotlineBemerkung" field="hotline_bemerkung"
-             max_length="25"/>
-      <field name="fldHotlineEmail" field="hotline_email" max_length="25"/>
-      <field name="fldHotlineHandy" field="hotline_handy" max_length="25"/>
-      <field name="fldHotlineKunde" field="hotline_kunde" max_length="25"/>
-      <field name="fldHotlineName" field="hotline_name" max_length="25"/>
-      <field name="fldHotlineTelefax" field="hotline_telefax" max_length="25"/>
-      <field name="fldHotlineTelefon" field="hotline_telefon" max_length="25"/>
-    </block>
-
     <block name="blkOpenTickets" datasource="dtsOpenTickets">
       <field name="fldStatus" field="hotline_status" max_length="1" />
     </block>
@@ -305,11 +296,11 @@
       <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="fldKontakt" style="dropdown"/>
+        block="blkTicket" field="fldKontaktName" style="dropdown"/>
       <entry name="inpKTel" c:height="1" c:width="35" c:x="14" c:y="7"
-        block="blkKontakt" field="fldHotlineTelefon" style="label"/>
+        block="blkTicket" field="fldKontaktTelefon" style="label"/>
       <entry name="inpMail" c:height="1" c:width="35" c:x="14" c:y="8"
-        block="blkKontakt" field="fldHotlineEmail" style="label"/>
+        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"
@@ -337,15 +328,15 @@
       <entry name="inpStatus" c:height="1" c:width="35" c:x="14" c:y="17"
         block="blkTicket" field="fldHotlineGrund" style="dropdown"/>
 
-      <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"
+      <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>
     </page>
   </layout>