r128 - in gnue-invoice: . forms schema

[kilo]

Author: kilo
Date: 2004-11-23 05:52:49 -0600 (Tue, 23 Nov 2004)
New Revision: 128

Modified:
   gnue-invoice/forms/INV_Head.gfd
   gnue-invoice/news
   gnue-invoice/schema/invoice.gcd
Log:
GNUe Invoice.
Transformed INV_Head.gfd to dialog style.

Modified: gnue-invoice/forms/INV_Head.gfd
===================================================================
--- gnue-invoice/forms/INV_Head.gfd     2004-11-23 09:00:23 UTC (rev 127)
+++ gnue-invoice/forms/INV_Head.gfd     2004-11-23 11:52:49 UTC (rev 128)
@@ -23,7 +23,13 @@
 
      $Id$ -->
 
-<form xmlns:c="GNUe:Layout:Char" title="Invoice">
+<form style="dialog" xmlns:c="GNUe:Layout:Char" title="Invoice">
+  <trigger type="On-Startup">
+    form.setFeature('GUI:MENUBAR:SUPPRESS', True)
+    form.setFeature('GUI:TOOLBAR:SUPPRESS', True)
+    form.setFeature('GUI:STATUSBAR:SUPPRESS', True)
+  </trigger>
+
   <options/>
 
   <!--*****************************************************
@@ -47,7 +53,23 @@
     blkINV_Head.call("INV_calcDateDue", {})
   </trigger>
 
+  <trigger name="saveAll" type="NAMED">
+    if not blkINV_Item.isSaved():
+      print "Item not saved, saving..."
+      blkINV_Item.commit()
+    if not blkINV_Head.isSaved():
+      print "Head not saved, saving..."
+      blkINV_Head.commit()
+    close()
+  </trigger>
 
+  <trigger name="revertAll" type="NAMED">
+    blkINV_Item.rollback()
+    blkINV_Head.rollback()
+    close()
+  </trigger>
+
+
   <logic>
     <!--***************************************************
                         Invoice head
@@ -60,9 +82,8 @@
       <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!!!
+<!--
+        <trigger type="POST-CHANGE" name="postchange" src="calcDueDate"/>
 -->
       </field>
       <field name="fldInvDatedelivery" field="INV_dateDelivery" maxLength="10"
@@ -70,8 +91,7 @@
       <field name="fldInvDateissued" field="INV_dateIssued" maxLength="10"
              typecast="date">
 <!--
-             <trigger type="POST-CHANGE" name="postchange" src="calcDueDate"/>
-This causes infinite loop when autocommitting items!!!
+        <trigger type="POST-CHANGE" name="postchange" src="calcDueDate"/>
 -->
       </field>
       <field name="fldInvDatedue" field="INV_dateDue" maxLength="10"
@@ -81,45 +101,14 @@
              readonly="Y" typecast="number"/>
       <field name="fldInvValuetotalGross" field="INV_valueTotalGross"
              maxLength="10" typecast="number"/>
-
-      <!--Display stored dates and # of prints
-      upon viewing an invoice-->
-      <trigger type="POST-QUERY" name="postquery">
-        print "blkINV_Head::PostQuery"
-        blkFreeHead.number.set(self.fldInvNumber.get())
-        blkFreeHead.dateIssued.set(self.fldInvDateissued.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())
-      </trigger>
     </block>
 
 
-    <!--***************************************************************
-                                Free head block
-     Fields to display generated/computed invoice head data on the form
-    ****************************************************************-->
-    <block name="blkFreeHead">
-      <field name="number" readonly="Y" />
-      <field name="dateIssued" 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())
-      </trigger>
-    </block>
-
-
     <!--***************************************************
                       Invoice items (lines)
     ****************************************************-->
     <block name="blkINV_Item" datasource="dtsinv_item" rows="5"
-             autoCommit="Y" autoCreate="Y" autoNextRecord="Y">
+             autoCreate="Y" autoNextRecord="Y">
       <field name="fldInvHead" field="INV_head" maxLength="32" />
       <field name="fldInvProduct" field="INV_product"
              fk_description="ITEM_shortName" fk_key="gnue_id"
@@ -128,21 +117,18 @@
              fk_description="ITEM_price" fk_key="gnue_id"
              fk_source="dts_ITEM_Item" readonly="Y" />
       <field name="fldInvQuantity" field="INV_quantity" maxLength="10"
-             typecast="number" />
+             typecast="number" >
+        <!--Count item value -->
+        <trigger type="POST-CHANGE" name="onchange">
+          #Calling a calculated property will cause it to refresh
+          blkINV_Head.call("INV_getvalueTotalGross", {})
+        </trigger>
+      </field>
       <field name="fldInvUnit" field="INV_product"
              fk_description="ITEM_unit.ITEM_value" fk_key="gnue_id"
              fk_source="dts_ITEM_Item" readonly="Y" />
       <field name="fldInvValueGross" field="INV_valueGross"
              typecast="number" readonly="Y"/>
