[gnue] r9207 - trunk/gnue-samples/two-tier/forms

[johannes]

Author: johannes
Date: 2007-01-05 03:36:51 -0600 (Fri, 05 Jan 2007)
New Revision: 9207

Modified:
   trunk/gnue-samples/two-tier/forms/invoice.gfd
Log:
Use a better way for looking up the default price


Modified: trunk/gnue-samples/two-tier/forms/invoice.gfd
===================================================================
--- trunk/gnue-samples/two-tier/forms/invoice.gfd       2007-01-05 09:15:25 UTC 
(rev 9206)
+++ trunk/gnue-samples/two-tier/forms/invoice.gfd       2007-01-05 09:36:51 UTC 
(rev 9207)
@@ -21,9 +21,6 @@
     </sortorder>
   </datasource>
 
-  <datasource name="dts_item_lookup" connection="sample" table="items"
-    explicitfields="price" />
-
   <datasource name="dts_invoice" connection="sample" table="invoice" >
     <sortorder>
       <sortfield name="date" descending="True" />
@@ -88,19 +85,17 @@
 
     <block name="blk_invoice_item" datasource="dts_invoice_item">
       <field name="sku" field="sku" fk_source="dts_items" fk_key="id"
-        fk_description="sku" >
-        <trigger type="POST-CHANGE">
-          activateTrigger('item_changed')
-        </trigger>
-      </field>
+        fk_description="sku" />
       <field name="sku_name" field="sku" fk_source="dts_items" fk_key="id"
-        fk_description="description" >
-        <trigger type="POST-CHANGE">
-          activateTrigger('item_changed')
-        </trigger>
-      </field>
+        fk_description="description" />
+      <field name="default_price" field="sku" fk_source="dts_items" fk_key="id"
+        fk_description="price" />
 
       <field name="quantity" field="quantity" datatype="number" length="6">
+        <trigger type="PRE-FOCUSOUT">
+          if not blk_invoice_item.quantity.value:
+              abort('Please enter a valid quantity')
+        </trigger>
         <trigger type="POST-CHANGE">
           activateTrigger('calculate_total')
         </trigger>
@@ -108,19 +103,16 @@
 
       <field name="price" field="unit_price" datatype="number" length="9"
         scale="2" >
+        <trigger type="PRE-FOCUSIN">
+          if not blk_invoice_item.price.value:
+              blk_invoice_item.price = blk_invoice_item.default_price.value
+        </trigger>
         <trigger type="POST-CHANGE">
           activateTrigger('calculate_total')
         </trigger>
       </field>
     </block>
 
-    <trigger type="NAMED" name="item_changed">
-      old_price = blk_invoice_item.price.get()
-      if not old_price:
-          res = dts_item_lookup.simpleQuery({'id': blk_invoice_item.sku.get()})
-          if res:
-              blk_invoice_item.price = res[0].get('price', 0)
-    </trigger>
   </logic>
 
   <layout xmlns:s="GNUe:Layout:Sizer">