diff --git a/.liquibase/Data_alias/basic/2019.2/AditoBasic/extendKeywordOrganisationType.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/extendKeywordOrganisationType.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bb786527e4b9ae046d8e63dce9123e8ad696779f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/AditoBasic/extendKeywordOrganisationType.xml
@@ -0,0 +1,40 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.goderbauer" id="26ab4f8b-edbf-49c3-a7a3-1e48ca369119">
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="SORTING" valueNumeric="6"/>
+ <where>AB_KEYWORD_ENTRY.CONTAINER = ? and SORTING = ?</where>
+ <whereParams>
+ <param value="OrganisationType" />
+ <param valueNumeric="3" />
+ </whereParams>
+ </update>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="7ac75d3d-243c-49d2-9f50-25403fab003a"/>
+ <column name="KEYID" value="dbb3f596-bd2b-4e08-baef-ba28d7b752e9"/>
+ <column name="TITLE" value="Manufacturer"/>
+ <column name="CONTAINER" value="OrganisationType"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/><!-- e.g. used in Product -->
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="2b9c1bdf-b0bb-447d-a57d-e369cf475fca"/>
+ <column name="KEYID" value="eccaf9de-5c7b-4b6e-ab77-0b33d8486f29"/>
+ <column name="TITLE" value="Competitor"/>
+ <column name="CONTAINER" value="OrganisationType"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/><!-- e.g. used in SalesprojectMember -->
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="45438bcf-74cf-408f-bc4d-5d70595369c8"/>
+ <column name="KEYID" value="e9f133a7-27b4-4ce1-ab93-03876ec3de61"/>
+ <column name="TITLE" value="Partner"/>
+ <column name="CONTAINER" value="OrganisationType"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/AditoBasic/removeAttributeKeywordTargetGroup.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/removeAttributeKeywordTargetGroup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a758e72cef065e43d8e2957e10d8cb1c0751fa31
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/AditoBasic/removeAttributeKeywordTargetGroup.xml
@@ -0,0 +1,29 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.goderbauer" id="26f320dcd1-9e9d-4a35-a399-ce98c7aa2e11">
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRY.CONTAINER = ?</where>
+ <whereParams>
+ <param value="TargetGroup" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTE.AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_ATTRIBUTERELATION">
+ <where>AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID = ?</where>
+ <whereParams>
+ <param value="5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = ?</where>
+ <whereParams>
+ <param value="5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53" />
+ </whereParams>
+ </delete>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/Classification/create_classification_tables.xml b/.liquibase/Data_alias/basic/2019.2/Classification/create_classification_tables.xml
new file mode 100644
index 0000000000000000000000000000000000000000..40c738cbad5282b932f5cbe281615e7790055164
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/Classification/create_classification_tables.xml
@@ -0,0 +1,41 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="85efe5d3-8032-4277-9177-3daa11951bb0">
+ <createTable tableName="CLASSIFICATION">
+ <column name="CLASSIFICATIONID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATION_CLASSIFICATIONID"/>
+ </column>
+ <column name="CLASSIFICATIONSCORE_ID" type="CHAR(36)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="CLASSIFICATIONTYPE_ID" type="CHAR(36)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="OBJECT_TYPE" type="VARCHAR(50)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="OBJECT_ROWID" type="CHAR(36)">
+ <constraints nullable="false"/>
+ </column>
+ </createTable>
+
+ <createTable tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONSCORE_CLASSIFICATIONSCOREID"/>
+ </column>
+ <column name="SCORETYPE" type="VARCHAR(80)"/>
+ <column name="TITLE" type="NVARCHAR(50)"/>
+ <column name="SCORE" type="NUMERIC(10,2)"/>
+ <column name="SORT" type="INTEGER"/>
+ </createTable>
+
+ <createTable tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONTYPEID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONTYPE_CLASSIFICATIONTYPEID"/>
+ </column>
+ <column name="CLASSIFICATIONTYPE" type="CHAR(36)"/>
+ <column name="SCORETYPE" type="VARCHAR(80)"/>
+ <column name="CLASSIFICATIONNUMBER" type="INTEGER"/>
+ </createTable>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_scores.xml b/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_scores.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c540fee5688e8a36a6047a7a7b87d3eab309e294
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_scores.xml
@@ -0,0 +1,417 @@
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="286d5a05-7618-414b-9e96-81b1c407b473">
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="01840c9d-2856-4882-a12a-303e58fd9d30"/>
+ <column name="SCORETYPE" value="ScoreDepartment"/>
+ <column name="TITLE" value="Purchasing"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="50"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="0803779b-73d8-47b3-9705-f5771c01e6a3"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Automotive"/>
+ <column name="SCORE" valueNumeric="33.30"/>
+ <column name="SORT" valueNumeric="140"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="10419ecc-335b-43c3-a1e3-8ecfbeda6f2b"/>
+ <column name="SCORETYPE" value="ScoreDepartment"/>
+ <column name="TITLE" value="Project management"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="60"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="11418754-1667-437b-816b-adec4b9291f3"/>
+ <column name="SCORETYPE" value="ScoreProjectStart"/>
+ <column name="TITLE" value="No project planned"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="40"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="1bc2b2aa-2582-4b0c-a2f8-04125b82ba33"/>
+ <column name="SCORETYPE" value="ScoreDepartment"/>
+ <column name="TITLE" value="Service"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="40"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="1f924d71-c500-4cdd-bc52-4718a6b88e45"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Consultation"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="70"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="2a516661-537d-473e-864a-c2f721b96a42"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Service"/>
+ <column name="SCORE" valueNumeric="33.30"/>
+ <column name="SORT" valueNumeric="180"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="2f3b6088-d78f-4fba-998d-b18a6b981485"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Environment"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="170"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
+ <column name="SCORETYPE" value="ScoreBudget"/>
+ <column name="TITLE" value="0 to 49T"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="50"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+ <column name="SCORETYPE" value="ScoreBased"/>
+ <column name="TITLE" value="Germany"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="3035e36e-ee6a-45d1-9d68-920cd3666362"/>
+ <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="TITLE" value="Student/Internship"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="70"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="35d8ae15-8993-4ab2-99f6-e57c2ebf0bb3"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Food"/>
+ <column name="SCORE" valueNumeric="33.30"/>
+ <column name="SORT" valueNumeric="80"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="39547328-ccc6-47ad-b31a-d6a149081c44"/>
+ <column name="SCORETYPE" value="ScoreUsers"/>
+ <column name="TITLE" value="0 to 49"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="50"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+ <column name="SCORETYPE" value="ScoreUsers"/>
+ <column name="TITLE" value="251 to 1000"/>
+ <column name="SCORE" valueNumeric="30.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+ <column name="SCORETYPE" value="ScoreCustomizing"/>
+ <column name="TITLE" value="Yes"/>
+ <column name="SCORE" valueNumeric="25.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+ <column name="SCORETYPE" value="ScoreStandard"/>
+ <column name="TITLE" value="Standard"/>
+ <column name="SCORE" valueNumeric="12.50"/>
+ <column name="SORT" valueNumeric="20"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Public"/>
+ <column name="SCORE" valueNumeric="50.00"/>
+ <column name="SORT" valueNumeric="190"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="41300a6c-8dc7-4b5a-9fb1-cecd3d5cbb8c"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Electric"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="160"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="41d43723-7d19-4a7e-936a-df9013db7dfb"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Logistics"/>
+ <column name="SCORE" valueNumeric="50.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
+ <column name="SCORETYPE" value="ScoreDepartment"/>
+ <column name="TITLE" value="Sales"/>
+ <column name="SCORE" valueNumeric="7.50"/>
+ <column name="SORT" valueNumeric="20"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="56a56ec0-34c1-419f-81c2-1c1310d685d2"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Education"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="120"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="5ca391a5-9de8-41e6-9792-17cf8deaa7e7"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Energy"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="90"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="61fe4e4f-e64d-4195-87b5-658f36ce1736"/>
+ <column name="SCORETYPE" value="ScoreStandard"/>
+ <column name="TITLE" value="Individual"/>
+ <column name="SCORE" valueNumeric="25.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="636af750-fcd3-4480-bfe7-ead42bf85280"/>
+ <column name="SCORETYPE" value="ScoreDecisionPhase"/>
+ <column name="TITLE" value="Choice"/>
+ <column name="SCORE" valueNumeric="30.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="6bd19de4-691b-4e78-84dc-cf6f41231978"/>
+ <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="TITLE" value="Management/Sales Manager"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="6d6653ae-024e-444c-aeae-561874d55569"/>
+ <column name="SCORETYPE" value="ScoreBudget"/>
+ <column name="TITLE" value="50 to 99T"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="40"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="77a0088c-a665-4feb-9f60-99c1eb710015"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Lifesience"/>
+ <column name="SCORE" valueNumeric="33.30"/>
+ <column name="SORT" valueNumeric="50"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="7d6f716a-97c7-417b-a8c0-3cb71e403dde"/>
+ <column name="SCORETYPE" value="ScoreBased"/>
+ <column name="TITLE" value="Other"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="7e569319-5885-452e-9331-a507f3365236"/>
+ <column name="SCORETYPE" value="ScoreDepartment"/>
+ <column name="TITLE" value="Overarching"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="90361317-d80e-4466-a45b-3021bf02e2f9"/>
+ <column name="SCORETYPE" value="ScoreUsers"/>
+ <column name="TITLE" value="101 to 250"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="9a3183db-8a38-4cf1-a234-3e2cf20a4f77"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="IT"/>
+ <column name="SCORE" valueNumeric="33.30"/>
+ <column name="SORT" valueNumeric="40"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+ <column name="SCORETYPE" value="ScoreCloud"/>
+ <column name="TITLE" value="OnPremise"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="a0fcd2e2-40c8-40b8-8a5b-e591154c248a"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Lottery"/>
+ <column name="SCORE" valueNumeric="33.30"/>
+ <column name="SORT" valueNumeric="110"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="a177b155-4665-4af1-b50e-0b59e8ac2752"/>
+ <column name="SCORETYPE" value="ScoreBased"/>
+ <column name="TITLE" value="Switzerland"/>
+ <column name="SCORE" valueNumeric="7.50"/>
+ <column name="SORT" valueNumeric="40"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="a61e3451-296b-4812-a7b2-425963176f80"/>
+ <column name="SCORETYPE" value="ScoreCloud"/>
+ <column name="TITLE" value="Cloud"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="a7e70abc-4d98-467d-a475-66bbd101de1d"/>
+ <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="TITLE" value="Head of IT"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="b1c55bcd-16c6-4b2f-8f73-e16397b40e93"/>
+ <column name="SCORETYPE" value="ScoreUsers"/>
+ <column name="TITLE" value="from 1,000"/>
+ <column name="SCORE" valueNumeric="30.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
+ <column name="SCORETYPE" value="ScoreProjectStart"/>
+ <column name="TITLE" value="Within 6 months"/>
+ <column name="SCORE" valueNumeric="30.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
+ <column name="SCORETYPE" value="ScoreBudget"/>
+ <column name="TITLE" value="200 to 349T"/>
+ <column name="SCORE" valueNumeric="30.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="bf44ae05-a4c4-4ee9-ad6e-7d64474afeff"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Finance"/>
+ <column name="SCORE" valueNumeric="16.60"/>
+ <column name="SORT" valueNumeric="60"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+ <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="TITLE" value="Service Manager"/>
+ <column name="SCORE" valueNumeric="15.00"/>
+ <column name="SORT" valueNumeric="40"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+ <column name="SCORETYPE" value="ScoreProjectStart"/>
+ <column name="TITLE" value="No date yet"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="c6300eeb-0494-4eba-89b1-23afdbb397e9"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Publishing house"/>
+ <column name="SCORE" valueNumeric="33.30"/>
+ <column name="SORT" valueNumeric="150"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="c9d4e28d-7935-42c5-9da5-5ce0b51b425a"/>
+ <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="TITLE" value="CRM Manager"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="d032f425-5739-4f0c-8103-e102fe0d3ccf"/>
+ <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="TITLE" value="Skilled workers"/>
+ <column name="SCORE" valueNumeric="15.00"/>
+ <column name="SORT" valueNumeric="50"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+ <column name="SCORETYPE" value="ScoreDecisionPhase"/>
+ <column name="TITLE" value="Rate"/>
+ <column name="SCORE" valueNumeric="15.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="d7d807a2-8a97-4a0e-9d1c-fb8c7a703599"/>
+ <column name="SCORETYPE" value="ScoreUsers"/>
+ <column name="TITLE" value="50 to 100"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="40"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="e6ab210e-6a26-4a12-9d50-ff8bd392c590"/>
+ <column name="SCORETYPE" value="ScoreDecisionPhase"/>
+ <column name="TITLE" value="Search"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="e70a23b4-f2a9-4438-8ba6-742c6c17e5cc"/>
+ <column name="SCORETYPE" value="ScoreCustomizing"/>
+ <column name="TITLE" value="No"/>
+ <column name="SCORE" valueNumeric="12.50"/>
+ <column name="SORT" valueNumeric="20"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="e824d7e3-dfbe-4f34-a5c7-8f2226aade7e"/>
+ <column name="SCORETYPE" value="ScoreBudget"/>
+ <column name="TITLE" value="100 to 199T"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="e8741cb0-9ada-48dd-89d1-f00a1a755c38"/>
+ <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="TITLE" value="Counsellor"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="60"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="ec51d975-bda6-415e-9b91-32f0e981ecd8"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Building and construction suppliers"/>
+ <column name="SCORE" valueNumeric="50.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="ecf421ef-66b2-4f9f-98c6-ee8a73e753da"/>
+ <column name="SCORETYPE" value="ScoreBased"/>
+ <column name="TITLE" value="Austria"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="ed6a38f7-97bf-4e3d-a34c-4a1e636fa6a7"/>
+ <column name="SCORETYPE" value="ScoreBudget"/>
+ <column name="TITLE" value="from 350T"/>
+ <column name="SCORE" valueNumeric="50.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="efec90bd-c99f-49d9-bd52-df0ae6f938a3"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Machinery and equipment"/>
+ <column name="SCORE" valueNumeric="50.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
+ <column name="SCORETYPE" value="ScoreDepartment"/>
+ <column name="TITLE" value="Marketing"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="f678b3e0-72c4-4b48-90c0-054bf3612dc2"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Trade"/>
+ <column name="SCORE" valueNumeric="33.30"/>
+ <column name="SORT" valueNumeric="130"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="fae1ef0a-5d07-4725-907f-4b2ac5814328"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="TITLE" value="Industry"/>
+ <column name="SCORE" valueNumeric="33.30"/>
+ <column name="SORT" valueNumeric="100"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="fb8cb769-d95b-468a-ac64-7ee0cefd46a7"/>
+ <column name="SCORETYPE" value="ScoreProjectStart"/>
+ <column name="TITLE" value="Within 12 months"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_types.xml b/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_types.xml
new file mode 100644
index 0000000000000000000000000000000000000000..04269b04e6331b3d90b2ec6a111d18796a17fe9c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_types.xml
@@ -0,0 +1,70 @@
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="f904e9fd-d5e1-4f9b-b334-5621132449ce">
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONTYPEID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+ <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONNUMBER" valueNumeric="1"/>
+ <column name="SCORETYPE" value="ScoreBased"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONTYPEID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+ <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONNUMBER" valueNumeric="1"/>
+ <column name="SCORETYPE" value="ScoreBranch"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONTYPEID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+ <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONNUMBER" valueNumeric="1"/>
+ <column name="SCORETYPE" value="ScoreUsers"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONTYPEID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+ <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONNUMBER" valueNumeric="2"/>
+ <column name="SCORETYPE" value="ScoreBudget"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONTYPEID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+ <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONNUMBER" valueNumeric="2"/>
+ <column name="SCORETYPE" value="ScoreCustomizing"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONTYPEID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+ <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONNUMBER" valueNumeric="2"/>
+ <column name="SCORETYPE" value="ScoreStandard"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONTYPEID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+ <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONNUMBER" valueNumeric="3"/>
+ <column name="SCORETYPE" value="ScoreCloud"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONTYPEID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+ <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONNUMBER" valueNumeric="3"/>
+ <column name="SCORETYPE" value="ScoreDepartment"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONTYPEID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+ <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONNUMBER" valueNumeric="3"/>
+ <column name="SCORETYPE" value="ScoreDecisionPhase"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONTYPEID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+ <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONNUMBER" valueNumeric="3"/>
+ <column name="SCORETYPE" value="ScorePosition"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONTYPEID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+ <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONNUMBER" valueNumeric="3"/>
+ <column name="SCORETYPE" value="ScoreProjectStart"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index a0a3f2ebe004e0569b30493b05f688b2a1f0759f..c667163ec915034d3692ea87b2acdab117cedd53 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -163,4 +163,11 @@
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignCostCategory.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml"/>
+
+ <include relativeToChangelogFile="true" file="Classification/create_classification_tables.xml"/>
+ <include relativeToChangelogFile="true" file="Classification/insert_classification_scores.xml"/>
+ <include relativeToChangelogFile="true" file="Classification/insert_classification_types.xml"/>
+
+ <include relativeToChangelogFile="true" file="AditoBasic/extendKeywordOrganisationType.xml"/>
+ <include relativeToChangelogFile="true" file="AditoBasic/removeAttributeKeywordTargetGroup.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
index 3d1f4c3b29c7cd36cdb58c30f8f06eb4bc4b0cea..ed487a5a71bc2f197a7f18edcbd66389faf0b7a9 100644
--- a/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
+++ b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
@@ -442,7 +442,7 @@
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="1f2749b3-1402-46fb-892a-e68b9a39065d"/>
<column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
- <column name="MIN_COUNT" valueNumeric="1"/>
+ <column name="MIN_COUNT" valueNumeric="0"/>
<column name="OBJECT_TYPE" value="Organisation"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
@@ -453,7 +453,7 @@
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="140b87a4-4f8e-4ae5-84d5-4bc26fa51901"/>
<column name="AB_ATTRIBUTE_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
- <column name="MIN_COUNT" valueNumeric="1"/>
+ <column name="MIN_COUNT" valueNumeric="0"/>
<column name="OBJECT_TYPE" value="Organisation"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
@@ -536,7 +536,7 @@
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="05576033-1bee-4547-ab82-fdfcdd039642"/>
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
- <column name="MIN_COUNT" valueNumeric="2"/>
+ <column name="MIN_COUNT" valueNumeric="1"/>
<column name="OBJECT_TYPE" value="Organisation"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
@@ -547,7 +547,7 @@
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
<column name="AB_ATTRIBUTE_ID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
- <column name="MIN_COUNT" valueNumeric="1"/>
+ <column name="MIN_COUNT" valueNumeric="0"/>
<column name="OBJECT_TYPE" value="Organisation"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
index d045c99388757f245242ffd31e52d3fabcab6a9c..b5195dab42f4d8f2218f945cf10e69a1139b7d06 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
@@ -7,7 +7,7 @@
</column>
<column name="BACKPACK" type="CLOB"/>
<column name="CAPTION" type="VARCHAR(512)"/>
- <column name="CREATIONDATE" type="BIGINT"/>
+ <column name="CREATIONDATE" type="TIMESTAMP"/>
<column name="DESCRIPTION" type="VARCHAR(1023)"/>
<column name="FORCEDPRIORITY" type="VARCHAR(15)"/>
<column name="ICON_INFO" type="VARCHAR(1023)"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 16125dbb1e92aece3bb37ac760d7d463213a5866..8de09d704e74582837bc2ffca80d301eb748ea31 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -9528,6 +9528,262 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>CLASSIFICATIONTYPE</name>
+ <dbName></dbName>
+ <idColumn>CLASSIFICATIONTYPEID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>SCORETYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="80" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CLASSIFICATIONTYPEID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CLASSIFICATIONNUMBER</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CLASSIFICATIONTYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>CLASSIFICATION</name>
+ <dbName></dbName>
+ <idColumn>CLASSIFICATIONID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>CLASSIFICATIONTYPE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OBJECT_ROWID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CLASSIFICATIONSCORE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CLASSIFICATIONID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OBJECT_TYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>CLASSIFICATIONSCORE</name>
+ <dbName></dbName>
+ <idColumn>CLASSIFICATIONSCOREID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>SCORETYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="80" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SCORE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2" />
+ <size v="10" />
+ <scale v="2" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CLASSIFICATIONSCOREID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SORT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TITLE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index eba6a0902171df7e8d2780f911da2290bb745f5c..0d177e8626540ded4bfa599f68b8485e5fa17b26 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -43,6 +43,7 @@
<node name="KeywordEntry" kind="10077" />
<node name="KeywordAttribute" kind="10077" />
<node name="ObjectRelationType" kind="10077" />
+ <node name="ClassificationAdmin" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 97cdc499fb89380aefa75d745a6dbc37ec5394ee..fac358483e655ed4957327bfd601fefd8488671b 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -103,7 +103,6 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -135,7 +134,6 @@
</entityParameter>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -427,18 +425,22 @@
</entityConsumer>
<entityField>
<name>USER_NEW</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
</entityFields>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 3e759ee766e32941875082eec13f678f45a5857a..22812c87250a31ceb015f1c4060c1ea1a3f05647 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -14,6 +14,7 @@
</entityField>
<entityField>
<name>UID</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/uid/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>ObjectType_param</name>
diff --git a/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
index 7409382ca9647cea62c56bf84e883a0bbe9618ff..15e5bd8050094175fd5fe8268c904f99002e0197 100644
--- a/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
@@ -2,9 +2,9 @@ import("ObjectRelation_lib");
import("system.neon");
import("system.vars");
-if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
{
- var selectedRows = JSON.parse(vars.get("$sys.selection"));
+ var selectedRows = JSON.parse(vars.getString("$sys.selection"));
var params = {
"ObjectType_param" : vars.get("$param.ObjectType_param"),
"ObjectRowId_param" : vars.get("$param.ObjectRowId_param")
diff --git a/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js b/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js
index 1600aca0c7b87edeec96b9ee5b8424eb9aa55d38..a398c25dfea02c14c520e9d932ecc46607d9db69 100644
--- a/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js
@@ -4,9 +4,9 @@ import("system.neon");
import("Attribute_lib");
var state = neon.COMPONENTSTATE_DISABLED;
-if (vars.exists("$local.rows"))
+if (vars.exists("$sys.selectionRows"))
{
- var row = JSON.parse(vars.get("$local.rows"))[0];
+ var row = JSON.parse(vars.getString("$sys.selectionRows"))[0];
if (row.AB_ATTRIBUTE_ID)
state = neon.COMPONENTSTATE_EDITABLE;
}
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index d7272d437efde682b4229c0a8a740e9d04f35586..a4103a08d2b54cabd3fb9db6911d21c55a25be28 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -17,7 +17,6 @@
<state>AUTO</state>
<valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
@@ -128,7 +127,6 @@
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js</onInsert>
<recordFields>
<element>UID.value</element>
diff --git a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 92dde9b3b1b0d9866b8b0323cecf5b9e07add0c6..47b855205d48ae27be7500b9c810a89b06e14086 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -40,7 +40,6 @@
</entityParameter>
<entityParameter>
<name>CampaignStepId_param</name>
- <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignparticipantsprovider/children/campaignstepid_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
</children>
diff --git a/entity/CampaignParticipant_entity/entityfields/campaignparticipantsprovider/children/campaignstepid_param/valueProcess.js b/entity/CampaignParticipant_entity/entityfields/campaignparticipantsprovider/children/campaignstepid_param/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
index 4e09ec798a27900e7e2ffeb2cb819458feb470a4..5c0b77f8819d8c7ff522a3d6b911cd45bc6c54ce 100644
--- a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
@@ -3,12 +3,12 @@ import("system.vars");
import("system.neon");
import("Campaign_lib");
logging.log("inOnAction -> ");
- logging.log("sys selection -> " + vars.get("$sys.selection"));
+ logging.log("sys selection -> " + vars.getString("$sys.selection"));
if(vars.exists("$sys.selection")) //selektierte IDs als Array
{
logging.log("campaignid -> " + vars.get("$field.CAMPAIGN_ID"));
logging.log("campaignstepid -> " + vars.get("$field.CAMPAIGNSTEP_ID"));
logging.log("contact id -> " + vars.get("$field.CONTACT_ID"));
- logging.log("sys selection -> " + vars.get("$sys.selection"));
- CampaignUtils.openSetCampaignStepView(vars.get("$sys.selection"), vars.get("$field.CAMPAIGN_ID"), vars.get("$field.CAMPAIGNSTEP_ID"));
+ logging.log("sys selection -> " + vars.getString("$sys.selection"));
+ CampaignUtils.openSetCampaignStepView(vars.getString("$sys.selection"), vars.get("$field.CAMPAIGN_ID"), vars.get("$field.CAMPAIGNSTEP_ID"));
}
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index c42c5cf31dd12bbaeb9f5fd470c460ba61f842bb..26df0d0a1a8dae016d4d6e0f8d1b492ef1ccd618 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -5,6 +5,7 @@
<icon>NEON:GROUP_APPOINTMENT</icon>
<title>Campaign Step</title>
<contentTitleProcess>%aditoprj%/entity/CampaignStep_entity/contentTitleProcess.js</contentTitleProcess>
+ <imageProcess>%aditoprj%/entity/CampaignStep_entity/imageProcess.js</imageProcess>
<titlePlural>Steps</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -388,6 +389,10 @@
<name>COST.value</name>
<expression>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/cost.value/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CAMPAIGN_ID.displayValue</name>
+ <expression>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/CampaignStep_entity/imageProcess.js b/entity/CampaignStep_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c88b7ab04f19f1ebdbb7cfbd189709d3fcd9cbfe
--- /dev/null
+++ b/entity/CampaignStep_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.NAME"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js b/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b0e58bb166cdf86ae459585247513c7055af3de
--- /dev/null
+++ b/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+var res = "select CAMPAIGN.NAME from CAMPAIGN where CAMPAIGN.CAMPAIGNID = CAMPAIGNSTEP.CAMPAIGN_ID";
+result.string(res);
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 651b2eae242a9ae2dca22e8937d68fe91dd0b227..387e4cf5c24138da14c61e3c427608c8e0b65281 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -6,6 +6,7 @@
<title>Campaign</title>
<contentTitleProcess>%aditoprj%/entity/Campaign_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Campaign_entity/afterUiInit.js</afterUiInit>
+ <imageProcess>%aditoprj%/entity/Campaign_entity/imageProcess.js</imageProcess>
<titlePlural>Campaigns</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -60,7 +61,6 @@
<name>DESCRIPTION</name>
<title>Description</title>
<contentType>LONG_TEXT</contentType>
- <titleProcess>%aditoprj%/entity/Campaign_entity/entityfields/description/titleProcess.js</titleProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
diff --git a/entity/Campaign_entity/entityfields/description/titleProcess.js b/entity/Campaign_entity/entityfields/description/titleProcess.js
deleted file mode 100644
index 076336c605a88532487f3d2043c0450d7021806e..0000000000000000000000000000000000000000
--- a/entity/Campaign_entity/entityfields/description/titleProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("system.translate");
-
-if(vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_VIEW)
-{
- result.string(translate.text("Description"));
-}
\ No newline at end of file
diff --git a/entity/Campaign_entity/imageProcess.js b/entity/Campaign_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c88b7ab04f19f1ebdbb7cfbd189709d3fcd9cbfe
--- /dev/null
+++ b/entity/Campaign_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.NAME"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c5b3232e4f301c7f625e92f15931fe092a3957f6
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
+ <name>ClassificationAdmin_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Classification</title>
+ <titlePlural>Classifications</titlePlural>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityConsumer>
+ <name>ClassificationsAdmin</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Classification_entity</entityName>
+ <fieldName>ClassificationsAdministration</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ClassificationType_param</name>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationsadmin/children/classificationtype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationsadmin/children/classificationtype_param/valueProcess.js
similarity index 52%
rename from entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js
rename to entity/ClassificationAdmin_entity/entityfields/classificationsadmin/children/classificationtype_param/valueProcess.js
index a5632992f1eb801942517498616c86a95f49b737..16c85500b5355a72548030867e3d300661e9d4aa 100644
--- a/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationsadmin/children/classificationtype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
import("system.vars");
+import("system.result");
-result.string(vars.getString("$field.UID"));
\ No newline at end of file
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ac1682daac72873983e54688cb7fb34ae5ef3a9
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.db");
+
+result.object(db.table("select distinct CLASSIFICATIONTYPE from CLASSIFICATIONTYPE"));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..33a68efe1c6f48cc4133c01d6e82de4f48421d0c
--- /dev/null
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
+ <name>ClassificationScore_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Possible Values</title>
+ <contentTitleProcess>%aditoprj%/entity/ClassificationScore_entity/contentTitleProcess.js</contentTitleProcess>
+ <onValidation>%aditoprj%/entity/ClassificationScore_entity/onValidation.js</onValidation>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONSCOREID</name>
+ <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ <title>Title</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>SCORETYPE</name>
+ <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/scoretype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SORT</name>
+ <title>Sorting</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>SCORE</name>
+ <title>Score</title>
+ <mandatory v="true" />
+ <onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/score/onValidation.js</onValidation>
+ </entityField>
+ <entityProvider>
+ <name>ClassificationScores</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>85ff242d-a743-413f-8112-6d589baa30de</name>
+ <entityName>Classification_entity</entityName>
+ <fieldName>ClassificationScores</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>Scoretype_param</name>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>Scoretype_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>MaxValue</name>
+ <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>e2fecaf8-bc95-4a4d-bd96-88731568b1a4</name>
+ <tableName>CLASSIFICATIONSCORE</tableName>
+ <primaryKey>CLASSIFICATIONSCOREID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONSCOREID.value</name>
+ <recordfield>CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SCORE.value</name>
+ <recordfield>CLASSIFICATIONSCORE.SCORE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SORT.value</name>
+ <recordfield>CLASSIFICATIONSCORE.SORT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TITLE.value</name>
+ <recordfield>CLASSIFICATIONSCORE.TITLE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SCORETYPE.value</name>
+ <recordfield>CLASSIFICATIONSCORE.SCORETYPE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/ClassificationScore_entity/contentTitleProcess.js b/entity/ClassificationScore_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a32d1c4fccfbd2b173010c5281709660619bd4cf
--- /dev/null
+++ b/entity/ClassificationScore_entity/contentTitleProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+result.string(translate.text(vars.get("$field.TITLE")));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2e1eadc780ee959ee845885c8bca4d35d4eece3d
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.util");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js b/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9da24ed56ab23b3c689c0bf7e19a3914337fe58b
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js
@@ -0,0 +1,20 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.db");
+import("Sql_lib");
+
+if (!vars.get("$this.value"))
+{
+ var scoreType = vars.get("$param.Scoretype_param");
+
+ result.string(db.cell(
+ SqlCondition.begin()
+ .andPrepare("CLASSIFICATIONTYPE.SCORETYPE", scoreType, "# <> ?")
+ .and("CLASSIFICATIONTYPE.CLASSIFICATIONNUMBER = " + db.translateStatement(SqlCondition.begin()
+ .andPrepare("CLASSIFICATIONTYPE.SCORETYPE", scoreType, "# = ?")
+ .buildSql("(select CLASSIFICATIONNUMBER from CLASSIFICATIONTYPE", "1=2", ")")))
+ .buildSql("select 100.0 - sum(maxScore) from ( \n\
+ select max(SCORE) maxScore from CLASSIFICATIONTYPE \n\
+ join CLASSIFICATIONSCORE on CLASSIFICATIONSCORE.scoretype = CLASSIFICATIONTYPE.scoretype", "1=2", "group by CLASSIFICATIONTYPE.scoretype) maxScores")))
+}
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/score/onValidation.js b/entity/ClassificationScore_entity/entityfields/score/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..be6e4157430034d74f2785dcd3c5198b8dfe6a17
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/score/onValidation.js
@@ -0,0 +1,8 @@
+import("Entity_lib");
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+var max = parseFloat(vars.getString("$field.MaxValue"));
+if (parseFloat(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.SCORE"))) > max)
+ result.string(translate.withArguments("${HIGHER_THAN_MAX} max: %0", [max]));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/scoretype/valueProcess.js b/entity/ClassificationScore_entity/entityfields/scoretype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4e230187750d5c3f58e8702e5858a7ad35cc55fe
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/scoretype/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.logging");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ logging.log(vars.get("$param.Scoretype_param"))
+ result.string(vars.get("$param.Scoretype_param"));
+}
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/onValidation.js b/entity/ClassificationScore_entity/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..10a616168f1215f6ed3df9679a7e2e56b0aa1d2d
--- /dev/null
+++ b/entity/ClassificationScore_entity/onValidation.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.logging");
+
+
+logging.log("aaaaaaaaaaaaaa")
+logging.log(vars.get("$param.Scoretype_param"))
+logging.log(vars.get("$sys.recordstate"))
+
+/*select CLASSIFICATIONTYPE.scoretype, max(score) from CLASSIFICATIONTYPE
+join CLASSIFICATIONSCORE on CLASSIFICATIONSCORE.scoretype = CLASSIFICATIONTYPE.scoretype where CLASSIFICATIONNUMBER = 2 group by CLASSIFICATIONTYPE.scoretype;*/
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js b/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..811e28aa9ae80ff40acd82e1d8a01a07fadc73c9
--- /dev/null
+++ b/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Sql_lib");
+import("system.db");
+import("system.result");
+
+result.string(db.translateCondition(SqlCondition.begin()
+ .andPrepareVars("CLASSIFICATIONSCORE.SCORETYPE", "$param.Scoretype_param")
+ .build("1=2")));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js b/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b0539ac314524a1cb75d491dce4252bad6cc7407
--- /dev/null
+++ b/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+
+result.object({
+ "CLASSIFICATIONSCORE.SORT": false
+})
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..857ba0f7b21e248b9605d1c9e8c7d3d812349a4f
--- /dev/null
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
+ <name>ClassificationType_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONTYPEID</name>
+ </entityField>
+ <entityField>
+ <name>TYPE</name>
+ </entityField>
+ <entityField>
+ <name>CLASS</name>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <linkInformation>
+ <linkInformation>
+ <name>0a0944fd-a72f-4c95-8c42-b1e7d3e17721</name>
+ <tableName>CLASSIFICATIONTYPE</tableName>
+ <primaryKey>CLASSIFICATIONTYPEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONTYPEID.value</name>
+ <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CLASS.value</name>
+ <recordfield>CLASSIFICATIONTYPE.CLASS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TYPE.value</name>
+ <recordfield>CLASSIFICATIONTYPE.TYPE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..410357d231e67f03816954e976f0f2f762ad997b
--- /dev/null
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
+ <name>Classification_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Classification</title>
+ <afterOperatingState>%aditoprj%/entity/Classification_entity/afterOperatingState.js</afterOperatingState>
+ <titlePlural>Classifications</titlePlural>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONID</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATIONSCORE_ID</name>
+ <consumer>ClassificationScores</consumer>
+ <titleProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js</titleProcess>
+ <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ClassificationType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowid_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>Classifications</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>6274acfa-3dbf-4a9b-8926-2a2d1ff80d6d</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Classifications</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ScoreType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>IsAdminMode_param</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classifications/children/isadminmode_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONTYPEID</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtypeid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SCORETYPE</name>
+ <title>Scoretype</title>
+ <groupable v="true" />
+ <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATIONNUMBER</name>
+ <title>Classification number</title>
+ <contentType>TEXT</contentType>
+ <groupable v="true" />
+ <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationnumber/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/Classification_entity/entityfields/classificationnumber/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATIONTYPE_ID</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_ROWID</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_TYPE</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/object_type/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityConsumer>
+ <name>ClassificationScores</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <state>INVISIBLE</state>
+ <stateProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ClassificationScore_entity</entityName>
+ <fieldName>ClassificationScores</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Scoretype_param</name>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>edit</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/Classification_entity/entityfields/edit/onActionProcess.js</onActionProcess>
+ </entityActionField>
+ <entityParameter>
+ <name>ScoreType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>CLASSIFICATIONTYPE</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>ClassificationsAdministration</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>67603e12-a23a-4f3f-9fcd-b128bd5f9b5f</name>
+ <entityName>ClassificationAdmin_entity</entityName>
+ <fieldName>ClassificationsAdmin</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>IsAdminMode_param</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationsadministration/children/isadminmode_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ScoreType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>IsAdminMode_param</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/isadminmode_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>Info</name>
+ <title>Rating</title>
+ <contentType>HTML</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/info/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SCORE_RESULTS</name>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <recordFields>
+ <element>UID.value</element>
+ <element>CLASSIFICATIONID.value</element>
+ <element>CLASSIFICATIONNUMBER.value</element>
+ <element>CLASSIFICATIONSCORE_ID.value</element>
+ <element>CLASSIFICATIONTYPEID.value</element>
+ <element>CLASSIFICATIONTYPE_ID.value</element>
+ <element>OBJECT_ROWID.value</element>
+ <element>OBJECT_TYPE.value</element>
+ <element>SCORETYPE.value</element>
+ <element>CLASSIFICATIONTYPE.value</element>
+ <element>SCORE_RESULTS.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Classification_entity/afterOperatingState.js b/entity/Classification_entity/afterOperatingState.js
new file mode 100644
index 0000000000000000000000000000000000000000..a94093073f1d90cd4d112f5e93eb90f853d2f4fd
--- /dev/null
+++ b/entity/Classification_entity/afterOperatingState.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+ neon.refreshAll();
+}
diff --git a/entity/Classification_entity/entityfields/classificationnumber/displayValueProcess.js b/entity/Classification_entity/entityfields/classificationnumber/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..99c5e9563cfce4fdff07c9e4f5f5383e77463f58
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationnumber/displayValueProcess.js
@@ -0,0 +1,26 @@
+import("system.db");
+import("system.vars");
+import("system.result");
+import("system.translate");
+import("Sql_lib");
+import("Classification_lib")
+
+if (vars.exists("$param.IsAdminMode_param") && vars.get("$param.IsAdminMode_param") == "1")
+{
+ result.string(vars.get("$this.value") + ". " + translate.text("Classification"));
+}
+else
+{
+ if (vars.getString("$field.CLASSIFICATIONNUMBER"))
+ {
+ var score = JSON.parse(vars.getString("$field.SCORE_RESULTS"))[vars.getString("$field.CLASSIFICATIONNUMBER")];
+
+ if (!score)
+ score = 0;
+ else
+ score = parseInt(score);
+
+ result.string(vars.get("$this.value") + ". " + translate.text("Classification") + ": " + score + " " + translate.text("points") + " = " + ClassificationUtils.mapToClass(score));
+
+ }
+}
diff --git a/entity/Classification_entity/entityfields/classificationnumber/onValidation.js b/entity/Classification_entity/entityfields/classificationnumber/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..00d5ca00d56da1a0d3076dbe16d77ba5f1415517
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationnumber/onValidation.js
@@ -0,0 +1,12 @@
+import("Entity_lib");
+import("system.logging");
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+var number = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CLASSIFICATIONNUMBER"));
+
+if (!/^[0-9]+$/.test(number))
+{
+ result.string(translate.text("${NUMBER_FORMAT_NEEDED}"));
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classifications/children/isadminmode_param/valueProcess.js b/entity/Classification_entity/entityfields/classifications/children/isadminmode_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4e869dc96dea5ebac65b88b688e7c4c87b6b303e
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classifications/children/isadminmode_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.logging");
+import("system.result");
+logging.log("asdf")
+result.string(0);
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js b/entity/Classification_entity/entityfields/classificationsadministration/children/isadminmode_param/valueProcess.js
similarity index 50%
rename from entity/Contract_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
rename to entity/Classification_entity/entityfields/classificationsadministration/children/isadminmode_param/valueProcess.js
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0488a23572b30f97174720a23726a09b8b266381 100644
--- a/entity/Contract_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
+++ b/entity/Classification_entity/entityfields/classificationsadministration/children/isadminmode_param/valueProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("DOCUMENT");
\ No newline at end of file
+result.string(1);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js b/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c4b352e1b6d58a78c7d1d9a1d8c6cc20df770045
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("Sql_lib");
+import("system.db");
+import("system.result");
+
+// TODO: loadEntity / #Title
+result.string(translate.text(db.cell(SqlCondition.begin()
+ .andPrepareVars("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", "$field.CLASSIFICATIONSCORE_ID")
+ .buildSql("select TITLE from CLASSIFICATIONSCORE", "1=2"))));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js b/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8100cef278f6517bd07495fba976386fa12c5991
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+
+result.string(translate.text(vars.get("$field.SCORETYPE")))
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js b/entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5b4133d616996e3340521a9fb7831ea77f95fb8d
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.SCORETYPE"));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationscores/stateProcess.js b/entity/Classification_entity/entityfields/classificationscores/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..02b7fbc2bb2c333e2948112fad78a3b816c71313
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationscores/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.IsAdminMode_param") && vars.getString("$param.IsAdminMode_param") == "1")
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationtype/valueProcess.js b/entity/Classification_entity/entityfields/classificationtype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2bccd5eb7fbb2311971da0e6ae2ed3b56ed21268
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationtype/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$param.ClassificationType_param"));
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js b/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e49c8fad1ac02b78443eda6f571e2589b11afc7c
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$this.value"))
+{
+ result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationtypeid/valueProcess.js b/entity/Classification_entity/entityfields/classificationtypeid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..20cd6706484d99085c2cb18d81000ebdf00f883a
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationtypeid/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/edit/onActionProcess.js b/entity/Classification_entity/entityfields/edit/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..eac189a4480128900fa2bd92cd2f2e8aee38c2ae
--- /dev/null
+++ b/entity/Classification_entity/entityfields/edit/onActionProcess.js
@@ -0,0 +1,25 @@
+import("system.logging");
+import("system.vars");
+import("system.neon");
+import("KeywordRegistry_basic");
+
+logging.log(vars.get("$param.IsAdminMode_param"))
+
+var selection = JSON.parse(vars.getString("$sys.selectionRows"));
+if (selection.length > 0)
+{
+ var params = {
+ "ClassificationType_param" : vars.get("$param.ClassificationType_param"),
+ "ObjectType_param" : vars.get("$param.ObjectType_param"),
+ "ObjectRowid_param" : vars.get("$param.ObjectRowid_param")
+ }
+
+ var view = "ClassificatonEdit_view";
+
+ if (vars.exists("$param.IsAdminMode_param") && vars.get("$param.IsAdminMode_param") == "1")
+ view = "ClassificatonAdminEdit_view";
+
+ neon.openContext("Classification", view, [selection[0].UID], neon.OPERATINGSTATE_EDIT, params);
+}
+
+
diff --git a/entity/Classification_entity/entityfields/info/valueProcess.js b/entity/Classification_entity/entityfields/info/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1e5d2960de057ce775777fe7378bb327546b7141
--- /dev/null
+++ b/entity/Classification_entity/entityfields/info/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.result");
+
+var sumTranslated = translate.text("sum");
+result.string(translate.text(
+"A: 75 < " + sumTranslated + " <= 100<br>\
+B: 50 < " + sumTranslated + " <= 75<br>\
+C: 25 < " + sumTranslated + " <= 50<br>\
+D: 0 <= " + sumTranslated + " <= 25"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/Classification_entity/entityfields/isadminmode_param/valueProcess.js
similarity index 50%
rename from entity/Offer_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
rename to entity/Classification_entity/entityfields/isadminmode_param/valueProcess.js
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0488a23572b30f97174720a23726a09b8b266381 100644
--- a/entity/Offer_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
+++ b/entity/Classification_entity/entityfields/isadminmode_param/valueProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("DOCUMENT");
\ No newline at end of file
+result.string(1);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/object_rowid/valueProcess.js b/entity/Classification_entity/entityfields/object_rowid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d15a596ff1090502ac8cd6afd63e12893ce05625
--- /dev/null
+++ b/entity/Classification_entity/entityfields/object_rowid/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$this.value"))
+{
+ result.string(vars.get("$param.ObjectRowid_param"));
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/object_type/valueProcess.js b/entity/Classification_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b532aa65a135891c68363e05f02e3420967f409a
--- /dev/null
+++ b/entity/Classification_entity/entityfields/object_type/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$this.value"))
+{
+ result.string(vars.get("$param.ObjectType_param"));
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js b/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..002fb0103bfb70fcaf7ad4f979a2d8b4b96c6295
--- /dev/null
+++ b/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+result.string(translate.text(vars.get("$this.value")))
\ No newline at end of file
diff --git a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bad13cbd6f15fec52532defb25a92f0c2f224b58
--- /dev/null
+++ b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,56 @@
+import("Classification_lib");
+import("system.vars");
+import("Sql_lib");
+import("system.db");
+import("system.result");
+
+var admin = (vars.exists("$param.IsAdminMode_param") && vars.get("$param.IsAdminMode_param") == "1")
+var scores = {};
+
+if (!admin)
+{
+ scores = JSON.stringify(ClassificationUtils.getScore(vars.get("$param.ClassificationType_param"), vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowid_param")));
+}
+
+
+
+var classificationId;
+var classificationTypeId;
+
+// if the id starts with "C," it is a classificationId. If it starts with "T,", it is a classificationtypeId
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues") && vars.get("$local.idvalues").length > 0)
+{
+ var selected = vars.get("$local.idvalues")[0].split(",");
+ if (selected.length == 2)
+ {
+ if (selected[0] == 'C')
+ classificationId = selected[1]
+ else if (selected[0] == 'T')
+ classificationTypeId = selected[1]
+ }
+}
+
+var cond = SqlCondition.begin()
+ .andPrepareVars("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", "$param.ClassificationType_param")
+ .andPrepareIfSet("CLASSIFICATION.CLASSIFICATIONID", classificationId)
+
+
+
+if (!classificationId)
+{
+ cond.andPrepareIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId);
+
+ if(!admin)
+ cond.andSqlCondition(SqlCondition.begin().orPrepareVars("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
+ .or("CLASSIFICATION.OBJECT_TYPE is null"))
+ .andSqlCondition(SqlCondition.begin().orPrepareVars("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param")
+ .or("CLASSIFICATION.OBJECT_ROWID is null"))
+}
+
+result.object(db.table(cond.buildSql("select case when CLASSIFICATIONID is not null then 'C,' || CLASSIFICATIONID else 'T,' || CLASSIFICATIONTYPEID end, CLASSIFICATIONID, CLASSIFICATIONNUMBER, CLASSIFICATIONSCORE_ID, CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE_ID, OBJECT_TYPE, OBJECT_ROWID, SCORETYPE, CLASSIFICATIONTYPE.CLASSIFICATIONTYPE from CLASSIFICATION \n\
+ right join CLASSIFICATIONTYPE on CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPEID", "1=2", "order by CLASSIFICATIONNUMBER asc"))
+ .map(function(pRow)
+ {
+ pRow.push(scores);
+ return pRow;
+ }));
\ No newline at end of file
diff --git a/entity/Classification_entity/recordcontainers/jdito/onInsert.js b/entity/Classification_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..7304a96a3cebcf223423274896596280a5e8c841
--- /dev/null
+++ b/entity/Classification_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,11 @@
+import("system.db");
+import("system.util");
+import("system.vars");
+
+var newId = util.getNewUUID();
+db.insertData("CLASSIFICATIONTYPE", ["CLASSIFICATIONTYPEID", "CLASSIFICATIONTYPE", "SCORETYPE", "CLASSIFICATIONNUMBER"], null, [
+ newId,
+ vars.get("$field.CLASSIFICATIONTYPE"),
+ vars.get("$field.SCORETYPE"),
+ vars.get("$field.CLASSIFICATIONNUMBER"),
+]);
\ No newline at end of file
diff --git a/entity/Classification_entity/recordcontainers/jdito/onUpdate.js b/entity/Classification_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..d856750d58b5aaa505819006a3e1e899415df880
--- /dev/null
+++ b/entity/Classification_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,33 @@
+import("system.neon");
+import("system.util");
+import("Sql_lib");
+import("system.db");
+import("system.vars");
+
+// check if it already exists
+if (vars.get("$field.CLASSIFICATIONID"))
+{
+ if (vars.get("$field.CLASSIFICATIONSCORE_ID"))
+ {
+ db.updateData("CLASSIFICATION", ["CLASSIFICATIONSCORE_ID"], null, [
+ vars.get("$field.CLASSIFICATIONSCORE_ID")
+ ], SqlCondition.equals("CLASSIFICATION.CLASSIFICATIONID", vars.get("$field.CLASSIFICATIONID"), "1=2"));
+ }
+ else
+ {
+ db.deleteData("CLASSIFICATION", SqlCondition.equals("CLASSIFICATION.CLASSIFICATIONID", vars.get("$field.CLASSIFICATIONID")));
+ }
+}
+else if (vars.get("$field.CLASSIFICATIONSCORE_ID"))
+{
+ var newId = util.getNewUUID();
+ db.insertData("CLASSIFICATION", ["CLASSIFICATIONID", "OBJECT_TYPE", "OBJECT_ROWID", "CLASSIFICATIONTYPE_ID", "CLASSIFICATIONSCORE_ID"], null, [
+ newId,
+ vars.get("$field.OBJECT_TYPE"),
+ vars.get("$field.OBJECT_ROWID"),
+ vars.get("$field.CLASSIFICATIONTYPE_ID"),
+ vars.get("$field.CLASSIFICATIONSCORE_ID"),
+ ]);
+
+ neon.setFieldValue("$field.CLASSIFICATIONID", newId);
+}
\ No newline at end of file
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index ef47ec1799cea63c2483986d3a98d2170052d42f..b5b4e2e54ee72305aff1f4694c788a657f35e730 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -180,9 +180,11 @@
</entityProvider>
<entityField>
<name>CONTACT_ORG_ID</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>CONTACT_PERSON_ID</name>
+ <searchable v="false" />
</entityField>
<entityConsumer>
<name>Documents</name>
@@ -195,7 +197,6 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
<triggerRecalculation v="false" />
</entityParameter>
<entityParameter>
@@ -222,7 +223,6 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
diff --git a/entity/Contract_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/Contract_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
deleted file mode 100644
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0000000000000000000000000000000000000000
--- a/entity/Contract_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index bd4cb5cb45fedcb66b58253d22fecda8ad2ab930..8bebd3388b3a32522a179f5b1ca26b1a69ec3efe 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -41,12 +41,12 @@
<consumer>Attachments</consumer>
<linkedContext>DocumentTemplate</linkedContext>
<stateProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
<name>DocumentId_param</name>
<expose v="true" />
+ <triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
@@ -81,10 +81,12 @@
<children>
<entityParameter>
<name>DocumentId_param</name>
+ <expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>Type_param</name>
+ <expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -92,7 +94,7 @@
<entityParameter>
<name>Type_param</name>
<expose v="true" />
- <triggerRecalculation v="false" />
+ <triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityActionField>
diff --git a/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/valueProcess.js b/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js b/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js
index 869448c9ca28335e1f66c6e48aa35eb20b6abd51..df7fdfffbfa712ea63faca46424e7dd059f1495b 100644
--- a/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js
+++ b/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js
@@ -1,2 +1,13 @@
-import("Document_lib");
-DocumentUtil.downloadSelectedDocuments();
\ No newline at end of file
+import("system.db");
+import("system.vars");
+import("system.neon");
+import("system.logging");
+
+var fileInformation = db.array(db.ROW, "select ID, FILENAME from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATE_ID_CHILD") + "'", "_____SYSTEMALIAS");
+var data = db.getBinaryContent(fileInformation[0], "_____SYSTEMALIAS");
+neon.download(data, fileInformation[1]);
+
+
+
+
+
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 5e23957f78abe3e69f3955e0134cc327ffc3b3f8..d2ee5cf1ddd7537842bb82936f31a2933236f78c 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -14,6 +14,7 @@
<entityField>
<name>DATE_EDIT</name>
<title>Date edit</title>
+ <searchable v="false" />
</entityField>
<entityField>
<name>DESCRIPTION</name>
@@ -22,15 +23,18 @@
</entityField>
<entityField>
<name>DOCUMENTTEMPLATEID</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<title>Date new</title>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -41,10 +45,10 @@
<groupable v="true" />
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>USER_EDIT</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>NAME</name>
@@ -82,7 +86,6 @@
</entityParameter>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -136,7 +139,6 @@
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>texText</name>
@@ -145,7 +147,6 @@
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>CLASSIFICATION</name>
@@ -175,7 +176,8 @@
<entityProvider>
<name>Attachments</name>
<fieldType>DEPENDENCY_IN</fieldType>
- <targetConsumerProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attachments/targetConsumerProcess.js</targetConsumerProcess>
+ <targetContextField>TARGET_CONTEXT</targetContextField>
+ <targetIdField>DOCUMENTTEMPLATEID</targetIdField>
<titlePlural>Attachments</titlePlural>
<recordContainer>db</recordContainer>
<dependencies>
@@ -240,6 +242,11 @@
<triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityField>
+ <name>TARGET_CONTEXT</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/DocumentTemplate_entity/entityfields/attachments/targetConsumerProcess.js b/entity/DocumentTemplate_entity/entityfields/attachments/targetConsumerProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/DocumentTemplate_entity/entityfields/htmltext/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/htmltext/displayValueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..183df0aef24b48a3650d4295f38428336c337ff0
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.logging");
+import("system.db");
+import("system.vars");
+import("system.result");
+import("system.util");
+import("Context_lib");
+
+result.string('Document');
+
+
diff --git a/entity/DocumentTemplate_entity/entityfields/textext/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/textext/displayValueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/DocumentTemplate_entity/entityfields/type/onValueChange.js b/entity/DocumentTemplate_entity/entityfields/type/onValueChange.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/fromClauseProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/fromClauseProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index ae3e58dcdf196205f60402a740da6424c5483e2f..8e3bef4ffed999e1d4b4fcbdac2ce7a968d5af06 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -193,11 +193,19 @@
<fieldName>Documents</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>e326d4f9-40fd-42c8-88d6-0c5cefc6fa71</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
<name>AssignmentName_param</name>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
<expose v="true" />
+ <documentation>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/documentation.adoc</documentation>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -265,7 +273,9 @@
</entityParameter>
<entityParameter>
<name>AssignmentName_param</name>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
<expose v="true" />
+ <documentation>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
diff --git a/entity/Document_entity/entityfields/documents/children/assignmentname_param/documentation.adoc b/entity/Document_entity/entityfields/documents/children/assignmentname_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..1dee07239dd5a6da38e5531ca58900858ebb44f6
--- /dev/null
+++ b/entity/Document_entity/entityfields/documents/children/assignmentname_param/documentation.adoc
@@ -0,0 +1 @@
+Assignment name for a document. If you do not overwrite this param in a consumer the default value `DOCUMENT` will be used.
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/Document_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
similarity index 100%
rename from entity/Activity_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
rename to entity/Document_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
diff --git a/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc b/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..1dee07239dd5a6da38e5531ca58900858ebb44f6
--- /dev/null
+++ b/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc
@@ -0,0 +1 @@
+Assignment name for a document. If you do not overwrite this param in a consumer the default value `DOCUMENT` will be used.
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js b/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
similarity index 100%
rename from entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
rename to entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 149fb2a0acdc86fb7a9fd9be87d4fcf9af7518eb..388552cb8f508b2e216b1c02f78b447c297c398b 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -203,7 +203,6 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
diff --git a/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
deleted file mode 100644
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0000000000000000000000000000000000000000
--- a/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index 30cec857a2e3f4796042bccb2744b9413f4cfe1b..26da6300a3593c11b294a3d11e69208d9f2283c1 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -112,7 +112,6 @@
<isPageable v="false" />
<isSortable v="false" />
<contentProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <rowCountProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/jdito/rowCountProcess.js</rowCountProcess>
<recordFields>
<element>UID.value</element>
<element>DATE_NEW.value</element>
diff --git a/entity/LogHistory_entity/recordcontainers/jdito/rowCountProcess.js b/entity/LogHistory_entity/recordcontainers/jdito/rowCountProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 487b2ab08a222fce3b4acf8dc4aef95f564454a0..65261ddd1eac7bb2af7fa69bd6e68cfb9152992f 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -24,24 +24,33 @@
</entityField>
<entityField>
<name>STATE</name>
+ <title>State</title>
+ <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>BACKPACK</name>
</entityField>
<entityField>
<name>CAPTION</name>
+ <title>title</title>
</entityField>
<entityField>
<name>CREATIONDATE</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ <resolution>MINUTE</resolution>
+ <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/creationdate/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DESCRIPTION</name>
+ <title>description</title>
</entityField>
<entityField>
<name>FORCEDPRIORITY</name>
</entityField>
<entityField>
<name>ICON</name>
+ <contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/Notification_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -55,6 +64,8 @@
</entityField>
<entityField>
<name>TYPECODE</name>
+ <title>Type</title>
+ <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>VERSION</name>
@@ -73,35 +84,46 @@
<entityActionGroup>
<name>setNotificationState</name>
<children>
+ <entityActionField>
+ <name>archieve</name>
+ <fieldType>ACTION</fieldType>
+ <title>archieve</title>
+ <description></description>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:ARCHIVE</iconId>
+ <tooltip></tooltip>
+ <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
<entityActionField>
<name>setRead</name>
<fieldType>ACTION</fieldType>
+ <title>setRead</title>
<description></description>
<onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js</onActionProcess>
<isSelectionAction v="true" />
<iconId>VAADIN:OPEN_BOOK</iconId>
- <tooltip>gelesen setzen</tooltip>
+ <tooltip></tooltip>
+ <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>setUnread</name>
<fieldType>ACTION</fieldType>
+ <title>setUnread</title>
<description></description>
<onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js</onActionProcess>
<isSelectionAction v="true" />
<iconId>VAADIN:BOOK</iconId>
- <tooltip>ungelesen setzen</tooltip>
- </entityActionField>
- <entityActionField>
- <name>archieve</name>
- <fieldType>ACTION</fieldType>
- <description></description>
- <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
- <iconId>VAADIN:ARCHIVE</iconId>
- <tooltip>archivieren</tooltip>
+ <tooltip></tooltip>
+ <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js</tooltipProcess>
</entityActionField>
</children>
</entityActionGroup>
+ <entityActionField>
+ <name>rowClickAction</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js</onActionProcess>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -109,6 +131,7 @@
<alias>_____SYSTEMALIAS</alias>
<isPageable v="false" />
<conditionProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<linkInformation>
<linkInformation>
<name>33b9740c-cd3d-43ec-97e6-65c9e880655a</name>
@@ -186,6 +209,10 @@
<name>LINKINFO.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.LINK_INFO</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ICON.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.ICON_INFO</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Notification_entity/entityfields/creationdate/valueProcess.js b/entity/Notification_entity/entityfields/creationdate/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..139597f9cb07c5d48bed18984ec4747f4b4f3438
--- /dev/null
+++ b/entity/Notification_entity/entityfields/creationdate/valueProcess.js
@@ -0,0 +1,2 @@
+
+
diff --git a/entity/Notification_entity/entityfields/icon/valueProcess.js b/entity/Notification_entity/entityfields/icon/valueProcess.js
index 8286cb65453e694a6e4f7d0c0fe809c664f3fc06..42ceb3e11613a838e987a9b09441b3fa952aa307 100644
--- a/entity/Notification_entity/entityfields/icon/valueProcess.js
+++ b/entity/Notification_entity/entityfields/icon/valueProcess.js
@@ -6,7 +6,5 @@ import("system.notification");
if(vars.get("$field.TYPECODE"))
{
var type = notification.getType(vars.get("$field.TYPECODE"));
- logging.log("type: " + type);
-
result.string(type["icon"]);
}
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js b/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fe4feb0273c3f4e7f0df505922588f7f80ca7021
--- /dev/null
+++ b/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.tools");
+import("system.notification");
+import("system.neon");
+
+var user = tools.getCurrentUser();
+var selectedNotifications = JSON.parse(vars.getString("$sys.selection"));
+
+for(var i = 0; i < selectedNotifications.length; i++)
+ notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
+
+neon.refresh();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js
index 8a6a2c0e84604ef39bfb79ecf7b05d6e43aa7d77..da92b7c1c0a592b2cefb6ba5e05680a92cabf53d 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js
@@ -1,26 +1,12 @@
-import("system.logging");
import("system.vars");
import("system.tools");
import("system.notification");
import("system.neon");
var user = tools.getCurrentUser();
-var selectedNotifications = JSON.parse(vars.get("$sys.selection"));
+var selectedNotifications = JSON.parse(vars.getString("$sys.selection"));
-var userNotis = notification.getUserNotifications(user["name"], null);
-var contentId;
+for(var i = 0; i < selectedNotifications.length; i++)
+ notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_ARCHIVE);
-for(var x = 0; x < selectedNotifications.length; x++)
-{
- for(var i = 0; i < userNotis.length; i++)
- {
- if(userNotis[i][notification.PROP_ID] == selectedNotifications[x])
- {
- contentId = userNotis[i][notification.PROP_CONTENTID];
- notification.updateUserNotificationState(user["name"], contentId, notification.STATE_ARCHIVE);
- break;
- }
- }
-}
-
-neon.refreshAll();
\ No newline at end of file
+neon.refresh();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3aa94ad62826d8f05824f78874cd2e2fe739ea56
--- /dev/null
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.text("archieve"));
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
index b00ff316d43bf58300b9da509ec1d78e547e52fa..fe4feb0273c3f4e7f0df505922588f7f80ca7021 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
@@ -1,26 +1,12 @@
-import("system.logging");
import("system.vars");
import("system.tools");
import("system.notification");
import("system.neon");
var user = tools.getCurrentUser();
-var selectedNotifications = JSON.parse(vars.get("$sys.selection"));
+var selectedNotifications = JSON.parse(vars.getString("$sys.selection"));
-var userNotis = notification.getUserNotifications(user["name"], null);
-var contentId;
+for(var i = 0; i < selectedNotifications.length; i++)
+ notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
-for(var x = 0; x < selectedNotifications.length; x++)
-{
- for(var i = 0; i < userNotis.length; i++)
- {
- if(userNotis[i][notification.PROP_ID] == selectedNotifications[x])
- {
- contentId = userNotis[i][notification.PROP_CONTENTID];
- notification.updateUserNotificationState(user["name"], contentId, notification.STATE_CONFIRMED);
- break;
- }
- }
-}
-
-neon.refreshAll();
\ No newline at end of file
+neon.refresh();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..82b5a19c94ab62162274d40e060ec34dee10da48
--- /dev/null
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.text("setRead"));
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js
index e2b7ef56da954598a4bf8858e32877048d741269..41106789babc5151e9972cdfff055f303fce4fe0 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js
@@ -1,26 +1,12 @@
-import("system.logging");
import("system.vars");
import("system.tools");
import("system.notification");
import("system.neon");
var user = tools.getCurrentUser();
-var selectedNotifications = JSON.parse(vars.get("$sys.selection"));
+var selectedNotifications = JSON.parse(vars.getString("$sys.selection"));
-var userNotis = notification.getUserNotifications(user["name"], null);
-var contentId;
+for(var i = 0; i < selectedNotifications.length; i++)
+ notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_UNSEEN);
-for(var x = 0; x < selectedNotifications.length; x++)
-{
- for(var i = 0; i < userNotis.length; i++)
- {
- if(userNotis[i][notification.PROP_ID] == selectedNotifications[x])
- {
- contentId = userNotis[i][notification.PROP_CONTENTID];
- notification.updateUserNotificationState(user["name"], contentId, notification.STATE_UNSEEN);
- break;
- }
- }
-}
-
-neon.refreshAll();
\ No newline at end of file
+neon.refresh();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7fdaef5f6d333ff01ea64d8d64f506214e7ee00d
--- /dev/null
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.text("setUnread"));
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/state/displayValueProcess.js b/entity/Notification_entity/entityfields/state/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7e736b667632a0590db5625794ae3d632963be83
--- /dev/null
+++ b/entity/Notification_entity/entityfields/state/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+
+result.string(translate.text(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/typecode/displayValueProcess.js b/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..51ef6ebf74100633cdd031a8c82d9f91e7faf599
--- /dev/null
+++ b/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
@@ -0,0 +1,28 @@
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+var PREFIX = "_____SYSTEM_";
+var typecode = vars.get("$field.TYPECODE");
+
+switch(typecode)
+{
+ case PREFIX + "NOTIFICATION_PHONECALL":
+ result.string(translate.text("Phonecall"));
+ break;
+
+ case PREFIX + "NOTIFICATION_EMAIL":
+ result.string(translate.text("Email"));
+ break;
+
+ case PREFIX + "NOTIFICATION_APPOINTMENT":
+ result.string(translate.text("Appointment"));
+ break;
+
+ case PREFIX + "NOTIFICATION_TODO":
+ result.string(translate.text("Todo"));
+ break;
+
+ default:
+ result.string(typecode);
+}
\ No newline at end of file
diff --git a/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js b/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..eb0a11a5c9c14b8f6bb5a190072f67c23b064661
--- /dev/null
+++ b/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.db");
+
+result.object({
+ "ASYS_NOTIFICATIONS.STATE": db.DESCENDING,
+ "ASYS_NOTIFICATIONCONTENTS.CREATIONDATE": db.DESCENDING
+ });
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
index c18d22015d610e510b71019881de089a06d1632c..fb08dc76113c8cbdc41dd7026fe7f636813fd418 100644
--- a/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
+++ b/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
@@ -2,12 +2,12 @@ import("ObjectRelation_lib");
import("system.neon");
import("system.vars");
-if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
{
- var selectedRows = JSON.parse(vars.get("$sys.selection"));
+ var selectedRows = JSON.parse(vars.getString("$sys.selection"));
var uid = JSON.parse(selectedRows[0]);
var isObjectRelationNode = typeof uid[2] == "string";
-
+
if (isObjectRelationNode)
{
var params = {
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
index e46436ab939b94aa8d697e23d9d92390d1384404..743f50d6546e1d8d4e3e2b89df98387f6e209bcf 100644
--- a/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
+++ b/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
@@ -2,11 +2,12 @@ import("system.result");
import("system.neon");
import("system.vars");
-if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
{
- var selectedRows = JSON.parse(vars.get("$sys.selection"));
+ var selectedRows = JSON.parse(vars.getString("$sys.selection"));
var isObjectRelationNode = false;
- if (selectedRows.length > 0)
+
+ if (selectedRows.length > 0 && selectedRows[0] && selectedRows[0].length > 0 && selectedRows[0][0] == "[")
{
var uid = JSON.parse(selectedRows[0]);
isObjectRelationNode = typeof uid[2] == "string";
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
index cbeeeb007e4e98249f4cc3d011932efece2af4b2..591155e7bc1a18a7ac381396f1780497f0002a42 100644
--- a/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
+++ b/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
@@ -2,15 +2,15 @@ import("system.result");
import("system.neon");
import("system.vars");
-if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
{
- var selectedRows = JSON.parse(vars.get("$sys.selection"));
+ var selectedRows = JSON.parse(vars.getString("$sys.selection"));
var isObjectRelationNode = false;
if (selectedRows.length > 0)
{
var uid = JSON.parse(selectedRows[0]);
isObjectRelationNode = typeof uid[2] == "string";
-
+
if (isObjectRelationNode)
{
parentId = uid[0];
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js
index 5e1e7308c70d180decdf001e23bdb853e3e1e4c4..13b22713a3525ae5cc932375724dd401be2ccfa0 100644
--- a/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js
+++ b/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js
@@ -3,11 +3,12 @@ import("system.neon");
import("system.vars");
import("system.neon");
-if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
{
- var selectedRows = JSON.parse(vars.get("$sys.selection"));
+ var selectedRows = JSON.parse(vars.getString("$sys.selection"));
var isObjectRelationNode = false;
- if (selectedRows.length > 0)
+
+ if (selectedRows.length > 0 && selectedRows[0] && selectedRows[0].length > 0 && selectedRows[0][0] == "[")
{
var uid = JSON.parse(selectedRows[0]);
isObjectRelationNode = typeof uid[2] == "string";
@@ -23,4 +24,4 @@ if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
result.string(neon.COMPONENTSTATE_DISABLED);
}
else
- result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+ result.string(neon.COMPONENTSTATE_DISABLED);
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index b7e9b9983dd60bc75dcbc6f51d4d0bd084536986..a4243ae51f84199d9996fbeaf387afe624e38fac 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -43,9 +43,12 @@ else
selectedRelationType = filter.childs[0].value;
}
}
- var originalObjectId = vars.get("$param.ObjectId_param");
+ if (vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
+ {
+ var originalObjectId = vars.get("$param.ObjectId_param");
- _loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType);
+ _loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType);
+ }
}
result.object(tree);
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 8431b8efbef9c1d3666a72ce62032552a08ed870..8c9c6bc7cc2f46ea0b1a4d0440bae43ca3ecbd65 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -4,7 +4,6 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
<title>Offer</title>
- <contentTitleProcess>%aditoprj%/entity/Offer_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:CART</iconId>
<recordContainer>db</recordContainer>
@@ -283,7 +282,6 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -307,7 +305,6 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
diff --git a/entity/Offer_entity/contentTitleProcess.js b/entity/Offer_entity/contentTitleProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Offer_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js b/entity/Offer_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
deleted file mode 100644
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 18b0cf323f399c50f064b7f0ec933e91e1f4dafb..8635f28461e0e852635cbdd424b89857bc1b53a9 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -213,9 +213,11 @@
</entityParameter>
<entityField>
<name>CONTACT_ORG_ID</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>CONTACT_PERSON_ID</name>
+ <searchable v="false" />
</entityField>
<entityConsumer>
<name>AnyContacts</name>
@@ -235,10 +237,6 @@
<fieldName>Documents</fieldName>
</dependency>
<children>
- <entityParameter>
- <name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
- </entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
@@ -261,7 +259,7 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
+ <documentation>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -284,6 +282,7 @@
</entityConsumer>
<entityField>
<name>ADDRESS</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/address/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
diff --git a/entity/Order_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/Order_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
deleted file mode 100644
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValidation.js b/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc
similarity index 100%
rename from entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValidation.js
rename to entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc
diff --git a/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js b/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
deleted file mode 100644
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 550e2fcdb31d835970d28ec6131a0c975bec2183..8b17de684f70e44fb679865ce497af8534f64afc 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -85,6 +85,7 @@
<entityConsumer>
<name>Contact</name>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <selectionMode>MULTI</selectionMode>
<dependency>
<name>dependency</name>
<entityName>Person_entity</entityName>
@@ -117,6 +118,18 @@
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>2eb60a6e-575c-4579-9278-5868ffe4bc75</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>71be0991-5bd8-4046-89b5-41d9a152202b</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -192,6 +205,7 @@
<entityConsumer>
<name>Contracts</name>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <selectionMode>MULTI</selectionMode>
<dependency>
<name>dependency</name>
<entityName>Contract_entity</entityName>
@@ -247,7 +261,6 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -670,20 +683,6 @@
<entityProvider>
<name>WithAttribute</name>
<fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>10480df2-f0b6-4cb6-8bfb-4a468b994996</name>
- <entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f368be61-1a15-449f-b37c-b1343069412c</name>
- <entityName>Product_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>AttributeId_param</name>
@@ -800,6 +799,12 @@
<iconId>NEON:GROUP_APPOINTMENT</iconId>
<tooltip>Choose a campaign and a step to add the contact to a campaign</tooltip>
</entityActionField>
+ <entityParameter>
+ <name>OrganisationType_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisationtype_param/documentation.adoc</documentation>
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/Organisation_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
deleted file mode 100644
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js b/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
index fde05a49a0df1146c17e05dc3775b82ea0de6f12..45a55b3998f07f9d2d3ce78ad10b19894407f43e 100644
--- a/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
@@ -7,7 +7,7 @@ import("Context_lib");
var params = {};
-params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(calendars.VEVENT, "neue Termin weissu", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.ORGANISATIONID")));
+params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(calendars.VEVENT, "", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.ORGANISATIONID")));
neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params);
diff --git a/entity/Organisation_entity/entityfields/organisationtype_param/documentation.adoc b/entity/Organisation_entity/entityfields/organisationtype_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..9dd2be39a6b8facd112ed750541682ed95571c9c
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/organisationtype_param/documentation.adoc
@@ -0,0 +1 @@
+Param for filtering a specific organisationtype. (OrganisationType is a keyword)
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index 20bdc717713e1706c9e6c86a981b2fb83fc6d0af..ab816d38cf282db509c2e9e1f068f48ff9cde390 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -40,5 +40,7 @@ if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedC
cond.andSqlCondition(excludedCond, "1=1");
}
+cond.andPrepareVars("ORGANISATION.TYPE", "$param.OrganisationType_param");
+
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 12f6d323c52fa5a7e97e905c52eb462c242a1f1a..290daec830c48dd872c5119e30e1f9929a0cbf4e 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -302,7 +302,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js b/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js
index 4272aa62116b561dd4c1afe4ed5dd86663d57988..4ad263b4ef3d4498fcf4a282917a2ed55b0f493a 100644
--- a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js
+++ b/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js
@@ -2,7 +2,7 @@ import("system.vars");
import("system.logging");
import("system.neon");
import("Campaign_lib");
- logging.log("sys selection -> " + vars.get("$sys.selection"));
+ logging.log("sys selection -> " + vars.getString("$sys.selection"));
if(vars.exists("$sys.selection")) //selektierte IDs als Array
{
CampaignUtils.addParticipants(vars.getString("$sys.selection"));
diff --git a/entity/Person_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/Person_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
deleted file mode 100644
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 90adbe96e8d48676ebd8c05967f1ead44828b6d1..4e5a6938c967b68556fcec85968e22cc5ed7de9a 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -85,16 +85,12 @@
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
- <fieldName>WithAttribute</fieldName>
+ <fieldName>Organisations</fieldName>
</dependency>
<children>
<entityParameter>
- <name>AttributeId_param</name>
- <valueProcess>%aditoprj%/entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AttributeKeyId_param</name>
- <valueProcess>%aditoprj%/entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js</valueProcess>
+ <name>OrganisationType_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -222,10 +218,6 @@
<fieldName>Documents</fieldName>
</dependency>
<children>
- <entityParameter>
- <name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
- </entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
@@ -246,10 +238,6 @@
<fieldName>MainDocuments</fieldName>
</dependency>
<children>
- <entityParameter>
- <name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
- </entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
@@ -430,18 +418,22 @@
</entityConsumer>
<entityField>
<name>USER_NEW</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
diff --git a/entity/Product_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/Product_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
deleted file mode 100644
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js b/entity/Product_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
deleted file mode 100644
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js b/entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
deleted file mode 100644
index 645b2d936511e365614a516e8292c1f34bb3a51f..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-// Target Group (Zielgruppe)
-result.string("5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53");
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js b/entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
deleted file mode 100644
index 4a5bc0b05c93591807469e2ec88adda2db5cb056..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-// Manufacturer
-result.string("41b0832f-8de2-4ab5-a6e0-9a793c5f80c3");
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js b/entity/Product_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b537d2a8f3f250bcf366e2c9a81aa7de5e978e12
--- /dev/null
+++ b/entity/Product_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.organisationType$manufacturer());
\ No newline at end of file
diff --git a/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod b/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
index ea1ba9eb8fa962e253cd835ff59f4630a001fee6..bcc6c554043872ac60afdd495aae3365dadeb23a 100644
--- a/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
+++ b/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
@@ -11,14 +11,6 @@
<name>SalesprojectClassificatonEntries</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>a7414022-56d3-4ca0-b15f-33601b655d78</name>
- <entityName>SalesprojectClassification_entity</entityName>
- <fieldName>SalesprojectClassificationEntries</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ClassId_param</name>
diff --git a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod b/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
deleted file mode 100644
index c4b9f4f6472a21dfa1558e3170f9793feff6375b..0000000000000000000000000000000000000000
--- a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
- <name>SalesprojectClassification_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Classification</title>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>CLASSNAME</name>
- </entityField>
- <entityConsumer>
- <name>SalesprojectClassificationEntries</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>SalesprojectClassificationEntry_entity</entityName>
- <fieldName>SalesprojectClassificatonEntries</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ClassId_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityProvider>
- <name>SalesprojectClassifications</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <titlePlural>Classification</titlePlural>
- <recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>a56beadb-61a5-4065-a64a-f9f136dd4996</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectClassifications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>POINTS</name>
- <valueProcess>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/points/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/SalesprojectClassification_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>CLASSNAME.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/SalesprojectClassification_entity/contentProcess.js b/entity/SalesprojectClassification_entity/contentProcess.js
deleted file mode 100644
index bb0a011684fcc7b40aefaaac225bd985aa83c0ec..0000000000000000000000000000000000000000
--- a/entity/SalesprojectClassification_entity/contentProcess.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-
-var keyword = LegacyKeywordUtils.createKeyword("SALESPROJECT.CLASS");
-
-if (vars.exists("$local.idvalues") && vars.get("$local.idvalues")) {
- var idValues = vars.get("$local.idvalues");
-
- if (idValues.length > 0) {
- keyword.filter(function(id) {
- return id == idValues[0];
- });
- }
-}
-result.object(keyword.toArray(["id", "name"]));
-
-
-//TODO correct db if kewords changed
diff --git a/entity/SalesprojectClassification_entity/entityfields/points/valueProcess.js b/entity/SalesprojectClassification_entity/entityfields/points/valueProcess.js
deleted file mode 100644
index 5b74382810fde5dda8a728acd2e9c6ce0b1709bf..0000000000000000000000000000000000000000
--- a/entity/SalesprojectClassification_entity/entityfields/points/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-// TODO: load from Entry. Currently this is not possible.
-result.object(50); // return dummy value
\ No newline at end of file
diff --git a/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js b/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js
deleted file mode 100644
index 098d87cfa55579898b8da11975f3fb345672247f..0000000000000000000000000000000000000000
--- a/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$param.SalesprojectId_param"));
\ No newline at end of file
diff --git a/entity/SalesprojectClassification_entity/recordcontainers/jdito/contentProcess.js b/entity/SalesprojectClassification_entity/recordcontainers/jdito/contentProcess.js
deleted file mode 100644
index bb0a011684fcc7b40aefaaac225bd985aa83c0ec..0000000000000000000000000000000000000000
--- a/entity/SalesprojectClassification_entity/recordcontainers/jdito/contentProcess.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-
-var keyword = LegacyKeywordUtils.createKeyword("SALESPROJECT.CLASS");
-
-if (vars.exists("$local.idvalues") && vars.get("$local.idvalues")) {
- var idValues = vars.get("$local.idvalues");
-
- if (idValues.length > 0) {
- keyword.filter(function(id) {
- return id == idValues[0];
- });
- }
-}
-result.object(keyword.toArray(["id", "name"]));
-
-
-//TODO correct db if kewords changed
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 68aa6b74b7a051ae50fd44df4c0933145592e75a..b335122509b27a20ec90e52dc2353fe5de5d375b 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -110,21 +110,17 @@
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
- <fieldName>WithAttribute</fieldName>
+ <fieldName>Organisations</fieldName>
</dependency>
<children>
- <entityParameter>
- <name>AttributeId_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AttributeKeyId_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js</valueProcess>
- </entityParameter>
<entityParameter>
<name>ExcludedContactIds_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>OrganisationType_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
@@ -262,7 +258,6 @@
<name>IMAGE</name>
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/image/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/image/displayValueProcess.js</displayValueProcess>
</entityField>
</entityFields>
<recordContainers>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/image/displayValueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/image/displayValueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
deleted file mode 100644
index 645b2d936511e365614a516e8292c1f34bb3a51f..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-// Target Group (Zielgruppe)
-result.string("5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
deleted file mode 100644
index ca41e6e2608d46ef8e47125ee72c25b51d271bd8..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-// Competitor
-result.string("fc09afd5-5f74-4e48-af26-3600bb4c9610");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..47b950fc1ae42270522a57fb9feab4355ec2f8e6
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.organisationType$competitor());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index faa8f54f7afa881f80640faf05a0808d17e839ed..993787b67b39900cfbeaf1768bf757f0cdf4314e 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -244,21 +244,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityConsumer>
- <name>SalesprojectClassifications</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>SalesprojectClassification_entity</entityName>
- <fieldName>SalesprojectClassifications</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
<entityActionField>
<name>newOffer</name>
<fieldType>ACTION</fieldType>
@@ -326,7 +311,6 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -350,7 +334,6 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -429,11 +412,11 @@
<tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityField>
- <name>DAYS_NOTACTIVE</name>
+ <name>InactiveTime</name>
<title>Days inactive</title>
<contentType>NUMBER</contentType>
<state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>KeywordWonLost</name>
@@ -601,6 +584,44 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>Classifications</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Classification_entity</entityName>
+ <fieldName>Classifications</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowid_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classifications/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ClassificationType_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>RemainingTime</name>
+ <title>Days remaining</title>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/remainingtime/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>RunTime</name>
+ <title>Days running</title>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/runtime/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ClassificationResult</name>
+ <title>Classification</title>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Salesproject_entity/afterOperatingState.js b/entity/Salesproject_entity/afterOperatingState.js
index fb90fb67eb08a580d37ed8302a987d8e56df034c..e93da299eeb50537fa1fa0d5c1ad736528772b82 100644
--- a/entity/Salesproject_entity/afterOperatingState.js
+++ b/entity/Salesproject_entity/afterOperatingState.js
@@ -1,6 +1,8 @@
import("system.vars");
import("system.neon");
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
-{
- neon.refresh();
-}
\ No newline at end of file
+
+//TODO: error on save, why should be a refresh necessary
+//if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
+//{
+// neon.refresh();
+//}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js b/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d120e5bb6d7d5b266e2b2a46ca2e13e3d5c8c382
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Classification_lib")
+import("Context_lib")
+
+result.string(ClassificationUtils.getClass("968eafa3-3e76-4afa-8999-878e51cc3bab", ContextUtils.getCurrentContextId(), vars.get("$sys.uid")));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0f664a349180456fb39a1e5ebc877015b49fc221
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("968eafa3-3e76-4afa-8999-878e51cc3bab");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..533f8ec837ea2f9b588ddf05545ac47cdda23d18
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classifications/children/objecttype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/classifications/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/classifications/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js b/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js
deleted file mode 100644
index 5362824c125d6f7ce0b16f7c5d1441052b49063d..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("ActivityTask_lib");
-import("Date_lib");
-
-var entryDate = ActivityUtils.getLastActivityDate(vars.get("$field.SALESPROJECTID"));
-var daysPassed = DateUtils.getDayDifference(entryDate);
-
-if (daysPassed != null)
- result.string(daysPassed);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/Salesproject_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
deleted file mode 100644
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js b/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6b34c36109ff89747f452c0fde2be42f8fcc974d
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js
@@ -0,0 +1,20 @@
+import("system.datetime");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("ActivityTask_lib");
+import("Date_lib");
+
+var entryDate = ActivityUtils.getLastActivityDate(vars.get("$field.SALESPROJECTID"));
+if (!entryDate)
+ entryDate = vars.get("$field.STARTDATE");
+
+var roleoutDate = vars.getString("$field.ENDDATE");
+var daysPassed ;
+if (!roleoutDate || roleoutDate < datetime.date())
+ daysPassed = 0;
+else
+ daysPassed = DateUtils.getDayDifference(entryDate);
+
+if (daysPassed != null)
+ result.string(daysPassed);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js b/entity/Salesproject_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
deleted file mode 100644
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/remainingtime/valueProcess.js b/entity/Salesproject_entity/entityfields/remainingtime/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c93dbc277c9c3767b856d939b4a5dd9bdc678016
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/remainingtime/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.datetime");
+import("system.eMath");
+import("system.vars");
+import("system.result");
+
+var roleoutDate = vars.getString("$field.ENDDATE");
+var res = 0;
+
+if (roleoutDate)
+{
+ dateDiff = eMath.subInt(roleoutDate, datetime.date());//diff in ms
+ if (dateDiff > 0)//negative remaining time is pointless, so let's just show 0
+ res = eMath.divInt(dateDiff, datetime.ONE_DAY);
+}
+result.string(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/runtime/valueProcess.js b/entity/Salesproject_entity/entityfields/runtime/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..95c1884c758e81fabdeadcafcc2208a8e9747805
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/runtime/valueProcess.js
@@ -0,0 +1,17 @@
+import("system.datetime");
+import("system.eMath");
+import("system.vars");
+import("system.result");
+
+var startDate = vars.getString("$field.STARTDATE");
+var endDate = vars.getString("$field.ENDDATE");
+if (!endDate || datetime.date() < endDate)
+ endDate = datetime.date();
+
+var dateDiff = eMath.subInt(endDate, startDate);//diff in ms
+if (dateDiff > 0)
+ dateDiff = eMath.divInt(dateDiff, datetime.ONE_DAY);
+else
+ dateDiff = 0;
+
+result.string(dateDiff);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/valueProcess.js
deleted file mode 100644
index b9a94c51a19da02962159545a287ddc773e7320d..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volume/titleProcess.js b/entity/Salesproject_entity/entityfields/volume/titleProcess.js
index 1a6ace2c3d8c008ae506a1c6b9f615e6d945777a..2c5d74cb558030ed298322cba971cba3dbfdd032 100644
--- a/entity/Salesproject_entity/entityfields/volume/titleProcess.js
+++ b/entity/Salesproject_entity/entityfields/volume/titleProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.translate");
-result.string(translate.text("Volume") + " (" + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}") + ")");
\ No newline at end of file
+result.string(translate.text("Volume") + " (" + translate.text("${EURO_SIGN}") + ")");
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 1d8e6ddc9d561d4320373529e5d1c4965bd3d467..b33e69684fc981b8082c033eaf5df65d504cfd8f 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -68,6 +68,7 @@
<title>Begin</title>
<contentType>DATE</contentType>
<resolution>MINUTE</resolution>
+ <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/start_date/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Task_entity/entityfields/start_date/onValidation.js</onValidation>
@@ -77,6 +78,7 @@
<title>Maturity</title>
<contentType>DATE</contentType>
<resolution>MINUTE</resolution>
+ <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/maturity_date/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Task_entity/entityfields/maturity_date/onValidation.js</onValidation>
</entityField>
@@ -129,6 +131,7 @@
<entityConsumer>
<name>MainDocuments</name>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/Task_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
@@ -137,7 +140,6 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -433,6 +435,25 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>Documents</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Task_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/Task_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c95f5ea0c85673d6f68abfdbef56f55fb63597c1
--- /dev/null
+++ b/entity/Task_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/Task_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
similarity index 65%
rename from entity/DocumentTemplate_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
rename to entity/Task_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
index 6429dbcc1ac80330962ba43cb085a71d46871c52..d3aecacb237b618671518dc550354184d3a3d4e3 100644
--- a/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
+++ b/entity/Task_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
import("system.result");
+import("system.vars");
-result.string("DOCUMENT");
\ No newline at end of file
+result.string("TASK");
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js b/entity/Task_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
deleted file mode 100644
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/maindocuments/stateProcess.js b/entity/Task_entity/entityfields/maindocuments/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5458354c9a9f66b8f11aa4e84682bbc666bea207
--- /dev/null
+++ b/entity/Task_entity/entityfields/maindocuments/stateProcess.js
@@ -0,0 +1,14 @@
+import("system.result");
+import("system.db");
+import("system.vars");
+import("system.neon");
+import("Sql_lib");
+
+if (0 == db.getBinaryCount("TASK", "DOCUMENT", vars.get("$sys.uid"), SqlUtils.getSystemAlias(), "MAINDOCUMENT"))
+{
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 4f6610e9e36aaf7ecb58d4e7c279890f4f485d10..b8a3f0a5cebd0fc6fad52400a35863c337475f9b 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -75,6 +75,9 @@
<entry>
<key>Office address</key>
</entry>
+ <entry>
+ <key>${HIGHER_THAN_MAX} max: %0</key>
+ </entry>
<entry>
<key>Contact</key>
</entry>
@@ -3525,6 +3528,288 @@
<entry>
<key>Letter</key>
</entry>
+ <entry>
+ <key>Appointment</key>
+ </entry>
+ <entry>
+ <key>ARCHIEVED</key>
+ </entry>
+ <entry>
+ <key>UNSEEN</key>
+ </entry>
+ <entry>
+ <key>TODELETE</key>
+ </entry>
+ <entry>
+ <key>CONFIRMED</key>
+ </entry>
+ <entry>
+ <key>SEEN</key>
+ </entry>
+ <entry>
+ <key>rebuild Index</key>
+ </entry>
+ <entry>
+ <key>Charts</key>
+ </entry>
+ <entry>
+ <key>Keywords</key>
+ </entry>
+ <entry>
+ <key>Days running</key>
+ </entry>
+ <entry>
+ <key>Logs</key>
+ </entry>
+ <entry>
+ <key>Mail</key>
+ </entry>
+ <entry>
+ <key>Phonecall</key>
+ </entry>
+ <entry>
+ <key>Chart 2</key>
+ </entry>
+ <entry>
+ <key>Log</key>
+ </entry>
+ <entry>
+ <key>Offer Header Text</key>
+ </entry>
+ <entry>
+ <key>Employees</key>
+ </entry>
+ <entry>
+ <key>Todo</key>
+ </entry>
+ <entry>
+ <key>Days remaining</key>
+ </entry>
+ <entry>
+ <key>Offer Footer Text</key>
+ </entry>
+ <entry>
+ <key>Date new</key>
+ </entry>
+ <entry>
+ <key>Date edit</key>
+ </entry>
+ <entry>
+ <key>Keyword Attributes</key>
+ </entry>
+ <entry>
+ <key>HTML</key>
+ </entry>
+ <entry>
+ <key>Student/Internship</key>
+ </entry>
+ <entry>
+ <key>Food</key>
+ </entry>
+ <entry>
+ <key>200 to 349T</key>
+ </entry>
+ <entry>
+ <key>Within 6 months</key>
+ </entry>
+ <entry>
+ <key>No project planned</key>
+ </entry>
+ <entry>
+ <key>Logistics</key>
+ </entry>
+ <entry>
+ <key>Skilled workers</key>
+ </entry>
+ <entry>
+ <key>Purchasing</key>
+ </entry>
+ <entry>
+ <key>Rate</key>
+ </entry>
+ <entry>
+ <key>Choice</key>
+ </entry>
+ <entry>
+ <key>points</key>
+ </entry>
+ <entry>
+ <key>Education</key>
+ </entry>
+ <entry>
+ <key>Public</key>
+ </entry>
+ <entry>
+ <key>Building and construction suppliers</key>
+ </entry>
+ <entry>
+ <key>0 to 49</key>
+ </entry>
+ <entry>
+ <key>0 to 49T</key>
+ </entry>
+ <entry>
+ <key>CRM Manager</key>
+ </entry>
+ <entry>
+ <key>50 to 99T</key>
+ </entry>
+ <entry>
+ <key>Search</key>
+ </entry>
+ <entry>
+ <key>Counsellor</key>
+ </entry>
+ <entry>
+ <key>50 to 100</key>
+ </entry>
+ <entry>
+ <key>OnPremise</key>
+ </entry>
+ <entry>
+ <key>Head of IT</key>
+ </entry>
+ <entry>
+ <key>251 to 1000</key>
+ </entry>
+ <entry>
+ <key>Electric</key>
+ </entry>
+ <entry>
+ <key>from 1,000</key>
+ </entry>
+ <entry>
+ <key>Publishing house</key>
+ </entry>
+ <entry>
+ <key>100 to 199T</key>
+ </entry>
+ <entry>
+ <key>101 to 250</key>
+ </entry>
+ <entry>
+ <key>Overarching</key>
+ </entry>
+ <entry>
+ <key>Energy</key>
+ </entry>
+ <entry>
+ <key>Machinery and equipment</key>
+ </entry>
+ <entry>
+ <key>Trade</key>
+ </entry>
+ <entry>
+ <key>Consultation</key>
+ </entry>
+ <entry>
+ <key>Cloud</key>
+ </entry>
+ <entry>
+ <key>No date yet</key>
+ </entry>
+ <entry>
+ <key>Classifications</key>
+ </entry>
+ <entry>
+ <key>Service Manager</key>
+ </entry>
+ <entry>
+ <key>Lifesience</key>
+ </entry>
+ <entry>
+ <key>Automotive</key>
+ </entry>
+ <entry>
+ <key>Lottery</key>
+ </entry>
+ <entry>
+ <key>from 350T</key>
+ </entry>
+ <entry>
+ <key>Management/Sales Manager</key>
+ </entry>
+ <entry>
+ <key>Environment</key>
+ </entry>
+ <entry>
+ <key>Within 12 months</key>
+ </entry>
+ <entry>
+ <key>Finance</key>
+ </entry>
+ <entry>
+ <key>ScoreProjectStart</key>
+ </entry>
+ <entry>
+ <key>ScoreStandard</key>
+ </entry>
+ <entry>
+ <key>ScoreCustomizing</key>
+ </entry>
+ <entry>
+ <key>ScoreDecisionPhase</key>
+ </entry>
+ <entry>
+ <key>ScoreUsers</key>
+ </entry>
+ <entry>
+ <key>ScoreBranch</key>
+ </entry>
+ <entry>
+ <key>ScorePosition</key>
+ </entry>
+ <entry>
+ <key>ScoreBudget</key>
+ </entry>
+ <entry>
+ <key>ScoreDepartment</key>
+ </entry>
+ <entry>
+ <key>ScoreCloud</key>
+ </entry>
+ <entry>
+ <key>ScoreBased</key>
+ </entry>
+ <entry>
+ <key>aaa</key>
+ </entry>
+ <entry>
+ <key>dfssdfsdf</key>
+ </entry>
+ <entry>
+ <key>HUHUUU</key>
+ </entry>
+ <entry>
+ <key>Score</key>
+ </entry>
+ <entry>
+ <key>Scoretype</key>
+ </entry>
+ <entry>
+ <key>aaaaaaaaaaaaa</key>
+ </entry>
+ <entry>
+ <key>bbb</key>
+ </entry>
+ <entry>
+ <key>${NUMBER_FORMAT_NEEDED}</key>
+ </entry>
+ <entry>
+ <key>dsfsdf</key>
+ </entry>
+ <entry>
+ <key>asdfasdf</key>
+ </entry>
+ <entry>
+ <key>Classification number</key>
+ </entry>
+ <entry>
+ <key>dasgf</key>
+ </entry>
+ <entry>
+ <key>Possible values</key>
+ </entry>
<entry>
<key>New step</key>
</entry>
@@ -3541,7 +3826,11 @@ select AB_LANGUAGE.NAME_LATIN from AB_LANGUAGE
union
select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO
union
-select AB_OBJECTRELATIONTYPE.RELATION_TITLE from AB_OBJECTRELATIONTYPE</element>
+select AB_OBJECTRELATIONTYPE.RELATION_TITLE from AB_OBJECTRELATIONTYPE
+union
+select TITLE from CLASSIFICATIONSCORE
+union
+select SCORETYPE from CLASSIFICATIONTYPE</element>
</statements>
</languageSql>
</sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 4bc6fd5b7b92e422c876554bca51b6bcd9ff45a0..7de2cf637908d92e172c9a730b814f4bb2c66df0 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -98,6 +98,10 @@
<key>Maximal Count</key>
<value>Maximale Anzahl</value>
</entry>
+ <entry>
+ <key>UNSEEN</key>
+ <value>Neu</value>
+ </entry>
<entry>
<key>Campaign Participant</key>
<value>Kampagnen Teilnehmer/innen</value>
@@ -373,6 +377,10 @@
<key>Salutation</key>
<value>Anrede</value>
</entry>
+ <entry>
+ <key>setRead</key>
+ <value>Gelesen setzen</value>
+ </entry>
<entry>
<key>Middlename</key>
<value>Zwischenname</value>
@@ -457,6 +465,10 @@
<key>District</key>
<value>Kreis</value>
</entry>
+ <entry>
+ <key>TODELETE</key>
+ <value>Für Löschung vorgesehen</value>
+ </entry>
<entry>
<key>Companies</key>
<value>Firmen</value>
@@ -492,6 +504,10 @@
<key>Touchpoints</key>
<value>Kontaktpunkte</value>
</entry>
+ <entry>
+ <key>archieve</key>
+ <value>archivieren</value>
+ </entry>
<entry>
<key>Document Template</key>
<value>Dokumentvorlage</value>
@@ -639,6 +655,10 @@
<key>Commodity group 2</key>
<value>Warengruppe 2</value>
</entry>
+ <entry>
+ <key>setUnread</key>
+ <value>Ungelesen setzen</value>
+ </entry>
<entry>
<key>Campaign Step</key>
<value>Kampagnen Stufe</value>
@@ -938,6 +958,10 @@
<key>Receipt</key>
<value>Beleg</value>
</entry>
+ <entry>
+ <key>CONFIRMED</key>
+ <value>Gelesen</value>
+ </entry>
<entry>
<key>Show all receipts</key>
<value>Alle Belege anzeigen</value>
@@ -969,6 +993,10 @@
<entry>
<key>Option4</key>
</entry>
+ <entry>
+ <key>ARCHIVE</key>
+ <value>Archiviert</value>
+ </entry>
<entry>
<key>Offers</key>
<value>Angebote</value>
@@ -1709,7 +1737,8 @@
<value>Ihr zuständiger Betreuer:</value>
</entry>
<entry>
- <key>Termin</key>
+ <key>Appointment</key>
+ <value>Termin</value>
</entry>
<entry>
<key>Vorschau</key>
@@ -2271,7 +2300,7 @@
</entry>
<entry>
<key>Prospect</key>
- <value>Potenzieller Kunde</value>
+ <value>Interessent</value>
</entry>
<entry>
<key>Estonia</key>
@@ -4216,6 +4245,10 @@
<entry>
<key>Flag</key>
</entry>
+ <entry>
+ <key>SEEN</key>
+ <value>Neu</value>
+ </entry>
<entry>
<key>Address Id</key>
</entry>
@@ -4400,6 +4433,365 @@
<entry>
<key>Offer date</key>
</entry>
+ <entry>
+ <key>Termin</key>
+ </entry>
+ <entry>
+ <key>rebuild Index</key>
+ </entry>
+ <entry>
+ <key>Charts</key>
+ </entry>
+ <entry>
+ <key>Keywords</key>
+ </entry>
+ <entry>
+ <key>Days running</key>
+ <value>Tage laufend</value>
+ </entry>
+ <entry>
+ <key>Logs</key>
+ </entry>
+ <entry>
+ <key>Mail</key>
+ </entry>
+ <entry>
+ <key>Phonecall</key>
+ </entry>
+ <entry>
+ <key>Chart 2</key>
+ </entry>
+ <entry>
+ <key>Log</key>
+ </entry>
+ <entry>
+ <key>Offer Header Text</key>
+ <value>Angebot Kopftext</value>
+ </entry>
+ <entry>
+ <key>Employees</key>
+ </entry>
+ <entry>
+ <key>Todo</key>
+ </entry>
+ <entry>
+ <key>Days remaining</key>
+ <value>Tage verbleibend</value>
+ </entry>
+ <entry>
+ <key>Offer Footer Text</key>
+ <value>Angebot Fußtext</value>
+ </entry>
+ <entry>
+ <key>Date new</key>
+ </entry>
+ <entry>
+ <key>Date edit</key>
+ </entry>
+ <entry>
+ <key>Keyword Attributes</key>
+ </entry>
+ <entry>
+ <key>HTML</key>
+ </entry>
+ <entry>
+ <key>Student/Internship</key>
+ <value>Student/Praktikant</value>
+ </entry>
+ <entry>
+ <key>Food</key>
+ <value>Lebensmittel</value>
+ </entry>
+ <entry>
+ <key>200 to 349T</key>
+ <value>200 bis 349T</value>
+ </entry>
+ <entry>
+ <key>Within 6 months</key>
+ <value>Innerhalb 6 Monaten</value>
+ </entry>
+ <entry>
+ <key>No project planned</key>
+ <value>Kein Projekt geplant</value>
+ </entry>
+ <entry>
+ <key>Logistics</key>
+ <value>Logistik</value>
+ </entry>
+ <entry>
+ <key>Skilled workers</key>
+ <value>Fachkräfte</value>
+ </entry>
+ <entry>
+ <key>Purchasing</key>
+ <value>Einkauf</value>
+ </entry>
+ <entry>
+ <key>Rate</key>
+ <value>Bewerten</value>
+ </entry>
+ <entry>
+ <key>Choice</key>
+ <value>Auswahl</value>
+ </entry>
+ <entry>
+ <key>points</key>
+ <value>Punkte</value>
+ </entry>
+ <entry>
+ <key>Education</key>
+ <value>Bildung</value>
+ </entry>
+ <entry>
+ <key>Public</key>
+ <value>Öffentlich</value>
+ </entry>
+ <entry>
+ <key>Building and construction suppliers</key>
+ <value>Bau- und Bauzulieferer</value>
+ </entry>
+ <entry>
+ <key>0 to 49</key>
+ <value>0 bis 49</value>
+ </entry>
+ <entry>
+ <key>0 to 49T</key>
+ <value>0 bis 49T</value>
+ </entry>
+ <entry>
+ <key>CRM Manager</key>
+ <value>Leiter CRM</value>
+ </entry>
+ <entry>
+ <key>50 to 99T</key>
+ <value>50 bis 99T</value>
+ </entry>
+ <entry>
+ <key>Search</key>
+ <value>Suchen</value>
+ </entry>
+ <entry>
+ <key>Counsellor</key>
+ <value>Berater</value>
+ </entry>
+ <entry>
+ <key>50 to 100</key>
+ <value>50 bis 100</value>
+ </entry>
+ <entry>
+ <key>OnPremise</key>
+ <value>OnPremise</value>
+ </entry>
+ <entry>
+ <key>Head of IT</key>
+ <value>Leiter IT</value>
+ </entry>
+ <entry>
+ <key>251 to 1000</key>
+ <value>251 bis 1000</value>
+ </entry>
+ <entry>
+ <key>Electric</key>
+ <value>Elektro</value>
+ </entry>
+ <entry>
+ <key>from 1,000</key>
+ <value>ab 1.000</value>
+ </entry>
+ <entry>
+ <key>Publishing house</key>
+ <value>Verlag</value>
+ </entry>
+ <entry>
+ <key>100 to 199T</key>
+ <value>100 bis 199T</value>
+ </entry>
+ <entry>
+ <key>101 to 250</key>
+ <value>101 bis 250</value>
+ </entry>
+ <entry>
+ <key>Overarching</key>
+ <value>Ãœbergreifend</value>
+ </entry>
+ <entry>
+ <key>Energy</key>
+ <value>Energie</value>
+ </entry>
+ <entry>
+ <key>Machinery and equipment</key>
+ <value>Maschinen und Anlagen</value>
+ </entry>
+ <entry>
+ <key>Trade</key>
+ <value>Handel</value>
+ </entry>
+ <entry>
+ <key>Consultation</key>
+ <value>Beratung</value>
+ </entry>
+ <entry>
+ <key>Cloud</key>
+ <value>Cloud</value>
+ </entry>
+ <entry>
+ <key>No date yet</key>
+ <value>Noch kein Termin</value>
+ </entry>
+ <entry>
+ <key>Classifications</key>
+ <value>Klassifizierungen</value>
+ </entry>
+ <entry>
+ <key>Service Manager</key>
+ <value>Leiter Service</value>
+ </entry>
+ <entry>
+ <key>Lifesience</key>
+ <value>Lifesience</value>
+ </entry>
+ <entry>
+ <key>Automotive</key>
+ <value>Automotive</value>
+ </entry>
+ <entry>
+ <key>Lottery</key>
+ <value>Lotterie</value>
+ </entry>
+ <entry>
+ <key>from 350T</key>
+ <value>ab 350T</value>
+ </entry>
+ <entry>
+ <key>Management/Sales Manager</key>
+ <value>GF/Leiter Vertrieb</value>
+ </entry>
+ <entry>
+ <key>Environment</key>
+ <value>Umwelt</value>
+ </entry>
+ <entry>
+ <key>Within 12 months</key>
+ <value>Innerhalb 12 Monaten</value>
+ </entry>
+ <entry>
+ <key>Finance</key>
+ <value>Finanz</value>
+ </entry>
+ <entry>
+ <key>ScoreProjectStart</key>
+ <value>Projektstart</value>
+ </entry>
+ <entry>
+ <key>ScoreStandard</key>
+ <value>Standard</value>
+ </entry>
+ <entry>
+ <key>ScoreCustomizing</key>
+ <value>Eigenentwicklung</value>
+ </entry>
+ <entry>
+ <key>ScoreDecisionPhase</key>
+ <value>Entscheidungsphase</value>
+ </entry>
+ <entry>
+ <key>ScoreUsers</key>
+ <value>Anzahl Anwender</value>
+ </entry>
+ <entry>
+ <key>ScoreBranch</key>
+ <value>Branche</value>
+ </entry>
+ <entry>
+ <key>ScorePosition</key>
+ <value>Position</value>
+ </entry>
+ <entry>
+ <key>ScoreBudget</key>
+ <value>Projektbudget</value>
+ </entry>
+ <entry>
+ <key>ScoreDepartment</key>
+ <value>Einsatzbereich</value>
+ </entry>
+ <entry>
+ <key>ScoreCloud</key>
+ <value>Betriebsmodel</value>
+ </entry>
+ <entry>
+ <key>ScoreBased</key>
+ <value>Unternehmenssitz</value>
+ </entry>
+ <entry>
+ <key>aaa</key>
+ </entry>
+ <entry>
+ <key>dfssdfsdf</key>
+ </entry>
+ <entry>
+ <key>HUHUUU</key>
+ </entry>
+ <entry>
+ <key>Score</key>
+ </entry>
+ <entry>
+ <key>Scoretype</key>
+ <value>Bewertungstyp</value>
+ </entry>
+ <entry>
+ <key>aaaaaaaaaaaaa</key>
+ </entry>
+ <entry>
+ <key>bbb</key>
+ </entry>
+ <entry>
+ <key>${NUMBER_FORMAT_NEEDED}</key>
+ <value>Es wird eine Zahl erwartet.</value>
+ </entry>
+ <entry>
+ <key>dsfsdf</key>
+ </entry>
+ <entry>
+ <key>asdfasdf</key>
+ </entry>
+ <entry>
+ <key>Classification number</key>
+ <value>Klassifizierungsnummer</value>
+ </entry>
+ <entry>
+ <key>dasgf</key>
+ </entry>
+ <entry>
+ <key>Possible values</key>
+ <value>Mögliche Werte</value>
+ </entry>
+ <entry>
+ <key>ARCHIEVED</key>
+ </entry>
+ <entry>
+ <key>e</key>
+ </entry>
+ <entry>
+ <key>${HIGHER_THAN_MAX} max: %0</key>
+ <value>Der eingegebene Wert ist über dem Maximalwert %0.</value>
+ </entry>
+ <entry>
+ <key>huhu</key>
+ </entry>
+ <entry>
+ <key>Rating</key>
+ <value>Bewertung</value>
+ </entry>
+ <entry>
+ <key>sum</key>
+ <value>Summe</value>
+ </entry>
+ <entry>
+ <key>A: 75 < </key>
+ </entry>
+ <entry>
+ <key>Possible Values</key>
+ </entry>
<entry>
<key>New step</key>
<value>Neue Stufe</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 33c725d83eb174a0f9c441cdd2df9916cd68f141..f6c78eddbd9540dac71207673db8fc2cada4b7a2 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -3563,6 +3563,334 @@
<entry>
<key>Letter</key>
</entry>
+ <entry>
+ <key>Appointment</key>
+ </entry>
+ <entry>
+ <key>ARCHIEVED</key>
+ </entry>
+ <entry>
+ <key>UNSEEN</key>
+ </entry>
+ <entry>
+ <key>TODELETE</key>
+ </entry>
+ <entry>
+ <key>CONFIRMED</key>
+ </entry>
+ <entry>
+ <key>SEEN</key>
+ </entry>
+ <entry>
+ <key>rebuild Index</key>
+ </entry>
+ <entry>
+ <key>Charts</key>
+ </entry>
+ <entry>
+ <key>Keywords</key>
+ </entry>
+ <entry>
+ <key>Days running</key>
+ </entry>
+ <entry>
+ <key>Logs</key>
+ </entry>
+ <entry>
+ <key>Mail</key>
+ </entry>
+ <entry>
+ <key>Phonecall</key>
+ </entry>
+ <entry>
+ <key>Chart 2</key>
+ </entry>
+ <entry>
+ <key>Log</key>
+ </entry>
+ <entry>
+ <key>Offer Header Text</key>
+ </entry>
+ <entry>
+ <key>Employees</key>
+ </entry>
+ <entry>
+ <key>Todo</key>
+ </entry>
+ <entry>
+ <key>Days remaining</key>
+ </entry>
+ <entry>
+ <key>Offer Footer Text</key>
+ </entry>
+ <entry>
+ <key>Date new</key>
+ </entry>
+ <entry>
+ <key>Date edit</key>
+ </entry>
+ <entry>
+ <key>Keyword Attributes</key>
+ </entry>
+ <entry>
+ <key>HTML</key>
+ </entry>
+ <entry>
+ <key>Student/Internship</key>
+ </entry>
+ <entry>
+ <key>Food</key>
+ </entry>
+ <entry>
+ <key>200 to 349T</key>
+ </entry>
+ <entry>
+ <key>Within 6 months</key>
+ </entry>
+ <entry>
+ <key>No project planned</key>
+ </entry>
+ <entry>
+ <key>Logistics</key>
+ </entry>
+ <entry>
+ <key>Skilled workers</key>
+ </entry>
+ <entry>
+ <key>Purchasing</key>
+ </entry>
+ <entry>
+ <key>Rate</key>
+ </entry>
+ <entry>
+ <key>Choice</key>
+ </entry>
+ <entry>
+ <key>points</key>
+ </entry>
+ <entry>
+ <key>Education</key>
+ </entry>
+ <entry>
+ <key>Public</key>
+ </entry>
+ <entry>
+ <key>Building and construction suppliers</key>
+ </entry>
+ <entry>
+ <key>0 to 49</key>
+ </entry>
+ <entry>
+ <key>0 to 49T</key>
+ </entry>
+ <entry>
+ <key>CRM Manager</key>
+ </entry>
+ <entry>
+ <key>50 to 99T</key>
+ </entry>
+ <entry>
+ <key>Search</key>
+ </entry>
+ <entry>
+ <key>Counsellor</key>
+ </entry>
+ <entry>
+ <key>50 to 100</key>
+ </entry>
+ <entry>
+ <key>OnPremise</key>
+ </entry>
+ <entry>
+ <key>Head of IT</key>
+ </entry>
+ <entry>
+ <key>251 to 1000</key>
+ </entry>
+ <entry>
+ <key>Electric</key>
+ </entry>
+ <entry>
+ <key>from 1,000</key>
+ </entry>
+ <entry>
+ <key>Publishing house</key>
+ </entry>
+ <entry>
+ <key>100 to 199T</key>
+ </entry>
+ <entry>
+ <key>101 to 250</key>
+ </entry>
+ <entry>
+ <key>Overarching</key>
+ </entry>
+ <entry>
+ <key>Energy</key>
+ </entry>
+ <entry>
+ <key>Machinery and equipment</key>
+ </entry>
+ <entry>
+ <key>Trade</key>
+ </entry>
+ <entry>
+ <key>Consultation</key>
+ </entry>
+ <entry>
+ <key>Cloud</key>
+ </entry>
+ <entry>
+ <key>No date yet</key>
+ </entry>
+ <entry>
+ <key>Classifications</key>
+ </entry>
+ <entry>
+ <key>Service Manager</key>
+ </entry>
+ <entry>
+ <key>Lifesience</key>
+ </entry>
+ <entry>
+ <key>Automotive</key>
+ </entry>
+ <entry>
+ <key>Lottery</key>
+ </entry>
+ <entry>
+ <key>from 350T</key>
+ </entry>
+ <entry>
+ <key>Management/Sales Manager</key>
+ </entry>
+ <entry>
+ <key>Environment</key>
+ </entry>
+ <entry>
+ <key>Within 12 months</key>
+ </entry>
+ <entry>
+ <key>Finance</key>
+ </entry>
+ <entry>
+ <key>ScoreProjectStart</key>
+ <value>Project start</value>
+ </entry>
+ <entry>
+ <key>ScoreStandard</key>
+ <value>Standard</value>
+ </entry>
+ <entry>
+ <key>ScoreCustomizing</key>
+ <value>Customizing</value>
+ </entry>
+ <entry>
+ <key>ScoreDecisionPhase</key>
+ <value>Desicion phase</value>
+ </entry>
+ <entry>
+ <key>ScoreUsers</key>
+ <value>User count</value>
+ </entry>
+ <entry>
+ <key>ScoreBranch</key>
+ <value>Branche</value>
+ </entry>
+ <entry>
+ <key>ScorePosition</key>
+ <value>Position</value>
+ </entry>
+ <entry>
+ <key>ScoreBudget</key>
+ <value>Project budget</value>
+ </entry>
+ <entry>
+ <key>ScoreDepartment</key>
+ <value>department</value>
+ </entry>
+ <entry>
+ <key>ScoreCloud</key>
+ <value>Operating model</value>
+ </entry>
+ <entry>
+ <key>ScoreBased</key>
+ <value>Headquarters</value>
+ </entry>
+ <entry>
+ <key>aaa</key>
+ </entry>
+ <entry>
+ <key>dfssdfsdf</key>
+ </entry>
+ <entry>
+ <key>HUHUUU</key>
+ </entry>
+ <entry>
+ <key>Score</key>
+ </entry>
+ <entry>
+ <key>Scoretype</key>
+ </entry>
+ <entry>
+ <key>aaaaaaaaaaaaa</key>
+ </entry>
+ <entry>
+ <key>bbb</key>
+ </entry>
+ <entry>
+ <key>${NUMBER_FORMAT_NEEDED}</key>
+ <value>Value has to be a number.</value>
+ </entry>
+ <entry>
+ <key>dsfsdf</key>
+ </entry>
+ <entry>
+ <key>asdfasdf</key>
+ </entry>
+ <entry>
+ <key>Classification number</key>
+ </entry>
+ <entry>
+ <key>dasgf</key>
+ </entry>
+ <entry>
+ <key>Possible values</key>
+ </entry>
+ <entry>
+ <key>ARCHIVE</key>
+ </entry>
+ <entry>
+ <key>archieve</key>
+ </entry>
+ <entry>
+ <key>setUnread</key>
+ </entry>
+ <entry>
+ <key>setRead</key>
+ </entry>
+ <entry>
+ <key>e</key>
+ </entry>
+ <entry>
+ <key>${HIGHER_THAN_MAX} max: %0</key>
+ <value>The value is greater than the allowed max-value %0.</value>
+ </entry>
+ <entry>
+ <key>huhu</key>
+ </entry>
+ <entry>
+ <key>Rating</key>
+ </entry>
+ <entry>
+ <key>sum</key>
+ </entry>
+ <entry>
+ <key>A: 75 < </key>
+ </entry>
+ <entry>
+ <key>Possible Values</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/CampaignStep/CampaignStep.aod b/neonContext/CampaignStep/CampaignStep.aod
index 2c6cb5f3c0f93a686836c30837f902273b3c6814..45e6f68e94dc6226b28325eab2a8841b271c5b6e 100644
--- a/neonContext/CampaignStep/CampaignStep.aod
+++ b/neonContext/CampaignStep/CampaignStep.aod
@@ -7,7 +7,7 @@
<filterview>CampaignStepFilter_view</filterview>
<editview>CampaignStepEdit_view</editview>
<preview>CampaignStepPreview_view</preview>
- <lookupview>CampaignStepFilter_view</lookupview>
+ <lookupview>CampaignStepLookup_view</lookupview>
<entity>CampaignStep_entity</entity>
<references>
<neonViewReference>
@@ -38,6 +38,10 @@
<name>ad879f25-4659-49d0-81ed-2e09c8b11ac1</name>
<view>CampaignStepParticipnatsPerStep_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>b69f5e66-42ce-41a9-8877-66e8f82875e8</name>
+ <view>CampaignStepLookup_view</view>
+ </neonViewReference>
<neonViewReference>
<name>99367402-93e6-49d4-b60c-143b6e71df00</name>
<view>CampaignStepsGantt_view</view>
diff --git a/neonContext/Classification/Classification.aod b/neonContext/Classification/Classification.aod
new file mode 100644
index 0000000000000000000000000000000000000000..725483becd6b1b7041192bd5ac1cd8670e319644
--- /dev/null
+++ b/neonContext/Classification/Classification.aod
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>Classification</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>ClassificationAdminTree_view</mainview>
+ <editview>ClassificatonAdminEdit_view</editview>
+ <entity>Classification_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>3ab6b4d1-e6db-42be-8262-2499a3d114e9</name>
+ <view>ClassificationTree_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>359f42a2-1014-4d81-aa65-8f6aeba10f2d</name>
+ <view>ClassificatonAdminEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b54f49d0-3577-4221-8fd1-fc1c8239d689</name>
+ <view>ClassificationAdminTree_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>50c0d5c5-c84f-452d-9f77-41b82ac0319f</name>
+ <view>ClassificatonEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>8412dc60-bffd-49bd-a68d-c730404b807b</name>
+ <view>ClassificationFilter_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/ClassificationAdmin/ClassificationAdmin.aod b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
new file mode 100644
index 0000000000000000000000000000000000000000..39b6239be4602b6dca174ef368b0b7bd0facd5c1
--- /dev/null
+++ b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>ClassificationAdmin</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>ClassificationAdminMain_view</mainview>
+ <filterview>ClassificationAdminFilter_view</filterview>
+ <entity>ClassificationAdmin_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>e29a0221-6ac6-47d3-bee0-950def1847a8</name>
+ <view>ClassificationAdminFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>4a240156-6c62-46d8-890e-b5c239ef8128</name>
+ <view>ClassificationAdminMain_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/ClassificationScore/ClassificationScore.aod b/neonContext/ClassificationScore/ClassificationScore.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b93085f7299a80219111e4660ec78108ef2d0ccf
--- /dev/null
+++ b/neonContext/ClassificationScore/ClassificationScore.aod
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>ClassificationScore</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>ClassificationScore_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>ccaf4443-07e0-4e29-a73d-2073d132fbe6</name>
+ <view>ClassificationScoreMultipleEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/SalesprojectClassification/SalesprojectClassification.aod b/neonContext/SalesprojectClassification/SalesprojectClassification.aod
deleted file mode 100644
index 76e29d04b86f10591bb48ff255822d4685510324..0000000000000000000000000000000000000000
--- a/neonContext/SalesprojectClassification/SalesprojectClassification.aod
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>SalesprojectClassification</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>SalesprojectClassificationFilter_view</filterview>
- <preview>SalesprojectClassificationPreview_view</preview>
- <entity>SalesprojectClassification_entity</entity>
- <references>
- <neonViewReference>
- <name>c0720a84-98a8-459d-bdf5-b3daf56ee059</name>
- <view>SalesprojectClassificationFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>e5f1c9a7-19a8-433e-b25e-83001d4f7bf8</name>
- <view>SalesprojectClassificationPreview_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod b/neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod
deleted file mode 100644
index 80ff2cc86e9f990b1f5f596528eb5d2acf8ebf39..0000000000000000000000000000000000000000
--- a/neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>SalesprojectClassificationEntry</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>SalesprojectClassificationEntryPreview_view</mainview>
- <filterview>SalesprojectClassificationEntryPreview_view</filterview>
- <editview>SalesprojectClassificationEntryEdit_view</editview>
- <preview>SalesprojectClassificationEntryPreview_view</preview>
- <entity>SalesprojectClassificationEntry_entity</entity>
- <references>
- <neonViewReference>
- <name>7cddda68-3dcb-4daf-84a4-1546298cabb6</name>
- <view>SalesprojectClassificationEntryPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>80205380-7785-43a3-af7b-73ef8112ca38</name>
- <view>SalesprojectClassificationEntryEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonNotificationType/AndisNotification/AndisNotification.aod b/neonNotificationType/Andis/Andis.aod
similarity index 71%
rename from neonNotificationType/AndisNotification/AndisNotification.aod
rename to neonNotificationType/Andis/Andis.aod
index 3c43805abbdc4bfe1bd4584c23fa29fcbcd9244c..45ad2c35dace2106a2710a27626e2841a906efd4 100644
--- a/neonNotificationType/AndisNotification/AndisNotification.aod
+++ b/neonNotificationType/Andis/Andis.aod
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonNotificationType xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonNotificationType/1.1.0">
- <name>AndisNotification</name>
+ <name>Andis</name>
<title>Andis Noti</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:ASTERISK</icon>
+ <icon>VAADIN:COMMENT_ELLIPSIS_O</icon>
<resultFrameNeon></resultFrameNeon>
- <onResultOpen>%aditoprj%/neonNotificationType/AndisNotification/onResultOpen.js</onResultOpen>
</neonNotificationType>
diff --git a/neonNotificationType/AndisNotification/onResultOpen.js b/neonNotificationType/AndisNotification/onResultOpen.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index 6007ef7669965102d211ec690e99271dc8e85965..65acf9a4df32daf07b5fecd7828a1126ddad3ba5 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -4,9 +4,9 @@
<title>relations</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <noneLayout>
<name>layout</name>
- </boxLayout>
+ </noneLayout>
</layout>
<children>
<genericMultipleViewTemplate>
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index be8a19a301f6f1532c42af136b631774c4345117..819854f42b0c431257b16eac4e08f468cc9e8a73 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -4,9 +4,9 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/neonView/AppointmentPreview_view/documentation.adoc</documentation>
<layout>
- <headerFooterLayout>
+ <boxLayout>
<name>layout</name>
- </headerFooterLayout>
+ </boxLayout>
</layout>
<children>
<appointmentPreviewViewTemplate>
diff --git a/neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod b/neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod
index 89837dbdc48be1db6a691a421179a59ed82b328b..96b44126898eb22f208ec17f823626ea95513c0b 100644
--- a/neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod
+++ b/neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod
@@ -6,11 +6,24 @@
<layout>
<headerFooterLayout>
<name>layout</name>
- <header>campaignDetail</header>
- <footer>SelectedCampaignInfosScore</footer>
+ <header>SelectedCampaignInfosScore</header>
</headerFooterLayout>
</layout>
<children>
+ <scoreCardViewTemplate>
+ <name>SelectedCampaignInfosScore</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>5fb2164c-9433-480a-9d55-726a2b05a549</name>
+ <entityField>campaignStepCurrentParticipantCount</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d0820091-352f-431f-8d7a-71cb5b576853</name>
+ <entityField>campaignStepMaxParticipantCount</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
<genericViewTemplate>
<name>campaignDetail</name>
<editMode v="true" />
@@ -31,19 +44,5 @@
<entityField>#ENTITY</entityField>
<view>campaignParticipantMessage_view</view>
</neonViewReference>
- <scoreCardViewTemplate>
- <name>SelectedCampaignInfosScore</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>5fb2164c-9433-480a-9d55-726a2b05a549</name>
- <entityField>campaignStepCurrentParticipantCount</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d0820091-352f-431f-8d7a-71cb5b576853</name>
- <entityField>campaignStepMaxParticipantCount</entityField>
- </entityFieldLink>
- </fields>
- </scoreCardViewTemplate>
</children>
</neonView>
diff --git a/neonView/CampaignFilter_view/CampaignFilter_view.aod b/neonView/CampaignFilter_view/CampaignFilter_view.aod
index 76eb3162044f64f8d0e59abdc3a26c8ec8eee3df..ed7926efe8bc7bb0d4856b099538c4d2c351ee4e 100644
--- a/neonView/CampaignFilter_view/CampaignFilter_view.aod
+++ b/neonView/CampaignFilter_view/CampaignFilter_view.aod
@@ -15,6 +15,10 @@
<name>Campaigns</name>
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>8fd2c7a2-37ad-43be-b37a-3cf9d07e71c8</name>
+ <entityField>#IMAGE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>c384e4df-3f29-45b8-b86d-2c6aa253833f</name>
<entityField>NAME</entityField>
diff --git a/neonView/CampaignParticipantEdit_view/CampaignParticipantEdit_view.aod b/neonView/CampaignParticipantEdit_view/CampaignParticipantEdit_view.aod
index 031c3e7314a419cc5390075cd3707bbf0b0ba6d6..756b77934700c526ade996f5ac32d8ac50fde1da 100644
--- a/neonView/CampaignParticipantEdit_view/CampaignParticipantEdit_view.aod
+++ b/neonView/CampaignParticipantEdit_view/CampaignParticipantEdit_view.aod
@@ -7,11 +7,24 @@
<layout>
<headerFooterLayout>
<name>layout</name>
- <header>Generic</header>
- <footer>CampaignStepInfos_Score</footer>
+ <header>CampaignStepInfos_Score</header>
</headerFooterLayout>
</layout>
<children>
+ <scoreCardViewTemplate>
+ <name>CampaignStepInfos_Score</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>22e3fc0a-a3cb-4de0-92a6-9797bf2fafea</name>
+ <entityField>campaignStepCurrentParticipantCount</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>2bbf0c7e-6a47-4c5a-a2ae-b2ee1ee17d50</name>
+ <entityField>campaignStepMaxParticipantCount</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
<genericViewTemplate>
<name>Generic</name>
<editMode v="true" />
@@ -32,19 +45,5 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
- <scoreCardViewTemplate>
- <name>CampaignStepInfos_Score</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>22e3fc0a-a3cb-4de0-92a6-9797bf2fafea</name>
- <entityField>campaignStepCurrentParticipantCount</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>2bbf0c7e-6a47-4c5a-a2ae-b2ee1ee17d50</name>
- <entityField>campaignStepMaxParticipantCount</entityField>
- </entityFieldLink>
- </fields>
- </scoreCardViewTemplate>
</children>
</neonView>
diff --git a/neonView/CampaignPreview_view/CampaignPreview_view.aod b/neonView/CampaignPreview_view/CampaignPreview_view.aod
index 807406980b72d68120ef87044ea2b1f81af80bfe..50e0907a9664d4d1548bc2dadef2b531c69f698c 100644
--- a/neonView/CampaignPreview_view/CampaignPreview_view.aod
+++ b/neonView/CampaignPreview_view/CampaignPreview_view.aod
@@ -14,6 +14,7 @@
<children>
<cardViewTemplate>
<name>Header</name>
+ <iconField>#IMAGE</iconField>
<titleField>NAME</titleField>
<subtitleField>STATE</subtitleField>
<descriptionField>EMPLOYEE_CONTACT_ID</descriptionField>
diff --git a/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod b/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod
index c09b21d8dca86146e1d243c58ddd32c69224e55a..bbba38199f38da2176f3ad589c13a8b18bedfca2 100644
--- a/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod
+++ b/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod
@@ -15,6 +15,10 @@
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>5fea2adf-3005-4af0-b83a-a1c932f33a64</name>
+ <entityField>#IMAGE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>5d52aaef-ec22-4c45-9ac7-eaec5d967283</name>
<entityField>SORTING</entityField>
diff --git a/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod b/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d5afb6f10dc394d53b113b7512bd1d0c9cb57609
--- /dev/null
+++ b/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>CampaignStepLookup_view</name>
+ <title>Kampagnenschritte</title>
+ <description></description>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>StepsTable</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <columns>
+ <neonTableColumn>
+ <name>fe2a2d1d-6050-4d8a-87ea-ef90febf7ae5</name>
+ <entityField>#IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5d52aaef-ec22-4c45-9ac7-eaec5d967283</name>
+ <entityField>SORTING</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d9ca59de-1441-494a-91f0-1cff91c575de</name>
+ <entityField>NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1dc891fe-bbbc-4c91-ae71-4d0372d777bc</name>
+ <entityField>CAMPAIGN_ID</entityField>
+ <width v="75" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0ffcc021-2b58-49f6-91d0-21f4029f744f</name>
+ <entityField>DATE_START</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2507d34f-3bc2-426c-9acc-d8ae146daee8</name>
+ <entityField>DATE_END</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9fa9d9f4-5851-4125-ba59-09aa2fb07f89</name>
+ <entityField>STATE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
index cd7903384570b3137e9860af17819761a704a9ab..bec51dae92ef5e4ccf9c73fe9c1a4328006b119e 100644
--- a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
+++ b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
@@ -12,6 +12,7 @@
<children>
<cardViewTemplate>
<name>CampaignStepCard</name>
+ <iconField>#IMAGE</iconField>
<titleField>NAME</titleField>
<subtitleField>STATE</subtitleField>
<descriptionField>DESCRIPTION</descriptionField>
diff --git a/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0e582bf507e298476874175d085d1b7988c4dc0a
--- /dev/null
+++ b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ClassificationAdminFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Classificationtypes</name>
+ <hideActions v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>44e91668-7947-49e2-8aa4-b9a03bc87842</name>
+ <entityField>UID</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ClassificationAdminMain_view/ClassificationAdminMain_view.aod b/neonView/ClassificationAdminMain_view/ClassificationAdminMain_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..01e5e5579f7c7f5061697a45810d4983ecd20347
--- /dev/null
+++ b/neonView/ClassificationAdminMain_view/ClassificationAdminMain_view.aod
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ClassificationAdminMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>ce2fe9f5-b504-45fb-9cf0-be394f7aa901</name>
+ <entityField>ClassificationsAdmin</entityField>
+ <view>ClassificationAdminTree_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod b/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..957032ec621a5d865bf3c024180ee28c7aa9d529
--- /dev/null
+++ b/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ClassificationAdminTree_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treeViewTemplate>
+ <name>classificationTree</name>
+ <titleField>SCORETYPE</titleField>
+ <defaultGroupFields>
+ <element>CLASSIFICATIONNUMBER</element>
+ </defaultGroupFields>
+ <showChildrenCount v="false" />
+ <entryAction>edit</entryAction>
+ <entityField>#ENTITY</entityField>
+ </treeViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod b/neonView/ClassificationFilter_view/ClassificationFilter_view.aod
similarity index 64%
rename from neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
rename to neonView/ClassificationFilter_view/ClassificationFilter_view.aod
index 87da3752309443372ef83944905b3c79e605857f..fa541ebaeb8626db1a1a3cbea7b4d8fdba3b3a68 100644
--- a/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
+++ b/neonView/ClassificationFilter_view/ClassificationFilter_view.aod
@@ -1,26 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectClassificationFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Classifications</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>4139f5bd-0273-4b43-99a7-9122f0322170</name>
- <entityField>CLASSNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>9d31832d-86e4-49a8-99a5-2129cd6a1994</name>
- <entityField>POINTS</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ClassificationFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Classifications</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>f87e6f40-74ad-4f27-b9b0-32e1c6b294f4</name>
+ <entityField>CLASSIFICATIONTYPE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod b/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..33b639b8b18ef3cb4f427495f905f96237c7cc03
--- /dev/null
+++ b/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ClassificationScoreMultipleEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>scores</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>4c9b65c7-96a8-4524-a465-2e928b51242f</name>
+ <entityField>TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9321f0c5-321e-4962-843b-f274d33916be</name>
+ <entityField>SCORE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1170097d-0206-445e-8f2d-5768300f0262</name>
+ <entityField>SORT</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ClassificationTree_view/ClassificationTree_view.aod b/neonView/ClassificationTree_view/ClassificationTree_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9458284d2a8ca8e48a9c1af45b11065dbb1b3050
--- /dev/null
+++ b/neonView/ClassificationTree_view/ClassificationTree_view.aod
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ClassificationTree_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treeViewTemplate>
+ <name>classificationTree</name>
+ <titleField>SCORETYPE</titleField>
+ <descriptionField>CLASSIFICATIONSCORE_ID</descriptionField>
+ <defaultGroupFields>
+ <element>CLASSIFICATIONNUMBER</element>
+ </defaultGroupFields>
+ <hideActions v="true" />
+ <showChildrenCount v="false" />
+ <entryAction>edit</entryAction>
+ <entityField>#ENTITY</entityField>
+ </treeViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ClassificatonAdminEdit_view/ClassificatonAdminEdit_view.aod b/neonView/ClassificatonAdminEdit_view/ClassificatonAdminEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..07e0d1cefc179524edfb5a5b1fab5b334d001832
--- /dev/null
+++ b/neonView/ClassificatonAdminEdit_view/ClassificatonAdminEdit_view.aod
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ClassificatonAdminEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>classification</name>
+ <editMode v="true" />
+ <drawerCaption>Classification</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>7fddc4d4-6bdc-4c7a-9d69-bba4a9506707</name>
+ <entityField>CLASSIFICATIONNUMBER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>cb6e8f64-b2a4-4cc4-88b7-2f64f56b83dc</name>
+ <entityField>SCORETYPE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>info</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>d19a852f-de03-4cb1-a5d5-4b35349ef480</name>
+ <entityField>Info</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>214fbe22-378d-404e-99f8-f175e037f196</name>
+ <entityField>ClassificationScores</entityField>
+ <view>ClassificationScoreMultipleEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod b/neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod
similarity index 62%
rename from neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
rename to neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod
index 80dae257c9923647d887cebc7a44320ce1bff51d..f78d8182f006411155e2b752bc30f3fec6af8a68 100644
--- a/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
+++ b/neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectClassificationEntryEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>003f3304-b8fb-4009-ba55-b56d005191e3</name>
- <entityField>NAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>90630f8e-8e32-4743-9b79-a1faa6e26414</name>
- <entityField>VALUE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ClassificatonEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>classification</name>
+ <editMode v="true" />
+ <drawerCaption>Classification</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>dfdbc6f4-4859-495b-96e7-0853bdbc611f</name>
+ <entityField>CLASSIFICATIONSCORE_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentEdit_view/DocumentEdit_view.aod b/neonView/DocumentEdit_view/DocumentEdit_view.aod
index e0cd372b0b900a03188a1d31c70c23be0e423e08..94c8f4329ba5469401611c1d36b95d8e342a8464 100644
--- a/neonView/DocumentEdit_view/DocumentEdit_view.aod
+++ b/neonView/DocumentEdit_view/DocumentEdit_view.aod
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>DocumentEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>7d74c495-1af7-4e00-8a78-5787e544e101</name>
- <entityField>BINDATA_UPLOAD</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>91d96ac4-d838-4f92-90e7-954166b57288</name>
- <entityField>NAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>253b8716-bdec-4e24-8540-7513d934693b</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d3265f22-18dd-468b-8316-6a11fab662c3</name>
- <entityField>IS_MAIN_DOCUMENT</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>DocumentEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>7d74c495-1af7-4e00-8a78-5787e544e101</name>
+ <entityField>BINDATA_UPLOAD</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>91d96ac4-d838-4f92-90e7-954166b57288</name>
+ <entityField>NAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>253b8716-bdec-4e24-8540-7513d934693b</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d3265f22-18dd-468b-8316-6a11fab662c3</name>
+ <entityField>IS_MAIN_DOCUMENT</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index 5d2a40b9838e62219414062a6147eeeb7ebad056..3c4e94ad0b0857e20ef1bea7d40954b0de04002f 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -12,15 +12,24 @@
<tableViewTemplate>
<name>Table</name>
<favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
+ <entryAction>rowClickAction</entryAction>
<showHeader v="true" />
<isSaveable v="false" />
<isEditable v="false" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
+ <name>1cff3be1-523d-4a5a-b7d1-389d7cbb726f</name>
<entityField>ICON</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>ebf8b6d5-1057-425d-a57b-d02e25dbd2a4</name>
+ <entityField>TYPECODE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
+ <entityField>CREATIONDATE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>3bf425ed-227c-4768-b339-4794aa0d6063</name>
<entityField>CAPTION</entityField>
@@ -29,10 +38,6 @@
<name>ff33a6c1-7ac6-4acd-a083-e56a36f89977</name>
<entityField>DESCRIPTION</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>63df503b-2502-4123-917a-77c932f61268</name>
- <entityField>ORIGINATORNAME</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>5cb09de4-4413-41e5-8a7c-4970a3cf6a62</name>
<entityField>STATE</entityField>
diff --git a/neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod b/neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod
index c16fba47be7d1fe724f8e707b2caf48f6029b587..5c920c8b7f5ee25d4fafa7a777ba1346749df489 100644
--- a/neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod
+++ b/neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod
@@ -4,9 +4,9 @@
<title>Cover letter</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <noneLayout>
<name>layout</name>
- </boxLayout>
+ </noneLayout>
</layout>
<children>
<genericViewTemplate>
diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index fffa1a47cf616548bc615b5f7150de889af0e20d..f36623d6b0d778341e1a8f310563d5d531ea6670 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -4,9 +4,9 @@
<title>Details</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <noneLayout>
<name>layout</name>
- </boxLayout>
+ </noneLayout>
</layout>
<children>
<genericViewTemplate>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index 224df4dc3dffd9d2668c7e5453be2c7dfb69507e..59a83f1de6e3537425cf7ec1f40daa8f16ddbc52 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -78,8 +78,8 @@
</fields>
</genericViewTemplate>
<neonViewReference>
- <name>b9166f18-c98c-4011-ba03-99e619b090c1</name>
- <entityField>Documents</entityField>
+ <name>2e68ece3-d98d-49c4-92f9-3e3675ba5cb2</name>
+ <entityField>MainDocuments</entityField>
<view>DocumentList_view</view>
</neonViewReference>
</children>
diff --git a/neonView/PersonLookup_view/PersonLookup_view.aod b/neonView/PersonLookup_view/PersonLookup_view.aod
index 01da1a8660b63258989e90a12c496476dd37adc2..7d68f4c10251fd9f3feb1eab1c4fc9090b08cd25 100644
--- a/neonView/PersonLookup_view/PersonLookup_view.aod
+++ b/neonView/PersonLookup_view/PersonLookup_view.aod
@@ -1,42 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>PersonLookup_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Persons</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>9541c336-10e9-4767-b6e5-52b6108d967a</name>
- <entityField>#IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>876baf47-81c8-477a-951c-18df2dd4d972</name>
- <entityField>FIRSTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>fb150402-a576-4e21-855c-91dd7574f353</name>
- <entityField>LASTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>768f2294-2c4e-4c71-9992-ee9cea299041</name>
- <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>eb778e57-1f2d-436e-b22a-e92f7a190606</name>
- <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>27d03313-3ec6-438f-b79b-724369316ef3</name>
- <entityField>ADDRESS_ID</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>PersonLookup_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Persons</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>9541c336-10e9-4767-b6e5-52b6108d967a</name>
+ <entityField>#IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>876baf47-81c8-477a-951c-18df2dd4d972</name>
+ <entityField>FIRSTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fb150402-a576-4e21-855c-91dd7574f353</name>
+ <entityField>LASTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9760f1eb-8296-4d29-9afc-45c7440a0dc5</name>
+ <entityField>ORGANISATION_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>768f2294-2c4e-4c71-9992-ee9cea299041</name>
+ <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>eb778e57-1f2d-436e-b22a-e92f7a190606</name>
+ <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>27d03313-3ec6-438f-b79b-724369316ef3</name>
+ <entityField>ADDRESS_ID</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index e9408e8d52ef829ae699cccca46ae7130c9021d1..1e1136374ab17eeefce549e59f7f85ed5433a432 100644
--- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
@@ -1,46 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>PersonSimpleList_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Persons</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>d6207ade-29e7-4af0-ba5f-e9ddd799de7b</name>
- <entityField>#IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>1053d3a7-c5ee-4260-86f6-54e820f53e9f</name>
- <entityField>SALUTATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>a7eb48e2-d2a0-4ddb-b197-74ee77896960</name>
- <entityField>TITLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>302d875b-644d-4f75-b8c2-f99bab8ae88d</name>
- <entityField>FIRSTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>eacb1707-191c-4f09-b213-fbe87988c523</name>
- <entityField>LASTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>38e8ea31-060d-4a4c-aa70-a6752019dcff</name>
- <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>60cb743a-7a1f-4faa-92d6-780bd2ad0564</name>
- <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>PersonSimpleList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Persons</name>
+ <favoriteActionGroup1>campaignActionGroup</favoriteActionGroup1>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>d6207ade-29e7-4af0-ba5f-e9ddd799de7b</name>
+ <entityField>#IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1053d3a7-c5ee-4260-86f6-54e820f53e9f</name>
+ <entityField>SALUTATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a7eb48e2-d2a0-4ddb-b197-74ee77896960</name>
+ <entityField>TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>302d875b-644d-4f75-b8c2-f99bab8ae88d</name>
+ <entityField>FIRSTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>eacb1707-191c-4f09-b213-fbe87988c523</name>
+ <entityField>LASTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>38e8ea31-060d-4a4c-aa70-a6752019dcff</name>
+ <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>60cb743a-7a1f-4faa-92d6-780bd2ad0564</name>
+ <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod b/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
deleted file mode 100644
index f3aac2c0b1e5630b2794daf0a4d35efd8162829d..0000000000000000000000000000000000000000
--- a/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectClassificationEntryPreview_view</name>
- <title>asdf</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- </headerFooterLayout>
- </layout>
- <children>
- <titledListViewTemplate>
- <name>Info</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>91aa4685-98f7-40e9-87be-877583a91143</name>
- <entityField>NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>88105c9a-fdf8-4d2b-ac96-d57ef4f41aa4</name>
- <entityField>TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>b862235e-6595-4ae0-8bd0-5f942d975c67</name>
- <entityField>VALUE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ff2b615b-5c98-4a21-bb71-34027711d5e7</name>
- <entityField>POINTS</entityField>
- </neonTableColumn>
- </columns>
- </titledListViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod b/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
deleted file mode 100644
index 93d3137486787d482825a37edc12f0b58e5a0080..0000000000000000000000000000000000000000
--- a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectClassificationPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- </headerFooterLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Info</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>51712a19-9a8c-4967-bd15-a448b5bffb77</name>
- <entityField>CLASSNAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c3621e4e-53b0-4932-b943-e1c07fe16a24</name>
- <entityField>POINTS</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>c6c26fdd-3812-495f-bd30-d3a6cdcd4eb0</name>
- <entityField>SalesprojectClassificationEntries</entityField>
- <view>SalesprojectClassificationEntryPreview_view</view>
- </neonViewReference>
- </children>
-</neonView>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 7552475d87ac3897fb08596f26585c5f97c96a5d..ab16cc92a394dc4a9e0101c9937e2f8267e103ff 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -1,92 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>AllSalesprojectDashlet</name>
- <title>Salesprojects</title>
- <description>Show all salesprojects</description>
- <fragment>Salesproject/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:filter</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>OpenSalesprojectsDashlet</name>
- <title>Open salesprojects</title>
- <description>Show open salesprojects</description>
- <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiMjViMGFjNzctZWY5Mi00ODA5LTgwMmUtYmI5ZDg3ODJmODY1IiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:filter</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Salesprojects</name>
- <entityField>#ENTITY</entityField>
- <title></title>
- <columns>
- <neonTableColumn>
- <name>2cbd6486-e1e4-4660-94f9-1b71e29b11ba</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
- <entityField>CONTACT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>9f6b967e-5140-420f-84ca-2273920221bd</name>
- <entityField>PROJECTTITLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
- <entityField>STARTDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4cc3c3f1-6f86-434d-8d1d-32a965aa76b2</name>
- <entityField>ENDDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>92699fdb-4eea-4ce2-98d2-6cc3f3b7581e</name>
- <entityField>VOLUME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>2689fee8-bebb-4d7c-b11e-4a7310664977</name>
- <entityField>PHASE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>52a851b0-9059-4d57-8ff5-335c819359e8</name>
- <entityField>STATE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SalesprojectFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>AllSalesprojectDashlet</name>
+ <title>Salesprojects</title>
+ <description>Show all salesprojects</description>
+ <fragment>Salesproject/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:filter</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ <neonDashletConfiguration>
+ <name>OpenSalesprojectsDashlet</name>
+ <title>Open salesprojects</title>
+ <description>Show open salesprojects</description>
+ <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiMjViMGFjNzctZWY5Mi00ODA5LTgwMmUtYmI5ZDg3ODJmODY1IiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:filter</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Salesprojects</name>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <columns>
+ <neonTableColumn>
+ <name>2cbd6486-e1e4-4660-94f9-1b71e29b11ba</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
+ <entityField>CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9f6b967e-5140-420f-84ca-2273920221bd</name>
+ <entityField>PROJECTTITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
+ <entityField>STARTDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4cc3c3f1-6f86-434d-8d1d-32a965aa76b2</name>
+ <entityField>ENDDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2689fee8-bebb-4d7c-b11e-4a7310664977</name>
+ <entityField>PHASE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>52a851b0-9059-4d57-8ff5-335c819359e8</name>
+ <entityField>STATE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 991ec53deb1f9383a911cb9fe97bd98584bb5d77..5b41f9deab2fdc1ee0cf688af4a7b718cb8ba151 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -74,5 +74,10 @@
<entityField>LogHistoryConsumer</entityField>
<view>LogHistoryFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>2a26811c-de47-442a-97d2-adc90a6c99ae</name>
+ <entityField>Classifications</entityField>
+ <view>ClassificationTree_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod b/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod
index 7e2e145ac56f048f9355e2ac8fbf7d2e93ba19ae..22a77ded18bff79861784a97fe69ab15e40e6335 100644
--- a/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod
+++ b/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod
@@ -6,6 +6,7 @@
<layout>
<boxLayout>
<name>layout</name>
+ <direction>HORIZONTAL</direction>
</boxLayout>
</layout>
<children>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 3696d1a1edae0e1a63e90e6ed414d2ecb046a746..06b276782207951313dac6c6287ca7ca4e258409 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -1,94 +1,106 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Head</header>
- <footer>AdditionalInfo</footer>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Head</name>
- <iconField>IMAGE</iconField>
- <titleField>PROJECTTITLE</titleField>
- <subtitleField>CONTACT_ID</subtitleField>
- <descriptionField>PROJECTCODE</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Details</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
- <entityField>RELATION_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
- <entityField>STATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>2867e662-b824-4bbf-8eaf-bbd34f44598e</name>
- <entityField>REASONS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ff0dcd67-56ec-4db1-8c53-531f22fda716</name>
- <entityField>PHASE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3164fe37-8ca0-44c0-bebe-b9573346fb72</name>
- <entityField>STARTDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>529e8b1f-014f-4b44-8bba-96869156ebf7</name>
- <entityField>ENDDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
- <entityField>PROBABILITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
- <entityField>VOLUME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
- <entityField>TIMETRACKINGSUM</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Further informations</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>9fe11db5-ec66-4238-9c56-5ace055f1d90</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>f3542270-e7bd-4f9f-b7c0-f6c5210bb337</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- <scoreCardViewTemplate>
- <name>AdditionalInfo</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>79490331-6be4-422f-9450-da0db56f0654</name>
- <entityField>DAYS_NOTACTIVE</entityField>
- </entityFieldLink>
- </fields>
- </scoreCardViewTemplate>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SalesprojectPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Head</header>
+ <footer>AdditionalInfo</footer>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Head</name>
+ <iconField>IMAGE</iconField>
+ <titleField>PROJECTTITLE</titleField>
+ <subtitleField>CONTACT_ID</subtitleField>
+ <descriptionField>PROJECTCODE</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
+ <entityField>RELATION_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
+ <entityField>STATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>2867e662-b824-4bbf-8eaf-bbd34f44598e</name>
+ <entityField>REASONS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ff0dcd67-56ec-4db1-8c53-531f22fda716</name>
+ <entityField>PHASE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3164fe37-8ca0-44c0-bebe-b9573346fb72</name>
+ <entityField>STARTDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>529e8b1f-014f-4b44-8bba-96869156ebf7</name>
+ <entityField>ENDDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
+ <entityField>PROBABILITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
+ <entityField>VOLUME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
+ <entityField>TIMETRACKINGSUM</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Further informations</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>7fb4fd2e-6076-461b-8d56-9ce4a939d281</name>
+ <entityField>ClassificationResult</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9fe11db5-ec66-4238-9c56-5ace055f1d90</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>f3542270-e7bd-4f9f-b7c0-f6c5210bb337</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ <scoreCardViewTemplate>
+ <name>AdditionalInfo</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>79490331-6be4-422f-9450-da0db56f0654</name>
+ <entityField>InactiveTime</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ce670b75-346e-4aeb-b72d-5ef68dd77e71</name>
+ <entityField>RemainingTime</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>884d9900-7e75-42d1-a669-53f6aae5c420</name>
+ <entityField>RunTime</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod
index 928e1837ed4732f9779c331295e4259ce6e3d3aa..05d95e244e2f26139d98380997f77a37dc8c9e15 100644
--- a/neonView/TaskMain_view/TaskMain_view.aod
+++ b/neonView/TaskMain_view/TaskMain_view.aod
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>TaskMain_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <masterSlaveLayout>
- <name>layout</name>
- <master>339e160e-e482-4be2-9550-fc06131fbffe</master>
- </masterSlaveLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>339e160e-e482-4be2-9550-fc06131fbffe</name>
- <entityField>#ENTITY</entityField>
- <view>TaskMainPreview_view</view>
- </neonViewReference>
- <genericViewTemplate>
- <name>details</name>
- <showDrawer v="true" />
- <drawerCaption>Detail</drawerCaption>
- <entityField>#ENTITY</entityField>
- <title>details</title>
- <fields>
- <entityFieldLink>
- <name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name>
- <entityField>PROTECTIONLEVEL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>fea59f13-750b-427d-bf33-cc1bead95446</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>4211b2cf-3a1f-4447-ad1c-f521d2d3f258</name>
- <entityField>ModuleTrees</entityField>
- <view>ModuleTree_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>6846f680-84ef-46da-a0ea-6797044cf693</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ffa776bd-013c-4d4d-aedd-490625ef0fe1</name>
- <entityField>LogHistories</entityField>
- <view>LogHistoryFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>TaskMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>339e160e-e482-4be2-9550-fc06131fbffe</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>339e160e-e482-4be2-9550-fc06131fbffe</name>
+ <entityField>#ENTITY</entityField>
+ <view>TaskMainPreview_view</view>
+ </neonViewReference>
+ <genericViewTemplate>
+ <name>details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Detail</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <title>details</title>
+ <fields>
+ <entityFieldLink>
+ <name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name>
+ <entityField>PROTECTIONLEVEL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>fea59f13-750b-427d-bf33-cc1bead95446</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>4211b2cf-3a1f-4447-ad1c-f521d2d3f258</name>
+ <entityField>ModuleTrees</entityField>
+ <view>ModuleTree_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6846f680-84ef-46da-a0ea-6797044cf693</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ffa776bd-013c-4d4d-aedd-490625ef0fe1</name>
+ <entityField>LogHistories</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml b/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 918bf0d09a54d5d47564b8b3b449e2a0f90ca518..b15f3c70f2b467ab1289590948c2eef8d11b45ff 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>basic</projectName>
+ <projectName>xRM-Basic5</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
diff --git a/process/Classification_lib/Classification_lib.aod b/process/Classification_lib/Classification_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..818373690075bf9196eb6e10c19f9c13ae3bd1fe
--- /dev/null
+++ b/process/Classification_lib/Classification_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+ <name>Classification_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Classification_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Classification_lib/process.js b/process/Classification_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..f73c136606584a3fea4e54c595d2ec6b6f9d4379
--- /dev/null
+++ b/process/Classification_lib/process.js
@@ -0,0 +1,66 @@
+import("system.logging");
+import("system.db");
+import("Sql_lib");
+
+/**
+ * Methods to manage classifications.
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function ClassificationUtils() {}
+
+/**
+ * Get the id of the current context
+ * TODO: use a UUID of the current context which doesn't change
+ *
+ * @return {String} Id of the current context
+ */
+ClassificationUtils.getScore = function(pClassificationType, pObjectType, pObjectRowid, pClassificationNumber)
+{
+ var score = db.table(SqlCondition.begin()
+ .andPrepareIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONNUMBER", pClassificationNumber)
+ .andPrepare("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", pClassificationType)
+ .andSqlCondition(SqlCondition.begin().orPrepare("CLASSIFICATION.OBJECT_TYPE", pObjectType)
+ .or("CLASSIFICATION.OBJECT_TYPE is null"))
+ .andSqlCondition(SqlCondition.begin().orPrepare("CLASSIFICATION.OBJECT_ROWID", pObjectRowid)
+ .or("CLASSIFICATION.OBJECT_ROWID is null"))
+ .buildSql("select CLASSIFICATIONTYPE.CLASSIFICATIONNUMBER, case when sum(score) is not null then sum(score) else 0 end from CLASSIFICATIONTYPE \n\
+ left join Classification on CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPEID \n\
+ left join CLASSIFICATIONSCORE on CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCOREID",
+ "1=2",
+ "group by CLASSIFICATIONTYPE.CLASSIFICATIONNUMBER order by CLASSIFICATIONTYPE.CLASSIFICATIONNUMBER asc"));
+
+ if (score.length == 1)
+ return score[0][1];
+
+ var scores = {};
+ score.forEach(function(pRow)
+ {
+ scores[pRow[0]] = pRow[1];
+ });
+ return scores;
+}
+
+ClassificationUtils.getClass = function(pClassificationType, pObjectType, pObjectRowid)
+{
+ var score = ClassificationUtils.getScore(pClassificationType, pObjectType, pObjectRowid);
+ return Object.keys(score).map(function(classNum)
+ {
+ return ClassificationUtils.mapToClass(score[classNum]);
+ }).join("");
+}
+
+ClassificationUtils.mapToClass = function(pScore)
+{
+ if(pScore >= 0 && pScore <= 50)
+ return "D";
+ if(pScore > 25 && pScore <= 50)
+ return "C";
+ if(pScore > 50 && pScore <= 75)
+ return "B";
+ if(pScore > 75 && pScore <= 100)
+ return "A";
+
+ return "_";
+}
\ No newline at end of file
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 39a53ff50e6a8ae0983da1ece4743bb30868f17e..f38b695d457b6dc8dd07faa2471bd421f816a524 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -65,6 +65,10 @@ ContextUtils.getContextConsumer = function(pContextId)
return "Contracts";
case ContextUtils.getContextName("Salesproject"):
return "Salesprojects";
+ case ContextUtils.getContextName("Campaign"):
+ return "Campaigns";
+ case ContextUtils.getContextName("CampaignStep"):
+ return "CampaignSteps";
}
}
@@ -378,11 +382,7 @@ ContextUtils.getSelectMap = function()
], "", false))
,"Task": ContextSelector.create("TASK", "TASKID", "SUBJECT")
,"Campaign": ContextSelector.create("CAMPAIGN", "CAMPAIGNID")
- .setTitleExpression(maskingUtils.concat([
- maskingUtils.cast("CAMPAIGN.NAME", SQLTYPES.VARCHAR, 10),
- "' - '",
- maskingUtils.cast("CAMPAIGNSTEP.NAME", SQLTYPES.VARCHAR, 10)
- ], "", false))
+ .setTitleExpression(maskingUtils.concat(["CAMPAIGN.NAME", "CAMPAIGNSTEP.NAME"], " - ", false))
.setContactIdField("CAMPAIGNPARTICIPANT.CONTACT_ID")
.setJoinExpression("left join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID " +
"left join CAMPAIGNSTEP on CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID")
diff --git a/process/Document_lib/process.js b/process/Document_lib/process.js
index e70f107941a857d9e5cf8f736e6fb725b9d4a227..22cb83a6655b53836b0055665fa13e87fcd81557 100644
--- a/process/Document_lib/process.js
+++ b/process/Document_lib/process.js
@@ -21,19 +21,19 @@ function DocumentUtil(){
DocumentUtil.downloadSelectedDocuments = function() {
var alias = SqlUtils.getSystemAlias();
- if(vars.exists("$sys.selectionRows") && vars.get("$sys.selectionRows")) {
+ if(vars.exists("$sys.selectionRows") && vars.getString("$sys.selectionRows")) {
var rows;
try {
- rows = JSON.parse(vars.get("$sys.selectionRows"));
+ rows = JSON.parse(vars.getString("$sys.selectionRows"));
} catch (e) {
- rows = JSON.parse(JSON.stringify(vars.get("$sys.selectionRows")));
+ rows = JSON.parse(JSON.stringify(vars.getString("$sys.selectionRows")));
}
var uids;
try {
- uids = JSON.parse(vars.get("$sys.selection"));
+ uids = JSON.parse(vars.getString("$sys.selection"));
} catch (e) {
- uids = JSON.parse(JSON.stringify(vars.get("$sys.selection")));
+ uids = JSON.parse(JSON.stringify(vars.getString("$sys.selection")));
}
var binaryContents = db.getBinaryContents(uids, alias);
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index ece0b8e36a049827b257050e159e263d018c66aa..4acc0874e2b9826453abbce9f47bc68ae3645cc3 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -33,7 +33,12 @@ $KeywordRegistry.contactStatus$active = function(){return "BSIC0rel-stat-actv-ae
$KeywordRegistry.currency = function(){return "Currency";};
$KeywordRegistry.productGroupcode = function(){return "ProductGroupcode";};
$KeywordRegistry.offerStatus = function(){return "OfferStatus";};
+
$KeywordRegistry.organisationType = function(){return "OrganisationType";};
+$KeywordRegistry.organisationType$manufacturer = function(){return "dbb3f596-bd2b-4e08-baef-ba28d7b752e9";};
+$KeywordRegistry.organisationType$competitor = function(){return "eccaf9de-5c7b-4b6e-ab77-0b33d8486f29";};
+
+
$KeywordRegistry.personGender = function(){return "PersonGender";};
$KeywordRegistry.taskStatus = function(){return "TaskStatus";};
$KeywordRegistry.taskStatus$new = function(){return "21bc4d20-1a87-4247-8f7c-8d3a09631850";};
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 462c4f7240aa681c309fdb7f17f9c9fdb0f56f11..4d5c93b08c4cce458a872e93c6955c99207d1d51 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -187,8 +187,11 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
+ db.translateCondition(SqlCondition.begin()
.and("validPP.PRODUCT_ID = PRODUCTID")
.andPrepare(["PRODUCTPRICE", "CURRENCY", "validPP"], priceListFilter.currency)
- .andPrepare(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), "# <= ?")
- .andPrepare(["PRODUCTPRICE", "VALID_TO", "validPP"], datetime.date().toString(), "# >= ?")
+ .andPrepare(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), "# <= ?")
+ .andSqlCondition(SqlCondition.begin()
+ .andPrepare(["PRODUCTPRICE", "VALID_TO", "validPP"], datetime.date().toString(), "# >= ?")
+ .or("validPP.VALID_TO is null")
+ )
.andPrepare(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, "# <= ?")
.andSqlCondition(SqlCondition.begin()
.orPrepare(["PRODUCTPRICE", "CONTACT_ID", "validPP"], priceListFilter.relationId)
@@ -251,7 +254,6 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
if (validPriceLists)
ProductDetails.PriceListToUse = _getPriceListToUse(ProductDetails.CurrentValidPriceLists, priceListFilter);
-
return ProductDetails;
function _getPriceListObject() {
diff --git a/process/Salesproject_lib/process.js b/process/Salesproject_lib/process.js
index ba78c7709d79f194884fe965eb7a80bf68a00ce1..81113ff02589099b48858235638a1fade03acb29 100644
--- a/process/Salesproject_lib/process.js
+++ b/process/Salesproject_lib/process.js
@@ -77,7 +77,8 @@ Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForec
* Notify the user to update the forecast
*/
Salesproject.notifyToUpdateForecast = function() {
- question.showMessage(translate.text("Please update the ${FORECAST_ENGLISH}."), question.INFORMATION, translate.text("${FORECAST_ENGLISH}"))
+ if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
+ question.showMessage(translate.text("Please update the ${FORECAST_ENGLISH}."), question.INFORMATION, translate.text("${FORECAST_ENGLISH}"));
}
/**
diff --git a/process/indexsearch_patternextension/indexsearch_patternextension.aod b/process/indexsearch_patternextension/indexsearch_patternextension.aod
index b7e2519c6746699347c0e1c7d199e304db788d48..44786e98684ee3028b4ef80a8809e874a45f7ba2 100644
--- a/process/indexsearch_patternextension/indexsearch_patternextension.aod
+++ b/process/indexsearch_patternextension/indexsearch_patternextension.aod
@@ -2,5 +2,4 @@
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>indexsearch_patternextension</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/indexsearch_patternextension/process.js</process>
</process>
diff --git a/process/indexsearch_patternextension/process.js b/process/indexsearch_patternextension/process.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/report/Offer_report/reportData.jrxml b/report/Offer_report/reportData.jrxml
index 621f6a5eed97ae0c86c7206d3aae0377138b8f01..e88c3470f1a4b962f2f6ef25eb4ebb47147b7376 100644
--- a/report/Offer_report/reportData.jrxml
+++ b/report/Offer_report/reportData.jrxml
@@ -62,49 +62,49 @@
<textField isStretchWithOverflow="true">
<reportElement x="20" y="0" width="177" height="48" uuid="b3b876cf-b4ce-4569-ae30-04ddc7690f9f"/>
<textElement>
- <font fontName="Segoe UI"/>
+ <font/>
</textElement>
<textFieldExpression><![CDATA[$P{OFFERAddr}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="372" y="0" width="60" height="15" uuid="98f1140c-7c34-47fb-b4e8-cb3af8c29a80"/>
<textElement>
- <font fontName="Segoe UI"/>
+ <font/>
</textElement>
<textFieldExpression><![CDATA[$P{Number}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="372" y="16" width="60" height="15" uuid="acd6017f-fa7c-43fb-9a7b-3a42b63a34cf"/>
<textElement>
- <font fontName="Segoe UI"/>
+ <font/>
</textElement>
<textFieldExpression><![CDATA[$P{Date}]]></textFieldExpression>
</textField>
<textField pattern="dd.MM.yyyy">
<reportElement x="432" y="16" width="64" height="15" uuid="2329be0e-9970-416f-af01-812d1d60676b"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI"/>
+ <font/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFER_OFFERDATE}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="372" y="35" width="183" height="15" uuid="67e65fc6-2a2a-4ab8-8485-2ad08c7e8168"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<text><![CDATA[]]></text>
</staticText>
<textField isStretchWithOverflow="true">
<reportElement x="372" y="50" width="183" height="22" uuid="159be5de-8473-415d-8d1e-bffa46e4764a"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{responsible}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="432" y="0" width="64" height="15" uuid="99c69604-7df6-432e-a492-6c31d8bd67fd"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="10"/>
+ <font size="10"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFER_OFFERCODE} + "-" + $F{OFFER_VERSNR}]]></textFieldExpression>
</textField>
@@ -113,7 +113,7 @@
<printWhenExpression><![CDATA[!$P{responsible}.equals("")]]></printWhenExpression>
</reportElement>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{directlyResponsible}]]></textFieldExpression>
</textField>
@@ -122,7 +122,7 @@
<textField>
<reportElement x="20" y="0" width="535" height="20" uuid="944d2cf1-3037-4d45-b6d3-9e43af16bf4a"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{OFFERPers}]]></textFieldExpression>
</textField>
@@ -131,7 +131,7 @@
<textField isStretchWithOverflow="true">
<reportElement x="20" y="0" width="535" height="20" uuid="8d10af04-82a4-4344-ae98-de42c82a674e"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFER_HEADER}]]></textFieldExpression>
</textField>
@@ -142,21 +142,21 @@
<printWhenExpression><![CDATA[!$P{printDiscount}.equals("0")]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<text><![CDATA[%]]></text>
</staticText>
<textField>
<reportElement x="389" y="24" width="63" height="15" uuid="3f7bbaf4-2239-47ca-a3ca-a6693387bad4"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFER_CURRENCY}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="496" y="11" width="57" height="12" uuid="85ff401c-24a9-4b83-9aa8-655db56119e4"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{Sum}]]></textFieldExpression>
</textField>
@@ -166,14 +166,14 @@
<textField>
<reportElement x="59" y="11" width="63" height="12" uuid="e37dd329-c082-4dfd-afa5-f1fe0bd96f4c"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{Articlenumber}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="389" y="11" width="63" height="12" uuid="754450e2-04ac-45d5-a0a0-64ea42c86431"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{Unitprice}]]></textFieldExpression>
</textField>
@@ -182,49 +182,49 @@
<printWhenExpression><![CDATA[!$P{printDiscount}.equals("0")]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{Discount}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="20" y="11" width="39" height="12" uuid="d483ee1c-9ae8-4929-ba15-069e8743d676"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{Pos}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="279" y="11" width="54" height="12" uuid="3bb98c33-f62c-444f-b706-49d4dd54cf35"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{Amount}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="454" y="11" width="38" height="12" uuid="592adef7-0b85-4304-8d6e-6640a157a7ee"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{VAT}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="454" y="24" width="38" height="15" uuid="57199603-485e-453a-8380-d3b85488883c"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<text><![CDATA[%]]></text>
</staticText>
<textField>
<reportElement x="496" y="24" width="57" height="15" uuid="6a4866ee-2bdd-40f5-b600-280615be2c1b"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFER_CURRENCY}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="122" y="11" width="156" height="12" uuid="0dbb9e83-463b-45e4-a702-2d1699220383"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{Articledescription}]]></textFieldExpression>
</textField>
@@ -241,7 +241,7 @@
<textField pattern="#,##0.00;-#,##0.00">
<reportElement x="452" y="6" width="100" height="15" uuid="f71cd6ef-6a10-4bd5-9bd5-4c8de5a276f1"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{SUMITEMSUM}]]></textFieldExpression>
</textField>
@@ -262,21 +262,21 @@
<printWhenExpression><![CDATA[!$P{OfferPaymentTerm}.equals("")]]></printWhenExpression>
</reportElement>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{PaymentConditions}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="122" y="13" width="100" height="20" uuid="8149be09-d439-4e1a-a853-f82bd5e5683e"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{OfferPaymentTerm}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="402" y="8" width="90" height="20" uuid="c3444576-6cb8-47f2-9dc9-e892a91ceb07"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8" isBold="true"/>
+ <font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$P{Total} + " " + $F{OFFER_CURRENCY}]]></textFieldExpression>
</textField>
@@ -292,7 +292,7 @@
<textField pattern="###0.00;-###0.00">
<reportElement x="491" y="8" width="59" height="20" uuid="75bb0951-e562-4170-a5c2-731d3219ec66"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8" isBold="true"/>
+ <font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$P{TOTAL}]]></textFieldExpression>
</textField>
@@ -303,14 +303,14 @@
<printWhenExpression><![CDATA[!$P{OfferDeliveryTerm}.equals("")]]></printWhenExpression>
</reportElement>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{DeliveryConditions}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="122" y="0" width="100" height="20" uuid="41f6ab85-0948-4529-969a-5cade6279d42"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{OfferDeliveryTerm}]]></textFieldExpression>
</textField>
@@ -334,7 +334,7 @@
<textField>
<reportElement x="0" y="0" width="555" height="20" forecolor="#999999" uuid="10be47d9-5d11-4115-857e-94ef762faa34"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
- <font fontName="Segoe UI"/>
+ <font/>
</textElement>
<textFieldExpression><![CDATA[$P{myAddr}]]></textFieldExpression>
</textField>
@@ -351,21 +351,21 @@
<textField>
<reportElement x="20" y="0" width="39" height="15" uuid="67a9deac-8a11-45cf-aa43-d400a322c995"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFERITEM_ITEMPOSITION}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="59" y="0" width="63" height="15" uuid="39d2d6c3-5658-4f9b-b94a-352291faee3f"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{PRODUCT_PRODUCTCODE}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="122" y="0" width="156" height="15" uuid="b0a5ce7d-8c01-41e5-8a59-bae7ec156590"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFERITEM_ITEMNAME}]]></textFieldExpression>
</textField>
@@ -374,28 +374,28 @@
<printWhenExpression><![CDATA[!$F{OFFERITEM_DISCOUNT}.equals("0,00") && !$F{OFFERITEM_DISCOUNT}.equals("0.00")]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFERITEM_DISCOUNT}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00;-#,##0.00">
<reportElement x="389" y="0" width="63" height="15" uuid="07d63f2e-b070-4807-a572-5282737310f0"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFERITEM_PRICE}]]></textFieldExpression>
</textField>
<textField pattern="###0.00;###0.00-">
<reportElement x="454" y="0" width="38" height="15" uuid="65d761f9-8f8e-41f6-9d36-d9fb7e0ec4bd"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8" isBold="false" isUnderline="false"/>
+ <font size="8" isBold="false" isUnderline="false"/>
</textElement>
<textFieldExpression><![CDATA[!$F{OFFERITEM_VAT}.equals(null)? $F{OFFERITEM_VAT} : ""]]></textFieldExpression>
</textField>
<textField pattern="###0;-###0">
<reportElement x="282" y="0" width="51" height="15" uuid="bd119f1f-b7f2-4df2-a807-2acbbbc19b74"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFERITEM_QUANTITY}.toString() + ' ' + $F{OFFERITEM_UNITTEXT}]]></textFieldExpression>
</textField>
@@ -404,7 +404,7 @@
<printWhenExpression><![CDATA[!$F{OFFERITEM_OPTIONAL}.equals("1")]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{ITEMSUM}]]></textFieldExpression>
</textField>
@@ -414,28 +414,28 @@
<textField>
<reportElement x="122" y="0" width="156" height="15" forecolor="#999999" uuid="ae45c708-344e-4a7d-8756-de306f3ec922"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFERITEM_ITEMNAME}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="20" y="0" width="39" height="15" forecolor="#999999" uuid="842be130-b034-43dc-9f4f-fec826c01520"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFERITEM_ITEMPOSITION}]]></textFieldExpression>
</textField>
<textField pattern="###0;-###0">
<reportElement x="282" y="0" width="51" height="15" forecolor="#999999" uuid="4337f5ec-5d87-403e-a6fd-d7036ae210b5"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFERITEM_QUANTITY}.toString() + ' ' + $F{OFFERITEM_UNITTEXT}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="59" y="0" width="63" height="15" forecolor="#999999" uuid="5ccc825d-3f26-4679-abaf-ab4966edcd3f"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{PRODUCT_PRODUCTCODE}]]></textFieldExpression>
</textField>
@@ -444,7 +444,7 @@
<textField isStretchWithOverflow="true">
<reportElement x="59" y="0" width="371" height="15" isRemoveLineWhenBlank="true" forecolor="#000000" uuid="1956ea3b-ba35-40ee-9924-33bcef054a9c"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFERITEM_INFO}]]></textFieldExpression>
</textField>
@@ -455,21 +455,21 @@
<textField pattern="EEEEE dd MMMMM yyyy">
<reportElement x="347" y="19" width="91" height="20" forecolor="#999999" uuid="8fea5314-3746-4a74-82bc-8a994c3cc7d8"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField>
<reportElement x="438" y="19" width="71" height="20" forecolor="#999999" uuid="1c40bae7-b031-423d-b0ad-0b360955f4a9"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Seite}+" "+$V{PAGE_NUMBER}+" "+$R{von}]]></textFieldExpression>
</textField>
<textField evaluationTime="Report">
<reportElement x="509" y="19" width="37" height="20" forecolor="#999999" uuid="55b24967-df04-442c-8aa3-0418f25f0eef"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
diff --git a/report/Offer_report/reportData_subreport1.jrxml b/report/Offer_report/reportData_subreport1.jrxml
index 8ab280b242857f15cd5e5f0130cfa165c67a2302..e0acf51a598f0dd26c9a9866b27cb64ec8ae46b7 100644
--- a/report/Offer_report/reportData_subreport1.jrxml
+++ b/report/Offer_report/reportData_subreport1.jrxml
@@ -20,14 +20,14 @@
<textField>
<reportElement x="0" y="0" width="117" height="15" uuid="050d8ed3-fb65-47cd-affd-3334e499ad35"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{PlusSalestax} + " (" + $F{VAT} + " %) "]]></textFieldExpression>
</textField>
<textField evaluationTime="Group" evaluationGroup="VAT" pattern="#,##0.00;-#,##0.00">
<reportElement x="117" y="0" width="80" height="15" uuid="6bba70aa-7399-45b7-805a-1590fbe07209"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$V{WERT_1}]]></textFieldExpression>
</textField>
diff --git a/report/Organisation_report/Aufgaben.jrxml b/report/Organisation_report/Aufgaben.jrxml
index 83ca1ab940627da958832b848609bab57c4d182b..970a22fdbc18e82a97aaf958abb7113c751f3dd8 100644
--- a/report/Organisation_report/Aufgaben.jrxml
+++ b/report/Organisation_report/Aufgaben.jrxml
@@ -16,28 +16,28 @@
<textField>
<reportElement x="3" y="0" width="102" height="15" uuid="f4c173de-6106-4330-87c2-b2ce021394ed"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{SUBJECT}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
<reportElement x="118" y="0" width="168" height="15" uuid="389fc04e-a659-4ef9-923c-3ff73f5bfd18"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{INFOTEXT}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="296" y="0" width="104" height="15" uuid="e8c8b469-8f88-47f0-8056-4a3fe23fd6e5"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{STATUS}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="445" y="0" width="100" height="15" uuid="fd1db5d1-8dc3-43ba-a723-da731405325c"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{RESPONSIBLE}]]></textFieldExpression>
</textField>
diff --git a/report/Organisation_report/Historien.jrxml b/report/Organisation_report/Historien.jrxml
index a01c78815fc330905a94fc6f796d4df8bf2cc6b5..fbae016a324a57139217543c2fc0ae9e20076daf 100644
--- a/report/Organisation_report/Historien.jrxml
+++ b/report/Organisation_report/Historien.jrxml
@@ -15,28 +15,28 @@
<textField>
<reportElement x="0" y="1" width="100" height="15" uuid="fc8f2d06-0eb7-4fd0-a91c-cda7a85dd06e"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{ENTRYDATE}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="103" y="1" width="100" height="15" uuid="d76859d9-0766-497e-9187-33ce879dc4f3"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{MEDIUM}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="222" y="1" width="91" height="15" uuid="df383fa6-a716-4f3c-ac97-d2beb7c329ac"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{LOGIN}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
<reportElement x="345" y="1" width="116" height="15" uuid="dd8ad103-b2e2-4fad-afea-81854bf12e47"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{INFO}]]></textFieldExpression>
</textField>
diff --git a/report/Organisation_report/Kommunikationsdaten.jrxml b/report/Organisation_report/Kommunikationsdaten.jrxml
index ca032c564f9ba7573fa0d3b22177bf97441ac4d6..550dfb0aa3067baf4b45990b7500b4d7913b43b5 100644
--- a/report/Organisation_report/Kommunikationsdaten.jrxml
+++ b/report/Organisation_report/Kommunikationsdaten.jrxml
@@ -17,14 +17,14 @@
<textField>
<reportElement x="0" y="1" width="100" height="15" uuid="c356083f-2a5e-4a3e-9b08-c7baf2b1381e"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{KINDOFCOMM}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="103" y="1" width="100" height="15" uuid="48bf1f6b-953a-44b6-9ebf-504203afa70d"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{COMMVALUE}]]></textFieldExpression>
</textField>
diff --git a/report/Organisation_report/Kontaktpersonen.jrxml b/report/Organisation_report/Kontaktpersonen.jrxml
index 8ba836d4e48f2a5c809b2d06ea136d8c5d61cfac..f011ec4b0b31dcd7115f37c513be8fc0262d2e3c 100644
--- a/report/Organisation_report/Kontaktpersonen.jrxml
+++ b/report/Organisation_report/Kontaktpersonen.jrxml
@@ -19,28 +19,28 @@
<textField isStretchWithOverflow="true">
<reportElement x="345" y="1" width="116" height="15" uuid="4186db31-3a25-43f2-ae39-abca90ded430"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{PERSCOMM}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="1" width="100" height="15" uuid="c356083f-2a5e-4a3e-9b08-c7baf2b1381e"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{PERSNAMECOMPLETE}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="222" y="1" width="91" height="15" uuid="03d2241a-2aa6-4dbf-bad7-94c48837eae6"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{PERSDEPARTMENT}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="103" y="1" width="100" height="15" uuid="48bf1f6b-953a-44b6-9ebf-504203afa70d"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{PERSFUNCTION}]]></textFieldExpression>
</textField>
diff --git a/report/Organisation_report/reportData.jrxml b/report/Organisation_report/reportData.jrxml
index b0c34aca470d12608851f89e298a6ddc4f21b19f..cbe236c19684bb7036fbd56b9a266507c283e251 100644
--- a/report/Organisation_report/reportData.jrxml
+++ b/report/Organisation_report/reportData.jrxml
@@ -32,7 +32,7 @@
<textField>
<reportElement x="0" y="70" width="555" height="20" forecolor="#999999" uuid="d8a7a770-46d6-4bd7-bc79-a98285ded43e"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{myAddr}]]></textFieldExpression>
</textField>
@@ -53,28 +53,28 @@
<textField>
<reportElement x="0" y="14" width="167" height="20" forecolor="#999999" uuid="db320a72-fac5-477a-8c9e-19d15a8d250f"/>
<textElement>
- <font fontName="Segoe UI" size="14"/>
+ <font size="14"/>
</textElement>
<textFieldExpression><![CDATA[$R{Customer Base Sheet}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
<reportElement x="0" y="46" width="100" height="15" uuid="cbc5f584-e9ee-4062-b6f5-7fd3a6e918f4"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{ORGAddr}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
<reportElement x="344" y="61" width="200" height="15" uuid="8d54ea3a-8c35-48a5-a3da-b77ff53591b7"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{INFO}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="344" y="46" width="92" height="15" uuid="a73a7562-7435-412e-b987-b8ba0980a7b7"/>
<textElement>
- <font fontName="Segoe UI" size="8" isBold="true"/>
+ <font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{Information}]]></textFieldExpression>
</textField>
@@ -88,21 +88,21 @@
<textField>
<reportElement x="0" y="15" width="100" height="15" uuid="ef198107-4f82-49ad-96f6-8afb09be58f1"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Type}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="103" y="15" width="100" height="15" uuid="b42a9c7d-fd06-4e16-a32e-61aa3ffcf299"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Value}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="0" width="103" height="15" forecolor="#0033FF" uuid="7c9e61d7-c823-4fbc-85ee-5a5a73a7999c"/>
<textElement>
- <font fontName="Segoe UI" size="8" isUnderline="true"/>
+ <font size="8" isUnderline="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{Communication data}]]></textFieldExpression>
</textField>
@@ -118,14 +118,14 @@
<textField>
<reportElement x="0" y="0" width="100" height="15" forecolor="#0033FF" uuid="9e3a2dda-7b73-41c5-a840-f356a2373e23"/>
<textElement>
- <font fontName="Segoe UI" size="8" isUnderline="true"/>
+ <font size="8" isUnderline="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{Contacts}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="15" width="100" height="15" uuid="f7f6caee-b1f5-487e-8d1a-738c533b214d"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Name}]]></textFieldExpression>
</textField>
@@ -135,21 +135,21 @@
<textField>
<reportElement x="103" y="15" width="100" height="15" uuid="e12cde69-8455-4dca-a760-c1eecb9a8034"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Position}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="221" y="15" width="100" height="15" uuid="0a43120b-40f3-4c5a-a7c9-15540fda5ff6"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Department}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="344" y="15" width="160" height="15" uuid="72c93546-9005-4051-9f52-28e10f8f54a5"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Communication data}]]></textFieldExpression>
</textField>
@@ -165,35 +165,35 @@
<textField>
<reportElement x="0" y="2" width="100" height="15" forecolor="#0033FF" uuid="60192885-ecfd-46cd-9de1-67cd2e285d1b"/>
<textElement>
- <font fontName="Segoe UI" size="8" isUnderline="true"/>
+ <font size="8" isUnderline="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{Activity}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="19" width="100" height="15" uuid="fbf2402f-6b63-48b9-814d-22d7f49d81db"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Date}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="103" y="19" width="100" height="15" uuid="652de0c2-220e-4bfc-a983-7335638307a5"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Contact type}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="221" y="19" width="100" height="15" uuid="eca234d8-ad5c-4b2e-aecd-81a9adff5f9d"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Employee}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="344" y="19" width="100" height="15" uuid="310e6639-fae6-4724-b353-d793069819b7"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Remark}]]></textFieldExpression>
</textField>
@@ -214,7 +214,7 @@
<printWhenExpression><![CDATA[$P{ORGAttr} != null && !$P{ORGAttr}.equals("")]]></printWhenExpression>
</reportElement>
<textElement>
- <font fontName="Segoe UI" size="8" isUnderline="true"/>
+ <font size="8" isUnderline="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{Attributes}]]></textFieldExpression>
</textField>
@@ -223,7 +223,7 @@
<textField isStretchWithOverflow="true">
<reportElement x="10" y="5" width="534" height="13" uuid="1ef0e703-9180-4540-b094-e1bcc9983001"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{ORGAttr}]]></textFieldExpression>
</textField>
@@ -244,35 +244,35 @@
<textField>
<reportElement x="0" y="20" width="100" height="15" uuid="ea868aed-1495-42b8-a398-b0a62ac0de80"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Subject}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="117" y="20" width="161" height="15" uuid="a2509776-a2f4-465d-851b-617468e91c3c"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Description}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="295" y="20" width="100" height="15" uuid="b3260378-eced-4883-ad0b-8692a3f83547"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Status}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="444" y="20" width="100" height="15" uuid="653a5cd5-4209-4570-b6c5-037285921d1a"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{responsible}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="4" width="100" height="15" forecolor="#0033FF" uuid="41f65e5b-23a5-4d39-8f9a-267ccab96c76"/>
<textElement>
- <font fontName="Segoe UI" size="8" isUnderline="true"/>
+ <font size="8" isUnderline="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{Tasks}]]></textFieldExpression>
</textField>
@@ -293,21 +293,21 @@
<textField pattern="EEEEE dd MMMMM yyyy">
<reportElement x="378" y="17" width="102" height="20" forecolor="#999999" uuid="84480a49-acb2-48cd-9885-540b816d74f1"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField>
<reportElement x="480" y="17" width="45" height="20" forecolor="#999999" uuid="047a5366-fd18-439d-847d-8a20efb74d34"/>
<textElement textAlignment="Right">
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Seite}+" "+$V{PAGE_NUMBER}+" "+$R{von}]]></textFieldExpression>
</textField>
<textField evaluationTime="Report">
<reportElement x="525" y="17" width="30" height="20" forecolor="#999999" uuid="fa23c12f-1e58-45d6-962d-0bbf70bc0032"/>
<textElement>
- <font fontName="Segoe UI" size="8"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>