[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r6212 - trunk/gnue-packages/base/person
|
From: |
kilo |
|
Subject: |
r6212 - trunk/gnue-packages/base/person |
|
Date: |
Thu, 26 Aug 2004 06:45:57 -0500 (CDT) |
Author: kilo
Date: 2004-08-26 06:45:53 -0500 (Thu, 26 Aug 2004)
New Revision: 6212
Modified:
trunk/gnue-packages/base/person/person.dia
trunk/gnue-packages/base/person/person.gcd
trunk/gnue-packages/base/person/person.gfd
trunk/gnue-packages/base/person/person.hu.gcd
trunk/gnue-packages/base/person/person.png
Log:
PERSON module a little bit more self-contained
Modified: trunk/gnue-packages/base/person/person.dia
===================================================================
--- trunk/gnue-packages/base/person/person.dia 2004-08-26 10:11:21 UTC (rev
6211)
+++ trunk/gnue-packages/base/person/person.dia 2004-08-26 11:45:53 UTC (rev
6212)
@@ -66,19 +66,19 @@
<dia:group>
<dia:object type="UML - LargePackage" version="0" id="O0">
<dia:attribute name="obj_pos">
- <dia:point val="16,2"/>
+ <dia:point val="16.5,2.35"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="15.95,0.95;46.05,16.65"/>
+ <dia:rectangle val="16.45,1.3;49.05,20.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="16,2"/>
+ <dia:point val="16.5,2.35"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="30"/>
+ <dia:real val="32.5"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="14.6"/>
+ <dia:real val="17.65"/>
</dia:attribute>
<dia:attribute name="line_colour">
<dia:color val="#000000"/>
@@ -95,19 +95,19 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O1">
<dia:attribute name="obj_pos">
- <dia:point val="28,5"/>
+ <dia:point val="17,10"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="27.95,4.95;45.45,15.65"/>
+ <dia:rectangle val="16.95,9.95;34.45,19.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="28,5"/>
+ <dia:point val="17,10"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="17.4"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="10.6"/>
+ <dia:real val="9"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#Person#</dia:string>
@@ -184,29 +184,6 @@
<dia:attribute name="attributes">
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#namePrefix#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#CDICT_Code#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#Mr., Mrs., Dr., etc#</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="abstract">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="class_scope">
- <dia:boolean val="false"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite type="umlattribute">
- <dia:attribute name="name">
<dia:string>#nameFirst#</dia:string>
</dia:attribute>
<dia:attribute name="type">
@@ -276,33 +253,10 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#nameSuffix#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#CDICT_Code#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#Jr., Sr., III., etc#</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="abstract">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="class_scope">
- <dia:boolean val="false"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite type="umlattribute">
- <dia:attribute name="name">
<dia:string>#nameNick#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#ststring(35)#</dia:string>
+ <dia:string>#string(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -498,7 +452,7 @@
<dia:point val="17,3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="16.95,2.95;25.7,7.45"/>
+ <dia:rectangle val="16.95,2.95;25.7,6.65"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="17,3"/>
@@ -507,7 +461,7 @@
<dia:real val="8.65"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="4.4"/>
+ <dia:real val="3.6"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#Employee#</dia:string>
@@ -607,10 +561,10 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#person#</dia:string>
+ <dia:string>#department#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#PERSON_Person#</dia:string>
+ <dia:string>#CDICT_Code#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -628,12 +582,108 @@
<dia:boolean val="false"/>
</dia:attribute>
</dia:composite>
+ </dia:attribute>
+ <dia:attribute name="operations"/>
+ <dia:attribute name="template">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="templates"/>
+ </dia:object>
+ <dia:object type="UML - Class" version="0" id="O3">
+ <dia:attribute name="obj_pos">
+ <dia:point val="41,12"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="40.95,11.95;47.95,15.65"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="41,12"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="6.9"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="3.6"/>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>#Prefix#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="stereotype">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>#Stores valid name prefixes#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="suppress_attributes">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="suppress_operations">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="visible_attributes">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="visible_operations">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="visible_comments">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="line_color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_color">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
+ <dia:attribute name="text_color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="normal_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font">
+ <dia:font family="monospace" style="88" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font">
+ <dia:font family="monospace" style="8" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="classname_font">
+ <dia:font family="sans" style="80" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_classname_font">
+ <dia:font family="sans" style="88" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="comment_font">
+ <dia:font family="sans" style="8" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="font_height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font_height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font_height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="classname_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_classname_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="comment_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="attributes">
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#department#</dia:string>
+ <dia:string>#code#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CDICT_Code#</dia:string>
+ <dia:string>#string(3)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -651,6 +701,29 @@
<dia:boolean val="false"/>
</dia:attribute>
</dia:composite>
+ <dia:composite type="umlattribute">
+ <dia:attribute name="name">
+ <dia:string>#value#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(35)#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="class_scope">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ </dia:composite>
</dia:attribute>
<dia:attribute name="operations"/>
<dia:attribute name="template">
@@ -658,29 +731,231 @@
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Association" version="0" id="O3">
+ <dia:object type="UML - Class" version="0" id="O4">
<dia:attribute name="obj_pos">
- <dia:point val="25.65,5.7"/>
+ <dia:point val="39,16"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24.9,4.95;28.05,7.3"/>
+ <dia:rectangle val="38.95,15.95;45.95,19.65"/>
</dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="39,16"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="6.9"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="3.6"/>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>#Suffix#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="stereotype">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>#Stores valid name suffixes#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="suppress_attributes">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="suppress_operations">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="visible_attributes">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="visible_operations">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="visible_comments">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="line_color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_color">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
+ <dia:attribute name="text_color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="normal_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font">
+ <dia:font family="monospace" style="88" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font">
+ <dia:font family="monospace" style="8" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="classname_font">
+ <dia:font family="sans" style="80" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_classname_font">
+ <dia:font family="sans" style="88" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="comment_font">
+ <dia:font family="sans" style="8" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="font_height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font_height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font_height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="classname_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_classname_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="comment_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="attributes">
+ <dia:composite type="umlattribute">
+ <dia:attribute name="name">
+ <dia:string>#code#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(3)#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="class_scope">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ </dia:composite>
+ <dia:composite type="umlattribute">
+ <dia:attribute name="name">
+ <dia:string>#value#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(35)#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="class_scope">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ <dia:attribute name="operations"/>
+ <dia:attribute name="template">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="templates"/>
+ </dia:object>
+ <dia:object type="UML - Association" version="0" id="O5">
+ <dia:attribute name="obj_pos">
+ <dia:point val="25.7,10"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="20.575,5.85;25.75,11.6"/>
+ </dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="25.65,5.7"/>
- <dia:point val="26.825,5.7"/>
- <dia:point val="26.825,5.7"/>
- <dia:point val="28,5.7"/>
+ <dia:point val="25.7,10"/>
+ <dia:point val="25.7,8.3"/>
+ <dia:point val="21.325,8.3"/>
+ <dia:point val="21.325,6.6"/>
</dia:attribute>
<dia:attribute name="orth_orient">
+ <dia:enum val="1"/>
<dia:enum val="0"/>
<dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>#person#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
<dia:enum val="0"/>
</dia:attribute>
+ <dia:attribute name="ends">
+ <dia:composite>
+ <dia:attribute name="role">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multiplicity">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="arrow">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="aggregate">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ <dia:composite>
+ <dia:attribute name="role">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multiplicity">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="arrow">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="aggregate">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O1" connection="1"/>
+ <dia:connection handle="1" to="O2" connection="6"/>
+ </dia:connections>
+ <dia:childnode parent="O0"/>
+ </dia:object>
+ <dia:object type="UML - Association" version="0" id="O6">
+ <dia:attribute name="obj_pos">
+ <dia:point val="34.4,11.9"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="34.35,11.85;42.4,14.3"/>
+ </dia:attribute>
+ <dia:attribute name="orth_points">
+ <dia:point val="34.4,11.9"/>
+ <dia:point val="35.7,11.9"/>
+ <dia:point val="35.7,12.7"/>
+ <dia:point val="41,12.7"/>
+ </dia:attribute>
+ <dia:attribute name="orth_orient">
+ <dia:enum val="0"/>
+ <dia:enum val="1"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
<dia:attribute name="autorouting">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="name">
- <dia:string>##</dia:string>
+ <dia:string>#namePrefix#</dia:string>
</dia:attribute>
<dia:attribute name="direction">
<dia:enum val="0"/>
@@ -691,22 +966,82 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="multiplicity">
+ <dia:string>#*#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="arrow">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="aggregate">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ <dia:composite>
+ <dia:attribute name="role">
<dia:string>##</dia:string>
</dia:attribute>
+ <dia:attribute name="multiplicity">
+ <dia:string>#0..1#</dia:string>
+ </dia:attribute>
<dia:attribute name="arrow">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="aggregate">
- <dia:enum val="1"/>
+ <dia:enum val="0"/>
</dia:attribute>
</dia:composite>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O1" connection="9"/>
+ <dia:connection handle="1" to="O3" connection="3"/>
+ </dia:connections>
+ <dia:childnode parent="O0"/>
+ </dia:object>
+ <dia:object type="UML - Association" version="0" id="O7">
+ <dia:attribute name="obj_pos">
+ <dia:point val="34.4,14.3"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="34.35,14.25;40.4,18.3"/>
+ </dia:attribute>
+ <dia:attribute name="orth_points">
+ <dia:point val="34.4,14.3"/>
+ <dia:point val="36.7,14.3"/>
+ <dia:point val="36.7,16.7"/>
+ <dia:point val="39,16.7"/>
+ </dia:attribute>
+ <dia:attribute name="orth_orient">
+ <dia:enum val="0"/>
+ <dia:enum val="1"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>#nameSuffix#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="ends">
<dia:composite>
<dia:attribute name="role">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="multiplicity">
+ <dia:string>#*#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="arrow">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="aggregate">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ <dia:composite>
+ <dia:attribute name="role">
<dia:string>##</dia:string>
</dia:attribute>
+ <dia:attribute name="multiplicity">
+ <dia:string>#0..1#</dia:string>
+ </dia:attribute>
<dia:attribute name="arrow">
<dia:boolean val="false"/>
</dia:attribute>
@@ -716,9 +1051,10 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O2" connection="11"/>
- <dia:connection handle="1" to="O1" connection="3"/>
+ <dia:connection handle="0" to="O1" connection="15"/>
+ <dia:connection handle="1" to="O4" connection="3"/>
</dia:connections>
+ <dia:childnode parent="O0"/>
</dia:object>
</dia:group>
</dia:layer>
Modified: trunk/gnue-packages/base/person/person.gcd
===================================================================
--- trunk/gnue-packages/base/person/person.gcd 2004-08-26 10:11:21 UTC (rev
6211)
+++ trunk/gnue-packages/base/person/person.gcd 2004-08-26 11:45:53 UTC (rev
6212)
@@ -1,22 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- PERSON Module
+
+ 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.
+-->
+
<module name="PERSON" comment="A person with names, physical address(es) and
communication way(s)">
<class name="Person" comment="Typedef of a person">
- <property name="namePrefix" type="CDICT_Code"
comment="Mr., Mrs., Dr., etc Code 004" />
+ <property name="namePrefix" type="PERSON_Prefix"
comment="Mr., Mrs., Dr., etc." />
<property name="nameFirst" type="string(35)"
comment="" />
<property name="nameMiddle" type="string(35)"
comment="" />
<property name="nameLast" type="string(35)" nullable="False"
comment="" />
- <property name="nameSuffix" type="CDICT_Code"
comment="Jr., Sr., III., etc Code 005" />
+ <property name="nameSuffix" type="PERSON_Suffix"
comment="Jr., Sr., III., etc." />
<property name="nameNick" type="string(35)"
comment="" />
<property name="workTitle" type="string(35)"
comment="" />
<property name="fullName" type="string"
comment="Full name per local requirements">
<![CDATA[
name = ''
- if self.namePrefix : name += self.namePrefix + ' '
+ if self.namePrefix : name += self.namePrefix.value + ' '
if self.nameFirst: name += self.nameFirst + ' '
if self.nameMiddle: name += self.nameMiddle + ' '
name += self.nameLast
- if self.nameSuffix: name += ' ' + self.nameSuffix
+ if self.nameSuffix: name += ' ' + self.nameSuffix.value
return name
]]>
@@ -24,7 +46,7 @@
<property name="politeName" type="string"
comment="Polite name per local requirements">
<![CDATA[
name = ''
- if self.namePrefix : name += self.namePrefix + ' '
+ if self.namePrefix : name += self.namePrefix.value + ' '
name += self.nameLast
return name
]]>
@@ -45,6 +67,17 @@
</procedure>
</class>
+ <class name="Prefix" comment="Stores valid name prefixes">
+ <property name="code" type="string(3)"
comment="" />
+ <property name="value" type="string(35)"
comment="" />
+ </class>
+
+ <class name="Suffix" comment="Stores valid name suffixes">
+ <property name="code" type="string(3)"
comment="" />
+ <property name="value" type="string(35)"
comment="" />
+ </class>
+
+
<class name="Employee" comment="">
<property name="code" type="string(8)"
comment="Employee designation" />
<property name="person" type="PERSON_Person"
comment="" />
Modified: trunk/gnue-packages/base/person/person.gfd
===================================================================
--- trunk/gnue-packages/base/person/person.gfd 2004-08-26 10:11:21 UTC (rev
6211)
+++ trunk/gnue-packages/base/person/person.gfd 2004-08-26 11:45:53 UTC (rev
6212)
@@ -4,10 +4,10 @@
<options/>
<datasource name="dtsPERSON_Person" connection="appserver"
table="PERSON_Person"/>
- <datasource name="dts_CDICT_Code_prefix" connection="appserver"
- table="CDICT_Code"/>
- <datasource name="dts_CDICT_Code_suffix" connection="appserver"
- table="CDICT_Code"/>
+ <datasource name="dts_PERSON_Prefix" connection="appserver"
+ table="PERSON_Prefix"/>
+ <datasource name="dts_PERSON_Suffix" connection="appserver"
+ table="PERSON_Suffix"/>
<logic>
<block name="blkPERSON_Person" datasource="dtsperson_person">
<field name="fldGnueId" field="gnue_id" maxLength="32"/>
@@ -17,9 +17,9 @@
maxLength="35"/>
<field name="fldPersonNamenick" field="PERSON_nameNick" maxLength="35"/>
<field name="fldPersonNameprefix" field="PERSON_namePrefix"
- fk_description="CDICT_name" fk_key="gnue_id"
fk_source="dts_CDICT_Code_prefix" maxLength="32"/>
+ fk_description="PERSON_value" fk_key="gnue_id"
fk_source="dts_PERSON_Prefix" maxLength="32"/>
<field name="fldPersonNamesuffix" field="PERSON_nameSuffix"
- fk_description="CDICT_name" fk_key="gnue_id"
fk_source="dts_CDICT_Code_suffix" maxLength="32"/>
+ fk_description="PERSON_value" fk_key="gnue_id"
fk_source="dts_PERSON_Suffix" maxLength="32"/>
<field name="fldPersonWorktitle" field="PERSON_workTitle"
maxLength="35"/>
<field name="fldPersonFullname" field="PERSON_fullName" maxLength="40"/>
<field name="fldPersonPolitename" field="PERSON_politeName"
@@ -28,43 +28,75 @@
</logic>
<layout xmlns:Char="GNUe:Layout:Char" Char:height="9" Char:width="61">
<page name="Page1">
- <entry name="entGnueId" Char:height="1" Char:width="32" Char:x="1"
- Char:y="8" block="blkPERSON_Person" field="fldGnueId" hidden="Y"
label=""/>
+ <label name="lblPerson Nameprefix:" Char:height="1" Char:width="7"
+ Char:x="1" Char:y="1" text="Prefix:"/>
+ <entry name="entPersonNameprefix" Char:height="1" Char:width="25"
+ Char:x="13" Char:y="1" block="blkPERSON_Person"
field="fldPersonNameprefix"
+ focusorder="1" label="" style="dropdown"/>
+ <button name="btnEditPrefix" Char:height="1" Char:width="6" Char:x="39"
+ Char:y="1" label="Edit...">
+ <trigger type="On-Action" name="btnEditPrefixTrigger"><![CDATA[##
+ location = "appserver://appserver/form/PERSON_Prefix"
+ form.runForm(location)
+ ]]>
+ </trigger>
+ </button>
+ <button name="btnRefreshPrefix" Char:height="1" Char:width="3"
+ Char:x="45" Char:y="1" label="@">
+ <trigger type="On-Action" name="btnRefreshPrefixTrigger"><![CDATA[##
+ blkPERSON_Person.fldPersonNameprefix.resetForeignKey()
+ ]]>
+ </trigger>
+ </button>
+
<label name="lblPerson Namefirst:" Char:height="1" Char:width="10"
Char:x="1" Char:y="2" text="Firstname:"/>
<entry name="entPersonNamefirst" Char:height="1" Char:width="25"
Char:x="13" Char:y="2" block="blkPERSON_Person"
field="fldPersonNamefirst"
focusorder="2" label=""/>
+ <label name="lblPerson Namemiddle:" Char:height="1" Char:width="12"
+ Char:x="1" Char:y="3" text="Middle name:"/>
+ <entry name="entPersonNamemiddle" Char:height="1" Char:width="25"
+ Char:x="13" Char:y="3" block="blkPERSON_Person"
field="fldPersonNamemiddle"
+ focusorder="3" label=""/>
<label name="lblPerson Namelast:" Char:height="1" Char:width="9"
Char:x="1" Char:y="4" text="Lastname:"/>
<entry name="entPersonNamelast" Char:height="1" Char:width="25"
Char:x="13" Char:y="4" block="blkPERSON_Person"
field="fldPersonNamelast"
focusorder="4" label=""/>
- <label name="lblPerson Namemiddle:" Char:height="1" Char:width="12"
- Char:x="1" Char:y="3" text="Middle name:"/>
- <entry name="entPersonNamemiddle" Char:height="1" Char:width="25"
- Char:x="13" Char:y="3" block="blkPERSON_Person"
field="fldPersonNamemiddle"
- focusorder="3" label=""/>
+ <label name="lblPerson Namesuffix:" Char:height="1" Char:width="7"
+ Char:x="1" Char:y="5" text="Suffix:"/>
+ <entry name="entPersonNamesuffix" Char:height="1" Char:width="25"
+ Char:x="13" Char:y="5" block="blkPERSON_Person"
field="fldPersonNamesuffix"
+ focusorder="5" label="" style="dropdown"/>
+ <button name="btnEditSuffix" Char:height="1" Char:width="6" Char:x="39"
+ Char:y="5" label="Edit...">
+ <trigger type="On-Action" name="btnEditSuffixTrigger"><![CDATA[##
+ location = "appserver://appserver/form/PERSON_Suffix"
+ form.runForm(location)
+ ]]>
+ </trigger>
+ </button>
+ <button name="btnRefreshSuffix" Char:height="1" Char:width="3"
+ Char:x="45" Char:y="5" label="@">
+ <trigger type="On-Action" name="btnRefreshSuffixTrigger"><![CDATA[##
+ blkPERSON_Person.fldPersonNamesuffix.resetForeignKey()
+ ]]>
+ </trigger>
+ </button>
+
<label name="lblPerson Namenick:" Char:height="1" Char:width="9"
Char:x="1" Char:y="6" text="Nickname:"/>
<entry name="entPersonNamenick" Char:height="1" Char:width="25"
Char:x="13" Char:y="6" block="blkPERSON_Person"
field="fldPersonNamenick"
focusorder="6" label=""/>
- <label name="lblPerson Nameprefix:" Char:height="1" Char:width="7"
- Char:x="1" Char:y="1" text="Prefix:"/>
- <entry name="entPersonNameprefix" Char:height="1" Char:width="25"
- Char:x="13" Char:y="1" block="blkPERSON_Person"
field="fldPersonNameprefix"
- focusorder="1" label="" style="dropdown"/>
- <label name="lblPerson Namesuffix:" Char:height="1" Char:width="7"
- Char:x="1" Char:y="5" text="Suffix:"/>
- <entry name="entPersonNamesuffix" Char:height="1" Char:width="25"
- Char:x="13" Char:y="5" block="blkPERSON_Person"
field="fldPersonNamesuffix"
- focusorder="5" label="" style="dropdown"/>
<label name="lblPerson Worktitle:" Char:height="1" Char:width="11"
Char:x="1" Char:y="7" text="Work title:"/>
<entry name="entPersonWorktitle" Char:height="1" Char:width="25"
Char:x="13" Char:y="7" block="blkPERSON_Person"
field="fldPersonWorktitle"
focusorder="7" label=""/>
+ <entry name="entGnueId" Char:height="1" Char:width="32" Char:x="1"
+ Char:y="8" block="blkPERSON_Person" field="fldGnueId" hidden="Y"
label=""/>
</page>
</layout>
</form>
Modified: trunk/gnue-packages/base/person/person.hu.gcd
===================================================================
--- trunk/gnue-packages/base/person/person.hu.gcd 2004-08-26 10:11:21 UTC
(rev 6211)
+++ trunk/gnue-packages/base/person/person.hu.gcd 2004-08-26 11:45:53 UTC
(rev 6212)
@@ -5,11 +5,11 @@
<property name="fullName" type="string"
comment="Full name per local requirements">
<![CDATA[
name = ''
- if self.PERSON_namePrefix: name += self.PERSON_namePrefix + ' '
+ if self.PERSON_namePrefix: name +=
self.PERSON_namePrefix.PERSON_value + ' '
name += self.PERSON_nameLast
if self.PERSON_nameMiddle: name += ' ' + self.PERSON_nameMiddle
if self.PERSON_nameFirst: name += ' ' + self.PERSON_nameFirst
- if self.PERSON_nameSuffix: name += ' ' + self.PERSON_nameSuffix
+ if self.PERSON_nameSuffix: name += ' ' +
self.PERSON_nameSuffix.PERSON_value
return name
]]>
@@ -18,7 +18,7 @@
<property name="politeName" type="string"
comment="Polite name per local requirements">
<![CDATA[
name = ''
- if self.PERSON_namePrefix: name += self.PERSON_namePrefix + ' '
+ if self.PERSON_namePrefix: name +=
self.PERSON_namePrefix.PERSON_value + ' '
name += self.PERSON_nameLast
return name
Modified: trunk/gnue-packages/base/person/person.png
===================================================================
(Binary files differ)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- r6212 - trunk/gnue-packages/base/person,
kilo <=