[gnue-contrib] r230 - in hotline: forms schema

[reinhard]

Author: reinhard
Date: 2006-01-09 12:03:40 -0600 (Mon, 09 Jan 2006)
New Revision: 230

Modified:
   hotline/forms/hotline.gfd
   hotline/schema/hotline.gcd
Log:
Adapted for mx.DateTime -> datetime transition.


Modified: hotline/forms/hotline.gfd
===================================================================
--- hotline/forms/hotline.gfd   2006-01-02 10:26:10 UTC (rev 229)
+++ hotline/forms/hotline.gfd   2006-01-09 18:03:40 UTC (rev 230)
@@ -95,7 +95,7 @@
   <trigger name="kunde_pruefen" type="NAMED">
     # Dieser Trigger versucht, eine Kundennummer f�r den aktuellen Wert des
     # Feldes Kunde zu finden
-    import mx.DateTime
+    import datetime
     value     = blkAuswahl.fldKunde.get ()
     selected  = False
     selTicket = True
@@ -155,7 +155,7 @@
         dtsTicket.simpleQuery ({'gnue_id': params ['ticket']})
         updGrund = False
 
-    blkAuswahl.fldStart.set (mx.DateTime.now ())
+    blkAuswahl.fldStart.set (datetime.datetime.now ())
 
     # FIXME: Das geh�rt in die Initialisierung der hotline_ticket Klasse
     if updGrund and blkKunde.fldVertrag.get ():
@@ -237,18 +237,18 @@
       <field name="fldHotlineStart" field="hotline_start" typecast="date"/>
       <field name="fldHotlineEnde" field="hotline_ende" typecast="date">
         <trigger name="TimeUpdate" type="PRE-FOCUSIN">
-          import mx.DateTime
+          import datetime
           curr = blkLeistung.fldHotlineEnde.get ()
           if curr is None or curr == '':
-            blkLeistung.fldHotlineEnde.set (mx.DateTime.now ())
+            blkLeistung.fldHotlineEnde.set (datetime.datetime.now ())
         </trigger>
       </field>
       <field name="fldHotlineMitarbeiter" field="hotline_mitarbeiter"/>
       <field name="fldHotlineTicket" field="hotline_ticket" max_length="32"/>
       <trigger name="Startzeit" type="PRE-FOCUSIN">
-        import mx.DateTime
+        import datetime
         newTime = blkAuswahl.fldStart.get ()
-        if isinstance (newTime, mx.DateTime.DateTimeType):
+        if isinstance (newTime, datetime.datetime):
           if blkLeistung.fldHotlineStart.isEmpty ():
             blkLeistung.fldHotlineStart.set (blkAuswahl.fldStart.get ())
 

Modified: hotline/schema/hotline.gcd
===================================================================
--- hotline/schema/hotline.gcd  2006-01-02 10:26:10 UTC (rev 229)
+++ hotline/schema/hotline.gcd  2006-01-09 18:03:40 UTC (rev 230)
@@ -141,20 +141,14 @@
 
     <property name="gesamtzeit" type="time"
               comment="Ermittelt die gesamt verbrauchte Zeit pro Ticket">
-      import mx.DateTime
+      import datetime
       cond = ['eq', ['field', 'hotline_ticket'], ['const', self.gnue_id]]
       <!--hotline_ticket = self.gnue_id -->
       prop = ['hotline_start', 'hotline_ende']
       leistungen = find ('hotline_leistung', cond, [], prop)
-      diff = mx.DateTime.Time (0, 0, 0)
+      diff = datetime.timedelta ()
       for l in leistungen:
-        s = l.start
-        e = l.ende
-        if e &lt; s:
-          t = s
-          s = e
-          e = t
-        diff = diff + (e - s)
+        diff = diff + (l.start - l.ende)
       return diff
     </property>
 
@@ -171,7 +165,6 @@
 
     <property name="startdatum" type="datetime"
               comment="Datum der ersten Leistung zu diesem Ticket">
-      import mx.DateTime
       cond = ['eq', ['field', 'hotline_ticket'], ['const', self.gnue_id]]
       <!--hotline_ticket = self.gnue_id -->
       leistungen = find ('hotline_leistung', cond, \