-
-      <!--Count totals -->
-      <trigger type="POST-COMMIT" name="postcommit">
-        #Calling a calculated property will cause it to refresh
-        blkINV_Head.call("INV_getvalueTotalGross", {})
-        #Must do it, so we can exit...
-        if not blkINV_Head.isSaved():
-          blkINV_Head.commit()
-      </trigger>
     </block>
 
   </logic>
@@ -151,12 +137,14 @@
   <!--*****************************************************
                           Form layout
   ******************************************************-->
-  <layout c:height="18" c:width="51">
+  <layout c:height="20" c:width="51">
     <page>
       <label name="lblNumber:" c:height="1" c:width="7" c:x="1" c:y="1"
           text="Number:"/>
+<!--
       <entry name="entInvNumber" c:height="1" c:width="20" c:x="16" c:y="1"
           block="blkFreeHead" field="number" style="label"/>
+-->
       <label name="lblBuyer:" c:height="1" c:width="6" c:x="1" c:y="2"
           text="Buyer:"/>
       <entry name="entInvBuyer" c:height="1" c:width="28" c:x="16" c:y="2"
@@ -184,7 +172,7 @@
       <label name="lblDateissued:" c:height="1" c:width="12" c:x="1" c:y="4"
           text="Date issued:"/>
       <entry name="entInvDateIssued" c:height="1" c:width="10" c:x="16" c:y="4"
-          block="blkFreeHead" field="dateIssued" />
+          block="blkINV_Head" field="fldInvDateissued" />
       <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"
@@ -236,6 +224,14 @@
           block="blkINV_Item" field="fldInvUnit" style="label" />
       <entry name="entItemPriceTotal" c:height="1" c:width="10" c:x="44" 
c:y="12"
           block="blkINV_Item" field="fldInvValueGross" style="label" />
+          
+      <button c:x="1" c:y="19" c:width="10" c:height="1" label="Ok">
+        <trigger type="ON-ACTION" src="saveAll" />
+      </button>
+      <button c:x="12" c:y="19" c:width="10" c:height="1" label="Cancel">
+        <trigger type="ON-ACTION" src="revertAll" />
+      </button>
+
     </page>
   </layout>
 

Modified: gnue-invoice/news
===================================================================
--- gnue-invoice/news   2004-11-23 09:00:23 UTC (rev 127)
+++ gnue-invoice/news   2004-11-23 11:52:49 UTC (rev 128)
@@ -5,6 +5,7 @@
 New features / changes by 2004.11.23
 * Display the product/service unit value upon selecting it from dropdown.
 * Added overhead labels for invoice lines.
+* Transformed INV_Head.gfd to be a dialog form.
 
 New features / changes by 2004.11.19
 * Applied changes due to correctly working dropdowns at last committed

Modified: gnue-invoice/schema/invoice.gcd
===================================================================
--- gnue-invoice/schema/invoice.gcd     2004-11-23 09:00:23 UTC (rev 127)
+++ gnue-invoice/schema/invoice.gcd     2004-11-23 11:52:49 UTC (rev 128)
@@ -163,7 +163,7 @@
 
       if self.number is None:
         self.number = self.newNumber()
-        print 'INV_Head::OnValidate number set to %s' % self.number
+        print 'INV_Head::OnValidate - number set to %s' % self.number
 
       if self.paymentMethod is None:
         #TODO: fill paymentMethod with some reasonable value
@@ -171,15 +171,15 @@
 
       if self.dateIssued is None:
         self.dateIssued = mx.DateTime.today().date
-        print 'INV_Head::OnValidate dateIssued set to %s' % self.dateIssued
+        print 'INV_Head::OnValidate - dateIssued set to %s' % self.dateIssued
 
       if self.dateDue is None:
         self.dateDue = self.calcDateDue()
-        print 'INV_Head::OnValidate dateDue set to %s' % self.dateDue
+        print 'INV_Head::OnValidate - dateDue set to %s' % self.dateDue
 
       if self.dateDelivery is None:
         self.dateDelivery = mx.DateTime.today().date
-        print 'INV_Head::OnValidate dateDelivery set to %s' % self.dateDelivery
+        print 'INV_Head::OnValidate - dateDelivery set to %s' % 
self.dateDelivery
     </procedure>
 
     <!--******************
@@ -189,6 +189,7 @@
       print "INV_Head::OnInit"
       import mx.DateTime
       self.dateIssued = mx.DateTime.today().date
+      print 'INV_Head::OnInit - dateIssued set to %s' % self.dateIssued
 
       #NULL does not behave well on the form, so better set it to '0'.
       self.printed = 0