r124 - in gnue-invoice: . forms schema

[kilo]

Author: kilo
Date: 2004-11-19 06:29:36 -0600 (Fri, 19 Nov 2004)
New Revision: 124

Modified:
   gnue-invoice/forms/INV_Head.gfd
   gnue-invoice/news
   gnue-invoice/schema/invoice.gcd
Log:
GNUe Invoice.
Moved automatic date calculations to the server.

Modified: gnue-invoice/forms/INV_Head.gfd
===================================================================
--- gnue-invoice/forms/INV_Head.gfd     2004-11-19 11:27:52 UTC (rev 123)
+++ gnue-invoice/forms/INV_Head.gfd     2004-11-19 12:29:36 UTC (rev 124)
@@ -44,8 +44,7 @@
                       Named triggers
   ******************************************************-->
   <trigger name="calcDueDate" type="NAMED">
-    dateDue = blkINV_Head.call("INV_calcDateDue", {})
-    blkFreeHead.dateDue.set(dateDue)
+    blkINV_Head.call("INV_calcDateDue", {})
   </trigger>
 
 
@@ -61,7 +60,7 @@
       <field name="fldInvPaymentmethod" field="INV_paymentMethod"
              fk_description="INV_name" fk_key="gnue_id"
              fk_source="dts_INV_PaymentMethod" maxLength="32">
-<!--
+<!--             
       <trigger type="POST-CHANGE" name="postchange" src="calcDueDate"/>
 This causes infinite loop when autocommitting items!!!
 -->
@@ -89,14 +88,12 @@
         print "blkINV_Head::PostQuery"
         blkFreeHead.number.set(self.fldInvNumber.get())
         blkFreeHead.dateIssued.set(self.fldInvDateissued.get())
-        blkFreeHead.dateDue.set(self.fldInvDatedue.get())
       </trigger>
 
       <!--Copy generated and computed data to the DB-->
       <trigger type="PRE-COMMIT" name="precommit">
         print "blkINV_Head::PreCommit"
         self.fldInvDateissued.set(blkFreeHead.dateIssued.get())
-        self.fldInvDatedue.set(blkFreeHead.dateDue.get())
       </trigger>
     </block>
 
@@ -108,14 +105,12 @@
     <block name="blkFreeHead">
       <field name="number" readonly="Y" />
       <field name="dateIssued" readonly="Y" typecast="date"/>
-      <field name="dateDue" readonly="Y" typecast="date"/>
       
       <!--Setting generated and computed initial data-->
       <trigger type="ON-NEWRECORD" name="onnewrecord">
         print "blkFreeHead::OnNewRecord"
 
         self.dateIssued.set(blkINV_Head.fldInvDateissued.get())
-        self.dateDue.set(blkINV_Head.fldInvDatedue.get())
       </trigger>
     </block>
 
@@ -190,7 +185,7 @@
       <label name="lblDatedue:" c:height="1" c:width="14" c:x="1" c:y="5"
           text="Due date:"/>
       <entry name="entInvDatedue" c:height="1" c:width="10" c:x="16" c:y="5"
-          block="blkFreeHead" field="dateDue" />
+          block="blkINV_Head" field="fldInvDatedue" />
       <label name="lblDatedelivery:" c:height="1" c:width="14" c:x="1" c:y="6"
           text="Delivery date:"/>
       <entry name="entInvDatedelivery" c:height="1" c:width="10" c:x="16" 
c:y="6"

Modified: gnue-invoice/news
===================================================================
--- gnue-invoice/news   2004-11-19 11:27:52 UTC (rev 123)
+++ gnue-invoice/news   2004-11-19 12:29:36 UTC (rev 124)
@@ -8,6 +8,8 @@
 * Moved more business logic to the AppServer. All logic in connection with
     invoice lines is now processed on the server side.
 * Counting of invoice total value is now also happens on server side
+* Moved date calculations to server side - it still causes
+    infinite loop though upon commit
 
 New features / changes by 2004.11.16
 * Modified the 'Edit...' button's width. It is 7 now. It always should

Modified: gnue-invoice/schema/invoice.gcd
===================================================================
--- gnue-invoice/schema/invoice.gcd     2004-11-19 11:27:52 UTC (rev 123)
+++ gnue-invoice/schema/invoice.gcd     2004-11-19 12:29:36 UTC (rev 124)
@@ -131,8 +131,10 @@
       if (method is not None) and (issued is not None):
         import mx.DateTime
         dateDue = issued + mx.DateTime.RelativeDate(days=method.INV_dueDays)
+        self.dateDue = dateDue.date
         return dateDue.date
       else:
+        self.dateDue = None
         return None
     </procedure>