commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnue-contrib] r257 - in address: . forms schema


From: reinhard
Subject: [gnue-contrib] r257 - in address: . forms schema
Date: Mon, 26 Mar 2007 06:44:06 -0500 (CDT)

Author: reinhard
Date: 2007-03-26 06:44:05 -0500 (Mon, 26 Mar 2007)
New Revision: 257

Added:
   address/forms/
   address/forms/address.gfd
   address/forms/stamm.gfd
   address/schema/
   address/schema/schema.gsd
Removed:
   address/address.gfd
   address/schema.gsd
   address/stamm.gfd
Log:
Reorganised directory structure and added local connections.conf.


Deleted: address/address.gfd
===================================================================
--- address/address.gfd 2007-01-10 10:37:26 UTC (rev 256)
+++ address/address.gfd 2007-03-26 11:44:05 UTC (rev 257)
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<form title="Studiokonzept Adreßdatenbank">
-  <options>
-    <author>ByteWise Software GmbH</author>
-    <version>0.0.1</version>
-    <description>Simple address management</description>
-  </options>
-
-  <datasource name="dtsCompany" connection="address" table="company">
-    <sortorder>
-      <sortfield name="name1" descending="False" ignorecase="True" />
-    </sortorder>
-  </datasource>
-
-  <datasource name="dtsContact" connection="address" table="contact"
-    master="dtsCompany" masterlink="id" detaillink="company" />
-  <datasource name="dtsCategory" connection="address" table="category"
-    prequery="Y" />
-  <datasource name="dtsSalutation" connection="address" table="salutation"
-    prequery="Y" />
-
-  <logic>
-    <block name="blkCompany" datasource="dtsCompany">
-      <field name="search" case="upper" />
-      <field name="eMatchcode" field="matchcode" maxLength="20" case="upper"/>
-      <field name="eName1" field="name1" maxLength="64"  />
-      <field name="eName2" field="name2" maxLength="64"  />
-      <field name="eCountry" field="country" maxLength="4"  />
-      <field name="eStreet" field="street" maxLength="64"  />
-      <field name="eCity" field="city" maxLength="64"  />
-      <field name="eZIP" field="zip" maxLength="10"  />
-      <field name="eVAT" field="vatid" maxLength="18"  />
-      <field name="eCRG" field="compreg" maxLength="32" />
-
-      <field name="ePhone" field="phone" maxLength="50"  />
-      <field name="eFax" field="fax" maxLength="50"  />
-      <field name="eWeb" field="web" maxLength="64" />
-      <field name="eMail" field="email" maxLength="64" />
-      <field name="eCustomer" field="customer" maxLength="20" />
-      <field name="eBWCustomer" field="bwcustomer" maxLength="16" />
-      <field name="eBWSupplier" field="bwsupplier" maxLength="16" />
-      <field name="eShipment" field="shipment" maxLength="64" />
-      <field name="eCategory" field="category" fk_key="id"
-        fk_description="text" fk_source="dtsCategory"/>
-      <field name="eMemo" field="memo" />
-      <field name="eMemoAvailable" readonly="Y" />
-
-      <trigger type="ON-RECORDLOADED"><![CDATA[
-        value = len (blkCompany.eMemo.get ().strip ()) > 0
-        blkCompany.eMemoAvailable.set (value)
-        ]]>
-      </trigger>
-    </block>
-
-    <block name="blkContact" datasource="dtsContact">
-      <field name="eSalutation" field="salutation" fk_key="id"
-        fk_description="text" fk_source="dtsSalutation" />
-      <field name="eTitle" field="title" maxLength="21" />
-      <field name="eFirstname" field="firstname" maxLength="26" />
-      <field name="eSurname" field="surname" maxLength="31" />
-      <field name="eDepartment" field="department" maxLength="32" />
-      <field name="eDuty" field="duty" maxLength="32" />
-      <field name="ePhone1" field="phone1" maxLength="32" />
-      <field name="ePhone2" field="phone2" maxLength="32" />
-      <field name="eFax" field="fax" maxLength="32" />
-      <field name="eMail" field="email" maxLength="64" />
-      <field name="eMemo" field="memo" />
-      <field name="eMemoAvailable" readonly="Y" />
-
-      <trigger type="ON-RECORDLOADED"><![CDATA[
-        value = len (blkContact.eMemo.get ().strip ()) > 0
-        blkContact.eMemoAvailable.set (value)
-        ]]>
-      </trigger>
-    </block>
-  </logic>
-
-  <layout xmlns:c="GNUe:Layout:Char" c:height="17" c:width="105" tabbed="none">
-    <page name="pgContact" caption="Contacts">
-      <label c:x="0" c:y="0" c:width="8" text="Suche:" alignment="right" />
-      <label c:x="0" c:y="1" c:width="8" text="Match:" alignment="right"/>
-      <label c:x="0" c:y="2" c:width="8" text="Firma 1:" alignment="right"/>
-      <label c:x="0" c:y="3" c:width="8" text="Firma 2:" alignment="right"/>
-      <label c:x="0" c:y="4" c:width="8" text="Straße:" alignment="right"/>
-      <label c:x="0" c:y="5" c:width="8" text="PLZ:" alignment="right"/>
-      <label c:x="20" c:y="5" c:width="6" text="Stadt:" alignment="right"/>
-      <label c:x="0" c:y="6" c:width="8" text="Land:" alignment="right"/>
-      <label c:x="20" c:y="6" c:width="6" text="UID:" alignment="right"/>
-      <label c:x="20" c:y="7" c:width="6" text="FNr:" alignment="right"/>
-
-      <entry c:x="9" c:y="0" c:width="28" block="blkCompany" field="search" />
-
-      <button c:x="39" c:y="0" c:width="10" label="Suche">
-        <trigger type="ON-ACTION"><![CDATA[
-          def u (v):
-            return unicode (v, 'utf-8')
-
-          def build (aval, last = 0):
-            cmap = {u('ö'): u('Ö'), u('Ö'): u('ö'),
-                    u('ä'): u('Ä'), u('Ä'): u('ä'),
-                    u('ü'): u('Ü'), u('Ü'): u('ü')}
-
-            result = []
-
-            for ix in range (last, len (aval)):
-              if aval [ix] in cmap:
-                cc = aval [ix]
-                newval = aval [0:ix] + cmap [cc] + aval [ix + 1:]
-
-                xres = build (newval, ix + 1)
-                result.extend (xres)
-
-            result.append (aval)
-            return result
-
-          def buildPattern (pattern):
-            result = []
-
-            for item in build (pattern):
-              result.extend ([ \
-                ['like', ['upper', ['field', 'matchcode']], ['const', item]], \
-                ['like', ['upper', ['field', 'name1']], ['const', item]],     \
-                ['like', ['upper', ['field', 'name2']], ['const', item]], \
-                ['exist', 'contact', 'id', 'company', \
-                  ['or', 
-                    ['like', ['upper', ['field', 'firstname']],
-                    ['const', item]],
-                    ['like', ['upper', ['field', 'surname']],
-                    ['const', item]]]]])
-
-            result.insert (0, 'or')
-            return result
-
-          val = blkCompany.search.get ()
-          pattern = "%%%s%%" % val
-
-          cond = buildPattern (pattern)
-
-          r = dtsCompany.createResultSet (cond, query = True)
-          ]]>
-        </trigger>
-      </button>
-
-      <entry c:x="9" c:y="1" c:width="40" block="blkCompany"
-        field="eMatchcode"/>
-      <entry c:x="9" c:y="2" c:width="40" block="blkCompany"
-        field="eName1"/>
-      <entry c:x="9" c:y="3" c:width="40" block="blkCompany"
-        field="eName2"/>
-      <entry c:x="9" c:y="4" c:width="40" block="blkCompany"
-        field="eStreet"/>
-      <entry c:x="9" c:y="5" c:width="10" block="blkCompany"
-        field="eZIP"/>
-
-      <entry c:x="27" c:y="5" c:width="22" block="blkCompany"
-        field="eCity"/>
-      <entry c:x="9" c:y="6" c:width="10" block="blkCompany"
-        field="eCountry"/>
-      <entry c:x="27" c:y="6" c:width="22" block="blkCompany"
-        field="eVAT"/>
-      <entry c:x="27" c:y="7" c:width="22" block="blkCompany"
-        field="eCRG"/>
-
-      <entry c:x="22" c:y="8" c:width="14" block="blkCompany"
-        field="eMemoAvailable" style="checkbox" label="Memo verfügbar"/>
-
-      <button c:x="37" c:y="8" c:width="12" c:height="1" label="Memo">
-        <trigger type="ON-ACTION"><![CDATA[
-          params = {'memo': blkCompany.eMemo.get ()}
-          activateDialog ('editMemo', params, True)
-          if params.get ('mres'):
-            value = params.get ('memo')
-            blkCompany.eMemo.set (value)
-            blkCompany.eMemoAvailable.set (bool (value))
-          ]]>
-        </trigger>
-      </button>
-
-      <label c:x="50" c:y="1" c:width="12" text="Tel.allg.:" 
alignment="right"/>
-      <label c:x="50" c:y="2" c:width="12" text="Fax allg.:" 
alignment="right"/>
-      <label c:x="50" c:y="3" c:width="12" text="Internet:" alignment="right"/>
-      <label c:x="50" c:y="4" c:width="12" text="eMail:" alignment="right"/>
-      <label c:x="50" c:y="5" c:width="12" text="unsere KdNr:"
-        alignment="right"/>
-      <label c:x="50" c:y="6" c:width="12" text="BW KdNr:" alignment="right"/>
-      <label c:x="50" c:y="7" c:width="12" text="BW LiNr:" alignment="right"/>
-      <label c:x="50" c:y="8" c:width="12" text="Versandart:"
-        alignment="right"/>
-      <label c:x="50" c:y="9" c:width="12" text="Kategorie:" 
alignment="right"/>
-
-      <entry c:x="63" c:y="1" c:width="40" block="blkCompany" field="ePhone" />
-      <entry c:x="63" c:y="2" c:width="40" block="blkCompany" field="eFax" />
-      <entry c:x="63" c:y="3" c:width="40" block="blkCompany" field="eWeb" />
-      <entry c:x="63" c:y="4" c:width="40" block="blkCompany" field="eMail" />
-      <entry c:x="63" c:y="5" c:width="40" block="blkCompany"
-        field="eCustomer" />
-      <entry c:x="63" c:y="6" c:width="40" block="blkCompany"
-        field="eBWCustomer" />
-      <entry c:x="63" c:y="7" c:width="40" block="blkCompany"
-        field="eBWSupplier" />
-      <entry c:x="63" c:y="8" c:width="40" block="blkCompany" 
-        field="eShipment" />
-      <entry c:x="63" c:y="9" c:width="40" block="blkCompany" field="eCategory"
-        style="dropdown" />
-
-
-      <box c:x="0" c:y="10" c:width="103" c:height="7" label="Ansprechperson" 
/>
-
-      <label c:x="1" c:y="11" c:width="10" text="Anrede:" alignment="right"/>
-      <label c:x="1" c:y="12" c:width="10" text="Vorname:" alignment="right"/>
-      <label c:x="1" c:y="13" c:width="10" text="Nachname:" alignment="right"/>
-      <label c:x="1" c:y="14" c:width="10" text="Abteilung:" 
alignment="right"/>
-      <label c:x="1" c:y="15" c:width="10" text="Funktion:" alignment="right"/>
-      <label c:x="28" c:y="11" c:width="5" text="Titel:" alignment="right"/>
-
-      <entry c:x="12" c:y="11" c:width="15" block="blkContact"
-        field="eSalutation" style="dropdown" />
-      <entry c:x="34" c:y="11" c:width="15" block="blkContact" field="eTitle" 
/>
-      <entry c:x="12" c:y="12" c:width="37" block="blkContact"
-        field="eFirstname" />
-      <entry c:x="12" c:y="13" c:width="37" block="blkContact" field="eSurname"
-        />
-      <entry c:x="12" c:y="14" c:width="37" block="blkContact"
-        field="eDepartment" />
-      <entry c:x="12" c:y="15" c:width="37" block="blkContact"
-        field="eDuty" />
-
-      <label c:x="50" c:y="11" c:width="12" text="Telefon 1:"
-        alignment="right"/>
-      <label c:x="50" c:y="12" c:width="12" text="Telefon 2:" 
-        alignment="right"/>
-      <label c:x="50" c:y="13" c:width="12" text="Fax:" alignment="right"/>
-      <label c:x="50" c:y="14" c:width="12" text="E-Mail:" alignment="right"/>
-
-      <entry c:x="63" c:y="11" c:width="38" block="blkContact" 
field="ePhone1"/>
-      <entry c:x="63" c:y="12" c:width="38" block="blkContact" 
field="ePhone2"/>
-      <entry c:x="63" c:y="13" c:width="38" block="blkContact" field="eFax" />
-      <entry c:x="63" c:y="14" c:width="38" block="blkContact" field="eMail" />
-
-      <entry c:x="74" c:y="15" c:width="14" block="blkContact"
-        field="eMemoAvailable" style="checkbox" label="Memo verfügbar"/>
-
-      <button c:x="89" c:y="15" c:width="12" c:height="1" label="Memo">
-        <trigger type="ON-ACTION"><![CDATA[
-          params = {'memo': blkContact.eMemo.get ()}
-          activateDialog ('editMemo', params, True)
-          if params.get ('mres'):
-            blkContact.eMemo.set (params.get ('memo'))
-          ]]>
-        </trigger>
-      </button>
-    </page>
-
-  </layout>
-
-  <dialog xmlns:c="GNUe:Layout:Char" name="editMemo" title="Memo bearbeiten">
-
-    <trigger type="On-Startup">
-      form.setFeature ('GUI:MENUBAR:SUPPRESS', 1)
-      form.setFeature ('GUI:TOOLBAR:SUPPRESS', 1)
-      form.setFeature ('GUI:STATUSBAR:SUPPRESS', 1)
-    </trigger>
-
-    <trigger type="On-Activation">
-      blk.memo.set (getParameter ('memo'))
-      setFocus (blk.memo)
-    </trigger>
-
-    <logic>
-      <block name="blk">
-        <field name="memo" />
-      </block>
-    </logic>
-
-    <layout c:height="10" c:width="40">
-      <page name="Page">
-        <label c:x="1" c:y="0" c:width="10" text="Memo:" />
-        <entry c:x="1" c:y="1" c:width="39" c:height="8" block="blk"
-            field="memo" />
-
-        <button c:x="18" c:y="9" c:width="10" c:height="1" label="Ok" >
-          <trigger type="ON-ACTION"><![CDATA[
-            val = blk.memo.get ()
-            setParameter ('memo', val)
-            setParameter ('mres', True)
-            close ()
-            ]]>
-          </trigger>
-        </button>
-
-        <button c:x="30" c:y="9" c:width="10" c:height="1" label="Abbrechen" >
-          <trigger type="ON-ACTION"><![CDATA[
-            setParameter ('mres', False)
-            close ()
-            ]]>
-          </trigger>
-        </button>
-      </page>
-    </layout>
-  </dialog>
-</form>

