[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r141 - in gnue-pim: . forms
|
From: |
kilo |
|
Subject: |
r141 - in gnue-pim: . forms |
|
Date: |
Thu, 25 Nov 2004 16:55:32 -0600 (CST) |
Author: kilo
Date: 2004-11-25 16:55:32 -0600 (Thu, 25 Nov 2004)
New Revision: 141
Added:
gnue-pim/forms/ADDR_Address.gfd
gnue-pim/forms/ADDR_Country.gfd
Removed:
gnue-pim/forms/person.gfd
Modified:
gnue-pim/NEWS
gnue-pim/forms/pim.gfd
Log:
GNUe PIM.
Added Address & Country forms.
Removed obsoleted form.
Modified: gnue-pim/NEWS
===================================================================
--- gnue-pim/NEWS 2004-11-25 13:44:02 UTC (rev 140)
+++ gnue-pim/NEWS 2004-11-25 22:55:32 UTC (rev 141)
@@ -5,4 +5,5 @@
New features / changes by 2004.11.25.
*Designed new main form.
*Added Person form.
-
+*Added Address form.
+*Added Country form.
Added: gnue-pim/forms/ADDR_Address.gfd
===================================================================
--- gnue-pim/forms/ADDR_Address.gfd 2004-11-25 13:44:02 UTC (rev 140)
+++ gnue-pim/forms/ADDR_Address.gfd 2004-11-25 22:55:32 UTC (rev 141)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="iso8859-1"?>
+
+<!-- Address editor 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="Address">
+ <options/>
+
+ <trigger type="On-Activation">
+ match = getParameter('id')
+ if match:
+ dts.simpleQuery({'gnue_id': match})
+ </trigger>
+
+ <datasource name="dts" connection="pim" table="ADDR_Address"/>
+ <datasource name="dts_ADDR_Country" connection="pim" prequery="Y"
+ table="ADDR_Country"/>
+
+
+ <logic>
+ <block name="blk" datasource="dts">
+ <field name="fldCountry" field="ADDR_country" maxLength="32"
+ fk_source="dts_ADDR_Country" fk_key="gnue_id"
+ fk_description="ADDR_formatted"/>
+ <field name="fldPostcode" field="ADDR_postcode" maxLength="10"/>
+ <field name="fldAddr1" field="ADDR_addr1" maxLength="35"/>
+ <field name="fldAddr2" field="ADDR_addr2" maxLength="35"/>
+ <field name="fldAddr3" field="ADDR_addr3" maxLength="35"/>
+ <field name="fldAddr4" field="ADDR_addr4" maxLength="35"/>
+ <field name="fldAddr5" field="ADDR_addr5" maxLength="35"/>
+ </block>
+ </logic>
+
+
+ <layout c:height="9" c:width="52">
+ <page name="Page1">
+ <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"
+ block="blk" field="fldCountry" style="dropdown"/>
+ <button name="btnEditCountry" c:height="1" c:width="7" c:x="43" c:y="1"
+ label="Edit...">
+ <trigger type="ON-ACTION" name="btnEditCountryTrigger">
+ params = {'id': blk.fldCountry.get() or ''}
+ form.runForm('ADDR_Country.gfd', params)
+ blk.fldCountry.resetForeignKey()
+ </trigger>
+ </button>
+ <label name="lblPostcode:" c:height="1" c:width="9" c:x="1" c:y="2"
+ text="Postcode:"/>
+ <entry name="entPostcode" c:height="1" c:width="10" c:x="11" c:y="2"
+ block="blk" field="fldPostcode"/>
+ <label name="lblAddr1:" c:height="1" c:width="10" c:x="1" c:y="3"
+ text="Address 1:"/>
+ <entry name="entAddr1" c:height="1" c:width="35" c:x="11" c:y="3"
+ block="blk" field="fldAddr1"/>
+ <label name="lblAddr2:" c:height="1" c:width="10" c:x="1" c:y="4"
+ text="Address 2:"/>
+ <entry name="entAddr2" c:height="1" c:width="35" c:x="11" c:y="4"
+ block="blk" field="fldAddr2"/>
+ <label name="lblAddr3:" c:height="1" c:width="10" c:x="1" c:y="5"
+ text="Address 3:"/>
+ <entry name="entAddr3" c:height="1" c:width="35" c:x="11" c:y="5"
+ block="blk" field="fldAddr3"/>
+ <label name="lblAddr4:" c:height="1" c:width="10" c:x="1" c:y="6"
+ text="Address 4:"/>
+ <entry name="entAddr4" c:height="1" c:width="35" c:x="11" c:y="6"
+ block="blk" field="fldAddr4"/>
+ <label name="lblAddr5:" c:height="1" c:width="10" c:x="1" c:y="7"
+ text="Address 5:"/>
+ <entry name="entAddr5" c:height="1" c:width="35" c:x="11" c:y="7"
+ block="blk" field="fldAddr5"/>
+ </page>
+ </layout>
+</form>
Property changes on: gnue-pim/forms/ADDR_Address.gfd
___________________________________________________________________
Name: svn:keywords
+ Id
Added: gnue-pim/forms/ADDR_Country.gfd
===================================================================
--- gnue-pim/forms/ADDR_Country.gfd 2004-11-25 13:44:02 UTC (rev 140)
+++ gnue-pim/forms/ADDR_Country.gfd 2004-11-25 22:55:32 UTC (rev 141)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="iso8859-1"?>
+
+<!-- Country editor 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="Country">
+ <options/>
+
+ <trigger type="On-Activation">
+ match = getParameter('id')
+ if match:
+ dts.simpleQuery({'gnue_id': match})
+ </trigger>
+
+ <datasource name="dts" connection="pim" table="ADDR_Country"/>
+
+ <logic>
+ <block name="blk" datasource="dts">
+ <field name="fldCode" field="ADDR_code" maxLength="3"/>
+ <field name="fldName" field="ADDR_name" maxLength="35"/>
+ </block>
+ </logic>
+
+ <layout c:height="3" c:width="46">
+ <page>
+ <label name="lblCode:" c:height="1" c:width="4" c:x="1" c:y="1"
+ text="Code:"/>
+ <entry name="entCode" c:height="1" c:width="3" c:x="9" c:y="1"
+ block="blk" field="fldCode"/>
+ <label name="lblName:" c:height="1" c:width="4" c:x="1" c:y="2"
+ text="Name:"/>
+ <entry name="entName" c:height="1" c:width="30" c:x="9" c:y="2"
+ block="blk" field="fldName"/>
+ </page>
+ </layout>
+
+</form>
Property changes on: gnue-pim/forms/ADDR_Country.gfd
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: gnue-pim/forms/person.gfd
===================================================================
--- gnue-pim/forms/person.gfd 2004-11-25 13:44:02 UTC (rev 140)
+++ gnue-pim/forms/person.gfd 2004-11-25 22:55:32 UTC (rev 141)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="iso8859-1"?>
-
-<!-- GNUe-Designer (0.5.4.99)
- Saved on: 2004-09-29 13:13:03 -->
-
-<form title="Persons">
- <options/>
- <datasource name="dtsPERSON_Person" connection="pim" requery="True"
- table="PERSON_Person"/>
- <datasource name="dts_AdPe" connection="pim" detaillink="PIM_person"
- master="dtsPERSON_Person" masterlink="gnue_id" requery="True"
table="PIM_AdPe"/>
- <datasource name="dtsADDR_Address" connection="pim" detaillink="gnue_id"
- master="dts_AdPe" masterlink="PIM_addr" requery="True"
table="ADDR_Address"/>
- <logic>
- <block name="blkPERSON_Person" datasource="dtsperson_person">
- <field name="fldPersonName1" field="PERSON_name1" maxLength="35"/>
- <field name="fldPersonName2" field="PERSON_name2" maxLength="35"/>
- <field name="fldPersonName3" field="PERSON_name3" maxLength="35"/>
- <field name="fldGnueid" field="gnue_id" maxLength="32"/>
- </block>
-
- <block name="blkAdPe" datasource="dts_AdPe">
- <field name="fldAdPePerson" field="PIM_person" maxLength="32"/>
- <field name="fldAdPeAddress" field="PIM_addr" maxLength="32"/>
- <field name="fldAdPeType" field="PIM_type" maxLength="32"/>
- <field name="fldAdPeFrom" field="PIM_from" maxLength="10"/>
- <field name="fldAdPeUntil" field="PIM_until" maxLength="10"/>
- </block>
-
- <block name="blkADDR_Address" datasource="dtsaddr_address" rows="5">
- <field name="fldAddrCountry" field="ADDR_country" maxLength="32"/>
- <field name="fldAddrAddr1" field="ADDR_addr1" maxLength="35"/>
- <field name="fldAddrAddr2" field="ADDR_addr2" maxLength="35"/>
- <field name="fldGNueid" field="gnue_id" maxLength="32"/>
-
- <trigger type="POST-COMMIT" name="a1">
- import mx.DateTime
- blkAdPe.fldAdPePerson.set(blkPERSON_Person.fldGnueid.get()) #set
Person in link table
- blkAdPe.fldAdPeAddress.set(blkADDR_Address.fldGnueid.get()) #set
Address in link table
- #blkAdPe.fldAdPeType.set(???) #set Address type in link table
- blkAdPe.fldFrom.set(mx.DateTime.now())
- </trigger>
- </block>
- </logic>
-
- <layout xmlns:Char="GNUe:Layout:Char" Char:height="25" Char:width="75">
- <page name="Page1">
- <box name="BoxAddr" Char:height="7" Char:width="72" Char:x="2"
- Char:y="4" label="Address"/>
- <box name="BoxComm" Char:height="7" Char:width="72" Char:x="2"
- Char:y="11" label="Communications"/>
- <box name="BoxParty" Char:height="7" Char:width="72" Char:x="2"
- Char:y="18" label="Parties"/>
-
- <label name="lblPerson Name1:" Char:height="1" Char:width="6" Char:x="1"
- Char:y="1" text="Name1:"/>
- <entry name="entPersonName1" Char:height="1" Char:width="35" Char:x="8"
- Char:y="1" block="blkPERSON_Person" field="fldPersonName1"
label=""/>
- <label name="lblPerson Name2:" Char:height="1" Char:width="6" Char:x="1"
- Char:y="2" text="Name2:"/>
- <entry name="entPersonName2" Char:height="1" Char:width="35" Char:x="8"
- Char:y="2" block="blkPERSON_Person" field="fldPersonName2"
label=""/>
- <label name="lblPerson Name3:" Char:height="1" Char:width="6" Char:x="1"
- Char:y="3" text="Name3:"/>
- <entry name="entPersonName3" Char:height="1" Char:width="35" Char:x="8"
- Char:y="3" block="blkPERSON_Person" field="fldPersonName3"
label=""/>
-
- <entry name="entAddrCountry" Char:height="1" Char:width="8" Char:x="10"
- Char:y="5" block="blkADDR_Address" field="fldAddrCountry"
label=""/>
- <entry name="entAddrAddr1" Char:height="1" Char:width="20" Char:x="16"
- Char:y="5" block="blkADDR_Address" field="fldAddrAddr1" label=""/>
- <entry name="entAddrAddr2" Char:height="1" Char:width="20" Char:x="38"
- Char:y="5" block="blkADDR_Address" field="fldAddrAddr2" label=""/>
- <entry name="entAddrAddr2" Char:height="1" Char:width="20" Char:x="38"
- Char:y="5" block="blkADDR_Address" field="fldAddrAddr2" label=""/>
- </page>
- </layout>
-</form>
Modified: gnue-pim/forms/pim.gfd
===================================================================
--- gnue-pim/forms/pim.gfd 2004-11-25 13:44:02 UTC (rev 140)
+++ gnue-pim/forms/pim.gfd 2004-11-25 22:55:32 UTC (rev 141)
@@ -20,13 +20,13 @@
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 title="GNUe PIM">
<options/>
-
+
<datasource name="dtsPERSON_Person" connection="pim" table="PERSON_Person"
prequery="Y" />
<datasource name="dtsPIM_AdPe" connection="pim" table="PIM_AdPe" />
@@ -38,7 +38,7 @@
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"
@@ -53,31 +53,32 @@
</field>
<field name="fldAdpeAddress" field="PIM_addr"/>
</block>
-
+
<block name="blkPIM_PeCo" datasource="dtspim_peco">
<field name="fldPecoPerson" field="PIM_person"></field>
</block>
-
+
<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>
-
+
<block name="blkPARTY_Party" datasource="dtsparty_party" rows="3">
<field name="fldPartyFormatted" field="PARTY_formatted" readonly="Y"/>
</block>
-
+
</logic>
-
-
-
+
+
+
<layout xmlns:c="GNUe:Layout:Char" c:height="21" c:width="60" tabbed="top">
<page name="Person">
<entry name="entSelectPerson" c:height="1" c:width="20" c:x="1" c:y="1"
@@ -96,10 +97,15 @@
label="Addresses" />
<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 ''}
+ form.runForm('ADDR_Address.gfd', params)
+ #blkADDR_Address.fldAdpePerson.resetForeignKey()
+ </trigger>
</button>
<entry name="entAddrFormatted" c:height="1" c:width="40" c:x="3" c:y="5"
block="blkADDR_Address" field="fldAddrFormatted" />
-
+
<!--Comm box-->
<box name="boxComm" c:height="6" c:width="58" c:x="1" c:y="9"
label="Communication" />
@@ -108,7 +114,7 @@
</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" />
@@ -117,7 +123,7 @@
</button>
<entry name="entPartyFormatted" c:height="1" c:width="40" c:x="3"
c:y="17"
block="blkPARTY_Party" field="fldPartyFormatted" />
-
+
</page>
</layout>
</form>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- r141 - in gnue-pim: . forms,
kilo <=