skabacca-developer Mailing List for skabacca
Status: Pre-Alpha
Brought to you by:
triathlon98
Menu
▾
▴
skabacca-developer — skabacca developers mailing list
You can subscribe to this list here.
| 2010 |
Jan
(9) |
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <tri...@us...> - 2010-02-10 20:18:14
|
Revision: 27
http://skabacca.svn.sourceforge.net/skabacca/?rev=27&view=rev
Author: triathlon98
Date: 2010-02-10 20:18:08 +0000 (Wed, 10 Feb 2010)
Log Message:
-----------
add Artifact fields in Person, no Criteria just yet
Modified Paths:
--------------
trunk/src/main/dm/Artifact.table
trunk/src/main/dm/ArtifactCategory.table
trunk/src/main/dm/Person.table
Added Paths:
-----------
trunk/src/main/dm/PersonCategory.table
Modified: trunk/src/main/dm/Artifact.table
===================================================================
--- trunk/src/main/dm/Artifact.table 2010-02-10 20:05:14 UTC (rev 26)
+++ trunk/src/main/dm/Artifact.table 2010-02-10 20:18:08 UTC (rev 27)
@@ -55,6 +55,7 @@
<cascade-keep/>
</field>
+ <!--
<field name="Criteria" singular="Criterion" type="CriterionScore">
<description>
Non-competency related criteria for the selection of the artifact.
@@ -62,7 +63,8 @@
<multiple/>
<cascade-keep/>
</field>
-
+ -->
+
<field name="Children" singular="Child" type="Artifact">
<description>
Child artifacts for this one. Basically the profiles of children should be aggregated in some cases
@@ -83,9 +85,11 @@
<selection field="Organization" />
</select>
+ <!--
<select name="Criterion">
<selection field="Reference" path="criteria" table="Criterion"/>
</select>
+ -->
<select name="Organization">
<selection field="Organization" />
Modified: trunk/src/main/dm/ArtifactCategory.table
===================================================================
--- trunk/src/main/dm/ArtifactCategory.table 2010-02-10 20:05:14 UTC (rev 26)
+++ trunk/src/main/dm/ArtifactCategory.table 2010-02-10 20:18:08 UTC (rev 27)
@@ -4,7 +4,7 @@
<table name="ArtifactCategory" expected-amount="small" category="tables.Settings">
<description>
- An competency category allows grouping competencies in categories, for easier browsing.
+ An artifact category allows grouping artifacts in categories, for easier browsing.
</description>
<data-filter name="ApplicationDomain"><filter-query where="o.applicationDomain.reference=${}"/></data-filter>
Modified: trunk/src/main/dm/Person.table
===================================================================
--- trunk/src/main/dm/Person.table 2010-02-10 20:05:14 UTC (rev 26)
+++ trunk/src/main/dm/Person.table 2010-02-10 20:18:08 UTC (rev 27)
@@ -9,6 +9,8 @@
Each person is also a user of the application, so the user details are also included here.
</description>
+ <data-filter name="Organization"><filter-query where="o.organization.reference=${}"/></data-filter>
+
<page name="ALL">
<field name="UserName" type="string" length="30">
<constraints>
@@ -20,6 +22,37 @@
</page>
<page>
+ <field name="Organization" type="organization">
+ <description>
+ Organization for which this artifact is applicable.
+ </description>
+ </field>
+
+ <field name="Description" type="descriptionClob">
+ <description>
+ Description for the base competency.
+ </description>
+ <display/>
+ </field>
+
+ <field name="Categories" singular="Category" type="PersonCategory">
+ <description>
+ Categories for this person.
+ </description>
+ <multiple/>
+ <cascade-keep/>
+ </field>
+
+ <!--
+ <field name="Criteria" singular="Criterion" type="CriterionScore">
+ <description>
+ Non-competency related criteria for the selection of the artifact.
+ </description>
+ <multiple/>
+ <cascade-keep/>
+ </field>
+ -->
+
<group name="Assignments">
<field name="AssignedRoles" type="Artifact">
<description>List of assigned tasks and/or roles for this person</description>
Added: trunk/src/main/dm/PersonCategory.table
===================================================================
--- trunk/src/main/dm/PersonCategory.table (rev 0)
+++ trunk/src/main/dm/PersonCategory.table 2010-02-10 20:18:08 UTC (rev 27)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="PersonCategory" expected-amount="small" category="tables.Settings">
+
+ <description>
+ An person category allows grouping persons in categories, for easier browsing.
+ </description>
+
+ <data-filter name="ApplicationDomain"><filter-query where="o.applicationDomain.reference=${}"/></data-filter>
+
+ <page name="ALL">
+
+ <field name="Title" type="titleString">
+ <description>
+ Title for the category.
+ </description>
+ </field>
+
+ </page>
+
+ <page>
+
+ <field name="ApplicationDomains" type="ApplicationDomain">
+ <description>
+ Application domain for which this category is applicable.
+ </description>
+ <multiple/>
+ </field>
+
+ <field name="Description" type="descriptionClob">
+ <description>
+ Description for the category.
+ </description>
+ <display/>
+ </field>
+
+ </page>
+
+ <select name="Title">
+ <selection field="Title"/>
+ </select>
+
+</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-02-10 20:05:21
|
Revision: 26
http://skabacca.svn.sourceforge.net/skabacca/?rev=26&view=rev
Author: triathlon98
Date: 2010-02-10 20:05:14 +0000 (Wed, 10 Feb 2010)
Log Message:
-----------
site updates (minor)
Modified Paths:
--------------
trunk/src/site/docbook/index.xml
trunk/src/site/resources/images/logo.png
trunk/src/site/site.xml
trunk/src/site/wiki/gettingstarted.wiki
Added Paths:
-----------
trunk/src/site/docbook/matching.xml
Removed Paths:
-------------
trunk/src/site/wiki/index.wiki
Modified: trunk/src/site/docbook/index.xml
===================================================================
--- trunk/src/site/docbook/index.xml 2010-02-10 20:04:39 UTC (rev 25)
+++ trunk/src/site/docbook/index.xml 2010-02-10 20:05:14 UTC (rev 26)
@@ -2,7 +2,7 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<article id="docbook" lang="en">
- <title>Page title</title>
+ <title>skabacca</title>
<toc />
Added: trunk/src/site/docbook/matching.xml
===================================================================
--- trunk/src/site/docbook/matching.xml (rev 0)
+++ trunk/src/site/docbook/matching.xml 2010-02-10 20:05:14 UTC (rev 26)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<article id="docbook" lang="en">
+ <title>Competency matching</title>
+
+ <toc />
+
+ <section>
+ <title>Section</title>
+
+ <para>A sample paragraph.</para>
+ </section>
+</article>
Modified: trunk/src/site/resources/images/logo.png
===================================================================
(Binary files differ)
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2010-02-10 20:04:39 UTC (rev 25)
+++ trunk/src/site/site.xml 2010-02-10 20:05:14 UTC (rev 26)
@@ -14,6 +14,7 @@
<item name="Introduction" href="index.html"/>
<item name="Domain Model" href="dm/index.html"/>
<item name="Getting started" href="gettingstarted.html"/>
+ <item name="Matching" href="matching.html"/>
</menu>
<menu ref="modules" />
Modified: trunk/src/site/wiki/gettingstarted.wiki
===================================================================
--- trunk/src/site/wiki/gettingstarted.wiki 2010-02-10 20:04:39 UTC (rev 25)
+++ trunk/src/site/wiki/gettingstarted.wiki 2010-02-10 20:05:14 UTC (rev 26)
@@ -145,7 +145,7 @@
mvn equanda:ddltool
{code}
-Thos site is created using
+This site is created using
{code}
mvn site
{code}
Deleted: trunk/src/site/wiki/index.wiki
===================================================================
--- trunk/src/site/wiki/index.wiki 2010-02-10 20:04:39 UTC (rev 25)
+++ trunk/src/site/wiki/index.wiki 2010-02-10 20:05:14 UTC (rev 26)
@@ -1,3 +0,0 @@
-h1. skabacca
-
-You can start writing your documentation here.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <tri...@us...> - 2010-02-07 13:46:41
|
Revision: 24
http://skabacca.svn.sourceforge.net/skabacca/?rev=24&view=rev
Author: triathlon98
Date: 2010-02-07 13:46:33 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
more strict checkstyle
Modified Paths:
--------------
trunk/config/checkstyle.xml
Modified: trunk/config/checkstyle.xml
===================================================================
--- trunk/config/checkstyle.xml 2010-02-01 07:18:47 UTC (rev 23)
+++ trunk/config/checkstyle.xml 2010-02-07 13:46:33 UTC (rev 24)
@@ -103,7 +103,6 @@
<!-- size violations, see http://checkstyle.sourceforge.net/config_sizes.html -->
<module name="LineLength">
- <property name="severity" value="info"/>
<property name="max" value="120"/>
</module>
<!--
@@ -128,12 +127,10 @@
</module>
<module name="MethodParamPad"/>
<module name="NoWhitespaceAfter">
- <property name="severity" value="info"/>
<!-- Default tokens and additional GENERIC_START -->
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, GENERIC_START"/>
</module>
<module name="NoWhitespaceBefore">
- <property name="severity" value="info"/>
<!-- Default tokens and additional GENERIC_START and GENERIC_END -->
<property name="tokens" value="POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
</module>
@@ -146,10 +143,9 @@
<module name="WhitespaceAfter">
<property name="severity" value="info"/>
<!-- Default tokens and additional GENERIC_END -->
- <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/>
+ <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
</module>
<module name="WhitespaceAround">
- <property name="severity" value="info"/>
<!-- Default tokens without GENERIC_START and GENERIC_END -->
<property name="tokens"
value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
@@ -162,10 +158,8 @@
<!-- modifiers, see http://checkstyle.sourceforge.net/config_modifier.html -->
- <!--<module name="ModifierOrder"/>-->
- <module name="RedundantModifier">
- <property name="severity" value="info"/>
- </module>
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
<!-- coding , see http://checkstyle.sourceforge.net/config_coding.html -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-02-01 07:18:53
|
Revision: 23
http://skabacca.svn.sourceforge.net/skabacca/?rev=23&view=rev
Author: triathlon98
Date: 2010-02-01 07:18:47 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
improve logo some more
Modified Paths:
--------------
trunk/gui/src/main/webapp/images/logo.png
Added Paths:
-----------
trunk/gui/src/main/webapp/images/skabacca2.svg
Modified: trunk/gui/src/main/webapp/images/logo.png
===================================================================
(Binary files differ)
Added: trunk/gui/src/main/webapp/images/skabacca2.svg
===================================================================
--- trunk/gui/src/main/webapp/images/skabacca2.svg (rev 0)
+++ trunk/gui/src/main/webapp/images/skabacca2.svg 2010-02-01 07:18:47 UTC (rev 23)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="240"
+ height="40"
+ id="svg2826"
+ version="1.1"
+ inkscape:version="0.47pre4 r22446"
+ sodipodi:docname="skabacca2.svg"
+ inkscape:export-filename="/home/joachim/apps/java/skabacca/gui/src/main/webapp/images/logo.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs2828">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="-472 : 248.33333 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="350.66667 : 496.33333 : 1"
+ inkscape:persp3d-origin="364 : 80 : 1"
+ id="perspective2834" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#000000"
+ bordercolor="#dd6666"
+ borderopacity="1"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.5875"
+ inkscape:cx="117.81907"
+ inkscape:cy="20"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1440"
+ inkscape:window-height="851"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata2831">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-50)">
+ <g
+ transform="matrix(1,0,-0.32261519,1,0,-5.1901566)"
+ inkscape:transform-center-x="2.3266219"
+ style="font-size:45.56250763px;font-style:normal;font-weight:normal;fill:#cccccc;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ id="text2878">
+ <path
+ d="m 48.550513,63.969741 -2.03015,0 -1.746874,1.038681 c -1.794085,-1.03868 -3.588175,-1.510809 -5.854387,-1.510809 -5.287829,0 -9.112071,3.210475 -9.112071,7.648474 0,1.794084 0.708193,3.446535 1.982937,4.674067 1.416383,1.36917 2.785559,2.030151 5.854388,2.69113 l 3.446534,0.755405 c 2.360638,0.51934 3.304897,1.32196 3.304897,2.738342 0,1.699659 -1.558025,2.785556 -4.060301,2.785556 -3.635383,0 -6.326518,-2.030155 -8.59273,-6.515367 l -2.124577,0 0.236064,8.167815 1.982938,0 1.841299,-0.849831 c 1.746872,1.038681 4.201942,1.652448 6.657006,1.652448 5.571105,0 9.489773,-3.304901 9.489773,-8.026176 0,-1.982936 -0.708193,-3.635387 -2.030151,-4.815706 -1.227531,-1.085893 -2.219005,-1.510811 -5.618323,-2.36064 l -4.249152,-1.038682 c -2.313425,-0.613766 -2.927194,-1.085896 -2.927194,-2.313427 0,-1.605234 1.65245,-2.738343 3.965875,-2.738343 3.021617,0 5.240624,1.605239 7.554049,5.476685 l 2.219002,0 -0.188852,-7.459622"
+ id="path2830"
+ style="fill:#b06cc8" />
+ <path
+ d="m 62.491197,57.468694 -11.331073,0.708192 0,2.407853 0.897043,0 c 2.879978,0 3.02162,0.188855 3.02162,4.39079 l 0,20.490357 0,2.219001 c 0,1.888511 -0.519344,2.171789 -3.588173,2.171789 l -0.188852,0 0,2.407853 14.399905,0 0,-2.407853 c -2.73834,0 -3.21047,-0.330491 -3.21047,-2.219001 l 0,-2.171789 0,-1.321959 2.171789,-1.935725 4.343577,5.240621 c 0.377702,0.472128 0.613767,1.038683 0.613767,1.463597 0,0.613766 -0.613768,0.944256 -1.841299,0.944256 l -0.472128,0 0,2.407853 14.447117,0 0,-2.407853 c -1.652446,0 -2.077365,-0.330492 -4.154726,-3.021619 l -7.41241,-9.253709 3.635385,-3.02162 c 1.935723,-1.652446 3.304898,-2.219001 5.098983,-2.219001 l 1.085895,0 0,-2.407853 -13.880565,0 0,2.407853 0.566554,0 c 1.794085,0 2.832768,0.472128 2.832768,1.321958 0,0.566553 -0.33049,1.133108 -1.18032,1.888512 l -5.854387,5.098983 0,-23.181486"
+ id="path2832"
+ style="fill:#b06cc8" />
+ <path
+ d="m 107.32898,71.523789 c 0,-3.068829 -0.56656,-4.53243 -2.219,-5.854388 -1.74688,-1.416382 -4.72129,-2.171788 -8.403884,-2.171788 -6.51536,0 -10.764519,2.407856 -10.764519,6.090451 0,2.030149 1.652451,3.54096 3.824237,3.54096 2.171787,0 3.87145,-1.32196 3.87145,-3.068832 0,-0.566553 -0.236064,-1.227533 -0.660979,-1.794086 -0.424915,-0.519341 -0.424915,-0.566554 -0.424915,-0.802618 0,-0.802617 1.605237,-1.51081 3.493747,-1.51081 2.832765,0 3.87145,1.227536 3.87145,4.485217 l 0,2.455065 c -0.51934,0.141639 -1.133108,0.283277 -1.558023,0.33049 -4.768488,1.038681 -6.420943,1.463598 -8.639942,2.36064 -3.446532,1.416383 -5.05177,3.304899 -5.05177,6.137664 0,3.493744 2.691134,5.523898 7.270771,5.523898 4.060297,0 6.51537,-0.897045 9.017647,-3.352109 0.80262,2.124574 2.59671,3.352109 5.00456,3.352109 2.69112,0 5.1934,-1.888514 5.1934,-3.918662 0,-0.472128 -0.28327,-0.755405 -0.70819,-0.755405 -0.28327,0 -0.56655,0.09443 -0.94425,0.33049 -0.42492,0.283276 -0.56656,0.330489 -0.89705,0.330489 -1.03868,0 -1.27474,-0.660982 -1.27474,-3.399322 l 0,-8.309453 m -7.412413,3.918663 0,2.643917 c 0,3.635382 -1.699664,5.948813 -4.343578,5.948813 -1.841297,0 -3.021619,-1.274748 -3.021619,-3.304896 0,-2.502276 1.4636,-3.918664 4.862918,-4.721281 l 2.502279,-0.566553"
+ id="path2834"
+ style="fill:#800ca4" />
+ <path
+ d="m 123.39766,57.468695 -11.33107,0.708192 0,2.407853 0.89704,0 c 2.87998,0 3.02162,0.188855 3.02162,4.39079 l 0,17.563163 c 0,4.579637 -0.18885,7.790115 -0.66098,10.386817 l 2.31343,0 3.06883,-3.777025 c 2.219,2.691127 4.62686,3.824237 8.16781,3.824237 7.17634,0 12.08648,-5.004564 12.08648,-12.275328 0,-6.704212 -4.24916,-11.472711 -10.24518,-11.472711 -3.16325,0 -5.38226,1.085896 -7.31798,3.54096 l 0,-15.296948 m 4.95734,15.296948 c 2.97441,0 4.43801,2.832774 4.43801,8.498304 0,6.090446 -1.60524,9.25371 -4.67407,9.25371 -3.11604,0 -4.76849,-2.927199 -4.76849,-8.262241 0,-6.279296 1.69966,-9.489773 5.00455,-9.489773"
+ id="path2836"
+ style="fill:#b06cc8" />
+ <path
+ d="m 166.80605,71.523789 c 0,-3.068829 -0.56656,-4.53243 -2.219,-5.854388 -1.74688,-1.416382 -4.72129,-2.171788 -8.40388,-2.171788 -6.51536,0 -10.76452,2.407856 -10.76452,6.090451 0,2.030149 1.65245,3.54096 3.82423,3.54096 2.17179,0 3.87145,-1.32196 3.87145,-3.068832 0,-0.566553 -0.23606,-1.227533 -0.66098,-1.794086 -0.42491,-0.519341 -0.42491,-0.566554 -0.42491,-0.802618 0,-0.802617 1.60524,-1.51081 3.49375,-1.51081 2.83276,0 3.87145,1.227536 3.87145,4.485217 l 0,2.455065 c -0.51934,0.141639 -1.13311,0.283277 -1.55803,0.33049 -4.76848,1.038681 -6.42094,1.463598 -8.63994,2.36064 -3.44653,1.416383 -5.05177,3.304899 -5.05177,6.137664 0,3.493744 2.69114,5.523898 7.27077,5.523898 4.0603,0 6.51537,-0.897045 9.01765,-3.352109 0.80262,2.124574 2.59671,3.352109 5.00456,3.352109 2.69112,0 5.1934,-1.888514 5.1934,-3.918662 0,-0.472128 -0.28327,-0.755405 -0.70819,-0.755405 -0.28327,0 -0.56655,0.09443 -0.94425,0.33049 -0.42492,0.283276 -0.56656,0.330489 -0.89705,0.330489 -1.03868,0 -1.27474,-0.660982 -1.27474,-3.399322 l 0,-8.309453 m -7.41241,3.918663 0,2.643917 c 0,3.635382 -1.69967,5.948813 -4.34358,5.948813 -1.8413,0 -3.02162,-1.274748 -3.02162,-3.304896 0,-2.502276 1.4636,-3.918664 4.86292,-4.721281 l 2.50228,-0.566553"
+ id="path2838"
+ style="fill:#800ca4"
+ inkscape:export-filename="/home/joachim/apps/java/skabacca/gui/src/main/webapp/images/logo.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ d="m 193.73284,78.180794 c -0.66098,1.746872 -1.08589,2.50228 -1.79409,3.446535 -1.1331,1.510808 -3.02162,2.407853 -4.95734,2.407853 -3.82423,0 -6.04324,-3.304902 -6.04324,-9.159284 0,-5.618318 2.07737,-8.92322 5.61832,-8.92322 1.36917,0 2.50228,0.566555 2.50228,1.321959 0,0.141638 -0.0944,0.377703 -0.51934,0.897043 -0.80261,0.991468 -0.99147,1.416385 -0.99147,2.313427 0,2.030149 1.60524,3.446535 3.87145,3.446535 2.5967,0 4.24916,-1.605238 4.24916,-4.013088 0,-3.871446 -3.68261,-6.420941 -9.39535,-6.420941 -7.83732,0 -13.50286,5.098989 -13.50286,12.228115 0,6.893063 5.09899,11.519924 12.70024,11.519924 3.49374,0 5.80718,-0.944258 7.88454,-3.21047 1.36917,-1.416383 2.12457,-2.832771 2.83277,-5.05177 l -2.45507,-0.802618"
+ id="path2840"
+ style="fill:#b06cc8" />
+ <path
+ d="m 220.01339,78.180794 c -0.66098,1.746872 -1.0859,2.50228 -1.79409,3.446535 -1.1331,1.510808 -3.02162,2.407853 -4.95734,2.407853 -3.82424,0 -6.04324,-3.304902 -6.04324,-9.159284 0,-5.618318 2.07737,-8.92322 5.61832,-8.92322 1.36917,0 2.50228,0.566555 2.50228,1.321959 0,0.141638 -0.0944,0.377703 -0.51934,0.897043 -0.80262,0.991468 -0.99147,1.416385 -0.99147,2.313427 0,2.030149 1.60524,3.446535 3.87145,3.446535 2.5967,0 4.24915,-1.605238 4.24915,-4.013088 0,-3.871446 -3.6826,-6.420941 -9.39534,-6.420941 -7.83732,0 -13.50287,5.098989 -13.50287,12.228115 0,6.893063 5.09899,11.519924 12.70025,11.519924 3.49374,0 5.80717,-0.944258 7.88454,-3.21047 1.36917,-1.416383 2.12457,-2.832771 2.83276,-5.05177 l -2.45506,-0.802618"
+ style="font-size:47.21280288999999186px;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#dcc0e4;font-family:Century Schoolbook L;-inkscape-font-specification:Century Schoolbook L Medium"
+ id="path2842" />
+ <path
+ d="m 248.22969,71.523789 c 0,-3.068829 -0.56655,-4.53243 -2.219,-5.854388 -1.74687,-1.416382 -4.72128,-2.171788 -8.40388,-2.171788 -6.51536,0 -10.76452,2.407856 -10.76452,6.090451 0,2.030149 1.65245,3.54096 3.82424,3.54096 2.17179,0 3.87145,-1.32196 3.87145,-3.068832 0,-0.566553 -0.23607,-1.227533 -0.66098,-1.794086 -0.42491,-0.519341 -0.42492,-0.566554 -0.42492,-0.802618 0,-0.802617 1.60524,-1.51081 3.49375,-1.51081 2.83277,0 3.87145,1.227536 3.87145,4.485217 l 0,2.455065 c -0.51934,0.141639 -1.13311,0.283277 -1.55802,0.33049 -4.76849,1.038681 -6.42094,1.463598 -8.63994,2.36064 -3.44653,1.416383 -5.05177,3.304899 -5.05177,6.137664 0,3.493744 2.69113,5.523898 7.27077,5.523898 4.0603,0 6.51537,-0.897045 9.01764,-3.352109 0.80262,2.124574 2.59671,3.352109 5.00456,3.352109 2.69113,0 5.19341,-1.888514 5.19341,-3.918662 0,-0.472128 -0.28328,-0.755405 -0.70819,-0.755405 -0.28328,0 -0.56656,0.09443 -0.94426,0.33049 -0.42491,0.283276 -0.56655,0.330489 -0.89704,0.330489 -1.03868,0 -1.27475,-0.660982 -1.27475,-3.399322 l 0,-8.309453 m -7.41241,3.918663 0,2.643917 c 0,3.635382 -1.69966,5.948813 -4.34358,5.948813 -1.84129,0 -3.02162,-1.274748 -3.02162,-3.304896 0,-2.502276 1.4636,-3.918664 4.86292,-4.721281 l 2.50228,-0.566553"
+ style="font-size:47.21280288999999897px;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#dcc0e4;font-family:Century Schoolbook L;-inkscape-font-specification:Century Schoolbook L Medium"
+ id="path2844" />
+ </g>
+ </g>
+</svg>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-31 21:38:44
|
Revision: 22
http://skabacca.svn.sourceforge.net/skabacca/?rev=22&view=rev
Author: triathlon98
Date: 2010-01-31 21:38:17 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
improve logo a bit
Modified Paths:
--------------
trunk/gui/src/main/webapp/images/logo.png
Added Paths:
-----------
trunk/gui/src/main/webapp/images/skabacca.svg
Modified: trunk/gui/src/main/webapp/images/logo.png
===================================================================
(Binary files differ)
Added: trunk/gui/src/main/webapp/images/skabacca.svg
===================================================================
--- trunk/gui/src/main/webapp/images/skabacca.svg (rev 0)
+++ trunk/gui/src/main/webapp/images/skabacca.svg 2010-01-31 21:38:17 UTC (rev 22)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="240"
+ height="40"
+ id="svg2826"
+ version="1.1"
+ inkscape:version="0.47pre4 r22446"
+ sodipodi:docname="skabacca.svg"
+ inkscape:export-filename="/home/joachim/apps/java/skabacca/gui/src/main/webapp/images/skabacca.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs2828">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="-472 : 248.33333 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="350.66667 : 496.33333 : 1"
+ inkscape:persp3d-origin="364 : 80 : 1"
+ id="perspective2834" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#000000"
+ bordercolor="#dd6666"
+ borderopacity="1"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.5875"
+ inkscape:cx="117.81907"
+ inkscape:cy="20"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1440"
+ inkscape:window-height="851"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata2831">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-50)">
+ <text
+ xml:space="preserve"
+ style="font-size:45.56250763px;font-style:normal;font-weight:normal;fill:#cccccc;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="27.824093"
+ y="86.53746"
+ id="text2878"
+ transform="matrix(1,0,-0.32261519,1,0,0)"
+ inkscape:transform-center-x="2.3266219"><tspan
+ sodipodi:role="line"
+ id="tspan2880"
+ x="27.824093"
+ y="86.53746"
+ style="font-size:47.21280289px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#cccccc;font-family:Century Schoolbook L;-inkscape-font-specification:Century Schoolbook L Medium"><tspan
+ style="fill:#b06cc8"
+ id="tspan2820">sk</tspan><tspan
+ style="fill:#4c0064"
+ id="tspan2816">a</tspan><tspan
+ style="fill:#b06cc8"
+ id="tspan2818">b</tspan><tspan
+ style="fill:#4c0064"
+ id="tspan2814">a</tspan><tspan
+ style="fill:#b06cc8"
+ id="tspan2822">c</tspan>ca</tspan></text>
+ </g>
+</svg>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-31 19:51:03
|
Revision: 21
http://skabacca.svn.sourceforge.net/skabacca/?rev=21&view=rev
Author: triathlon98
Date: 2010-01-31 19:50:37 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
only allow (contextualised) competencies, no non-contextualised
Modified Paths:
--------------
trunk/src/main/dm/AssessedCompetencyLevel.table
trunk/src/main/dm/Competency.table
trunk/src/main/dm/Context.table
trunk/src/main/dm/DeltaProficiencyCompetency.table
trunk/src/main/dm/MatchProfile.table
trunk/src/main/dm/ProficiencyCompetency.table
trunk/src/main/dm/Score.table
trunk/src/main/dm/WeighedCompetency.table
Removed Paths:
-------------
trunk/src/main/dm/Commitment.table
trunk/src/main/dm/ScoreCommitment.table
Modified: trunk/src/main/dm/AssessedCompetencyLevel.table
===================================================================
--- trunk/src/main/dm/AssessedCompetencyLevel.table 2010-01-30 21:03:38 UTC (rev 20)
+++ trunk/src/main/dm/AssessedCompetencyLevel.table 2010-01-31 19:50:37 UTC (rev 21)
@@ -21,7 +21,7 @@
<page>
- <field name="Competency" type="Commitment">
+ <field name="Competency" type="Competency">
<description>
Competency (in context) which is Weighed, to be assigned in an artifact as embedded details for competencies.
</description>
Deleted: trunk/src/main/dm/Commitment.table
===================================================================
--- trunk/src/main/dm/Commitment.table 2010-01-30 21:03:38 UTC (rev 20)
+++ trunk/src/main/dm/Commitment.table 2010-01-31 19:50:37 UTC (rev 21)
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table SYSTEM "equanda.dtd">
-
-<table name="Commitment" expected-amount="small" category="tables.Main">
-
- <description>
- Link between a competency and the context. The link with the competency content ontology is also considered a context.
- </description>
-
- <data-filter name="Organization"><filter-query from="IN (o.competency.organizations) org" where="org.reference=${}"/></data-filter>
- <data-filter name="ApplicationDomain"><filter-query where="o.applicationDomain.reference=${}"/></data-filter>
- <data-filter name="InactiveFilter"><filter-query where="o.inactive=0"/></data-filter>
-
- <page name="ALL">
-
- <field name="Competency" type="Competency">
- <description>
- Competency for this commitment.
- </description>
- <link-name>Competency_Commitment</link-name>
- </field>
-
- <field name="Context" type="Context">
- <description>
- Context for this commitment.
- </description>
- <display/>
- <constraints>
- <required/>
- </constraints>
- <default type="class">org.skabacca.util.DefaultCompetencyContext</default>
- </field>
-
- <field name="Title" type="titleString">
- <description>
- Competency title.
- </description>
- <constraints>
- <required/>
- </constraints>
- </field>
-
- </page>
-
- <page>
-
- <field name="Reference" type="referenceString">
- <description>
- Reference for competency, also referred to (in documents) as Id.
- This will typically be the RCD URI.
- </description>
- </field>
-
- <field name="Description" type="descriptionClob">
- <description>
- Description for the competency in this context.
- </description>
- <constraints>
- <value-when-null field="Description" path="Competency"/>
- </constraints>
- <display/>
- </field>
-
- <field name="CompetencyCategories" singular="CompetencyCategory" type="CompetencyCategory">
- <description>
- Categories for this competency.
- </description>
- <multiple/>
- <cascade-keep/>
- </field>
-
- <field name="Scale" type="Scale">
- <description>
- Scale to be used for the competency in this context.
- When the scale is chosen, and the scale is discrete, then the user should be given a list of scores as it needs to be allowed to specify context specific text/commitment.
- </description>
- </field>
-
- <field name="Scores" type="ScoreCommitment">
- <description>
- Commitments for the scale.
- </description>
- <link-name>Competency_ScoreCommitment</link-name>
- <cascade-delete/>
- <hide/>
- </field>
-
- <field name="Commitment" type="uri">
- <description>
- Location where the semantical commitment can be found. This uri is also used to determine how the commitment can be defined.
- It is normally based on the ontology for the context.
- In principle this is only filled if the scale is continuous, otherwise the commitment should be specific for each possible score.
- </description>
- </field>
-
- <field name="Inactive" type="boolean">
- <description>
- Indicates that the object should not be selectable in the gui.
- </description>
- </field>
-
- <group name="RollupRules">
-
- <field name="CombinationRule" length="4">
- <description>
- How should the child competencies be matched?
- </description>
- <choice name="COMBINATIONRULE_ALL" value="ALL"/>
- <choice name="COMBINATIONRULE_SOME" value="SOME"/>
- <default>COMBINATIONRULE_ALL</default>
- <constraints>
- <required/>
- </constraints>
- </field>
-
- <field name="MinimumMatchWeight" type="int" priority="6">
- <description>
- Details the minimum combined weight of matching child compentencies to allow this one to match.
- Can not be higher than the total weights linked WeightCompetencies with positive weight.
- Only relevant when combinationrule is set so "some".
- </description>
- <default>0</default>
- </field>
-
- <field name="MinimumScoreWeight" type="int" priority="6">
- <description>
- Details the minimum combined weight of matching child compentencies as used to calculate the match score.
- Has to be positive.
- For example a competency with three children, all weighed as "1", and one child weighed as "2" may have a MinimumMatchWeight of "2" and a MinimumScoreWeight of "3". The match competency matches when at least a weight of two is reached, but you need a weight of 3 to have a shot at 1.0 as match score.
- Only relevant when combinationrule is set so "some".
- </description>
- <default>1</default>
- </field>
-
- </group>
-
- <field name="WeighedCompetencies" singular="WeighedCompetency" type="WeighedCompetency">
- <description>
- Child competencies for this one.
- </description>
- <link-name>Competency_WeighedCompetency</link-name>
- <multiple/>
- <embedded/>
- </field>
-
- <!-- some calculated fields to easy display of levels etc -->
- <field name="Discrete" type="boolean">
- <description>
- Indicates whether the scale (if any) is discrete.
- </description>
- <calculated/>
- <hide/>
- </field>
- <field name="MinimumProficiencyLevel" type="double">
- <description>
- Lowest (inclusive) allowed value for the scale.
- </description>
- <calculated/>
- <hide/>
- </field>
- <field name="MaximumProficiencyLevel" type="double">
- <description>
- Highest (inclusive) allowed value for the scale.
- </description>
- <calculated/>
- <hide/>
- </field>
-
- </page>
-
- <select name="Reference" type="single">
- <selection field="Reference"/>
- </select>
-
- <select name="Context">
- <description>Select the commitments in a specific context.</description>
- <selection field="Context"/>
- </select>
-
- <select name="Category">
- <selection field="CompetencyCategories" />
- </select>
-
- <select name="HasSemantics">
- <selection field="Commitment" test="is not null"/>
- <hide/>
- </select>
-
- <action name="linkDogTagger" return="java.net.URL">
- <description>
- Allows the definition of the link with the semantic definition using Starlab's dogtagger.
- </description>
- </action>
-
-</table>
Modified: trunk/src/main/dm/Competency.table
===================================================================
--- trunk/src/main/dm/Competency.table 2010-01-30 21:03:38 UTC (rev 20)
+++ trunk/src/main/dm/Competency.table 2010-01-31 19:50:37 UTC (rev 21)
@@ -4,12 +4,11 @@
<table name="Competency" expected-amount="medium" category="tables.Main">
<description>
- A general competency, as interpreted inside a context.
+ A competency. The context for the competency is explicit.
</description>
- <data-filter name="Organization"><filter-query from="IN (o.organizations) org" where="org.reference=${}"/></data-filter>
+ <data-filter name="Organization"><filter-query from="IN (o.competency.organizations) org" where="org.reference=${}"/></data-filter>
<data-filter name="ApplicationDomain"><filter-query where="o.applicationDomain.reference=${}"/></data-filter>
- <!--<data-filter>Context</data-filter>-->
<data-filter name="InactiveFilter"><filter-query where="o.inactive=0"/></data-filter>
<page name="ALL">
@@ -23,6 +22,17 @@
</constraints>
</field>
+ <field name="Context" type="Context">
+ <description>
+ Context for this competency.
+ </description>
+ <display/>
+ <constraints>
+ <required/>
+ </constraints>
+ <default type="class">org.skabacca.util.DefaultCompetencyContext</default>
+ </field>
+
</page>
<page>
@@ -34,20 +44,12 @@
</description>
</field>
- <field name="Organizations" type="organizations">
+ <field name="Description" type="descriptionClob">
<description>
- Organizations for which this assessment method is applicable.
+ Description for the competency in this context.
</description>
+ <display/>
</field>
-
- <field name="Commitments" type="Commitment">
- <description>
- Semantic commitments including possible context links.
- </description>
- <link-name>Competency_Commitment</link-name>
- <multiple/>
- <embedded/>
- </field>
<field name="CompetencyCategories" singular="CompetencyCategory" type="CompetencyCategory">
<description>
@@ -57,11 +59,11 @@
<cascade-keep/>
</field>
- <field name="Description" type="descriptionClob">
+ <field name="Scale" type="Scale">
<description>
- Description for the Competency.
+ Scale to be used for the competency.
+ When the scale is chosen, and the scale is discrete, then the user should be given a list of scores.
</description>
- <display/>
</field>
<field name="Inactive" type="boolean">
@@ -70,6 +72,73 @@
</description>
</field>
+ <group name="RollupRules">
+
+ <field name="CombinationRule" length="4">
+ <description>
+ How should the child competencies be matched?
+ </description>
+ <choice name="COMBINATIONRULE_ALL" value="ALL"/>
+ <choice name="COMBINATIONRULE_SOME" value="SOME"/>
+ <default>COMBINATIONRULE_ALL</default>
+ <constraints>
+ <required/>
+ </constraints>
+ </field>
+
+ <field name="MinimumMatchWeight" type="int" priority="6">
+ <description>
+ Details the minimum combined weight of matching child compentencies to allow this one to match.
+ Can not be higher than the total weights linked WeightCompetencies with positive weight.
+ Only relevant when combinationrule is set so "some".
+ </description>
+ <default>0</default>
+ </field>
+
+ <field name="MinimumScoreWeight" type="int" priority="6">
+ <description>
+ Details the minimum combined weight of matching child compentencies as used to calculate the match score.
+ Has to be positive.
+ For example a competency with three children, all weighed as "1", and one child weighed as "2" may have a MinimumMatchWeight of "2" and a MinimumScoreWeight of "3". The match competency matches when at least a weight of two is reached, but you need a weight of 3 to have a shot at 1.0 as match score.
+ Only relevant when combinationrule is set so "some".
+ </description>
+ <default>1</default>
+ </field>
+
+ </group>
+
+ <field name="WeighedCompetencies" singular="WeighedCompetency" type="WeighedCompetency">
+ <description>
+ Child competencies for this one.
+ </description>
+ <link-name>Competency_WeighedCompetency</link-name>
+ <multiple/>
+ <embedded/>
+ </field>
+
+ <!-- some calculated fields to easy display of levels etc -->
+ <field name="Discrete" type="boolean">
+ <description>
+ Indicates whether the scale (if any) is discrete.
+ </description>
+ <calculated/>
+ <hide/>
+ </field>
+ <field name="MinimumProficiencyLevel" type="double">
+ <description>
+ Lowest (inclusive) allowed value for the scale.
+ </description>
+ <calculated/>
+ <hide/>
+ </field>
+ <field name="MaximumProficiencyLevel" type="double">
+ <description>
+ Highest (inclusive) allowed value for the scale.
+ </description>
+ <calculated/>
+ <hide/>
+ </field>
+
</page>
<select name="Reference" type="single">
@@ -77,15 +146,12 @@
</select>
<select name="Context">
- <selection field="Reference" table="Context" path="commitments.context"/>
+ <description>Select the competencies in a specific context.</description>
+ <selection field="Context"/>
</select>
<select name="Category">
<selection field="CompetencyCategories" />
</select>
- <select name="Organization">
- <selection field="Reference" table="Organization" path="organizations"/>
- </select>
-
</table>
Modified: trunk/src/main/dm/Context.table
===================================================================
--- trunk/src/main/dm/Context.table 2010-01-30 21:03:38 UTC (rev 20)
+++ trunk/src/main/dm/Context.table 2010-01-31 19:50:37 UTC (rev 21)
@@ -48,12 +48,6 @@
<display/>
</field>
- <field name="Ontology" type="uri">
- <description>
- Location where the ontology can be found. This uri is also used to determine how the commitment can be defined.
- </description>
- </field>
-
</page>
<select name="Reference" type="single">
Modified: trunk/src/main/dm/DeltaProficiencyCompetency.table
===================================================================
--- trunk/src/main/dm/DeltaProficiencyCompetency.table 2010-01-30 21:03:38 UTC (rev 20)
+++ trunk/src/main/dm/DeltaProficiencyCompetency.table 2010-01-31 19:50:37 UTC (rev 21)
@@ -9,7 +9,7 @@
<page>
- <field name="Competency" type="Commitment">
+ <field name="Competency" type="Competency">
<description>
Weighed competency, to be assigned in an artifact as embedded details for competencies.
</description>
Modified: trunk/src/main/dm/MatchProfile.table
===================================================================
--- trunk/src/main/dm/MatchProfile.table 2010-01-30 21:03:38 UTC (rev 20)
+++ trunk/src/main/dm/MatchProfile.table 2010-01-31 19:50:37 UTC (rev 21)
@@ -47,32 +47,6 @@
<default>0.5</default>
</field>
- <field name="DirectMatchMultiplier" type="double">
- <description>
- Multiplier which should be applied to the confidence rating for direct matching.
- The value should be in the [0..1].
- Direct matching is not considered when the value is 0.
- </description>
- <constraints>
- <compare test="<=" value="1.0"/>
- <compare test=">" value="0"/>
- </constraints>
- <default>1.0</default>
- </field>
-
- <field name="SemanticMatchMultiplier" type="double">
- <description>
- Multiplier which should be applied to the confidence rating for semantic matching.
- The value should be in the [0..1].
- Semantic matching is not considered when the value is 0.
- </description>
- <constraints>
- <compare test="<=" value="1.0"/>
- <compare test=">=" value="0.0"/>
- </constraints>
- <default>0.0</default>
- </field>
-
<group name="Relevancy">
<field name="RelevancyGraceDaysDefault" type="int">
<description>
Modified: trunk/src/main/dm/ProficiencyCompetency.table
===================================================================
--- trunk/src/main/dm/ProficiencyCompetency.table 2010-01-30 21:03:38 UTC (rev 20)
+++ trunk/src/main/dm/ProficiencyCompetency.table 2010-01-31 19:50:37 UTC (rev 21)
@@ -9,7 +9,7 @@
<page>
- <field name="Competency" type="Commitment">
+ <field name="Competency" type="Competency">
<description>
Competency (in context) which is Weighed, to be assigned in an artifact as embedded details for competencies.
</description>
Modified: trunk/src/main/dm/Score.table
===================================================================
--- trunk/src/main/dm/Score.table 2010-01-30 21:03:38 UTC (rev 20)
+++ trunk/src/main/dm/Score.table 2010-01-31 19:50:37 UTC (rev 21)
@@ -29,15 +29,6 @@
</constraints>
</field>
- <field name="Commitments" type="ScoreCommitment">
- <description>
- Commitments for this score.
- </description>
- <link-name>Score_ScoreCommitment</link-name>
- <cascade-delete/>
- <hide/>
- </field>
-
<field name="Description" type="descriptionClob">
<description>
Description for the score.
Deleted: trunk/src/main/dm/ScoreCommitment.table
===================================================================
--- trunk/src/main/dm/ScoreCommitment.table 2010-01-30 21:03:38 UTC (rev 20)
+++ trunk/src/main/dm/ScoreCommitment.table 2010-01-31 19:50:37 UTC (rev 21)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table SYSTEM "equanda.dtd">
-
-<table name="ScoreCommitment" expected-amount="small" category="tables.Settings">
-
- <description>
- A commitment for a specific score (or the scores for a possible competency commitment).
- </description>
-
- <page name="ALL">
-
- <field name="Score" type="Score">
- <description>
- Score for which this is a specific commitment.
- </description>
- <link-name>Score_ScoreCommitment</link-name>
- <constraints>
- <required/>
- </constraints>
- </field>
-
- <field name="Competency" type="Commitment">
- <description>
- Competency (and context) for which this score is applicable.
- </description>
- <link-name>Competency_ScoreCommitment</link-name>
- <constraints>
- <required/>
- </constraints>
- </field>
-
- </page>
-
- <page>
-
- <field name="Description" type="descriptionClob">
- <description>
- Description for the score.
- </description>
- <display/>
- </field>
-
- <field name="Value" type="double">
- <description>
- Value for the scale, should be between minimum and maximum allowed values for the scale.
- </description>
- </field>
-
- <field name="Commitment" type="uri">
- <description>
- Location where the semantical commitment can be found. This uri is also used to determine how the commitment can be defined.
- It is normally based on the ontology for the context.
- IN principle this is only filled if the scale is continuous, otherwise the commitment should be specific for each possible score.
- </description>
- </field>
-
- </page>
-
-</table>
Modified: trunk/src/main/dm/WeighedCompetency.table
===================================================================
--- trunk/src/main/dm/WeighedCompetency.table 2010-01-30 21:03:38 UTC (rev 20)
+++ trunk/src/main/dm/WeighedCompetency.table 2010-01-31 19:50:37 UTC (rev 21)
@@ -9,14 +9,14 @@
<page>
- <field name="Parent" type="Commitment">
+ <field name="Parent" type="Competency">
<description>
Competency which combines this one.
</description>
<link-name>Competency_WeighedCompetency</link-name>
</field>
- <field name="Competency" type="Commitment">
+ <field name="Competency" type="Competency">
<description>
Weighed competency, to be assigned in an artifact as embedded details for competencies.
</description>
@@ -38,7 +38,7 @@
<description>
If the competency has a scale with discrete values, then the score should be used to assign a value.
This is the minimum allowed score for the competency.
- {note}Only scores which are attached to the selected commitment should be allowed.{note}
+ {note}Only scores which are attached to the selected competency should be allowed.{note}
</description>
<display/>
</field>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-30 21:04:04
|
Revision: 20
http://skabacca.svn.sourceforge.net/skabacca/?rev=20&view=rev
Author: triathlon98
Date: 2010-01-30 21:03:38 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
fix login using chenillekit-access (SessionState object *needs* to be of type "WebSessionUser", and not "EquandaWebSessionUser") + loginservice does not remember across requests
Modified Paths:
--------------
trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java
trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java
trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java
trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java
trunk/gui/src/main/java/org/skabacca/gui/services/JbossAppServerLoginService.java
Modified: trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java 2010-01-29 19:19:09 UTC (rev 19)
+++ trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java 2010-01-30 21:03:38 UTC (rev 20)
@@ -95,7 +95,7 @@
void onSuccess()
{
- // @todo return page handling should be implicit
+ System.out.println( "login was successful, wsu=" + webSessionUser );
if ( null != webSessionUser ) resources.discardPersistentFieldChanges();
logger.debug( "login successful" );
Modified: trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java 2010-01-29 19:19:09 UTC (rev 19)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java 2010-01-30 21:03:38 UTC (rev 20)
@@ -60,7 +60,7 @@
javassist.runtime.Desc.useContextClassLoader = true;
}
- // not that this is not 5.1 compatible, these versions use the ApplicationDefaults below...
+ // note that this is not 5.1 compatible, these versions use the ApplicationDefaults below...
public static void contributeMetaDataLocator( MappedConfiguration<String, String> configuration )
{
@@ -73,7 +73,7 @@
final AppServerLoginFilter accessFilter )
{
System.out.println( "adding AppServerLogin filter" );
- configuration.add( "AppServerLogin", accessFilter, "after:CookieRedirect" );
+ configuration.add( "AppServerLogin", accessFilter, "after:AccessControl" );
}
@@ -107,7 +107,7 @@
public static void contributeAuthenticationService( OrderedConfiguration<AuthenticationServiceFilter> configuration,
LoginInfoService loginInfoService )
{
- configuration.add( "CA", new EquandaAuthService(loginInfoService) );
+ configuration.add( "CA", new EquandaAuthService( loginInfoService ) );
}
/**
Modified: trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java 2010-01-29 19:19:09 UTC (rev 19)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java 2010-01-30 21:03:38 UTC (rev 20)
@@ -45,7 +45,7 @@
throws IOException
{
System.out.println( "AppServerLoginFilter.handle compo" );
- WebSessionUser wsu = asoManager.getIfExists( EquandaWebSessionUser.class );
+ WebSessionUser wsu = asoManager.getIfExists( WebSessionUser.class );
System.out.println( "webSessionUser=" + wsu );
if ( null != wsu ) appServerLoginService.appServerLogin( wsu );
componentRequestHandler.handleComponentEvent( componentEventRequestParameters );
@@ -56,7 +56,7 @@
throws IOException
{
System.out.println( "AppServerLoginFilter.handle page" );
- WebSessionUser wsu = asoManager.getIfExists( EquandaWebSessionUser.class );
+ WebSessionUser wsu = asoManager.getIfExists( WebSessionUser.class );
System.out.println( "webSessionUser=" + wsu );
if ( null != wsu ) appServerLoginService.appServerLogin( wsu );
componentRequestHandler.handlePageRender( pageRenderRequestParameters );
Modified: trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java 2010-01-29 19:19:09 UTC (rev 19)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java 2010-01-30 21:03:38 UTC (rev 20)
@@ -60,7 +60,9 @@
log.debug( "authentication succeeded for " + userName + " guiAP=" +
loginInfo.isGuiAccessProhibited() );
}
+ System.out.println( "loginInfoService=" + loginInfoService );
loginInfoService.setLoginInfo( loginInfo );
+ System.out.println( "value in loginInfoService=" + loginInfoService.getLoginInfo() );
return new EquandaWebSessionUser( loginInfo );
}
}
Modified: trunk/gui/src/main/java/org/skabacca/gui/services/JbossAppServerLoginService.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/JbossAppServerLoginService.java 2010-01-29 19:19:09 UTC (rev 19)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/JbossAppServerLoginService.java 2010-01-30 21:03:38 UTC (rev 20)
@@ -54,7 +54,7 @@
public void appServerLogin( WebSessionUser user )
{
- log.debug( "do appServerLogin on user " + user );
+ log.debug( "do appServerLogin for user " + user );
// skip for import url
try
{
@@ -84,7 +84,9 @@
}
// now also assure the login info service is filled and info copied
+ System.out.println( "jas loginInfoService was " + loginInfoService.getLoginInfo() );
loginInfoService.setLoginInfo( loginInfo );
+ System.out.println( "jas loginInfoService now " + loginInfoService.getLoginInfo() );
try
{
if ( null != loginInfo && null != loginInfo.getUser() )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-29 19:19:44
|
Revision: 19
http://skabacca.svn.sourceforge.net/skabacca/?rev=19&view=rev
Author: triathlon98
Date: 2010-01-29 19:19:09 +0000 (Fri, 29 Jan 2010)
Log Message:
-----------
try to fix login, no success yet
Modified Paths:
--------------
trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java
trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java
trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java
trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java
Modified: trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java 2010-01-24 20:28:34 UTC (rev 18)
+++ trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java 2010-01-29 19:19:09 UTC (rev 19)
@@ -66,8 +66,6 @@
@Persist
private int loginAttempts;
- private WebSessionUser tmpUser;
-
@Inject
private Cookies cookies;
@@ -86,9 +84,9 @@
{
logger.debug( "login validate start user = " + userName );
loginAttempts++;
- tmpUser = authenticationService.doAuthenticate( userName, password );
- logger.debug( "login validate start res = " + tmpUser );
- if ( tmpUser == null )
+ webSessionUser = authenticationService.doAuthenticate( userName, password );
+ logger.debug( "login validate start res = " + webSessionUser );
+ if ( webSessionUser == null )
{
validationTracker
.recordError( messages.format( ChenilleKitAccessConstants.NOT_AUTHENTICATED_ERROR_MESSAGE, userName ) );
@@ -98,9 +96,8 @@
void onSuccess()
{
// @todo return page handling should be implicit
- if ( null != tmpUser ) resources.discardPersistentFieldChanges();
+ if ( null != webSessionUser ) resources.discardPersistentFieldChanges();
logger.debug( "login successful" );
- webSessionUser = tmpUser;
cookies.writeCookieValue( ChenilleKitAccessConstants.LOGIN_SUCCESSFUL_COOKIE_NAME, "OK", 300 );
}
Modified: trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java 2010-01-24 20:28:34 UTC (rev 18)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java 2010-01-29 19:19:09 UTC (rev 19)
@@ -24,6 +24,7 @@
import org.chenillekit.access.ChenilleKitAccessConstants;
import org.chenillekit.access.services.AppServerLoginService;
import org.chenillekit.access.services.AuthenticationServiceFilter;
+import org.equanda.t5gui.services.LoginInfoService;
import org.slf4j.Logger;
import java.io.IOException;
@@ -63,23 +64,18 @@
public static void contributeMetaDataLocator( MappedConfiguration<String, String> configuration )
{
+ System.out.println( "Contributing metaDataLocator" );
configuration.add( MetaDataConstants.SECURE_PAGE, "true" );
}
/* Contributes AppServerLoginFilter which handles appserver login */
- public static void contributePageRenderRequestHandler( OrderedConfiguration<PageRenderRequestFilter> configuration,
- final AppServerLoginFilter accessFilter )
+ public static void contributeComponentRequestHandler( OrderedConfiguration<ComponentRequestFilter> configuration,
+ final AppServerLoginFilter accessFilter )
{
- configuration.add( "AppServerLogin", accessFilter, "after:AccessControl" );
+ System.out.println( "adding AppServerLogin filter" );
+ configuration.add( "AppServerLogin", accessFilter, "after:CookieRedirect" );
}
- /* Contributes AppServerLoginFilter which handles appserver login */
- public static void contributeComponentEventRequestHandler(
- OrderedConfiguration<ComponentEventRequestFilter> configuration,
- final AppServerLoginFilter accessFilter )
- {
- configuration.add( "AppServerLogin", accessFilter, "after:AccessControl" );
- }
/**
* Contribute application defaults
@@ -108,10 +104,10 @@
configuration.add( ChenilleKitAccessConstants.LOGIN_PAGE, "login" );
}
- public static void contributeAuthenticationService(
- OrderedConfiguration<AuthenticationServiceFilter> configuration )
+ public static void contributeAuthenticationService( OrderedConfiguration<AuthenticationServiceFilter> configuration,
+ LoginInfoService loginInfoService )
{
- configuration.add( "CA", new EquandaAuthService() );
+ configuration.add( "CA", new EquandaAuthService(loginInfoService) );
}
/**
Modified: trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java 2010-01-24 20:28:34 UTC (rev 18)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java 2010-01-29 19:19:09 UTC (rev 19)
@@ -28,7 +28,7 @@
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class AppServerLoginFilter
- implements ComponentEventRequestFilter, PageRenderRequestFilter
+ implements ComponentRequestFilter
{
private final ApplicationStateManager asoManager;
private final AppServerLoginService appServerLoginService;
@@ -40,22 +40,26 @@
this.appServerLoginService = appServerLoginService;
}
- public void handle( ComponentEventRequestParameters componentEventRequestParameters,
- ComponentEventRequestHandler componentEventRequestHandler )
+ public void handleComponentEvent( ComponentEventRequestParameters componentEventRequestParameters,
+ ComponentRequestHandler componentRequestHandler )
throws IOException
{
+ System.out.println( "AppServerLoginFilter.handle compo" );
WebSessionUser wsu = asoManager.getIfExists( EquandaWebSessionUser.class );
+ System.out.println( "webSessionUser=" + wsu );
if ( null != wsu ) appServerLoginService.appServerLogin( wsu );
- componentEventRequestHandler.handle( componentEventRequestParameters );
+ componentRequestHandler.handleComponentEvent( componentEventRequestParameters );
}
- public void handle( PageRenderRequestParameters pageRenderRequestParameters,
- PageRenderRequestHandler pageRenderRequestHandler )
+ public void handlePageRender( PageRenderRequestParameters pageRenderRequestParameters,
+ ComponentRequestHandler componentRequestHandler )
throws IOException
{
+ System.out.println( "AppServerLoginFilter.handle page" );
WebSessionUser wsu = asoManager.getIfExists( EquandaWebSessionUser.class );
+ System.out.println( "webSessionUser=" + wsu );
if ( null != wsu ) appServerLoginService.appServerLogin( wsu );
- pageRenderRequestHandler.handle( pageRenderRequestParameters );
+ componentRequestHandler.handlePageRender( pageRenderRequestParameters );
}
}
Modified: trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java 2010-01-24 20:28:34 UTC (rev 18)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java 2010-01-29 19:19:09 UTC (rev 19)
@@ -16,10 +16,12 @@
package org.skabacca.gui.services;
import org.apache.log4j.Logger;
+import org.apache.tapestry5.ioc.annotations.Inject;
import org.chenillekit.access.WebSessionUser;
import org.chenillekit.access.services.AuthenticationService;
import org.chenillekit.access.services.AuthenticationServiceFilter;
import org.equanda.client.LoginInfo;
+import org.equanda.t5gui.services.LoginInfoService;
import org.skabacca.gui.data.EquandaWebSessionUser;
import org.skabacca.login.LoginCache;
@@ -33,6 +35,13 @@
{
private static final Logger log = Logger.getLogger( EquandaAuthService.class );
+ private LoginInfoService loginInfoService;
+
+ public EquandaAuthService( LoginInfoService loginInfoService )
+ {
+ this.loginInfoService = loginInfoService;
+ }
+
public WebSessionUser doAuthenticate( String userName, String password,
AuthenticationService authenticationService )
{
@@ -51,6 +60,7 @@
log.debug( "authentication succeeded for " + userName + " guiAP=" +
loginInfo.isGuiAccessProhibited() );
}
+ loginInfoService.setLoginInfo( loginInfo );
return new EquandaWebSessionUser( loginInfo );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-24 20:28:40
|
Revision: 18
http://skabacca.svn.sourceforge.net/skabacca/?rev=18&view=rev
Author: triathlon98
Date: 2010-01-24 20:28:34 +0000 (Sun, 24 Jan 2010)
Log Message:
-----------
test should create some users with some gui rights
Modified Paths:
--------------
trunk/test/src/test/resources/organizations.import.txt
Modified: trunk/test/src/test/resources/organizations.import.txt
===================================================================
--- trunk/test/src/test/resources/organizations.import.txt 2010-01-24 20:26:17 UTC (rev 17)
+++ trunk/test/src/test/resources/organizations.import.txt 2010-01-24 20:28:34 UTC (rev 18)
@@ -13,8 +13,8 @@
:table:User/UserName:UserName,Password,Organization/Reference,Roles/Role
"test","test","TEST",[["User"]]
"dummy","dummy", "DUMMY",[["normal"]]
-"guiAdmin","guiAdmin",,[["guiAdmin",["User"]]
-"admin","admin",,[["guiAdmin",["User"]]
+"guiAdmin","guiAdmin",,[["guiAdmin","User"]]
+"admin","admin",,[["guiAdmin","User"]]
"ws","ws","WS"
"match","match","MATCH"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-24 20:26:26
|
Revision: 17
http://skabacca.svn.sourceforge.net/skabacca/?rev=17&view=rev
Author: triathlon98
Date: 2010-01-24 20:26:17 +0000 (Sun, 24 Jan 2010)
Log Message:
-----------
test should create some users with some gui rights
Modified Paths:
--------------
trunk/gui/src/main/webapp/WEB-INF/web.xml
trunk/test/pom.xml
Added Paths:
-----------
trunk/test/src/test/resources/organizations.import.txt
Modified: trunk/gui/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/gui/src/main/webapp/WEB-INF/web.xml 2010-01-22 19:48:21 UTC (rev 16)
+++ trunk/gui/src/main/webapp/WEB-INF/web.xml 2010-01-24 20:26:17 UTC (rev 17)
@@ -18,13 +18,12 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <!--
<servlet>
<servlet-name>import</servlet-name>
<servlet-class>org.equanda.ymport.Servlet</servlet-class>
<init-param>
<param-name>DatabaseMap</param-name>
- <param-value>be.synergetics.ca.ymport.DatabaseMap</param-value>
+ <param-value>org.skabacca.ymport.DatabaseMap</param-value>
</init-param>
</servlet>
@@ -32,7 +31,6 @@
<servlet-name>import</servlet-name>
<url-pattern>/import</url-pattern>
</servlet-mapping>
- -->
<security-constraint>
<web-resource-collection>
@@ -45,7 +43,6 @@
</user-data-constraint>
</security-constraint>
- <!--
<security-constraint>
<web-resource-collection>
<web-resource-name>Secured Content</web-resource-name>
@@ -75,5 +72,4 @@
<description>Administrator</description>
<role-name>LocalAdmin</role-name>
</security-role>
- -->
</web-app>
Modified: trunk/test/pom.xml
===================================================================
--- trunk/test/pom.xml 2010-01-22 19:48:21 UTC (rev 16)
+++ trunk/test/pom.xml 2010-01-24 20:26:17 UTC (rev 17)
@@ -95,11 +95,19 @@
<artifactId>equanda-maven-plugin</artifactId>
<version>${equanda-version}</version>
<configuration>
+ <!-- ddltool configuration -->
<database>${skabacca.db.url}</database>
<dblogin>${skabacca.db.login}</dblogin>
<dbpassword>${skabacca.db.password}</dbpassword>
<dbmap>org.skabacca.ddltool.EquandaMap</dbmap>
<ddltargets>update defaults</ddltargets>
+ <!-- import configuration, defined here as this is where maven retrieves it from -->
+ <url>https://localhost:8443/skabacca/import</url>
+ <login>local</login>
+ <password>local</password>
+ <locations>
+ <location>organizations.import.txt</location>
+ </locations>
</configuration>
<executions>
<execution>
@@ -135,7 +143,7 @@
<deployable>
<artifactId>ear</artifactId>
<type>ear</type>
- <pingURL>http://${skabacca.jboss.host}:${skabacca.jboss.port}/ca/gui/start
+ <pingURL>http://${skabacca.jboss.host}:${skabacca.jboss.port}/skabacca/gui/start
</pingURL>
</deployable>
</deployables>
@@ -160,6 +168,22 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-maven-plugin</artifactId>
+ <configuration>
+ <!-- maven uses the configuration defined above -->
+ </configuration>
+ <executions>
+ <execution>
+ <id>import</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>import</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Added: trunk/test/src/test/resources/organizations.import.txt
===================================================================
--- trunk/test/src/test/resources/organizations.import.txt (rev 0)
+++ trunk/test/src/test/resources/organizations.import.txt 2010-01-24 20:26:17 UTC (rev 17)
@@ -0,0 +1,60 @@
+:table:Organization/Reference:Reference,Name
+"TEST","Test Organization"
+"DUMMY","Dummy second organization"
+"WS","ws test organization"
+"MATCH","matcher test organization"
+"PROCAR","for Prolix testing"
+
+:table:EquandaRole/Role:RoleName,GuiAdministrator,AuthAndConfig
+"normal"
+"User",,"field.Artifact.Description=RWL\nfield.Artifact.Title=RWL\nfield.Artifact.Organization=RW\nfield.Artifact.Reference=RWLP\n\nfield.Competency.Description=RWL\nfield.Competency.Inactive=RW\nfield.Competency.Organizations=H\nfield.Competency.Reference=RWLPS\nfield.Competency.Title=RWLPS\nfield.CompetencyPlan.Assignments=RW\nfield.CompetencyPlan.Description=RWL\nfield.CompetencyPlan.Inactive=RWL\nfield.CompetencyPlan.MatchProfile=RW\nfield.CompetencyPlan.Organization=H\nfield.CompetencyPlan.Reference=RWLPS\nfield.CompetencyPlan.Title=RWLPS\nfield.CompetencyPlanAssignment.Persons=RWLS\nfield.CompetencyPlanAssignment.Plan=RWLPS\nfield.CompetencyPlanAssignment.Task=RWLS\nfield.Organization.Name=RL\nfield.Organization.Reference=RL\ngroup.Artifact.Assignments=RW\ngroup.Artifact.Content=RW\ngroup.Artifact.PersonInfo=RW\npage.Artifact.ALL=RW\npage.Artifact.default=RW\npage.Commitment.ALL=RW\npage.Commitment.default=RW\npage.Competency.ALL=RW\npage.Competency.default=RW\npage.Organization.ALL=R\npage.Organization.default=H\ntable.Artifact=RWD\ntable.Commitment=RW\ntable.Competency=RWD\ntable.CompetencyPlan=RWD\ntable.CompetencyPlanAssignment=RWD\ntable.ConfidenceScale=RWD\ntable.ConfidenceScore=RWD\ntable.Context=RWD\ntable.Criterion=RWD\ntable.CriterionScore=RWD\ntable.DeltaProficiencyCompetency=RWD\ntable.Organization=R"
+"guiAdmin",true,"table.EquandaRole=RWD\ntable.EquandaUser=RWD"
+
+:table:User/UserName:UserName,Password,Organization/Reference,Roles/Role
+"test","test","TEST",[["User"]]
+"dummy","dummy", "DUMMY",[["normal"]]
+"guiAdmin","guiAdmin",,[["guiAdmin",["User"]]
+"admin","admin",,[["guiAdmin",["User"]]
+"ws","ws","WS"
+"match","match","MATCH"
+
+:table:AssessmentMethod/Reference:Reference,Name,Organizations/Reference,Description,ConfidenceLevelDefault
+"SELF", "Self-Assessment", [["TEST"]], "Indicates that the person determined the competencies him/herself.", 0.4
+"SELF", "Self-Assessment", [["WS"]], "Indicates that the person determined the competencies him/herself.", 0.4
+"SELF", "Self-Assessment", [["DUMMY"]], "Indicates that the person determined the competencies him/herself.", 0.4
+"SELF", "Self-Assessment", [["MATCH"]], "Indicates that the person determined the competencies him/herself.", 0.4
+"SELF", "Self-Assessment", [["TEST","WS","DUMMY","MATCH"]], "Indicates that the person determined the competencies him/herself.", 0.4
+"AM0","DefaultAssessmentMethod",["MATCH"],,0.6
+
+:table:Organization/Reference:Reference,SelfAssessmentMethod/Reference
+"TEST","SELF"
+
+:table:Context/Reference:Organizations/Reference,Reference,Title,Ontology
+["TEST"], "TEST", "Test Context", "dogma://PROLIX/BT/1.0"
+
+:table:Competency/Reference:Organizations/Reference,Reference,Title
+[["TEST"]], "CT1", "Leadership"
+[["TEST"]], "CT2", "Conceptual thinking"
+[["TEST"]], "CT3", "Technical insight"
+
+:table:Commitment/Reference:Reference,Competency/Reference,Context/Reference,Title
+"CT1", "CT1", "TEST", "Leadership"
+"CT2", "CT2", "TEST", "Conceptual thinking"
+"CT3", "CT3", "TEST", "Technical insight"
+
+:table:TaskArtifact/Reference:Reference,Organization/Reference,Title,RequiredCompetencies[[Competency/Reference,ProficiencyLevel]]
+"TTASK1", "TEST", "Group Leading", [ [ "CT1", 0.9 ] ]
+"TTASK2", "TEST", "Innovation lead", [ [ "CT2", 0.8 ], [ "CT3", 1.0 ] ]
+
+:table:LearningArtifact/Reference:Reference,Organization/Reference,Title,LearningCompetencies[[Competency/Reference,PrerequisiteLevel,ObjectiveLevel]], Description
+"LEAD-COURSE", "TEST", "Leadership course", [ [ "CT1", 0, 1 ] ], "Extensive leadership course, based on the psychology of suppressing people :-)"
+
+:table:PersonArtifact/Reference:Reference,Title,Organization/Reference,AssignedRoles/Reference
+"TEST","Test person","TEST",[[TTASK1],[TTASK2]]
+"TRIATHLON98", "triathlon98","TEST"
+
+:table:CompetencyPlan/Reference:Reference,Title,Organization/Reference,Description
+"TEST","Test plan","TEST","Competency Plan for testing"
+:table:CompetencyPlanAssignment:Plan/Reference,Task/Reference,Persons/Reference
+"TEST", TTASK1, [[TEST],[TRIATHLON98]]
+"TEST", TTASK2, [[TEST]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-22 19:48:28
|
Revision: 16
http://skabacca.svn.sourceforge.net/skabacca/?rev=16&view=rev
Author: triathlon98
Date: 2010-01-22 19:48:21 +0000 (Fri, 22 Jan 2010)
Log Message:
-----------
layout, breadcrumbs compo, partial docs in docbook
Modified Paths:
--------------
trunk/gui/src/main/resources/org/skabacca/gui/components/EditLayout.tml
trunk/gui/src/main/resources/org/skabacca/gui/components/Layout.tml
trunk/gui/src/main/webapp/css/style.css
trunk/pom.xml
Added Paths:
-----------
trunk/gui/src/main/java/org/skabacca/gui/components/Breadcrumbs.java
trunk/gui/src/main/resources/org/skabacca/gui/components/breadcrumbs.tml
trunk/src/site/docbook/
trunk/src/site/docbook/codingstyle.xml
trunk/src/site/docbook/developers.xml
trunk/src/site/docbook/gettingstarted.xml
trunk/src/site/docbook/index.xml
Added: trunk/gui/src/main/java/org/skabacca/gui/components/Breadcrumbs.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/components/Breadcrumbs.java (rev 0)
+++ trunk/gui/src/main/java/org/skabacca/gui/components/Breadcrumbs.java 2010-01-22 19:48:21 UTC (rev 16)
@@ -0,0 +1,61 @@
+/*
+ * This file is part of skabacca.
+ *
+ * Copyright belongs to the respective authors, see subversion.
+ *
+ * skabacca is free software: you can redistribute it and/or modify it under the terms of the
+ * Affero GNU General Public License as published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * Skabacca 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.
+ *
+ * For the full text of the license, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.skabacca.gui.components;
+
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.ApplicationStateManager;
+import org.equanda.t5nav.services.NavigationContext;
+import org.equanda.t5nav.services.NavigationTarget;
+
+/**
+ * Component which displays the breadcrumbs
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class Breadcrumbs
+{
+ @Inject
+ private ApplicationStateManager asoManager;
+
+ @Property
+ private NavigationTarget current;
+
+ @Property
+ private int index;
+
+ public NavigationTarget[] getBreadcrumbs()
+ {
+ if ( !asoManager.exists( NavigationContext.class ) ) return null;
+ NavigationContext currNav = asoManager.get( NavigationContext.class );
+ NavigationTarget[] list = currNav.getRecentReturnTargets();
+ if ( null == list ) return null;
+ int length = list.length;
+ NavigationTarget[] res = new NavigationTarget[length];
+ for ( int i = 0; i < length ; i++ )
+ {
+ res[ length - i - 1 ] = list[ i ];
+ }
+ return res;
+ }
+
+ public Object onActionFromBreadcrumb( int index )
+ {
+ NavigationContext currNav = asoManager.get( NavigationContext.class );
+ if ( null == currNav ) return null;
+ return currNav.getRecentReturnTargets()[ index ].getLink();
+ }
+}
\ No newline at end of file
Modified: trunk/gui/src/main/resources/org/skabacca/gui/components/EditLayout.tml
===================================================================
--- trunk/gui/src/main/resources/org/skabacca/gui/components/EditLayout.tml 2010-01-21 14:42:00 UTC (rev 15)
+++ trunk/gui/src/main/resources/org/skabacca/gui/components/EditLayout.tml 2010-01-22 19:48:21 UTC (rev 16)
@@ -1,4 +1,4 @@
-dit<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<t:parameter name="title">
<t:delegate to="title"/>
Modified: trunk/gui/src/main/resources/org/skabacca/gui/components/Layout.tml
===================================================================
--- trunk/gui/src/main/resources/org/skabacca/gui/components/Layout.tml 2010-01-21 14:42:00 UTC (rev 15)
+++ trunk/gui/src/main/resources/org/skabacca/gui/components/Layout.tml 2010-01-22 19:48:21 UTC (rev 16)
@@ -48,7 +48,7 @@
-->
<div id="layout-topbar">
<div id="layout-topbar-right"><t:delegate to="context"/></div>
- <div id="layout-breadcrumbs"><div id="layout-breadcrumbs-title"><t:delegate to="title"/></div>breadcrumbs bar</div>
+ <div id="layout-breadcrumbs"><div id="layout-breadcrumbs-title"><t:delegate to="title"/></div><t:breadcrumbs/></div>
</div>
<div id="layout-info"><t:delegate to="sidebar"/></div>
@@ -58,11 +58,9 @@
<t:errors/>
<t:body/>
</div>
- <div id="layout-buttons"><t:delegate to="buttons"/></div>
- </div>
</div>
-
+</div>
<div id="footer">
<div id="layout-buttons"><t:delegate to="buttons"/></div>
<p id="footermsg"><a href="http://www.skabacca.org//">${equanda-message:layout.PoweredBy}</a></p>
Added: trunk/gui/src/main/resources/org/skabacca/gui/components/breadcrumbs.tml
===================================================================
--- trunk/gui/src/main/resources/org/skabacca/gui/components/breadcrumbs.tml (rev 0)
+++ trunk/gui/src/main/resources/org/skabacca/gui/components/breadcrumbs.tml 2010-01-22 19:48:21 UTC (rev 16)
@@ -0,0 +1,5 @@
+<div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+ <t:loop source="breadcrumbs" value="current" index="index" volatile="true">
+ > <t:actionlink t:id="breadcrumb" context="index">${current.title}</t:actionlink>
+ </t:loop>
+</div>
Modified: trunk/gui/src/main/webapp/css/style.css
===================================================================
--- trunk/gui/src/main/webapp/css/style.css 2010-01-21 14:42:00 UTC (rev 15)
+++ trunk/gui/src/main/webapp/css/style.css 2010-01-22 19:48:21 UTC (rev 16)
@@ -87,6 +87,7 @@
width: 100%;
background: black;
}
+
#footer {
position: fixed;
bottom: 0;
@@ -94,6 +95,28 @@
width: 100%;
background: black;
}
+#layout-buttons {
+ padding : 8px;
+ text-align: center;
+}
+#footermsg {
+ position: fixed;
+ right: 0;
+ bottom: 0;
+ text-align: right;
+}
+#footermsg a:link,
+#footermsg a:visited,
+#footermsg a:active {
+ color: #CCC;
+ text-decoration: underline;
+}
+#footermsg a:hover {
+ color: white;
+ text-decoration: none;
+}
+
+
#body {
margin: 42px 0;
}
@@ -117,7 +140,6 @@
#layout-breadcrumbs { position:fixed; top:16px; left:200px; right:0; height:16px; background-color: lightgray; text-align:center; }
#layout-breadcrumbs-title { float: left; font-weight: bold; padding-left: 6px; padding-right: 6px; }
#layout-main { position:fixed; top:32px; bottom:20px; left:200px; right:140px; overflow:auto; overflow-y:scroll; background-color:white; padding:10px; }
-#layout-buttons { position:fixed; left:200px; right:140px; bottom:0; background-color:lightgray; text-align:center; }
#layout-info { position:fixed; width:133px; right:0; top:32px; bottom:0; background-color:beige; border-left: 1px dashed black; overflow-x:hidden; overflow-y:scroll; padding:3px }
*/
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-01-21 14:42:00 UTC (rev 15)
+++ trunk/pom.xml 2010-01-22 19:48:21 UTC (rev 16)
@@ -6,7 +6,7 @@
<version>1.0-SNAPSHOT</version>
<artifactId>skabacca</artifactId>
<packaging>pom</packaging>
- <name>Skill + Knowledge + Behaviour = Competence, Competence Analyser</name>
+ <name>Skill + Knowledge + Behaviour = Competency, Competency Analyser</name>
<modules>
<module>core</module>
Added: trunk/src/site/docbook/codingstyle.xml
===================================================================
--- trunk/src/site/docbook/codingstyle.xml (rev 0)
+++ trunk/src/site/docbook/codingstyle.xml 2010-01-22 19:48:21 UTC (rev 16)
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<!--
+ ~ This file is part of Geomajas, a component framework for building
+ ~ rich Internet applications (RIA) with sophisticated capabilities for the
+ ~ display, analysis and management of geographic information.
+ ~ It is a building block that allows developers to add maps
+ ~ and other geographic data capabilities to their web applications.
+ ~
+ ~ Copyright 2008-2010 Geosparc, http://www.geosparc.com, Belgium
+ ~
+ ~ This program is free software: you can redistribute it and/or modify
+ ~ it under the terms of the GNU Affero General Public License as
+ ~ published by the Free Software Foundation, either version 3 of the
+ ~ License, or (at your option) any later version.
+ ~
+ ~ This program 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 Affero General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Affero General Public License
+ ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+<article id="release" lang="en">
+ <title>Coding quality and style</title>
+
+ <toc />
+
+ <!--
+References
+- http://maven.apache.org/developers/conventions/code.html
+- http://docs.jboss.org/process-guide/en/html/coding.html
+- http://equanda.org/developers.html
+- http://svn.collab.net/repos/svn/trunk/www/hacking.html
+- http://java.sun.com/docs/codeconv/
+- http://geosoft.no/development/javastyle.html (!)
+- http://192.220.96.201/essays/java-style/single-page.html
+- http://gee.cs.oswego.edu/dl/html/javaCodingStd.html
+- http://www.ambysoft.com/essays/javaCodingStandards.html
+- http://docs.codehaus.org/display/GEOT/5+Project+Conventions
+-->
+
+ <para>As a general note, the coding style and naming conventions should be
+ adhered to. Some parts are even checked by the checkstyle maven plugin.
+ However, deviations are always allowed when this enhances code readability
+ (but only when checkstyle accepts it, otherwise the build will fail).</para>
+
+ <para>You can configure a formatter to apply this style in your favourite
+ IDE (see also at the bottom). You can be liberal on applying this on new
+ code, but be prudent when applying these to the existing code base. Code
+ style changes make revision changes a lot more difficult and should thus be
+ limited. If there is a need to reformat existing code, then this should be
+ done in a separate commit.</para>
+
+ <section>
+ <title>Class, method and variable names</title>
+
+ <para>Rules</para>
+
+ <itemizedlist>
+ <listitem>Use meaningful names. Especially class and method names should
+ explain their purpose.</listitem>
+
+ <listitem>For class, method and (non-static) variable names, use
+ camelCase to separate the words, not underscores. For abbreviations,
+ capitalize he first letter, lower case for the others.</listitem>
+
+ <listitem>Class names start with a capital, for example
+ "EquandaException".</listitem>
+
+ <listitem>Method and (non-static) variable names start lower case, for
+ example "getMessage".</listitem>
+
+ <listitem>All static variables should have capitalized names with words
+ separated by underscores.</listitem>
+
+ <listitem>Package names are all lower case and should be
+ singular.</listitem>
+
+ <listitem>Use getXxx/setXxx/isXxx.</listitem>
+
+ <listitem>Abbreviations and acronyms should not be uppercase when used
+ as name (for example, use "exportHtml()").</listitem>
+
+ <listitem>All names should be written in English.</listitem>
+
+ <listitem>The terms get/set must be used where an attribute is accessed
+ directly.</listitem>
+
+ <listitem>"is" prefix should be used for boolean variables and methods.
+ In some cases, when this is more readable, "has", "can" or "should" can
+ also be used as prefix.</listitem>
+
+ <listitem>Complement names must be used for complement entities. These
+ include get/set, add/remove, create/destroy, start/stop, insert/delete,
+ increment/decrement, old/new, begin/end, first/last, up/down, min/max,
+ next/previous, old/new, open/close, show/hide, suspend/resume,
+ etc.</listitem>
+
+ <listitem>Exception classes should be suffixed with
+ Exception.</listitem>
+ </itemizedlist>
+
+ <para>Recommendations</para>
+
+ <itemizedlist>
+ <listitem>Usually class names are nouns and method names are
+ verbs.</listitem>
+
+ <listitem>Generic variables should have the same name as their
+ type.</listitem>
+
+ <listitem>Variables with a large scope should have long names, variables
+ with a small scope can have short names. Scratch variables used for
+ temporary storage or indices are best kept short. A programmer reading
+ such variables should be able to assume that its value is not used
+ outside a few lines of code. Common scratch variables for integers are
+ i, j, k, m, n and for characters c and d.</listitem>
+
+ <listitem>The name of the object is implicit, and should be avoided in a
+ method name. For example, use "line.getLength()" instead of
+ "line.getLineLength()". The latter might seem natural in the class
+ declaration, but proves superfluous in use, as shown in the
+ example.</listitem>
+
+ <listitem>The term compute can be used in methods where something is
+ computed.</listitem>
+
+ <listitem>The term find can be used in methods where something is looked
+ up.</listitem>
+
+ <listitem>The term initialize can be used where an object or a concept
+ is established.</listitem>
+
+ <listitem>Plural form should be used on names representing a collection
+ of objects.</listitem>
+
+ <listitem>Negated boolean variable names must be avoided.</listitem>
+
+ <listitem>Default interface implementations can be prefixed by Default.
+ However, if it is not expected that there will even be another
+ implementation, it can be a lot more natural to suffix with "Impl"
+ instead.</listitem>
+
+ <listitem>Singleton classes should return their sole instance through
+ method getInstance(), should have a private constructor and be declared
+ final.</listitem>
+
+ <listitem>Functions (methods returning an object) should be named after
+ what they return and procedures (void methods) after what they
+ do.</listitem>
+ </itemizedlist>
+
+ <section><title>Comment</title>Each file should have the correct copyright
+ notice at the start of the file. <programlisting>/*
+ * This file is part of skabacca.
+ *
+ * Copyright belongs to the respective authors, see subversion.
+ *
+ * skabacca is free software: you can redistribute it and/or modify it under the terms of the
+ * Affero GNU General Public License as published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * Skabacca 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.
+ *
+ * For the full text of the license, see <http://www.gnu.org/licenses/>.
+ */</programlisting><itemizedlist>
+ <listitem>The copyright message should be at the top of the
+ file.</listitem>
+
+ <listitem>Each class and interface should have class comments
+ indicating the purpose of the class.</listitem>
+
+ <listitem>Public methods should be commented if the meaning is not
+ entirely clear from method and parameter names (is it ever?). When the
+ method overrides or implements a method, then repeating the javadoc is
+ not needed (it is recommended to us "@inheritedDoc").</listitem>
+
+ <listitem>Comments in the code are recommended when they explain a
+ block of code or when they explain why things are done in a certain
+ way. Repeating the code in human readable wording is
+ wasteful.</listitem>
+
+ <listitem>Use "@todo" comments to indicate shortcuts or hacks which
+ should be fixed. Better still is just to do it right and not have the
+ shortcut.</listitem>
+
+ <listitem>All comments should be written in English.</listitem>
+
+ <listitem>Comments should be indented relative to their position in
+ the code.</listitem>
+
+ <listitem>
+ <para>Javadoc comments should be active, not descriptive (for
+ example on method "getXxx()" the comment could be "Get xxx").</para>
+ </listitem>
+ </itemizedlist></section>
+
+ <section>
+ <title>Claim your code</title>
+
+ <para>Be proud of your code and take responsibility of your changes.
+ When making any kind of significant changes (not for reformatting,
+ fixing typing errors or renaming), add your full name (optionally
+ including e-mail link) at the bottom of the authors list in the class
+ comments.</para>
+ </section>
+
+ <section>
+ <title>Code layout</title>
+
+ <para>See the example below</para>
+
+ <programlisting>/*
+ * This file is part of skabacca.
+ *
+ * Copyright belongs to the respective authors, see subversion.
+ *
+ * skabacca is free software: you can redistribute it and/or modify it under the terms of the
+ * Affero GNU General Public License as published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * Skabacca 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.
+ *
+ * For the full text of the license, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.skabacca.bladibla;
+
+/**
+ * Page for importing/updating a portfolio from one of a selection of formats.
+ *
+ * @author <a href="mailto:au...@em...">Author's name</a>
+ * @author Another Author's Name
+ */
+@Annotation( param1 = "value1", param2 = "value2" )
+public class Foo
+ implements Serializable
+{
+ int[] x = new int[] { 1, 3, 5, 6, 7, 87, 1213, 2 };
+
+ /**
+ * Do something
+ *
+ * @param x some data
+ * @param y more data
+ */
+ public void foo( int x, int y )
+ throws Exception
+ {
+ for ( int i = 0; i < x ; i++ )
+ {
+ y += ( y ^ 0x123 ) << 2;
+ }
+ do
+ {
+ try
+ {
+ if ( 0 < x && x < 10 )
+ {
+ while ( x != y )
+ {
+ x = f( x * 3 + 5 );
+ }
+ }
+ else
+ {
+ synchronized ( this )
+ {
+ switch ( e.getCode() )
+ {
+ //...
+ }
+ }
+ }
+ }
+ catch ( MyException e )
+ {}
+ finally
+ {
+ int[] arr = (int[]) g( y );
+ x = y >= 0 ? arr[ y ] : -1;
+ }
+ }
+ while ( true );
+ }
+}</programlisting>
+
+ <para>The codingstyle is optimized for readability and thus uses a lot
+ of whitespace both horizontally as vertically.</para>
+
+ <itemizedlist>
+ <listitem>The code is written with the right margin at 120 characters
+ and lines should not be longer than that if possible.</listitem>
+
+ <listitem>All indents should be done using four spaces, no tabs
+ !</listitem>
+
+ <listitem>Braces are always on separate lines. The only exception is
+ for empty blocks and single line ifs and for/while loops.</listitem>
+
+ <listitem>Always use spaces inside brackets.</listitem>
+
+ <listitem>Spaces around operators.</listitem>
+
+ <listitem>No wildcards allowed on import statements.</listitem>
+
+ <listitem>Always use braces when the body is not on the same line as
+ the if, for, while, do-while.</listitem>
+
+ <listitem>Array specifiers must be attached to the type not the
+ variable.</listitem>
+
+ <listitem>Class variables should never be declared public.</listitem>
+
+ <listitem>Logical units within a block should be separated by one
+ blank line.</listitem>
+ </itemizedlist>
+
+ <para>We have an <ulink url="equanda.xml">IntelliJ IDEA</ulink>
+ formatter which can be used. However, be careful not to change the
+ entire formatting of a class.</para>
+ </section>
+ </section>
+</article>
Added: trunk/src/site/docbook/developers.xml
===================================================================
--- trunk/src/site/docbook/developers.xml (rev 0)
+++ trunk/src/site/docbook/developers.xml 2010-01-22 19:48:21 UTC (rev 16)
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<!--
+ ~ This file is part of Geomajas, a component framework for building
+ ~ rich Internet applications (RIA) with sophisticated capabilities for the
+ ~ display, analysis and management of geographic information.
+ ~ It is a building block that allows developers to add maps
+ ~ and other geographic data capabilities to their web applications.
+ ~
+ ~ Copyright 2008-2010 Geosparc, http://www.geosparc.com, Belgium
+ ~
+ ~ This program is free software: you can redistribute it and/or modify
+ ~ it under the terms of the GNU Affero General Public License as
+ ~ published by the Free Software Foundation, either version 3 of the
+ ~ License, or (at your option) any later version.
+ ~
+ ~ This program 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 Affero General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Affero General Public License
+ ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+<article id="release" lang="en">
+ <title>Developers information</title>
+
+ <toc />
+
+ <section>
+ <title>maven targets, profiles, variables</title>
+
+ <para>There are two main ways to install, either just compiling, running
+ the simple tests and installing, or running the full testsuite which does
+ integration tests by deploying some sample stuff into a jboss
+ instance.</para>
+
+ <para>You can choose by using one of the following targets.</para>
+
+ <programlisting>mvn install
+mvn -Dfulltest install
+</programlisting>
+
+ <para>To be able to run the full test suite, you need to include a profile
+ in your maven local settings (.m2/settings.xml).</para>
+
+ <programlisting><settings>
+ <profiles>
+ <profile>
+ <id>dev-joachim</id>
+ <properties>
+ <!-- selenium properties-->
+ <firefox.path>firefox /usr/lib/firefox/firefox-bin</firefox.path>
+
+ <equanda.db.url>jdbc:firebirdsql:localhost/3050:/home/joachim/data/equanda.fdb</equanda.db.url>
+ <equanda.db.login>sysdba</equanda.db.login>
+ <equanda.db.password>masterkey</equanda.db.password>
+ <equanda.db.location>/home/joachim/data/equanda.fdb</equanda.db.location>
+ <equanda.db.empty>/home/joachim/data/equanda-empty.fdb</equanda.db.empty>
+ <equanda.cargo.wait>true</equanda.cargo.wait>
+ <!-- jboss properties-->
+ <equanda.jboss.home>/home/joachim/java/equandajboss</equanda.jboss.home>
+ <equanda.jboss.config>equanda</equanda.jboss.config>
+ <equanda.jboss.host>localhost</equanda.jboss.host>
+ <equanda.jboss.port>8080</equanda.jboss.port>
+ <equanda.jboss.jvmargs>
+ -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
+ -Dsun.rmi.dgc.client.gcInterval=3600000
+ -Dsun.rmi.dgc.server.gcInterval=3600000
+ </equanda.jboss.jvmargs>
+ <equanda.jboss.logging>medium</equanda.jboss.logging>
+
+ </properties>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>dev-joachim</activeProfile>
+ </activeProfiles>
+
+ <pluginGroups>
+ <pluginGroup>org.equanda</pluginGroup>
+ </pluginGroups>
+
+</settings></programlisting>
+ </section>
+
+ <section><title>Documentation</title><para>All documentation is written in
+ docbook format to allow both PDF and HTML output formats. </para>To generate
+ the project site, use <programlisting>mvn site</programlisting><para>For
+ editing the docbook files, we recommend using <ulink
+ url="http://www.xmlmind.com/xmleditor/">XMLMind</ulink>. The personal
+ version is free and can (at the time of writing) be used for editing open
+ source documentation. </para><para>The docbook files are currently formatted
+ using XMLMind. When using another tool for editing, please keep the current
+ formatting to assure diffs remain usable. </para></section>
+
+ <section>
+ <title>subversion, commits</title>
+
+ <para>All SVN commits should include the JIRA issue number at the start of
+ the commit message, and a short description of the work done. The JIRA
+ issue number allows linking the commits with the issues (as can be seen in
+ JIRA), the short message allows persons to know what is happening without
+ referring to JIRA. The only times JIRA issue number are not needed is for
+ making "obvious" changes like fixing typos.</para>
+
+ <para>Commits should be grouped by issue as much as possible/sensible
+ (better two commits than one commit for fixing two issues, better one
+ commit of five files than five commits of one file (for one
+ issue)).</para>
+
+ <para>Development of the "latest-and-greatest" version happens in
+ "trunk".</para>
+
+ <para>When a release is cut, a tag with the release version as name is
+ created. The release should be built from the tagged files.</para>
+
+ <para>After each commit, the system should still compile and all test
+ cases should still succeed. There is a continuous integration engine
+ (Hudson) which verifies this and sends messages to the developers mailing
+ list on failures.</para>
+ </section>
+
+ <section>
+ <title>Coding</title>
+
+ <para>Note that details about coding style and naming are on the <ulink
+ url="codingstyle.html">coding style</ulink> page.</para>
+
+ <section>
+ <title>Logging</title>
+
+ <itemizedlist>
+ <listitem>
+ <para>For debug level messages, always use
+ <code>isDebugEnabled()</code>.</para>
+ </listitem>
+
+ <listitem>all logging is done through log4j, logger is created using
+ <programlisting>private static final Logger log = Logger.getLogger( ContainingClassName.class );</programlisting></listitem>
+
+ <listitem>logging levels<table>
+ <title>logging levels</title>
+
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry align="center">log level</entry>
+
+ <entry align="center">default on</entry>
+
+ <entry>use</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry>ERROR</entry>
+
+ <entry>yes</entry>
+
+ <entry>major problems, should always be visible in logs and
+ are likely to require action from a person (to fix the
+ condition or assure it does not happen again). Indicates
+ that something is seriously wrong.</entry>
+ </row>
+
+ <row>
+ <entry>WARN</entry>
+
+ <entry>yes</entry>
+
+ <entry>warning about potential problems. Should always be
+ visible in logs and a person will probably need to assess
+ whether this is harmless or should be treated as an
+ error.</entry>
+ </row>
+
+ <row>
+ <entry>INFO</entry>
+
+ <entry>yes</entry>
+
+ <entry>important information. You can assume this level is
+ on in production, so it should be carefully considered
+ whether this level is appropriate. In general only used to
+ indicate service status (started, stopped).</entry>
+ </row>
+
+ <row>
+ <entry>DEBUG</entry>
+
+ <entry>no</entry>
+
+ <entry>logging information which is detailed enough to know
+ what is happening in the system, without flooding the
+ logs.</entry>
+ </row>
+
+ <row>
+ <entry>TRACE</entry>
+
+ <entry>no</entry>
+
+ <entry>very detailed logging, probably only making sense to
+ the developer of the code.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table></listitem>
+
+ <listitem>When an exception is caught and (another exception) thrown
+ you should not log the exception. You should however include the cause
+ in the newly thrown exception.</listitem>
+ </itemizedlist>
+ </section>
+
+ <section>
+ <title>Unit testing</title>
+
+ <para>Unit testing: At least each class implementing the public API
+ should have a unit test, testing all methods. For testing JUnit is
+ used.</para>
+
+ <itemizedlist>
+ <listitem>Advantages of unit testing: <itemizedlist>
+ <listitem>
+ <para>Capturing a <ulink
+ url="http://jira.geomajas.org/">JIRA</ulink> bug report in a
+ reproducible manner.</para>
+ </listitem>
+
+ <listitem>Allowing you to specify exactly the behaviour you want,
+ before you start coding.</listitem>
+ </itemizedlist></listitem>
+
+ <listitem>How unit testing should be done: <itemizedlist>
+ <listitem>If you are testing
+ src/main/java/org/geomajas/ToBeTestedClass.java, create a class
+ src/test/java/org/geomajas/ToBeTestedClassTest.java. Actual test
+ methods have a name starting with "test". The class itself should
+ extend jnit.framework.TestCase.</listitem>
+
+ <listitem>
+ <para>The test will automatically be run when running "<code>mvn
+ install</code>".</para>
+ </listitem>
+ </itemizedlist></listitem>
+
+ <listitem>Integration tests should also be provided. These can also be
+ used for testing the user interface (thanks to selenium).</listitem>
+ </itemizedlist>
+ </section>
+
+ <section>
+ <title>Exception handling</title>
+
+ <para>*Never* throw away exception, either log them or throw them again
+ (possibly wrapped). Do not log and throw, this only clutters log files
+ with duplicate exceptions.</para>
+
+ <para>Do not wrap exceptions unnecessarily (so no
+ <code>EquandaException</code> caused by a <code>EquandaException</code>)
+ unless you add additional information in the message.</para>
+
+ <para>When wrapping an exception, always include the cause.</para>
+ </section>
+
+ <section>
+ <title>Refactoring</title>
+
+ <para>Changes in the (public) API use a "deprecate, then remove" cycle.
+ It should be marked "deprecated" in at least one minor version before it
+ can be removed in the next major version.</para>
+ </section>
+
+ <section>
+ <title>File encoding</title>
+
+ <para>All source files, including .properties files should use UTF-8
+ encoding.</para>
+ </section>
+
+ <section>
+ <title>Other</title>
+
+ <para>For the directory structure and file locations, we follow standard
+ maven conventions (see <ulink
+ url="http://maven.apache.org/guides/introduction/introduction-to-the-standard-directory-layout.html">http://maven.apache.org/guides/introduction/introduction-to-the-standard-directory-layout.html</ulink>).</para>
+ </section>
+ </section>
+</article>
Added: trunk/src/site/docbook/gettingstarted.xml
===================================================================
--- trunk/src/site/docbook/gettingstarted.xml (rev 0)
+++ trunk/src/site/docbook/gettingstarted.xml 2010-01-22 19:48:21 UTC (rev 16)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<article id="docbook" lang="en">
+ <title>Page title</title>
+
+ <toc />
+
+ <para>
+ <note>
+ <para><emphasis>warning</emphasis> : this documentation is still
+ somewhat incomplete. We are working hard to improve both the feature set
+ and the documentation. So do have a browse around, but definitely come
+ back later to see how things evolve.</para>
+ </note>
+ </para>
+
+ <section>
+ <title>Section</title>
+
+ <para>A sample paragraph.</para>
+ </section>
+</article>
Added: trunk/src/site/docbook/index.xml
===================================================================
--- trunk/src/site/docbook/index.xml (rev 0)
+++ trunk/src/site/docbook/index.xml 2010-01-22 19:48:21 UTC (rev 16)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<article id="docbook" lang="en">
+ <title>Page title</title>
+
+ <toc />
+
+ <para>
+ <note>
+ <para><emphasis>warning</emphasis> : this documentation is still
+ somewhat incomplete. We are working hard to improve both the feature set
+ and the documentation. So do have a browse around, but definitely come
+ back later to see how things evolve.</para>
+ </note>
+ </para>
+
+ <section>
+ <title>Section</title>
+
+ <para>A sample paragraph.</para>
+ </section>
+</article>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-21 14:42:19
|
Revision: 15
http://skabacca.svn.sourceforge.net/skabacca/?rev=15&view=rev
Author: triathlon98
Date: 2010-01-21 14:42:00 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
Assure login works (though not yet on "/" which seems to fail in chenillekit-access)
Modified Paths:
--------------
trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java
trunk/gui/src/main/resources/org/skabacca/gui/pages/Login.tml
Added Paths:
-----------
trunk/core/src/main/java/org/skabacca/dm/server/HTUser.java
Removed Paths:
-------------
trunk/core/src/main/java/org/skabacca/dm/server/UserMediator.java
Added: trunk/core/src/main/java/org/skabacca/dm/server/HTUser.java
===================================================================
--- trunk/core/src/main/java/org/skabacca/dm/server/HTUser.java (rev 0)
+++ trunk/core/src/main/java/org/skabacca/dm/server/HTUser.java 2010-01-21 14:42:00 UTC (rev 15)
@@ -0,0 +1,63 @@
+/*
+ * This file is part of skabacca.
+ *
+ * Copyright belongs to the respective authors, see subversion.
+ *
+ * skabacca is free software: you can redistribute it and/or modify it under the terms of the
+ * Affero GNU General Public License as published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * Skabacca 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.
+ *
+ * For the full text of the license, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.skabacca.dm.server;
+
+import org.apache.log4j.Logger;
+import org.equanda.client.EquandaException;
+import org.equanda.persistence.SelectorsState;
+import org.skabacca.dm.client.Organization;
+import org.skabacca.dm.server.pm.DMEquandaUser;
+
+/**
+ * Table helper for User object
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class HTUser
+ extends HTUserBase
+{
+
+ private static final Logger log = Logger.getLogger( HTUser.class );
+
+ /**
+ * Log in to organization
+ *
+ * @throws EquandaException oops
+ */
+ @Override
+ public void login( DMEquandaUser entity )
+ throws EquandaException
+ {
+ Organization org = null; // @todo
+ SelectorsState.setFilter( "Organization", org == null ? null : org.getReference() );
+ SelectorsState.setFilter( "OrganizationOne",
+ org == null ? null : "o.organization.reference='" + org.getReference() + "'" );
+ SelectorsState.setFilter( "OrganizationMul",
+ org == null ? null : "'" + org.getReference() + "' in o.organizations.reference" );
+ }
+
+ /**
+ * Log out from organization
+ *
+ * @throws EquandaException oops
+ */
+ @Override
+ public void logout( DMEquandaUser entity )
+ throws EquandaException
+ {
+ SelectorsState.setFilter( "Organization", null );
+ }
+}
Deleted: trunk/core/src/main/java/org/skabacca/dm/server/UserMediator.java
===================================================================
--- trunk/core/src/main/java/org/skabacca/dm/server/UserMediator.java 2010-01-21 09:05:43 UTC (rev 14)
+++ trunk/core/src/main/java/org/skabacca/dm/server/UserMediator.java 2010-01-21 14:42:00 UTC (rev 15)
@@ -1,59 +0,0 @@
-/*
- * This file is part of skabacca.
- *
- * Copyright belongs to the respective authors, see subversion.
- *
- * skabacca is free software: you can redistribute it and/or modify it under the terms of the
- * Affero GNU General Public License as published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * Skabacca 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.
- *
- * For the full text of the license, see <http://www.gnu.org/licenses/>.
- */
-
-package org.skabacca.dm.server;
-
-import org.skabacca.dm.client.Organization;
-import org.equanda.client.EquandaException;
-import org.equanda.persistence.SelectorsState;
-import org.apache.log4j.Logger;
-
-/**
- * Mediator for User object
- *
- * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- */
-public class UserMediator
-{
- private static final Logger log = Logger.getLogger( UserMediator.class );
-
- /**
- * Log in to organization
- *
- * @throws EquandaException oops
- */
- public void login()
- throws EquandaException
- {
- Organization org = null; // @todo
- SelectorsState.setFilter( "Organization", org == null ? null : org.getReference() );
- SelectorsState.setFilter( "OrganizationOne",
- org == null ? null : "o.organization.reference='" + org.getReference() + "'" );
- SelectorsState.setFilter( "OrganizationMul",
- org == null ? null : "'" + org.getReference() + "' in o.organizations.reference" );
- }
-
- /**
- * Log out from organization
- *
- * @throws EquandaException oops
- */
- public void logout()
- throws EquandaException
- {
- SelectorsState.setFilter( "Organization", null );
- }
-}
-
Modified: trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java 2010-01-21 09:05:43 UTC (rev 14)
+++ trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java 2010-01-21 14:42:00 UTC (rev 15)
@@ -16,19 +16,19 @@
package org.skabacca.gui.pages;
import org.apache.tapestry5.ComponentResources;
-import org.apache.tapestry5.EventContext;
-import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.ValidationTracker;
+import org.apache.tapestry5.annotations.Environmental;
import org.apache.tapestry5.annotations.Persist;
import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.annotations.SessionState;
import org.apache.tapestry5.ioc.Messages;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.ioc.annotations.Local;
import org.apache.tapestry5.services.ContextValueEncoder;
import org.apache.tapestry5.services.Cookies;
import org.chenillekit.access.ChenilleKitAccessConstants;
-import org.chenillekit.access.internal.ChenillekitAccessInternalUtils;
+import org.chenillekit.access.WebSessionUser;
import org.chenillekit.access.services.AuthenticationService;
-import org.skabacca.gui.data.EquandaWebSessionUser;
import org.slf4j.Logger;
/**
@@ -50,8 +50,8 @@
@Property
private String password;
- @ApplicationState
- private EquandaWebSessionUser webSessionUser;
+ @SessionState
+ private WebSessionUser webSessionUser;
@Inject
private Messages messages;
@@ -66,7 +66,7 @@
@Persist
private int loginAttempts;
- private EquandaWebSessionUser tmpUser;
+ private WebSessionUser tmpUser;
@Inject
private Cookies cookies;
@@ -74,6 +74,9 @@
@Inject
private ContextValueEncoder valueEncoder;
+ @Environmental
+ private ValidationTracker validationTracker;
+
final public boolean isLoginAllowed()
{
return loginAttempts < MAX_LOGIN_ATTEMPTS;
@@ -81,41 +84,29 @@
void onValidateForm()
{
+ logger.debug( "login validate start user = " + userName );
loginAttempts++;
- tmpUser = (EquandaWebSessionUser) authenticationService.doAuthenticate( userName, password );
+ tmpUser = authenticationService.doAuthenticate( userName, password );
+ logger.debug( "login validate start res = " + tmpUser );
+ if ( tmpUser == null )
+ {
+ validationTracker
+ .recordError( messages.format( ChenilleKitAccessConstants.NOT_AUTHENTICATED_ERROR_MESSAGE, userName ) );
+ }
}
- Object onSuccess()
+ void onSuccess()
{
// @todo return page handling should be implicit
if ( null != tmpUser ) resources.discardPersistentFieldChanges();
+ logger.debug( "login successful" );
webSessionUser = tmpUser;
- /*
- if ( null != tmpUser )
- {
- //asoManager.set( );
- String prevPage = cookies.readCookieValue( ChenilleKitAccessConstants.REQUESTED_PAGENAME_COOKIE );
- String prevContext = cookies.readCookieValue( ChenilleKitAccessConstants.REQUESTED_EVENTCONTEXT_COOKIE );
- if ( prevPage != null )
- {
- cookies.removeCookieValue( ChenilleKitAccessConstants.REQUESTED_EVENTCONTEXT_COOKIE );
- cookies.removeCookieValue( ChenilleKitAccessConstants.REQUESTED_PAGENAME_COOKIE );
- if ( prevContext != null && prevContext.length() > 0 )
- {
- EventContext context =
- ChenillekitAccessInternalUtils.getContextFromString( valueEncoder, prevContext );
- Object[] contextArray = new Object[context.getCount()];
- for ( int i = 0; i < context.getCount() ; i++ ) contextArray[ i ] = context.get( Object.class, i );
- return resources.createPageLink( prevPage, true, contextArray );
- }
- else
- {
- return resources.createPageLink( prevPage, false );
- }
- }
- }
- */
- return null;
+ cookies.writeCookieValue( ChenilleKitAccessConstants.LOGIN_SUCCESSFUL_COOKIE_NAME, "OK", 300 );
}
+
+ void onFailure()
+ {
+ cookies.writeCookieValue( ChenilleKitAccessConstants.LOGIN_SUCCESSFUL_COOKIE_NAME, "KO", 300 );
+ }
}
Modified: trunk/gui/src/main/resources/org/skabacca/gui/pages/Login.tml
===================================================================
--- trunk/gui/src/main/resources/org/skabacca/gui/pages/Login.tml 2010-01-21 09:05:43 UTC (rev 14)
+++ trunk/gui/src/main/resources/org/skabacca/gui/pages/Login.tml 2010-01-21 14:42:00 UTC (rev 15)
@@ -15,7 +15,7 @@
<h1 style="text-align:center;">${equanda-message:title.Login}</h1>
- <t:form action="#">
+ <t:form action="#" clientValidation="false">
<t:errors/>
<t:if test="isLoginAllowed()">
<t:parameter name="else">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-21 09:43:17
|
Revision: 14
http://skabacca.svn.sourceforge.net/skabacca/?rev=14&view=rev
Author: triathlon98
Date: 2010-01-21 09:05:43 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
prepare move to docbook for docs, force correct equanda version,...
Modified Paths:
--------------
trunk/core/pom.xml
trunk/core/src/main/resources/translations.txt
trunk/ddltool/pom.xml
trunk/gui/pom.xml
trunk/gui/src/main/java/org/skabacca/gui/services/JbossAppServerLoginService.java
trunk/pom.xml
trunk/test/pom.xml
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2010-01-17 20:05:23 UTC (rev 13)
+++ trunk/core/pom.xml 2010-01-21 09:05:43 UTC (rev 14)
@@ -17,6 +17,7 @@
<plugin>
<groupId>org.equanda</groupId>
<artifactId>equanda-maven-plugin</artifactId>
+ <version>${equanda-version}</version>
<configuration>
<sourceDirectory>${basedir}/../src/main/dm</sourceDirectory>
<template>ejb3,import,login</template>
Modified: trunk/core/src/main/resources/translations.txt
===================================================================
--- trunk/core/src/main/resources/translations.txt 2010-01-17 20:05:23 UTC (rev 13)
+++ trunk/core/src/main/resources/translations.txt 2010-01-21 09:05:43 UTC (rev 14)
@@ -1,26 +1,286 @@
-;Last edited: 2007-10-23
+;Last edited: 2010-01-20
.languages en;nl
+.key 100001/equanda-exceptions
+.label.en Person reference is required.
+.label.nl Referentie persoon verplicht.
+.key 110001/equanda-exceptions
+.label.en Context should have an ontology URI defined.
+.label.nl Er is geen ontologie URL gedefinieerd in de context.
+.key 110002/equanda-exceptions
+.label.en ParentType parameter is missing.
+.label.nl ParentType parameter niet opgegeven.
+.key CombinedProfile.ObjectTitle/app
+.label.en Title
+.label.nl Titel
+.key CombinedProfile.RequiredProficiency/app
+.label.en Required proficiency
+.label.nl Vereist niveau
+.key CombinedProfile.Title/app
+.label.en Combined profile
+.label.nl Gecombineerd profiel
+.key title/app
+.label.en skabacca
+.label.nl skabacca
+.key EvidenceDistillation.Competency.Reference/app
+.label.en Competency
+.label.nl Competentie
+.key EvidenceDistillation.Competency.Title/app
+.label.en Title
+.label.nl Titel
+.key EvidenceDistillation.Confidence/app
+.label.en Confidence
+.label.nl Vertrouwen
+.key EvidenceDistillation.Context.Title/app
+.label.en Context
+.label.nl Context
+.key EvidenceDistillation.Fluency/app
+.label.en Fluency
+.label.nl Vlotheid
+.key EvidenceDistillation.Proficiency/app
+.label.en Proficiency
+.label.nl Niveau
+.key EvidenceDistillation.Relevancy/app
+.label.en Relevancy
+.label.nl Relevantie
+.key GapView.Colour.Artifact/app
+.label.en Task or role
+.key GapView.Colour.CompetencyGap/app
+.label.en There is a remaining gap for this competency
+.key GapView.Colour.CompetencyHas/app
+.label.en Competency already present
+.key GapView.Colour.CompetencyLearned/app
+.label.en Competency will be acquired by following the courses
+.key GapView.Colour.CompetencyPart/app
+.label.en Competency will be acquired for some people only
+.key GapView.HasAfter/app
+.label.en After
+.key GapView.HasBefore/app
+.label.en Before
+.key GapView.Improved/app
+.label.en Improved
+.key GapView.LearningObjectCompetencyInfoTitle/app
+.label.en Competency details for learning objects
+.label.nl Competentie details voor leerobjecten
+.key GapView.MatchScore/app
+.label.en Match score
+.label.nl Match score
+.key GapView.Needed/app
+.label.en Needed
+.key GapView.StartProficiency/app
+.label.en Start proficiency
+.label.nl Huidig niveau
+.key GapView.TargetProficiency/app
+.label.en Requested proficiency
+.label.nl Gevraagde niveau
+.key GapView.Title/app
+.label.en Title
+.label.nl Titel
+.key GapView.TreePersonInfoTitle/app
+.label.en Person info
+.key Match.AverageGap/app
+.label.en avg
+.key Match.AverageScore/app
+.label.en avg
+.key Match.Competency/app
+.label.en Competency
+.key Match.CompetencyView/app
+.label.en Competencies
+.label.nl Competenties
+.key Match.GapCompletelyFilled/app
+.label.en The competency gap is completely filled by these learning objects.
+.label.nl De competentiekloof wordt volledig overbrugd door deze leerobjecten.
+.key Match.GapLink/app
+.label.en Gap
+.label.nl Kloof
+.key Match.GapNotFilled/app
+.label.en There is a remaining competency gap.
+.label.nl Er blijft een competentiekloof.
+.key Match.GapTotal/app
+.label.en Gap total
+.key Match.MatchProfile/app
+.label.en Match Profile
+.label.nl Matchprofiel
+.key Match.MaxProficiency/app
+.label.en Level
+.key Match.MaxScore/app
+.label.en max
+.key Match.MinScore/app
+.label.en min
+.key Match.Name/app
+.label.en Name
+.label.nl Naam
+.key Match.NoSuitableAssessments/app
+.label.en No suitable assessments
+.label.nl Geen geschikte evaluaties
+.key Match.NoSuitableLearningObjects/app
+.label.en No suitable learning objects have been found.
+.label.nl Er zijn geen geschikte leerobjecten gevonden.
+.key Match.NoSuitablePersons/app
+.label.en No suitable persons
+.label.nl Geen geschikte personen
+.key Match.NotStarted/app
+.label.en Press the "Match" button at the bottom of the screen to see the result.
+.label.nl Druk onderaan op de knop "Matchen" om het resultaat te zien.
+.key Match.Person/app
+.label.en Person
+.label.nl Persoon
+.key Match.PersonCount/app
+.label.en Persons
+.label.nl Personen
+.key Match.PersonMatchScore/app
+.label.en Score
+.label.nl Score
+.key Match.PersonReference/app
+.label.en Reference
+.label.nl Referentie
+.key Match.PersonTitle/app
+.label.en Title
+.label.nl Titel
+.key Match.PersonView/app
+.label.en Person
+.label.nl Persoon
+.key Match.PersonWithGapCount/app
+.label.en Has gap
+.key Match.ProfileLink/app
+.label.en Profile
+.label.nl Profiel
+.key Match.ScoreAfter/app
+.label.en Score after
+.label.nl Score na
+.key Match.ScoreBefore/app
+.label.en Score before
+.label.nl Score voor
+.key Match.ScoreTotal/app
+.label.en Score total
+.key Match.Task/app
+.label.en Task
+.label.nl Taak
+.key Match.TreeView/app
+.label.en Tree
+.label.nl Boom
+.key MatchCompetencyPlan.NoSuitableLearningObjects/app
+.label.en No suitable learning objects have been found.
+.label.nl Er zijn geen geschikte leerobjecten gevonden.
+.key MatchCompetencyPlan.Root/app
+.label.en Competency Plan
+.label.nl Competentie Plan
+.key MatcherIndex.PercentCompletion/app
+.label.en Completion Percentage
+.label.nl Voltooiingspercentage
+.key MatcherIndex.ReIndex/app
+.label.en Re-index
+.label.nl Herindexeren
+.key PersonRoleAssessment.AssessmentMethod/app
+.label.en Assessment method
+.label.nl Evaluatiemethode
+.key PersonRoleAssessment.ClearLevels/app
+.label.en Clear
+.label.nl Wissen
+.key PersonRoleAssessment.Competency/app
+.label.en Competency
+.label.nl Competentie
+.key PersonRoleAssessment.CopyLevels/app
+.label.en Set required levels
+.label.nl Vereist niveau zetten
+.key PersonRoleAssessment.Level/app
+.label.en Proficiency Level
+.label.nl Bekwaamheidniveau
+.key PersonRoleAssessment.NoCompetenciesInAssignedTasks/app
+.label.en No competencies have been found in the assigned tasks/roles.
+.label.nl Er werden geen competenties gevonden in de toegekende taken/rollen.
+.key PersonRoleAssessment.NoPersonOrMethod/app
+.label.en Please set the person and assessment method first, then indicate next.
+.label.nl Gelieve eerst de persoon en evaluatiemethode te selecteren, dan volgende aanduiden.
+.key PersonRoleAssessment.NoTasks/app
+.label.en Please select the tasks you want to assess, then indicate next.
+.label.nl Gelieve de taken die je wil evalueren te selecteren, dan volgende aanduiden.
+.key PersonRoleAssessment.Person/app
+.label.en Person
+.label.nl Persoon
+.key PersonRoleAssessment.Tasks/app
+.label.en Tasks
+.label.nl Taken
+.key SelectListHeader/equanda-fixed
+.label.en Select
+.label.nl Selecteren
+.key SelectOneHeader/equanda-fixed
+.label.en Select
+.label.nl Selecteren
+.key SelectViewHeader/equanda-fixed
+.label.en View
+.label.nl Bekijken
+.key action.Artifact.getCompetencyProfile/equanda-table
+.label.en Get current competency profile
+.label.nl Bepaal huidig competentieprofiel
+.key action.Commitment.linkDogTagger/equanda-table
+.label.en DOGTagger link
+.label.nl DOGTagger link
.key action.EquandaRole.mergeRestrictions/equanda-table
-.label.en Merge Restriction
-.label.nl Beperkingen Samenvoegen
+.label.en Merge restrictions
+.label.nl Beperkingen samenvoegen
.key action.EquandaRole.mergeRights/equanda-table
.label.en Merge Rights
-.label.nl Rechten Samenvoegen
+.label.nl Rechten samenvoegen
.key action.EquandaUser.login/equanda-table
.label.en Login
.label.nl Inloggen
.key action.EquandaUser.logout/equanda-table
.label.en Logout
.label.nl Uitloggen
+.key action.MatchProfile.getMatchingProfile/equanda-table
+.label.en Get Matching Profile
+.label.nl Matchingprofiel ophalen
+.key action.ProficiencyCompetency.linkDogTagger/equanda-table
+.label.en DOGTagger link
+.label.nl DOGTagger link
.key borderOrganization
.label.en Organization
-.label.nl Organizatie
+.label.nl Organisatie
+.key button.Import/app
+.label.en Import
+.label.nl Import
+.key button.Match/app
+.label.en Match
+.label.nl Matchen
+.key button.Next/app
+.label.en Next
+.label.nl Volgende
+.key button.Ok/app
+.label.en Ok
+.label.nl Ok
+.key button.ReIndex/app
+.label.en Re-index
+.label.nl Herindexeren
+.key category./equanda-table
+.label.en default
+.label.nl standaard
.key category.default/equanda-table
.label.en default
.label.nl standaard
.key category.tables.Main/equanda-table
.label.en General
.label.nl Algemeen
+.key category.tables.Maintenance/equanda-table
+.label.en Maintenance
+.label.nl Onderhoud
+.key category.tables.Settings/equanda-table
+.label.en Settings
+.label.nl Instellingen
+.key choice.Artifact.Gender.GENDER_FEMALE/equanda-table
+.label.en Female
+.label.nl Vrouwelijk
+.key choice.Artifact.Gender.GENDER_MALE/equanda-table
+.label.en Male
+.label.nl Mannelijk
+.key choice.Artifact.Gender.GENDER_UNKNOWN/equanda-table
+.label.en Unknown
+.label.nl Onbekend
+.key choice.Commitment.CombinationRule.COMBINATIONRULE_ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key choice.Commitment.CombinationRule.COMBINATIONRULE_SOME/equanda-table
+.label.en Some
+.label.nl Sommige
.key choice.EquandaAlert.AlertType.ALERT_TYPE_CRITICAL/equanda-table
.label.en CRITICAL
.label.nl KRITISCH
@@ -48,6 +308,482 @@
.key choice.EquandaUser.Language.LANGUAGE_ENGLISH/equanda-table
.label.en English
.label.nl Engels
+.key choice.MatchProfile.MatchProfileWorker.MPW_AVERAGE_PROFICIENCY/equanda-table
+.label.en Average proficiency level
+.label.nl Gemiddeld bekwaamheidsniveau
+.key choice.MatchProfile.MatchProfileWorker.MPW_AVERAGE_WITH_FLUENCY/equanda-table
+.label.en Average proficiency level with fluency
+.label.nl Gemiddeld bekwaamheidsniveau met vlotheid
+.key choice.MatchProfile.MatchProfileWorker.MPW_CONFIDENCE_WEIGHTED/equanda-table
+.label.en Weighted confidence
+.label.nl Gewogen vertrouwen
+.key choice.MatchProfile.MatchProfileWorker.MPW_HIGHEST_CONFIDENCE/equanda-table
+.label.en Highest confidence
+.label.nl Hoogste vertrouwen
+.key choice.MatchProfile.MatchProfileWorker.MPW_HIGHEST_PROFICIENCY/equanda-table
+.label.en Highest proficiency level
+.label.nl Hoogste bekwaamheidsniveau
+.key choice.MatchProfile.MatchProfileWorker.MPW_HIGHEST_RELEVANCY/equanda-table
+.label.en Highest relevancy
+.label.nl Hoogste relevantie
+.key choice.MatchProfile.MatchProfileWorker.MPW_HIGHEST_WITH_FLUENCY/equanda-table
+.label.en Highest relevancy with fluency
+.label.nl Hoogste relevantie met vlotheid
+.key choice.MatchProfile.MatchProfileWorker.MPW_RELEVANCY_WEIGHTED/equanda-table
+.label.en Weighted relevancy
+.label.nl Gewogen relevantie
+.key choice.MatchProfile.MatchProfileWorker.MPW_WEIGHTED_AVERAGE_WITH_FLUENCY/equanda-table
+.label.en Weighted relevancy with fluency
+.label.nl Gewogen relevantie met vlotheid
+.key choice.WeighedCompetency.Required.REQUIRED_COMPETENCY/equanda-table
+.label.en Competency required
+.label.nl Competentie verplicht
+.key choice.WeighedCompetency.Required.REQUIRED_LEVEL/equanda-table
+.label.en Proficiency level required
+.label.nl Bekwaamheidsniveau verplicht
+.key choice.WeighedCompetency.Required.REQUIRED_NO/equanda-table
+.label.en Not required
+.label.nl Niet verplicht
+.key error.TooManyLoginAttempts/app
+.label.en Maximum number of login attempts reached. Please close your browser and try again.
+.label.nl Maximaal aantal inlogpogingen bereikt. Sluit je browser af en probeer opnieuw.
+.key exceptionReport.Comment/app
+.label.en What were you doing
+.caption.en Please indicate what you were doing as this can help us to prevent the same problem from occuring again in the future. Thanks
+.label.nl Wat deed je
+.caption.nl Gelieve aan te duiden wat je aan het doen was zodat we dit probleem in de toekomst kunnen voorkomen. Bedankt
+.key exceptionReport.Details/app
+.label.en problem details
+.label.nl details probleem
+.key field.ApplicationDomain.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.ApplicationDomain.Organization/equanda-table
+.label.en Organization
+.label.nl Organisatie
+.key field.ApplicationDomain.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.ApplicationDomain.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.Artifact.Address/equanda-table
+.label.en Address
+.caption.en Full address. You can use several lines.
+.label.nl Adres
+.caption.nl Volledig adres. Je kunt meerdere regels gebruiken.
+.key field.Artifact.ArtifactCategories/equanda-table
+.label.en Categories
+.label.nl Categoriën
+.key field.Artifact.AssignedRoles/equanda-table
+.label.en Assigned roles
+.caption.en Roles and tasks the person is assigned to, independent of whether all the competencies are acquired
+.label.nl Toegekende rollen
+.caption.nl Rollen en taken die aan de persoon zijn toegekend, de nodige competenties zijn niet per se verworven
+.key field.Artifact.Birthdate/equanda-table
+.label.en Date of Birth
+.label.nl Geboortedatum
+.key field.Artifact.Children/equanda-table
+.label.en Child Artefacts
+.label.nl Kindartefacten
+.key field.Artifact.City/equanda-table
+.label.en City
+.label.nl Plaats
+.key field.Artifact.ContentCachable/equanda-table
+.label.en Content cachable
+.caption.en Is it allowed for clients to copy the object locally
+.label.nl Inhoud cachebaar
+.caption.nl Mogen client programma's de inhoud lokaal opslagen
+.key field.Artifact.ContentType/equanda-table
+.label.en Content type
+.label.nl Type inhoud
+.key field.Artifact.ContentUrl/equanda-table
+.label.en Content URL
+.label.nl Inhoud link
+.key field.Artifact.Country/equanda-table
+.label.en Country
+.label.nl Land
+.key field.Artifact.Criteria/equanda-table
+.label.en Non-Competency Related Criteria
+.label.nl Niet -competentiegerelateerde criteria
+.key field.Artifact.Description/equanda-table
+.label.en Description
+.label.nl Omschrijving
+.key field.Artifact.Email/equanda-table
+.label.en E-mail
+.label.nl E-mail
+.key field.Artifact.Ethnicity/equanda-table
+.label.en Ethnicity
+.label.nl Etniciteit
+.key field.Artifact.Fax/equanda-table
+.label.en Fax
+.label.nl Fax
+.key field.Artifact.Gender/equanda-table
+.label.en Gender
+.label.nl Geslacht
+.key field.Artifact.Language/equanda-table
+.label.en Language
+.label.nl Taal
+.key field.Artifact.LearningArtifactKind/equanda-table
+.label.en Learning Artefact Type
+.label.nl Type leerartefact
+.key field.Artifact.LearningCompetencies/equanda-table
+.label.en Competencies
+.label.nl Competenties
+.key field.Artifact.MobilePhone/equanda-table
+.label.en Mobile Phone
+.label.nl GSM
+.key field.Artifact.Organization/equanda-table
+.label.en Organization
+.label.nl Organisatie
+.key field.Artifact.PersonFirstName/equanda-table
+.label.en First Name
+.label.nl Voornaam
+.key field.Artifact.PersonName/equanda-table
+.label.en Name
+.label.nl Naam
+.key field.Artifact.Phone/equanda-table
+.label.en Phone
+.label.nl Telefoon
+.key field.Artifact.Portfolio/equanda-table
+.label.en e-Portfolio URL
+.label.nl URL e-Portfolio
+.key field.Artifact.Reference/equanda-table
+.label.en Reference
+.caption.en External reference (if any) for this artefact. Should be unique.
+.label.nl Referentie
+.caption.nl Externe referentie voor dit object. Moet uniek zijn.
+.key field.Artifact.RequiredCompetencies/equanda-table
+.label.en Required competencies
+.caption.en Competencies that are required for the successful execution of (or that are tested by) this artefact
+.label.nl Vereiste competenties
+.caption.nl Competenties die nodig zijn voor het adequaat uitvoeren van (of die getest worden door) dit artefact.
+.key field.Artifact.TaskArtifactKind/equanda-table
+.label.en Task Artefact Type
+.label.nl Type taakartefact
+.key field.Artifact.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.Artifact.Url/equanda-table
+.label.en URL
+.label.nl URL
+.key field.Artifact.Zip/equanda-table
+.label.en Zip
+.label.nl Postcode
+.key field.ArtifactCategory.ApplicationDomains/equanda-table
+.label.en Application Domains
+.label.nl Toepassingsdomeinen
+.key field.ArtifactCategory.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.ArtifactCategory.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.AssessedArtifact.Artifact/equanda-table
+.label.en Artefact
+.label.nl Artefact
+.key field.AssessedArtifact.AssessmentDate/equanda-table
+.label.en Assessment Date
+.label.nl Evaluatiedatum
+.key field.AssessedArtifact.AssessmentLevel/equanda-table
+.label.en Assessment Level
+.label.nl Evaluatieniveau
+.key field.AssessedArtifact.AssessmentMethod/equanda-table
+.label.en Assessment Method
+.label.nl Evaluatiemethode
+.key field.AssessedArtifact.AssessmentScore/equanda-table
+.label.en Assessment Score
+.caption.en Discrete assessment score
+.label.nl Evaluatiescore
+.caption.nl Discrete evaluatiescore
+.key field.AssessedArtifact.EvidenceUri/equanda-table
+.label.en URI for Evidence
+.label.nl URI voor bewijs
+.key field.AssessedArtifact.Person/equanda-table
+.label.en Person
+.label.nl Persoon
+.key field.AssessedArtifact.Remarks/equanda-table
+.label.en Remarks
+.label.nl Bemerkingen
+.key field.AssessedCompetency.AssessmentDate/equanda-table
+.label.en Assessment Date
+.label.nl Evaluatiedatum
+.key field.AssessedCompetency.AssessmentLevel/equanda-table
+.label.en Assessment Level
+.label.nl Evaluatieniveau
+.key field.AssessedCompetency.AssessmentMethod/equanda-table
+.label.en Assessment Method
+.label.nl Evaluatiemethode
+.key field.AssessedCompetency.AssessmentScore/equanda-table
+.label.en Assessment Score
+.caption.en Discrete assessment score
+.label.nl Evaluatiescore
+.caption.nl Discrete evaluatiescore
+.key field.AssessedCompetency.EvidenceUri/equanda-table
+.label.en URI for Evidence
+.label.nl URI voor bewijs
+.key field.AssessedCompetency.Levels/equanda-table
+.label.en Competencies
+.label.nl Competenties
+.key field.AssessedCompetency.Person/equanda-table
+.label.en Person
+.label.nl Persoon
+.key field.AssessedCompetency.Remarks/equanda-table
+.label.en Remarks
+.label.nl Bemerkingen
+.key field.AssessedCompetencyLevel.Competency/equanda-table
+.label.en Competency
+.label.nl Competentie
+.key field.AssessedCompetencyLevel.Parent/equanda-table
+.label.en Parent
+.label.nl Ouder
+.key field.AssessedCompetencyLevel.ProficiencyLevel/equanda-table
+.label.en Proficiency Level
+.label.nl Vaardigheidsniveau
+.key field.AssessedCompetencyLevel.ProficiencyScore/equanda-table
+.label.en Proficiency Score
+.label.nl Vaardigheidsscore
+.key field.AssessmentMethod.AssessmentScale/equanda-table
+.label.en Assessment Scale
+.label.nl Evaluatieschaal
+.key field.AssessmentMethod.ConfidenceLevelDefault/equanda-table
+.label.en Confidence level
+.caption.en Default confidence level
+.label.nl Vertrouwen
+.caption.nl Standaard waarde voor het vertrouwen in deze evaluatiemethode.
+.key field.AssessmentMethod.ConfidenceRating/equanda-table
+.label.en Confidence Rating
+.label.nl Betrouwbaarheidsniveau
+.key field.AssessmentMethod.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.AssessmentMethod.Name/equanda-table
+.label.en Name
+.label.nl Naam
+.key field.AssessmentMethod.Organizations/equanda-table
+.label.en Organizations
+.label.nl Organisaties
+.key field.AssessmentMethod.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.AssessmentScale.AllowedValues/equanda-table
+.label.en Allowed values
+.label.nl Toegestane waarden
+.key field.AssessmentScale.ApplicationDomains/equanda-table
+.label.en Application Domains
+.label.nl Toepassingsgebieden
+.key field.AssessmentScale.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.AssessmentScale.Discrete/equanda-table
+.label.en Discrete
+.label.nl Discreet
+.key field.AssessmentScale.MaximumValue/equanda-table
+.label.en Maximum Value
+.label.nl Maximumwaarde
+.key field.AssessmentScale.MinimumValue/equanda-table
+.label.en Minimum Value
+.label.nl Minimumwaarde
+.key field.AssessmentScale.Organizations/equanda-table
+.label.en Organizations
+.label.nl Organisaties
+.key field.AssessmentScale.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.AssessmentScale.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.AssessmentScore.AssessmentScale/equanda-table
+.label.en Assessment Scale
+.label.nl Evaluatieschaal
+.key field.AssessmentScore.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.AssessmentScore.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.AssessmentScore.Value/equanda-table
+.label.en Value
+.label.nl Waarde
+.key field.Commitment.CombinationRule/equanda-table
+.label.en Combination Rule
+.label.nl Combinatiemethode
+.key field.Commitment.Commitment/equanda-table
+.label.en Semantic Definition
+.caption.en This is a URI link to a commitment in an ontology.
+.label.nl Semantische definitie
+.caption.nl Dit is een URI link naar een commitment in een ontologie.
+.key field.Commitment.Competency/equanda-table
+.label.en Competency
+.label.nl Competentie
+.key field.Commitment.CompetencyCategories/equanda-table
+.label.en Categories
+.label.nl Categoriën
+.key field.Commitment.Context/equanda-table
+.label.en Context
+.label.nl Context
+.key field.Commitment.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.Commitment.Discrete/equanda-table
+.label.en Discrete
+.label.nl Discreet
+.key field.Commitment.Inactive/equanda-table
+.label.en Inactive
+.label.nl Niet actief
+.key field.Commitment.MaximumProficiencyLevel/equanda-table
+.label.en Maximum Proficiency Level
+.label.nl Maximum vaardigheidsniveau
+.key field.Commitment.MinimumMatchWeight/equanda-table
+.label.en Minimum Total Weight
+.caption.en Minimum Total Weight for a Match
+.label.nl Minimumtotaalgewicht
+.caption.nl Minimumtotaalgewicht voor een match
+.key field.Commitment.MinimumProficiencyLevel/equanda-table
+.label.en Minimum Proficiency Level
+.label.nl Minimum vaardigheidsniveau
+.key field.Commitment.MinimumScoreWeight/equanda-table
+.label.en Minimum Total Weighted Scores
+.caption.en Minimum Total Weighted Scores for Match
+.label.nl Minimumtotaal gewogen scores
+.caption.nl Minimumtotaal gewogen scores voor match
+.key field.Commitment.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.Commitment.Scale/equanda-table
+.label.en Scale
+.label.nl Schaal
+.key field.Commitment.Scores/equanda-table
+.label.en Scores
+.label.nl Scores
+.key field.Commitment.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.Commitment.WeighedCompetencies/equanda-table
+.label.en Weighted Competencies
+.label.nl Gewogen competenties
+.key field.Competency.Commitments/equanda-table
+.label.en Contextualisations
+.label.nl Contextualiseringen
+.key field.Competency.CompetencyCategories/equanda-table
+.label.en Categories
+.caption.en Competency Categories
+.label.nl Categorieën
+.caption.nl Competentiecategorieën
+.key field.Competency.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.Competency.Inactive/equanda-table
+.label.en Inactive
+.label.nl Niet actief
+.key field.Competency.Organizations/equanda-table
+.label.en Organizations
+.label.nl Organisaties
+.key field.Competency.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.Competency.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.CompetencyCategory.ApplicationDomains/equanda-table
+.label.en Application Domains
+.label.nl Toepassingsgebieden
+.key field.CompetencyCategory.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.CompetencyCategory.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.CompetencyPlan.Assignments/equanda-table
+.label.en Assignments
+.label.nl Toewijzingen
+.key field.CompetencyPlan.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.CompetencyPlan.Inactive/equanda-table
+.label.en Inactive
+.label.nl Niet actief
+.key field.CompetencyPlan.MatchProfile/equanda-table
+.label.en Match Profile
+.label.nl Matchprofiel
+.key field.CompetencyPlan.Organization/equanda-table
+.label.en Organization
+.label.nl Organisatie
+.key field.CompetencyPlan.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.CompetencyPlan.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.CompetencyPlanAssignment.Person/equanda-table
+.label.en Person
+.label.nl Persoon
+.key field.CompetencyPlanAssignment.Persons/equanda-table
+.label.en Persons
+.label.nl Personen
+.key field.CompetencyPlanAssignment.Plan/equanda-table
+.label.en Plan
+.label.nl Plan
+.key field.CompetencyPlanAssignment.Target/equanda-table
+.label.en Target
+.label.nl Doel
+.key field.CompetencyPlanAssignment.Task/equanda-table
+.label.en Task / Role
+.label.nl Taak / Rol
+.key field.Context.ApplicationDomains/equanda-table
+.label.en Application Domains
+.label.nl Toepassingsgebieden
+.key field.Context.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.Context.Ontology/equanda-table
+.label.en Ontology
+.label.nl Ontologie
+.key field.Context.Organizations/equanda-table
+.label.en Organizations
+.label.nl Organisaties
+.key field.Context.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.Context.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.Criterion.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.Criterion.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.Criterion.Scores/equanda-table
+.label.en Scores
+.label.nl Scores
+.key field.Criterion.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.CriterionScore.Criterion/equanda-table
+.label.en Criterion
+.label.nl Criterium
+.key field.CriterionScore.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.CriterionScore.Value/equanda-table
+.label.en Value
+.label.nl Waarde
+.key field.DeltaProficiencyCompetency.Competency/equanda-table
+.label.en Competency
+.label.nl Competentie
+.key field.DeltaProficiencyCompetency.ObjectiveLevel/equanda-table
+.label.en Objective Level
+.label.nl Doelniveau
+.key field.DeltaProficiencyCompetency.ObjectiveScore/equanda-table
+.label.en Objective Score
+.label.nl Doelscore
+.key field.DeltaProficiencyCompetency.PrerequisiteLevel/equanda-table
+.label.en Prerequisite Level
+.label.nl Voorkennisniveau
+.key field.DeltaProficiencyCompetency.PrerequisiteScore/equanda-table
+.label.en Prerequisite Score
+.label.nl Voorkennisscore
.key field.EquandaAlert.AlertType/equanda-table
.label.en Alert Type
.label.nl Type Melding
@@ -75,12 +811,21 @@
.key field.EquandaAttachment.Date/equanda-table
.label.en Date
.label.nl Datum
+.key field.EquandaAttachment.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.EquandaAttachment.FileName/equanda-table
+.label.en Filename
+.label.nl Bestandsnaam
.key field.EquandaAttachment.MimeType/equanda-table
-.label.en MIME Type
-.label.nl MIME Aanduiding
+.label.en Mime type
+.label.nl Mime type
.key field.EquandaAttachment.Name/equanda-table
.label.en Name
.label.nl Naam
+.key field.EquandaAttachment.Object/equanda-table
+.label.en Object
+.label.nl Object
.key field.EquandaAttachment.Size/equanda-table
.label.en Size
.label.nl Grootte
@@ -113,19 +858,28 @@
.label.nl Administrator
.key field.EquandaRole.AppserverRole/equanda-table
.label.en Appserver Role
-.label.nl Appserver Rol
+.label.nl Appserver rol
+.key field.EquandaRole.AuthAndConfig/equanda-table
+.label.en Authorization and Configuration
+.label.nl Autorisatie en configuratie
.key field.EquandaRole.Description/equanda-table
.label.en Description
.label.nl Beschrijving
.key field.EquandaRole.GuiAccessProhibited/equanda-table
.label.en Gui Access Prohibited
-.label.nl GUI Toegang Verboden
+.label.nl Toegang GUI verboden
+.key field.EquandaRole.GuiAdministrator/equanda-table
+.label.en Can administer User Interface
+.label.nl Mag userinteface-rechten beheren
.key field.EquandaRole.Rights/equanda-table
.label.en Rights
.label.nl Rechten
.key field.EquandaRole.RoleName/equanda-table
.label.en Role Name
.label.nl Rolnaam
+.key field.EquandaUser.AuthAndConfig/equanda-table
+.label.en Authorization and Configuration
+.label.nl Autorisatie en configuratie
.key field.EquandaUser.FieldsPreferences/equanda-table
.label.en Field Preferences
.label.nl Veld Voorkeuren
@@ -146,7 +900,7 @@
.label.nl Organisatie
.key field.EquandaUser.Password/equanda-table
.label.en Password
-.label.nl Paswoord
+.label.nl Wachtwoord
.key field.EquandaUser.ReportPreferences/equanda-table
.label.en Report Preferences
.label.nl Rapport Voorkeuren
@@ -155,13 +909,101 @@
.label.nl Rollen
.key field.EquandaUser.StartPage/equanda-table
.label.en Start Page
-.label.nl Start Pagina
+.label.nl Startpagina
.key field.EquandaUser.TablesPreferences/equanda-table
.label.en Table Preferences
.label.nl Tabel Voorkeuren
.key field.EquandaUser.UserName/equanda-table
.label.en User Name
.label.nl Gebruikersnaam
+.key field.LearningArtifactKind.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.LearningArtifactKind.ExcludeFromCompetencyPlanMatching/equanda-table
+.label.en Exclude from Competency Plan Matching
+.label.nl Uitsluiten van competentieplanmatching
+.key field.LearningArtifactKind.ExcludeFromPersonTaskMatching/equanda-table
+.label.en Exclude from Person-Task Matching
+.label.nl Uitsluiten van Persoon-Taak matching
+.key field.LearningArtifactKind.Organizations/equanda-table
+.label.en Organizations
+.label.nl Organizatie
+.key field.LearningArtifactKind.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.LearningArtifactKind.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.LearningContentType.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.LearningContentType.Organizations/equanda-table
+.label.en Organizations
+.label.nl Organisatie
+.key field.LearningContentType.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.LearningContentType.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.MatchProfile.AssessmentThreshold/equanda-table
+.label.en Threshold
+.caption.en Minimum level for the assessments to be considered as "passed"
+.label.nl Ondergrens
+.caption.nl Minimum resultaat voor een evaluatie om geslaagd te zijn
+.key field.MatchProfile.ConfidenceThreshold/equanda-table
+.label.en Threshold
+.caption.en Minimum confidence level for the assessments to be taken into consideration.
+.label.nl Ondergrens
+.caption.nl Ondergrens voor het vertrouwen om de evaluatiemethode in beschouwing te nemen.
+.key field.MatchProfile.ConfidenceWeight/equanda-table
+.label.en Confidence Weight
+.label.nl Gewicht vertrouwen
+.key field.MatchProfile.DirectMatchMultiplier/equanda-table
+.label.en Direct multiplier
+.caption.en Mutiplier to apply to direct matching confidence score, 0 for no direct matching, 1 for normal
+.key field.MatchProfile.FluenceGraceCountDefault/equanda-table
+.label.en Fluency grace
+.caption.en Number of occurences before fluency is increased
+.key field.MatchProfile.FluencyAddDefault/equanda-table
+.label.en Fluency add
+.caption.en Amount of fluency to add for each occurence above the grace number of occurences
+.key field.MatchProfile.FluencyIncHigherProficiency/equanda-table
+.label.en Fluency include
+.caption.en Should higher proficiency levels be included when counting the number of occurences
+.key field.MatchProfile.FluencyWeight/equanda-table
+.label.en Fluency Weight
+.label.nl Gewicht vlotheid
+.key field.MatchProfile.MatchProfileWorker/equanda-table
+.label.en Worker
+.label.nl Worker
+.key field.MatchProfile.MaxResults/equanda-table
+.label.en Max results
+.label.nl Max resultaten
+.key field.MatchProfile.Organizations/equanda-table
+.label.en Organizations
+.label.nl Organisaties
+.key field.MatchProfile.Parameters/equanda-table
+.label.en Parameters
+.label.nl Parameters
+.key field.MatchProfile.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.MatchProfile.RelevancyDegradeDaysDefault/equanda-table
+.label.en Relevancy degrade
+.caption.en Number of days during which the relevancy degrades linearly
+.key field.MatchProfile.RelevancyGraceDaysDefault/equanda-table
+.label.en Relevancy grace
+.caption.en Grace period in days during which a competency remains fully relevant (no degradation yet)
+.key field.MatchProfile.RelevancyWeight/equanda-table
+.label.en Relevancy Weight
+.label.nl Gewicht relevantie
+.key field.MatchProfile.SemanticMatchMultiplier/equanda-table
+.label.en Semantic multiplier
+.caption.en Mutiplier to apply to semantic matching confidence score, 0 for no direct matching, 1 for normal
+.key field.MatchProfile.Title/equanda-table
+.label.en Title
+.label.nl Titel
.key field.Organization.Address/equanda-table
.label.en Address
.label.nl Adres
@@ -189,15 +1031,226 @@
.key field.Organization.Reference/equanda-table
.label.en Reference
.label.nl Referentie
+.key field.Organization.Reindex/equanda-table
+.label.en Reindex
+.label.nl Herindexeer
+.key field.Organization.ReindexProgress/equanda-table
+.label.en Reindex progress
+.label.nl Herindexeer vooruitgang
+.key field.Organization.SelfAssessmentMethod/equanda-table
+.label.en Self Assessment
+.caption.en Indicate the assessment method which is considered a self-assessment
+.label.nl Zelfevaluatie
+.caption.nl Kies de evaluatiemethode die als zelf-evaluatie beschouwd wordt
.key field.Organization.Url/equanda-table
.label.en URL
.label.nl URL
.key field.Organization.Zip/equanda-table
.label.en Zip
.label.nl Postcode
+.key field.ProficiencyCompetency.Competency/equanda-table
+.label.en Competency
+.label.nl Competentie
+.key field.ProficiencyCompetency.ProficiencyLevel/equanda-table
+.label.en Proficiency Level
+.label.nl Vaardigheidsniveau
+.key field.ProficiencyCompetency.ProficiencyScore/equanda-table
+.label.en Proficiency Level
+.caption.en Discrete proficiency level
+.label.nl Vaardigheidsniveau
+.caption.nl Discreet vaardigheidsniveau
+.key field.Scale.AllowedValues/equanda-table
+.label.en Allowed Values
+.label.nl Toegestane waarden
+.key field.Scale.ApplicationDomains/equanda-table
+.label.en Application Domains
+.label.nl Toepassingsgebieden
+.key field.Scale.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.Scale.Discrete/equanda-table
+.label.en Discrete
+.label.nl Discreet
+.key field.Scale.MaximumValue/equanda-table
+.label.en Maximum Value
+.label.nl Maximumwaarde
+.key field.Scale.MinimumValue/equanda-table
+.label.en Minimum Value
+.label.nl Minimumwaarde
+.key field.Scale.Organizations/equanda-table
+.label.en Organizations
+.label.nl Organisaties
+.key field.Scale.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.Scale.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.Score.Commitments/equanda-table
+.label.en Semantic Definitions
+.label.nl Semantische definities
+.key field.Score.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.Score.Scale/equanda-table
+.label.en Scale
+.label.nl Schaal
+.key field.Score.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.Score.Value/equanda-table
+.label.en Value
+.label.nl Waarde
+.key field.ScoreCommitment.Commitment/equanda-table
+.label.en Semantic Definition
+.label.nl Semantische definitie
+.key field.ScoreCommitment.Competency/equanda-table
+.label.en Competency
+.label.nl Competentie
+.key field.ScoreCommitment.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.ScoreCommitment.Score/equanda-table
+.label.en Score
+.label.nl Score
+.key field.ScoreCommitment.Value/equanda-table
+.label.en Value
+.label.nl Waarde
+.key field.TaskArtifactKind.Description/equanda-table
+.label.en Description
+.label.nl Beschrijving
+.key field.TaskArtifactKind.Organizations/equanda-table
+.label.en Organizations
+.label.nl Organisaties
+.key field.TaskArtifactKind.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key field.TaskArtifactKind.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key field.WeighedCompetency.Competency/equanda-table
+.label.en Competency
+.label.nl Competentie
+.key field.WeighedCompetency.MinimumProficiencyLevel/equanda-table
+.label.en Minimum Proficiency Level
+.label.nl Minimum vaardigheidsniveau
+.key field.WeighedCompetency.MinimumProficiencyScore/equanda-table
+.label.en Minimum Score
+.label.nl Minimumscore
+.key field.WeighedCompetency.Parent/equanda-table
+.label.en Parent
+.label.nl Ouder
+.key field.WeighedCompetency.Required/equanda-table
+.label.en Required
+.label.nl Verplicht
+.key field.WeighedCompetency.Weight/equanda-table
+.label.en Weight
+.label.nl Gewicht
+.key group.Artifact.Address/equanda-table
+.label.en Address
+.label.nl Adres
+.key group.Artifact.Assignments/equanda-table
+.label.en Assignments
+.label.nl Toewijzingen
+.key group.Artifact.Content/equanda-table
+.label.en Content
+.label.nl Inhoud
+.key group.Artifact.PersonInfo/equanda-table
+.label.en Person info
+.label.nl Persoonsinfo
+.key group.AssessedArtifact.AssessmentScore/equanda-table
+.label.en Assessment Score
+.label.nl Evaluatiescore
+.key group.AssessedCompetency.AssessmentScore/equanda-table
+.label.en Assessment Score
+.label.nl Evaluatiescore
+.key group.AssessedCompetencyLevel.ProficiencyScore/equanda-table
+.label.en Proficiency Score
+.label.nl Vaardigheidsscore
+.key group.Commitment.RollupRules/equanda-table
+.label.en Combination Rules
+.label.nl Combinatieregels
+.key group.DeltaProficiencyCompetency.DeltaProficiencyScore/equanda-table
+.label.en Proficiency Score Delta
+.label.nl Delta Vaardigheidsscore
+.key group.MatchProfile.Fluency/equanda-table
+.label.en Fluency
+.label.nl Vlotheid
+.key group.MatchProfile.Relevancy/equanda-table
+.label.en Relevancy
+.label.nl Relevantie
.key group.Organization.Address/equanda-table
.label.en Address
.label.nl Adres
+.key group.ProficiencyCompetency.ProficiencyScore/equanda-table
+.label.en Proficiency Score
+.label.nl Vaardigheidsscore
+.key group.WeighedCompetency.MinimumProficiencyScore/equanda-table
+.label.en Minimum Proficiency Score
+.label.nl Minimum vaardigheidsscore
+.key import.Data/app
+.label.en Data to import
+.label.nl Te importeren data
+.key layout.Actions/app
+.label.en Actions
+.label.nl Acties
+.key layout.Environment/app
+.label.en About
+.label.nl Aangaande
+.key layout.Help/app
+.label.en Help
+.label.nl Help
+.key layout.LoggedInUser/app
+.label.en Logged in user :
+.label.nl Ingelogde gebruiker :
+.key layout.Menu/app
+.label.en Shortcut Menu
+.label.nl Snelmenu
+.key layout.Other/app
+.label.en Main Menu
+.label.nl Hoofdmenu
+.key layout.PoweredBy
+.label.en Powered by the skabacca project.
+.label.nl Resultaat van het skabacca project.
+.key layout.PoweredBy/app
+.label.en Powered by the skabacca project
+.label.nl Powered by the skabacca project
+.key layout.ReverseLinks/app
+.label.en Reverse links
+.label.nl Reverse links
+.key layout.RoleConfigurations/app
+.label.en Role configurations
+.label.nl Rol instellingen
+.key layout.SearchBy/app
+.label.en Search by
+.label.nl Zoeken op
+.key layout.User/app
+.label.en User
+.label.nl Gebruiker
+.key layout.UserLogout/app
+.label.en Log out
+.label.nl Uitloggen
+.key layout.UserOrganization/app
+.label.en Organization :
+.label.nl Organisation :
+.key layout.UserPreferences/app
+.label.en User Preferences
+.label.nl Gebruikersvoorkeuren
+.key login.Password/app
+.label.en Password
+.label.nl Paswoord
+.key login.Submit/app
+.label.en Login
+.label.nl Login
+.key login.UserName/app
+.label.en Username
+.label.nl Login
+.key logout.BackToStart/app
+.label.en Back to skabacca
+.label.nl Terug naar de skabacca
+.key logout.YouHaveBeenLoggedOut/app
+.label.en You have been logged out.
+.label.nl Het systeem heeft je uitgelogd.
.key menu.alerts/equanda-skin
.label.en Alerts
.label.nl Meldingen
@@ -205,7 +1258,7 @@
.label.en Configuration
.label.nl Configuratie
.key menu.gui/equanda-skin
-.label.en Base tables
+.label.en Base Tables
.label.nl Basistabellen
.key menu.import/equanda-skin
.label.en Import
@@ -213,6 +1266,151 @@
.key menu.reports/equanda-skin
.label.en Reports
.label.nl Rapporten
+.key page.ApplicationDomain.ALL/equanda-table
+.label.en All
+.caption.en Application Domains
+.label.nl Alle
+.caption.nl Toepassingsgebieden
+.key page.ApplicationDomain.default/equanda-table
+.label.en Default
+.caption.en Application Domain
+.label.nl Standaard
+.caption.nl Toepassingsdomein
+.key page.Artifact.ALL/equanda-table
+.label.en All
+.caption.en Artefacts
+.label.nl Alle
+.caption.nl Artefacten
+.key page.Artifact.default/equanda-table
+.label.en Default
+.caption.en Artefact
+.label.nl Standaard
+.caption.nl Artefact
+.key page.ArtifactCategory.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.ArtifactCategory.default/equanda-table
+.label.en Default
+.label.nl Standaard
+.key page.AssessedArtifact.ALL/equanda-table
+.label.en All
+.caption.en Assessed Artefacts
+.label.nl Alle
+.caption.nl Geëvalueerde artefacten
+.key page.AssessedArtifact.default/equanda-table
+.label.en Default
+.caption.en Assessed Artefact
+.label.nl Standaard
+.caption.nl Geëvalueerd artefact
+.key page.AssessedCompetency.ALL/equanda-table
+.label.en All
+.caption.en Assessed Competency
+.label.nl Alle
+.caption.nl Geëvalueerde compentie
+.key page.AssessedCompetency.default/equanda-table
+.label.en Default
+.caption.en Assessed Competency
+.label.nl Standaard
+.caption.nl Geëvalueerde competentie
+.key page.AssessedCompetencyLevel.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.AssessedCompetencyLevel.default/equanda-table
+.label.en Default
+.caption.en Assessed Competency Level
+.label.nl Standaard
+.caption.nl Niveau geëvalueerde competentie
+.key page.AssessmentMethod.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.AssessmentMethod.default/equanda-table
+.label.en Default
+.caption.en Assessment Method
+.label.nl Standaard
+.caption.nl Evaluatiemethode
+.key page.AssessmentScale.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.AssessmentScale.default/equanda-table
+.label.en Default
+.caption.en Assessment Scale
+.label.nl Standaard
+.caption.nl Evaluatieschaal
+.key page.AssessmentScore.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.AssessmentScore.default/equanda-table
+.label.en Default
+.caption.en Assessment Score
+.label.nl Standaard
+.caption.nl Evaluatiescore
+.key page.Commitment.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.Commitment.default/equanda-table
+.label.en Default
+.caption.en Contextualized Competency
+.label.nl Standaard
+.caption.nl Gecontextualiseerde competentie
+.key page.Competency.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.Competency.default/equanda-table
+.label.en Default
+.caption.en Competency
+.label.nl Standaard
+.caption.nl Competentie
+.key page.CompetencyCategory.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.CompetencyCategory.default/equanda-table
+.label.en Default
+.caption.en Competenty Category
+.label.nl Standaard
+.caption.nl Competentiecategorie
+.key page.CompetencyPlan.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.CompetencyPlan.default/equanda-table
+.label.en Default
+.caption.en Competency Plan
+.label.nl Standaard
+.caption.nl Competentieplan
+.key page.CompetencyPlanAssignment.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.CompetencyPlanAssignment.default/equanda-table
+.label.en Default
+.caption.en Competency Plan Assignment
+.label.nl Standaard
+.caption.nl Toekenning competentieplan
+.key page.Context.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.Context.default/equanda-table
+.label.en Default
+.caption.en Context
+.label.nl Standaard
+.caption.nl Context
+.key page.Criterion.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.Criterion.default/equanda-table
+.label.en Default
+.caption.en Criterion
+.label.nl Standaard
+.caption.nl Criterium
+.key page.CriterionScore.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.CriterionScore.default/equanda-table
+.label.en Default
+.caption.en Criterion Score
+.label.nl Standaard
+.caption.nl Criteriumscore
+.key page.DeltaProficiencyCompetency.default/equanda-table
+.label.en Delta Proficiency
+.label.nl Vaardigheidheidsniveau delta
.key page.EquandaAlert.default/equanda-table
.label.en Alert
.label.nl Melding
@@ -226,32 +1424,346 @@
.label.en Right
.label.nl Recht
.key page.EquandaRole.default/equanda-table
-.label.en Role
-.label.nl Role
+.label.en Default
+.caption.en Role
+.label.nl Standaard
+.caption.nl Rol
.key page.EquandaUser.ALL/equanda-table
.label.en All
.label.nl Alle
.key page.EquandaUser.default/equanda-table
-.label.en User
-.label.nl Gebruiker
+.label.en Default
+.caption.en User
+.label.nl Standaard
+.caption.nl Gebruiker
+.key page.LearningArtifactKind.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.LearningArtifactKind.default/equanda-table
+.label.en Default
+.caption.en Learning Artefact Type
+.label.nl Standaard
+.caption.nl Type leerartefact
+.key page.LearningContentType.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.LearningContentType.default/equanda-table
+.label.en Default
+.label.nl Standaard
+.key page.MatchProfile.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.MatchProfile.default/equanda-table
+.label.en Default
+.caption.en Match Profile
+.label.nl Standaard
+.caption.nl Matchprofiel
.key page.Organization.ALL/equanda-table
.label.en All
.label.nl Alle
.key page.Organization.default/equanda-table
-.label.en Organization
-.label.nl Organisatie
+.label.en Default
+.caption.en Organization
+.label.nl Standaard
+.caption.nl Organisatie
+.key page.ProficiencyCompetency.default/equanda-table
+.label.en Default
+.caption.en Proficiency Competency
+.label.nl Standaard
+.caption.nl Vaardigheidscompetentie
+.key page.Scale.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.Scale.default/equanda-table
+.label.en Default
+.caption.en Scale
+.label.nl Standaard
+.caption.nl Schaal
+.key page.Score.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.Score.default/equanda-table
+.label.en Default
+.caption.en Score
+.label.nl Standaard
+.caption.nl Score
+.key page.ScoreCommitment.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.ScoreCommitment.default/equanda-table
+.label.en Default
+.label.nl Standaard
+.key page.TaskArtifactKind.ALL/equanda-table
+.label.en All
+.label.nl Alle
+.key page.TaskArtifactKind.default/equanda-table
+.label.en Default
+.caption.en Task Artefact Type
+.label.nl Standaard
+.caption.nl Type taakartefact
+.key page.WeighedCompetency.default/equanda-table
+.label.en Default
+.caption.en Weighted Competency
+.label.nl Standaard
+.caption.nl Gewogen competentie
+.key pagelink.EvidenceDistillation/app
+.label.en Person Competency Profile (Evidence Distillation)
+.label.nl Persoonlijk competentieprofiel (Bewijsdistillatie)
+.key pagelink.MatchCompetencyPlan/app
+.label.en Match Competency Plan
+.label.nl Competentieplan matchen
+.key pagelink.MatchPersonTask/app
+.label.en Find Learning Path (Match Person and Task)
+.label.nl Leerpad zoeken (Persoon en taak matchen)
+.key pagelink.MatchTask/app
+.label.en Find Best Person (Match Task)
+.label.nl Beste persoon zoeken (Taak matchen)
+.key pagelink.MatcherIndex/app
+.label.en Matching Index Statuses
+.label.nl Matchingindexstatussen
+.key pagelink.PersonRoleAssessment/app
+.label.en Evaluation of competenties for assigned tasks
+.label.nl Evaluatie van competenties voor toegewezen taken
+.key pagelink.SelfAssessment/app
+.label.en Self assessment for assigned tasks
+.label.nl Zelfevaluatie voor toegewezen taken
+.key pagelink.UiImport/app
+.label.en Import
+.label.nl Importeren
+.key pagelink.all.Artifact/app
+.label.en Artefacts
+.label.nl Artefacten
+.key pagelink.all.Commitment/app
+.label.en Contextualized Competencies
+.label.nl Gecontextualiseerde competenties
+.key pagelink.all.Competency/app
+.label.en Competencies
+.label.nl Competenties
+.key pagelink.all.CompetencyPlan/app
+.label.en Competency Plans
+.label.nl Competentieplannen
+.key pagelink.all.LearningArtifact/app
+.label.en Learning objects
+.label.nl Leerobjecten
+.key pagelink.all.Organization/app
+.label.en Organizations
+.label.nl Organisaties
+.key pagelink.all.PersonArtifact/app
+.label.en Persons
+.label.nl Personen
+.key pagelink.all.TaskArtifact/app
+.label.en Tasks
+.label.nl Taken
+.key pagelink.create.CompetencyAssessment/app
+.label.en Add Competency Assessment
+.label.nl Competentie-evaluatie toevoegen
+.key pagelink.create.TaskAssessment/app
+.label.en Add Task or Learning Assessment
+.label.nl Taak- of leerevaluatie toevoegen
+.key param.Artifact.getCompetencyProfile.matchProfileReference/equanda-table
+.label.en Match Profile
+.label.nl Matchprofiel
.key param.EquandaRole.mergeRestrictions.mergeName/equanda-table
-.label.en To merge
+.label.en To be merged
.label.nl Te mengen
.key param.EquandaRole.mergeRestrictions.resultName/equanda-table
.label.en Result
.label.nl Resultaat
.key param.EquandaRole.mergeRights.mergeName/equanda-table
-.label.en To Merge
-.label.nl Te Mengen
+.label.en To be merged
+.label.nl Te mengen
.key param.EquandaRole.mergeRights.resultName/equanda-table
.label.en Result
.label.nl Resultaat
+.key parameter.ApplicationDomain.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Omschrijving (Deel)
+.key parameter.ApplicationDomain.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Omschrijving (Begin)
+.key parameter.ApplicationDomain.EquandaReferenceStart.Reference/equanda-table
+.label.en Reference (Start)
+.label.nl Referentie (Begin)
+.key parameter.ApplicationDomain.Reference.Reference/equanda-table
+.label.en Application Domain
+.label.nl Toepassingsdomein
+.key parameter.Artifact.Category.ArtifactCategories/equanda-table
+.label.en Categories
+.label.nl Categoriën
+.key parameter.Artifact.Criterion.Reference/equanda-table
+.label.en Criterion
+.label.nl Criterium
+.key parameter.Artifact.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Omschrijving (Deel)
+.key parameter.Artifact.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Omschrijving (Begin)
+.key parameter.Artifact.EquandaReferenceStart.Reference/equanda-table
+.label.en Reference (Start)
+.label.nl Referentie (Begin)
+.key parameter.Artifact.Organization.Organization/equanda-table
+.label.en Organization
+.label.nl Organisatie
+.key parameter.Artifact.ParentOf.Reference/equanda-table
+.label.en Parent of
+.label.nl Ouder van
+.key parameter.Artifact.PersonReference.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key parameter.Artifact.Reference.Reference/equanda-table
+.label.en Artefacts
+.label.nl Artefact
+.key parameter.Artifact.ReferenceOrganization.Organization/equanda-table
+.label.en Organization
+.label.nl Organizatie
+.key parameter.Artifact.ReferenceOrganization.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key parameter.ArtifactCategory.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Beschrijving (Deel)
+.key parameter.ArtifactCategory.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Beschrijving (Begin)
+.key parameter.ArtifactCategory.Title.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key parameter.AssessedArtifact.Artifact.Reference/equanda-table
+.label.en Artefact
+.label.nl Artefact
+.key parameter.AssessedArtifact.Person.Reference/equanda-table
+.label.en Person
+.label.nl Persoon
+.key parameter.AssessedArtifact.PersonId.Person/equanda-table
+.label.en Person
+.label.nl Persoon
+.key parameter.AssessedCompetency.Person.Reference/equanda-table
+.label.en Person
+.label.nl Persoon
+.key parameter.AssessedCompetency.PersonId.Person/equanda-table
+.label.en Person
+.label.nl Persoon
+.key parameter.AssessmentMethod.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Omschrijving (Deel)
+.key parameter.AssessmentMethod.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Omschrijving (Begin)
+.key parameter.AssessmentMethod.EquandaReferenceStart.Reference/equanda-table
+.label.en Reference (Start)
+.label.nl Referentie (Begin)
+.key parameter.AssessmentMethod.Reference.Reference/equanda-table
+.label.en Assessment Method
+.label.nl Evaluatiemethode
+.key parameter.AssessmentScale.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Omschrijving (Deel)
+.key parameter.AssessmentScale.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Omschrijving (Begin)
+.key parameter.AssessmentScale.EquandaReferenceStart.Reference/equanda-table
+.label.en Reference (Start)
+.label.nl Referentie (Begin)
+.key parameter.AssessmentScale.Reference.Reference/equanda-table
+.label.en Assessment Scale
+.label.nl Evaluatieschaal
+.key parameter.AssessmentScore.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Omschrijving (Deel)
+.key parameter.AssessmentScore.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Omschrijving (Begin)
+.key parameter.Commitment.Category.CompetencyCategories/equanda-table
+.label.en Category
+.label.nl Categorie
+.key parameter.Commitment.Context.Context/equanda-table
+.label.en Context
+.label.nl Context
+.key parameter.Commitment.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Omschrijving (Deel)
+.key parameter.Commitment.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Omschrijving (Begin)
+.key parameter.Commitment.EquandaReferenceStart.Reference/equanda-table
+.label.en Reference (Start)
+.label.nl Referentie (Begin)
+.key parameter.Commitment.HasSemantics.Commitment/equanda-table
+.label.en Commitment
+.label.nl Commitment
+.key parameter.Commitment.Reference.Reference/equanda-table
+.label.en Contextualized Competency
+.label.nl Gecontextualiseerde competentie
+.key parameter.Competency.Category.CompetencyCategories/equanda-table
+.label.en Category
+.label.nl Categorie
+.key parameter.Competency.Context.Reference/equanda-table
+.label.en Context
+.label.nl Context
+.key parameter.Competency.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Omschrijving (Deel)
+.key parameter.Competency.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Omschrijving (Begin)
+.key parameter.Competency.EquandaReferenceStart.Reference/equanda-table
+.label.en Reference (Start)
+.label.nl Referentie (Begin)
+.key parameter.Competency.Organization.Reference/equanda-table
+.label.en Organization
+.label.nl Organisatie
+.key parameter.Competency.Reference.Reference/equanda-table
+.label.en Competency
+.label.nl Competentie
+.key parameter.CompetencyCategory.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Omschrijving (Deel)
+.key parameter.CompetencyCategory.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Omschrijving (Begin)
+.key parameter.CompetencyCategory.Title.Title/equanda-table
+.label.en Title
+.label.nl Titel
+.key parameter.CompetencyPlan.Active.Inactive/equanda-table
+.label.en Inactive
+.label.nl Niet actief
+.key parameter.CompetencyPlan.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Omschrijving (Deel)
+.key parameter.CompetencyPlan.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Omschrijving (Begin)
+.key parameter.CompetencyPlan.EquandaReferenceStart.Reference/equanda-table
+.label.en Reference (Start)
+.label.nl Referentie (Begin)
+.key parameter.CompetencyPlan.Reference.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key parameter.Context.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Omschrijving (Deel)
+.key parameter.Context.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Omschrijving (Begin)
+.key parameter.Context.EquandaReferenceStart.Reference/equanda-table
+.label.en Reference (Start)
+.label.nl Referentie (Begin)
+.key parameter.Context.Reference.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
+.key parameter.Criterion.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Omschrijving (Deel)
+.key parameter.Criterion.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Omschrijving (Begin)
+.key parameter.Criterion.EquandaReferenceStart.Reference/equanda-table
+.label.en Reference (Start)
+.label.nl Referentie (Begin)
+.key parameter.Criterion.Reference.Reference/equanda-table
+.label.en Reference
+.label.nl Referentie
.key parameter.EquandaAlert.AlertType.AlertType/equanda-table
.label.en Alert Type
.label.nl Type Melding
@@ -264,6 +1776,12 @@
.key parameter.EquandaAlert.Time.Before/equanda-table
.label.en Before
.label.nl Voor
+.key parameter.EquandaAttachment.EquandaDescriptionPart.Description/equanda-table
+.label.en Description (Part)
+.label.nl Beschrijving (Deel)
+.key parameter.EquandaAttachment.EquandaDescriptionStart.Description/equanda-table
+.label.en Description (Start)
+.label.nl Beschrijving (Start)
.key parameter.EquandaAttachment.EquandaNamePart.Name/equanda-table
.label.en Name (part)
.label.nl Naam (begin)
@@ -274,11 +1792,11 @@
.label.en Identifier
.label.nl Identifier
.key parameter.EquandaRole.EquandaDescriptionPart.Description/equanda-table
-.label.en Description (part)
-.label.nl Beschrijving (begin)
+.label.en Description (Part)
+.label.nl Omschrijving (Deel)
.key parameter.EquandaRole.EquandaDescriptionStart.Description/equanda-table
-.label.en Description (start)
-.label.nl Description (begin)
+.label.en Description (Start)
+.label.nl Omschrijving (Begin)
.key parameter.EquandaRole.Role.RoleName/equanda-table
.label.en Role Name
.label.nl Rolnaam
@@ -297,18 +1815,348 @@
.key parameter.EquandaUser.Organization.Reference/equanda-table
.label.en Reference
.label.nl Referentie
+.key parameter.EquandaUser.Role.Roles/equanda-table
+.label.en Roles
+.label.nl Rollen
.key parameter.EquandaUser.UserName.UserName/equanda-table
.label.en Username
.label.nl Gebruikersnaam
.key parameter.EquandaUser.UserPassword.Password/equanda-table
.label.en Password
-.label.nl Paswoord
+.label.nl Wachtwoord
.key parameter.EquandaUser.UserPassword.UserName/equanda-table
.label.en Username
.label.nl Gebruikersnaam
+.key parameter.LearningArtifactK...
[truncated message content] |