Copied: address/forms/address.gfd (from rev 241, address/address.gfd)

Copied: address/forms/stamm.gfd (from rev 241, address/stamm.gfd)

Copied: address/schema/schema.gsd (from rev 241, address/schema.gsd)

Deleted: address/schema.gsd
===================================================================
--- address/schema.gsd  2007-01-10 10:37:26 UTC (rev 256)
+++ address/schema.gsd  2007-03-26 11:44:05 UTC (rev 257)
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<schema>
-  <tables>
-    <table name="company">
-      <fields>
-        <field name="id" type="number" length="8" nullable="False"
-          defaultwith="serial" />
-
-        <field name="matchcode" type="string" length="20" />
-        <field name="name1" type="string" length="64" />
-        <field name="name2" type="string" length="64" />
-        <field name="street" type="string" length="64" />
-        <field name="country" type="string" length="4" />
-        <field name="zip" type="string" length="10" />
-        <field name="city" type="string" length="64" />
-        <field name="vatid" type="string" length="18"  />
-        <field name="compreg" type="string" length="32" />
-        <field name="phone" type="string" length="50"  />
-        <field name="fax" type="string" length="50"  />
-        <field name="web" type="string" length="64" />
-        <field name="email" type="string" length="64" />
-        <field name="customer" type="string" length="20" />
-        <field name="bwcustomer" type="string" length="16" />
-        <field name="bwsupplier" type="string" length="16" />
-        <field name="shipment" type="string" length="64" />
-        <field name="category" type="number" length="8" />
-
-        <field name="memo" type="string" length="2000" />
-      </fields>
-
-      <primarykey name="pk_company">
-        <pkfield name="id" />
-      </primarykey>
-
-      <constraints>
-        <foreignkey name="fk_company_has_category" references="category">
-          <fkfield name="category" references="id" />
-        </foreignkey>
-      </constraints>
-    </table>
-
-    <table name="contact">
-      <fields>
-        <field name="id" type="number" length="8" nullable="False"
-          defaultwith="serial" />
-        <field name="company" type="string" length="8" nullable="False" />
-
-        <field name="salutation" type="number" length="8" />
-        <field name="title" type="string" length="21" />
-        <field name="firstname" type="string" length="26" />
-        <field name="surname" type="string" length="31" />
-        <field name="department" type="string" length="32" />
-        <field name="duty" type="string" length="32" />
-        <field name="phone1" type="string" length="32" />
-        <field name="phone2" type="string" length="32" />
-        <field name="fax" type="string" length="32" />
-        <field name="email" type="string" length="64" />
-        <field name="memo" type="string" length="2000" />
-      </fields>
-
-      <primarykey name="pk_contact">
-        <pkfield name="id" />
-      </primarykey>
-
-      <constraints>
-        <foreignkey name="fk_company_has_contacts" references="company" >
-          <fkfield name="company" references="id" />
-        </foreignkey>
-
-        <foreignkey name="fk_contact_has_salutation" references="salutation">
-          <fkfield name="salutation" references="id" />
-        </foreignkey>
-      </constraints>
-    </table>
-
-    <table name="category">
-      <fields>
-        <field name="id" type="number" length="8" nullable="False"
-          defaultwith="serial" />
-        <field name="text" type="string" length="32" default="(neu/zuordnen)" 
/>
-      </fields>
-
-      <primarykey name="pk_category">
-        <pkfield name="id" />
-      </primarykey>
-    </table>
-
-    <table name="salutation">
-      <fields>
-        <field name="id" type="number" length="8" nullable="False"
-          defaultwith="serial" />
-        <field name="text" type="string" length="15" />
-      </fields>
-
-      <primarykey name="pk_salutation">
-        <pkfield name="id" />
-      </primarykey>
-    </table>
-
-  </tables>
-
-</schema>

