r143 - in gnue-pim: . forms schema

[kilo]

Author: kilo
Date: 2004-11-26 05:19:06 -0600 (Fri, 26 Nov 2004)
New Revision: 143

Added:
   gnue-pim/forms/SelectAddr.gfd
Modified:
   gnue-pim/NEWS
   gnue-pim/forms/ADDR_Address.gfd
   gnue-pim/schema/addr.gcd
Log:
GNUe PIM.
Added address selector form.
Changed address format.

Modified: gnue-pim/NEWS
===================================================================
--- gnue-pim/NEWS       2004-11-26 10:16:06 UTC (rev 142)
+++ gnue-pim/NEWS       2004-11-26 11:19:06 UTC (rev 143)
@@ -5,6 +5,7 @@
 New features / changes by 2004.11.25.
 *Changed name format.
 *Moved reusable trigger code.
+*Added address selector form.
 
 New features / changes by 2004.11.25.
 *Designed new main form.

Modified: gnue-pim/forms/ADDR_Address.gfd
===================================================================
--- gnue-pim/forms/ADDR_Address.gfd     2004-11-26 10:16:06 UTC (rev 142)
+++ gnue-pim/forms/ADDR_Address.gfd     2004-11-26 11:19:06 UTC (rev 143)
@@ -57,7 +57,7 @@
 
 
   <layout c:height="9" c:width="52">
-    <page name="Page1">
+    <page>
       <label name="lblCountry:" c:height="1" c:width="8" c:x="1" c:y="1"
           text="Country:"/>
       <entry name="entCountry" c:height="1" c:width="32" c:x="11" c:y="1"

Added: gnue-pim/forms/SelectAddr.gfd
===================================================================
--- gnue-pim/forms/SelectAddr.gfd       2004-11-26 10:16:06 UTC (rev 142)
+++ gnue-pim/forms/SelectAddr.gfd       2004-11-26 11:19:06 UTC (rev 143)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="iso8859-1"?>
+
+<!-- Address selector form
+
+     Copyright 2004 Free Software Foundation
+
+     This file is part of GNU Enterprise.
+
+     GNU Enterprise is free software; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License as
+     published by the Free Software Foundation; either version 2 of
+     the License, or (at your option) any later version.
+
+     GNU Enterprise is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNU Enterprise; see the file COPYING.  If not, write to
+     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+
+     $Id$
+-->
+
+<form style="dialog" xmlns:c="GNUe:Layout:Char" title="Select addresses">
+  <options/>
+  
+  <datasource name="dtsPIM_AdPe" connection="pim" table="PIM_AdPe"
+      prequery="Y"/>
+  <datasource name="dtsBoundAddr" connection="pim" table="ADDR_Address"
+      master="dtsPIM_AdPe" masterlink="PIM_addr" detaillink="gnue_id"/>
+  <datasource name="dtsFreeAddr" connection="pim" table="ADDR_Address"
+      prequery="Y"/>
+              
+  <logic>
+    <block name="blkPIM_AdPe" datasource="dtspim_adpe">
+      <field name="fldPimAddr" field="PIM_addr" maxLength="32"/>
+      <field name="fldPimPerson" field="PIM_person" maxLength="32"/>
+    </block>
+    
+    <block name="blkBoundAddr" datasource="dtsBoundAddr">
+      <field name="fldFormatted" field="gnue_id"
+          fk_source="dtsBoundAddr" fk_key="gnue_id"
+          fk_description="ADDR_formatted"/>
+    </block>
+    
+    <block name="blkFreeAddr" datasource="dtsFreeAddr">
+      <field name="fldFormatted" field="gnue_id"
+          fk_source="dtsFreeAddr" fk_key="gnue_id"
+          fk_description="ADDR_formatted"/>
+    </block>
+  </logic>
+  
+  <layout c:height="10" c:width="70">
+    <page>
+      <entry name="entFreeAddr" c:height="8" c:width="30" c:x="1" c:y="1"
+          block="blkFreeAddr" field="fldFormatted" style="listbox"/>
+      <button name="btnEditFree" c:height="1" c:width="7" c:x="12" c:y="9"
+          label="Edit...">
+      </button>
+      <entry name="entBoundAddr" c:height="8" c:width="30" c:x="40" c:y="1"
+          block="blkBoundAddr" field="fldFormatted" style="listbox"/>
+      <button name="btnEditBound" c:height="1" c:width="7" c:x="52" c:y="9"
+          label="Edit...">
+      </button>
+          
+      <button name="btnAdd" c:height="1" c:width="9" c:x="31" c:y="3"
+          label="Add &gt;" />
+      <button name="btnRemove" c:height="1" c:width="9" c:x="31" c:y="5"
+          label="&lt; Remove" />
+          
+    </page>
+  </layout>
+</form>


Property changes on: gnue-pim/forms/SelectAddr.gfd
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: gnue-pim/schema/addr.gcd
===================================================================
--- gnue-pim/schema/addr.gcd    2004-11-26 10:16:06 UTC (rev 142)
+++ gnue-pim/schema/addr.gcd    2004-11-26 11:19:06 UTC (rev 143)
@@ -47,16 +47,13 @@
     <property name="addr4"      type="string(35)"   comment="" />
     <property name="addr5"      type="string(35)"   comment="" />
     <property name="formatted"  type="string"       comment="Formatted per 
local requirements">
-      addr = ''
-
-      if self.addr1:    addr += self.addr1 + '\n'
-      if self.addr2:    addr += self.addr2 + '\n'
-      if self.addr3:    addr += self.addr3 + '\n'
-      if self.addr4:    addr += self.addr4 + '\n'
-      if self.addr5:    addr += self.addr5 + '\n'
-      if self.postcode: addr += self.postcode + '\n'
-      if self.country:  addr += self.country.formatted
-
+      addr = self.addr1 or ''
+      addr += (self.addr2 and ' ' + self.addr2) or ''
+      addr += (self.addr3 and ' ' + self.addr3) or ''
+      addr += (self.addr4 and ' ' + self.addr4) or ''
+      addr += (self.addr5 and ' ' + self.addr5) or ''
+      addr += (self.postcode and ' ' + self.postcode) or ''
+      addr += (self.country and ' ' + self.country.formatted) or ''
       return addr
     </property>
   </class>