[Skabacca-developer] SF.net SVN: skabacca:[25] trunk
Status: Pre-Alpha
Brought to you by:
triathlon98
Menu
▾
▴
[Skabacca-developer] SF.net SVN: skabacca:[25] trunk
|
From: <tri...@us...> - 2010-02-10 20:04:46
|
Revision: 25
http://skabacca.svn.sourceforge.net/skabacca/?rev=25&view=rev
Author: triathlon98
Date: 2010-02-10 20:04:39 +0000 (Wed, 10 Feb 2010)
Log Message:
-----------
separate Person from Artifact, make Person the table for login data as well
Modified Paths:
--------------
trunk/src/main/dm/AssessedArtifact.table
trunk/src/main/dm/AssessedCompetency.table
trunk/src/main/dm/CompetencyPlanAssignment.table
trunk/src/main/dm/dm.ini
trunk/t5compo/src/main/resources/t5gui/mytemplates/templates.properties
Added Paths:
-----------
trunk/src/main/dm/Person.table
trunk/src/main/dm/Test.table
Removed Paths:
-------------
trunk/src/main/dm/PersonArtifact.table
Modified: trunk/src/main/dm/AssessedArtifact.table
===================================================================
--- trunk/src/main/dm/AssessedArtifact.table 2010-02-07 13:46:33 UTC (rev 24)
+++ trunk/src/main/dm/AssessedArtifact.table 2010-02-10 20:04:39 UTC (rev 25)
@@ -22,13 +22,12 @@
<display/>
</field>
- <field name="Person" type="Artifact">
+ <field name="Person" type="Person">
<description>
Artifact for which this assessment was applied. Should be a person artifact.
</description>
<constraints>
<required/>
- <compare test="type" value="PersonArtifact"/>
</constraints>
<display/>
</field>
Modified: trunk/src/main/dm/AssessedCompetency.table
===================================================================
--- trunk/src/main/dm/AssessedCompetency.table 2010-02-07 13:46:33 UTC (rev 24)
+++ trunk/src/main/dm/AssessedCompetency.table 2010-02-10 20:04:39 UTC (rev 25)
@@ -11,13 +11,12 @@
<page name="ALL">
- <field name="Person" type="Artifact">
+ <field name="Person" type="Person">
<description>
Artifact for which this assessment was applies. Should be a person artifact.
</description>
<constraints>
<required/>
- <compare test="type" value="PersonArtifact"/>
</constraints>
<display/>
</field>
Modified: trunk/src/main/dm/CompetencyPlanAssignment.table
===================================================================
--- trunk/src/main/dm/CompetencyPlanAssignment.table 2010-02-07 13:46:33 UTC (rev 24)
+++ trunk/src/main/dm/CompetencyPlanAssignment.table 2010-02-10 20:04:39 UTC (rev 25)
@@ -32,7 +32,7 @@
<display/>
</field>
- <field name="Persons" type="Artifact">
+ <field name="Persons" type="Person">
<description>
Person for whom the desired tasks are registered.
</description>
@@ -40,7 +40,6 @@
<multiple/>
<constraints>
<required/>
- <compare test="type" value="PersonArtifact"/>
</constraints>
<display/>
</field>
Copied: trunk/src/main/dm/Person.table (from rev 23, trunk/src/main/dm/PersonArtifact.table)
===================================================================
--- trunk/src/main/dm/Person.table (rev 0)
+++ trunk/src/main/dm/Person.table 2010-02-10 20:04:39 UTC (rev 25)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Person" expected-amount="medium" category="tables.Main" proxy-interface="org.equanda.client.EquandaUserInfo">
+
+ <description>
+ An person indicates a link to a physical person.
+ A person does not directly have a competency profile, but it can be calculated from the assessments.
+ Each person is also a user of the application, so the user details are also included here.
+ </description>
+
+ <page name="ALL">
+ <field name="UserName" type="string" length="30">
+ <constraints>
+ <unique/>
+ <required/>
+ </constraints>
+ <display/>
+ </field>
+ </page>
+ <page>
+
+ <group name="Assignments">
+ <field name="AssignedRoles" type="Artifact">
+ <description>List of assigned tasks and/or roles for this person</description>
+ <multiple/>
+ <constraints>
+ <compare test="type" value="TaskArtifact"/>
+ </constraints>
+ </field>
+ </group>
+ <group name="PersonInfo">
+ <field name="FirstName" length="32">
+ <description>First name</description>
+ </field>
+ <field name="Name" length="32">
+ <description>name</description>
+ </field>
+ <include file="include/address.xml"/>
+ <!--
+ <field name="Birthdate" type="date">
+ <description>Birthdate for the person.</description>
+ </field>
+ <field name="Portfolio" type="uri">
+ <description>
+ Location of the e-portfolio for this person.
+ </description>
+ </field>
+ <field name="Gender" length="1">
+ <description>The gender is the official current gender of a natural person. This can be affected by a gender changing operation. This field is not affected by the Y-chromosome count (use field sex for that). When in doubt, gender is the preferred field to indicate gender/sex.</description>
+ <choice name="GENDER_MALE" value="M">
+ <description>Male gender.</description>
+ </choice>
+ <choice name="GENDER_FEMALE" value="F">
+ <description>Female gender.</description>
+ </choice>
+ <choice name="GENDER_UNKNOWN" value="?">
+ <description>Unknown gender.</description>
+ </choice>
+ <constraints>
+ <required/>
+ </constraints>
+ <default>GENDER_UNKNOWN</default>
+ </field>
+ <field name="Ethnicity">
+ <description>Ethnic information for the person.</description>
+ </field>
+ <field name="Language">
+ <description>Language information for the person.</description>
+ </field>
+ -->
+ </group>
+
+ </page>
+ <page name="Login">
+ <field name="Password" type="string" length="30"/>
+
+ <field name="Roles" type="EquandaRole">
+ <description>Grouping of security rights for this user</description>
+ <multiple/>
+ </field>
+
+ <field name="Language" type="string" length="5">
+ <include file="include/equanda/userLanguage.xml" required="false"/>
+ </field>
+
+ <field name="AuthAndConfig" type="clob">
+ <description>Authorization and configuration details for this user.</description>
+ </field>
+
+ <!--
+ <field name="StartPage" type="string">
+ <description>Starting page in GUI</description>
+ <hide/>
+ </field>
+ -->
+ </page>
+
+ <select name="UserName" type="single">
+ <selection field="UserName"/>
+ <security-role>NONE</security-role>
+ </select>
+
+ <select name="UserPassword" type="single">
+ <selection field="UserName"/>
+ <selection field="Password"/>
+ <security-role>NONE</security-role>
+ </select>
+
+ <select name="AllUsers">
+ <security-role>NONE</security-role>
+ <hide/>
+ </select>
+
+ <select name="Role">
+ <selection field="Roles"/>
+ </select>
+
+ <action name="login">
+ <security-role>NONE</security-role>
+ <description>
+ Action which should be called automatically when logging in.
+ </description>
+ </action>
+
+ <action name="logout">
+ <security-role>NONE</security-role>
+ <description>
+ Action which should be called automatically when logging out.
+ It is not guaranteed that this is called, specifically it will not be called when the session times out.
+ It may also not be called in other cases.
+ </description>
+ </action>
+
+ <!--
+ <action name="getCompetencyProfile" return="java.util.List<org.skabacca.matcher.MatchCompetency>">
+ <description>Get person's competency profile based on evidence resolution.</description>
+ <parameter type="String" name="matchProfileReference">
+ <description>Reference for the MatchProfile to use.</description>
+ </parameter>
+ </action>
+ -->
+
+</table>
Deleted: trunk/src/main/dm/PersonArtifact.table
===================================================================
--- trunk/src/main/dm/PersonArtifact.table 2010-02-07 13:46:33 UTC (rev 24)
+++ trunk/src/main/dm/PersonArtifact.table 2010-02-10 20:04:39 UTC (rev 25)
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table SYSTEM "equanda.dtd">
-
-<table name="PersonArtifact" type="PERS" expected-amount="medium" category="tables.Main">
-
- <description>
- An person artifact indicates a link to a physical person,
- but which can have a competency profile attached to it.
- </description>
-
- <template parent="Artifact"/>
-
- <page>
-
- <group name="Assignments">
- <field name="AssignedRoles" type="Artifact">
- <description>List of assigned tasks and/or roles for this person</description>
- <multiple/>
- <constraints>
- <compare test="type" value="TaskArtifact"/>
- </constraints>
- </field>
- </group>
- <group name="PersonInfo">
- <field name="PersonFirstName" length="32">
- <description>Phone number</description>
- </field>
- <field name="PersonName" length="32">
- <description>Phone number</description>
- </field>
- <include file="include/address.xml"/>
- <field name="Birthdate" type="date">
- <description>Birthdate for the person.</description>
- </field>
- <field name="Portfolio" type="uri">
- <description>
- Location of the e-portfolio for this person.
- </description>
- </field>
- <field name="Gender" length="1">
- <description>The gender is the official current gender of a natural person. This can be affected by a gender changing operation. This field is not affected by the Y-chromosome count (use field sex for that). When in doubt, gender is the preferred field to indicate gender/sex.</description>
- <choice name="GENDER_MALE" value="M">
- <description>Male gender.</description>
- </choice>
- <choice name="GENDER_FEMALE" value="F">
- <description>Female gender.</description>
- </choice>
- <choice name="GENDER_UNKNOWN" value="?">
- <description>Unknown gender.</description>
- </choice>
- <constraints>
- <required/>
- </constraints>
- <default>GENDER_UNKNOWN</default>
- </field>
- <field name="Ethnicity">
- <description>Ethnic information for the person.</description>
- </field>
- <field name="Language">
- <description>Language information for the person.</description>
- </field>
- </group>
-
- </page>
-
- <select name="PersonReference" type="single">
- <selection field="Reference"/>
- </select>
-
- <select name="Persons">
- <description>Select all person artifacts.</description>
- </select>
-
- <!--
- <action name="getCompetencyProfile" return="java.util.List<org.skabacca.matcher.MatchCompetency>">
- <description>Get person's competency profile based on evidence resolution.</description>
- <parameter type="String" name="matchProfileReference">
- <description>Reference for the MatchProfile to use.</description>
- </parameter>
- </action>
- -->
-
-</table>
Added: trunk/src/main/dm/Test.table
===================================================================
--- trunk/src/main/dm/Test.table (rev 0)
+++ trunk/src/main/dm/Test.table 2010-02-10 20:04:39 UTC (rev 25)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Test" expected-amount="medium" category="tables.Main">
+</table>
Modified: trunk/src/main/dm/dm.ini
===================================================================
--- trunk/src/main/dm/dm.ini 2010-02-07 13:46:33 UTC (rev 24)
+++ trunk/src/main/dm/dm.ini 2010-02-10 20:04:39 UTC (rev 25)
@@ -35,6 +35,8 @@
security-domain=skabacca
ejb-package=org.skabacca.dm
default-role=LocalUser
+user-table=Person
+role-table=EquandaRole
[database]
type=firebird
Modified: trunk/t5compo/src/main/resources/t5gui/mytemplates/templates.properties
===================================================================
--- trunk/t5compo/src/main/resources/t5gui/mytemplates/templates.properties 2010-02-07 13:46:33 UTC (rev 24)
+++ trunk/t5compo/src/main/resources/t5gui/mytemplates/templates.properties 2010-02-10 20:04:39 UTC (rev 25)
@@ -2,3 +2,7 @@
edit.type.link.SomeInlineTable.list=edit-tml/inlinelinklist.tml.vm
edit.type.link.SomeInlineTable.one=edit-tml/inlinelinkone.tml.vm
+edit.field.Person.Password=edit-tml/password.tml.vm
+view.field.Person.Password=view-tml/password.tml.vm
+list.field.Person.Password=view-tml/password.tml.vm
+summary.field.Person.Password=view-tml/password.tml.vm
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