Deleted: address/stamm.gfd
===================================================================
--- address/stamm.gfd   2007-01-10 10:37:26 UTC (rev 256)
+++ address/stamm.gfd   2007-03-26 11:44:05 UTC (rev 257)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="iso8859-1"?>
-
-<form title="Adressenverwaltung">
-  <options>
-    <author>ByteWise Software GmbH</author>
-    <version>0.0.1</version>
-    <description>Stammdaten</description>
-  </options>
-
-  <datasource name="dtsCategory" connection="address" table="category"
-    prequery="Y"/>
-  <datasource name="dtsSalutation" connection="address" table="salutation"
-    prequery="Y"/>
-
-  <logic>
-    <block name="blkCategory" datasource="dtsCategory" rows="10">
-      <field name="eId" field="id" readonly="Y" />
-      <field name="eText" field="text" maxLength="32" />
-    </block>
-
-    <block name="blkSalutation" datasource="dtsSalutation" rows="10">
-      <field name="eId" field="id" readonly="Y" />
-      <field name="eText" field="text" maxLength="15" />
-    </block>
-
-  </logic>
-
-  <layout xmlns:c="GNUe:Layout:Char" c:height="15" c:width="80" tabbed="top">
-
-    <page name="pgCategory" caption="Kategorie">
-      <label c:x="1" c:y="0" c:width="10" text="Bezeichnung:" />
-      <entry c:x="1" c:y="1" c:width="35" block="blkCategory" field="eText"/>
-    </page>
-
-    <page name="pgSalutation" caption="Anrede">
-      <label c:x="1" c:y="0" c:width="10" text="Bezeichnung:" />
-      <entry c:x="1" c:y="1" c:width="35" block="blkSalutation" field="eText"/>
-    </page>
-
-  </layout>
-</form>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]