r142 - in gnue-pim: . forms schema

[kilo]

Author: kilo
Date: 2004-11-26 04:16:06 -0600 (Fri, 26 Nov 2004)
New Revision: 142

Modified:
   gnue-pim/NEWS
   gnue-pim/forms/ADDR_Address.gfd
   gnue-pim/forms/pim.gfd
   gnue-pim/schema/person.gcd
Log:
GNUe PIM.
Changed name format.
Moved reusable trigger code.

Modified: gnue-pim/NEWS
===================================================================
--- gnue-pim/NEWS       2004-11-25 22:55:32 UTC (rev 141)
+++ gnue-pim/NEWS       2004-11-26 10:16:06 UTC (rev 142)
@@ -3,6 +3,10 @@
 *********************
 
 New features / changes by 2004.11.25.
+*Changed name format.
+*Moved reusable trigger code.
+
+New features / changes by 2004.11.25.
 *Designed new main form.
 *Added Person form.
 *Added Address form.

Modified: gnue-pim/forms/ADDR_Address.gfd
===================================================================
--- gnue-pim/forms/ADDR_Address.gfd     2004-11-25 22:55:32 UTC (rev 141)
+++ gnue-pim/forms/ADDR_Address.gfd     2004-11-26 10:16:06 UTC (rev 142)
@@ -29,8 +29,11 @@
 
   <trigger type="On-Activation">
     match = getParameter('id')
-    if match:
+    if match is not None:
       dts.simpleQuery({'gnue_id': match})
+      form.setTitle('Edit address')
+    else:
+      form.setTitle('Add/Remove address')
   </trigger>
 
   <datasource name="dts" connection="pim" table="ADDR_Address"/>

Modified: gnue-pim/forms/pim.gfd
===================================================================
--- gnue-pim/forms/pim.gfd      2004-11-25 22:55:32 UTC (rev 141)
+++ gnue-pim/forms/pim.gfd      2004-11-26 10:16:06 UTC (rev 142)
@@ -27,33 +27,40 @@
 <form title="GNUe PIM">
   <options/>
 
+  <trigger type="NAMED" name="Refresh">
+    person = blkPIM_AdPe.fldAdpePerson.get()
+    if person:
+      print 'Refresh.person: %s' % person
+      #dtsPIM_AdPe.simpleQuery({'PIM_person': person})
+  </trigger>
+  
   <datasource name="dtsPERSON_Person" connection="pim" table="PERSON_Person"
       prequery="Y" />
   <datasource name="dtsPIM_AdPe" connection="pim" table="PIM_AdPe" />
+<!--
   <datasource name="dtsPIM_PeCo" connection="pim" table="PIM_PeCo" />
   <datasource name="dtsPIM_PaPe" connection="pim" table="PIM_PaPe" />
+-->
   <datasource name="dtsADDR_Address" connection="pim" table="ADDR_Address"
       master="dtsPIM_AdPe" masterlink="PIM_addr" detaillink="gnue_id" />
+<!--
   <datasource name="dtsCOMM_Comm" connection="pim" table="COMM_Comm"
       master="dtsPIM_PeCo" masterlink="PIM_comm" detaillink="gnue_id" />
   <datasource name="dtsPARTY_Party" connection="pim" table="PARTY_Party"
       master="dtsPIM_PaPe" masterlink="PIM_party" detaillink="gnue_id" />
+-->
 
   <logic>
     <block name="blkPIM_AdPe" datasource="dtspim_adpe">
       <field name="fldAdpePerson" field="PIM_person"
           fk_source="dtsPERSON_Person" fk_key="gnue_id"
-          fk_description="PERSON_name1">
-        <trigger type="POST-CHANGE" name="postchange">
-          person = blkPIM_AdPe.fldAdpePerson.get()
-          if person:
-            print 'Person: %s' % person
-            dtsPIM_AdPe.simpleQuery({'PIM_person': person})
-        </trigger>
+          fk_description="PERSON_formatted">
+        <trigger type="POST-CHANGE" name="postchange" src="Refresh"/>
       </field>
       <field name="fldAdpeAddress" field="PIM_addr"/>
     </block>
 
+<!--
     <block name="blkPIM_PeCo" datasource="dtspim_peco">
       <field name="fldPecoPerson" field="PIM_person"></field>
     </block>
@@ -61,12 +68,14 @@
     <block name="blkPIM_PaPe" datasource="dtspim_pape">
       <field name="fldPapePerson" field="PIM_person"></field>
     </block>
+-->
 
     <block name="blkADDR_Address" datasource="dtsaddr_address" rows="3">
       <field name="fldGnueId" field="gnue_id" maxLength="32"/>
       <field name="fldAddrFormatted" field="ADDR_formatted" readonly="Y"/>
     </block>
 
+<!--
     <block name="blkCOMM_Comm" datasource="dtscomm_comm" rows="3">
       <field name="fldCommFormatted" field="COMM_formatted" readonly="Y"/>
     </block>
@@ -74,6 +83,7 @@
     <block name="blkPARTY_Party" datasource="dtsparty_party" rows="3">
       <field name="fldPartyFormatted" field="PARTY_formatted" readonly="Y"/>
     </block>
+-->
 
   </logic>
 
@@ -98,9 +108,9 @@
       <button name="btnAddAddress" c:height="1" c:width="12" c:x="3" c:y="4"
           label="Add/Edit...">
         <trigger type="ON-ACTION" name="btnEditAddressTrigger">
-          params = {'id': blkADDR_Address.fldGnueId.get() or ''}
+          params = {'id': blkADDR_Address.fldGnueId.get() or None}
           form.runForm('ADDR_Address.gfd', params)
-          #blkADDR_Address.fldAdpePerson.resetForeignKey()
+          form.activateTrigger('Refresh')
         </trigger>
       </button>
       <entry name="entAddrFormatted" c:height="1" c:width="40" c:x="3" c:y="5"
@@ -109,20 +119,24 @@
       <!--Comm box-->
       <box name="boxComm" c:height="6" c:width="58" c:x="1" c:y="9"
           label="Communication" />
+<!--
       <button name="btnAddComm" c:height="1" c:width="12" c:x="3" c:y="10"
           label="Add/Edit...">
       </button>
       <entry name="entCommFormatted" c:height="1" c:width="40" c:x="3" c:y="11"
           block="blkCOMM_Comm" field="fldCommFormatted" />
+-->
 
       <!--Party box-->
       <box name="boxParty" c:height="6" c:width="58" c:x="1" c:y="15"
           label="Parties" />
+<!--
       <button name="btnAddParty" c:height="1" c:width="12" c:x="3" c:y="16"
           label="Add/Edit...">
       </button>
       <entry name="entPartyFormatted" c:height="1" c:width="40" c:x="3" 
c:y="17"
           block="blkPARTY_Party" field="fldPartyFormatted" />
+-->
 
     </page>
   </layout>

Modified: gnue-pim/schema/person.gcd
===================================================================
--- gnue-pim/schema/person.gcd  2004-11-25 22:55:32 UTC (rev 141)
+++ gnue-pim/schema/person.gcd  2004-11-26 10:16:06 UTC (rev 142)
@@ -30,7 +30,10 @@
     <property name="name2"  type="string(35)"   comment="" />
     <property name="name3"  type="string(35)"   comment="" />
     <property name="formatted"  type="string"   comment="Formatted per local 
requirements">
-      return self.name1
+      name = self.name1 and self.name1 or ''
+      name += self.name2 and (' ' + self.name2) or ''
+      name += self.name3 and (' ' + self.name3) or ''
+      return name
     </property>
   </class>
 </module>