diff --git a/.aditoprj/ignoredScanServiceTasks.json b/.aditoprj/ignoredScanServiceTasks.json
new file mode 100644
index 0000000000000000000000000000000000000000..876fa8e77553251308a11423050ca464a547eba2
--- /dev/null
+++ b/.aditoprj/ignoredScanServiceTasks.json
@@ -0,0 +1,46 @@
+{
+ "entries": [
+ {
+ "target": "aliasDefinition/Data_alias/Data_alias.aod",
+ "line": -1,
+ "description": "The table \"AB_LOGHISTORY\" has no primary key [65]",
+ "groupName": "nb-tasklist-warning"
+ },
+ {
+ "target": "aliasDefinition/Data_alias/Data_alias.aod",
+ "line": -1,
+ "description": "The table \"DATABASECHANGELOG\" has no primary key [65]",
+ "groupName": "nb-tasklist-warning"
+ },
+ {
+ "target": "aliasDefinition/Data_alias/Data_alias.aod",
+ "line": -1,
+ "description": "There is no index for the column \"APPOINTMENT_ID\" in the table \"VISITPLANENTRY\" [59]",
+ "groupName": "nb-tasklist-warning"
+ },
+ {
+ "target": "aliasDefinition/Data_alias/Data_alias.aod",
+ "line": -1,
+ "description": "There is no index for the column \"DEPLOYMENT_ID\" in the table \"DATABASECHANGELOG\" [59]",
+ "groupName": "nb-tasklist-warning"
+ },
+ {
+ "target": "aliasDefinition/Data_alias/Data_alias.aod",
+ "line": -1,
+ "description": "There is no index for the column \"TESTING_CONTACT_ID\" in the table \"BULKMAIL\" [59]",
+ "groupName": "nb-tasklist-warning"
+ },
+ {
+ "target": "aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod",
+ "line": -1,
+ "description": "The table \"DATABASECHANGELOG\" has no primary key [65]",
+ "groupName": "nb-tasklist-warning"
+ },
+ {
+ "target": "aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod",
+ "line": -1,
+ "description": "There is no index for the column \"DEPLOYMENT_ID\" in the table \"DATABASECHANGELOG\" [59]",
+ "groupName": "nb-tasklist-warning"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index 2a99306b4f55d45d587ab183bf39b2e7b85ed5a9..b4940e7b136a1e7dc45d5afe6100e622a0deb61d 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
#This file is generated by ADITO designer. Do NOT delete or modify!
-#Mon Mar 16 10:08:50 CET 2020
-version=6.1.1
+#Tue Sep 08 15:42:02 CEST 2020
+version=6.2.0
diff --git a/.gitignore b/.gitignore
index c0fbe9c2a9088a99c14d690350315c8581d5ca49..3e6393c7c265ce2b7da30dcc0815f1879bb01e76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
/.aditoprj/cache
+/.aditoprj/UUIDNameMap.txt
+/.idea
/data
/others/db_changes/liqui_update.bat
/others/db_changes/liqui_reset.ps1
-/others/jsdocOut
\ No newline at end of file
+/others/jsdocOut
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 4a1ab973694e123dc08a82bf659081bd49e2404e..0000000000000000000000000000000000000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
- <profile version="1.0">
- <option name="myName" value="Project Default" />
- <inspection_tool class="LossyEncoding" enabled="false" level="WARNING" enabled_by_default="false" />
- </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 9661ac713428efbad557d3ba3a62216b5bb7d226..0000000000000000000000000000000000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
index 3e4f1fbd5b8f119ecc58649bab722422cfdf571b..7153295dc12d1b84566a0af057f0f65bf706f3e9 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
@@ -1,7 +1,17 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="b.ulrich" id="a9f53bcd-b541-4a46-bd40-a21f7fae7aba">
- <modifyDataType columnName="MEDIUM_ID" newDataType="CHAR(36)" tableName="COMMUNICATION"/>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet dbms="derby" author="b.ulrich" id="bd334096-a6ce-4739-b272-753a85ff103e">
+ <sql>
+ ALTER TABLE COMMUNICATION ADD COLUMN MEDIUM_ID_NEW CHAR(36);
+ UPDATE COMMUNICATION SET MEDIUM_ID_NEW=MEDIUM_ID;
+ ALTER TABLE COMMUNICATION DROP COLUMN MEDIUM_ID;
+ RENAME COLUMN COMMUNICATION.MEDIUM_ID_NEW TO MEDIUM_ID;
+ </sql>
</changeSet>
+
+ <changeSet dbms="!derby" author="b.ulrich" id="17c1eb73-3131-4a2b-bf9a-913590767c79">
+ <modifyDataType tableName="COMMUNICATION" columnName="MEDIUM_ID" newDataType="CHAR(36)"/>
+ </changeSet>
+
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
index 14c64bfefe06b69e868de85bdf8ab9fcd6a093c1..2cfda5e78c75dc24d61318c4867d381d01e4105d 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
@@ -1,7 +1,19 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="b.ulrich" id="5a0d5d3f-e849-4584-8082-481b1411d1fc">
- <modifyDataType columnName="DOCUMENTTEMPLATE_ID" newDataType="CHAR(36)" tableName="DOCUMENTTEMPLATE"/>
+ <changeSet dbms="derby" author="b.ulrich" id="83c25119-cf41-42ab-b42f-370195f9de87">
+ <!--not null must be set in derby before adding a primary key constraint-->
+ <sql>
+ ALTER TABLE DOCUMENTTEMPLATE ADD COLUMN DOCUMENTTEMPLATEID_NEW CHAR(36);
+ UPDATE DOCUMENTTEMPLATE SET DOCUMENTTEMPLATEID_NEW=DOCUMENTTEMPLATEID;
+ ALTER TABLE DOCUMENTTEMPLATE DROP COLUMN DOCUMENTTEMPLATEID;
+ RENAME COLUMN DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID_NEW TO DOCUMENTTEMPLATEID;
+ ALTER TABLE DOCUMENTTEMPLATE ALTER COLUMN DOCUMENTTEMPLATEID NOT NULL;
+ ALTER TABLE DOCUMENTTEMPLATE ADD CONSTRAINT PK_DOCUMENTTEMPLATE_DOCUMENTTEMPLATEID PRIMARY KEY (DOCUMENTTEMPLATEID);
+ </sql>
+ </changeSet>
+
+ <changeSet dbms="!derby" author="b.ulrich" id="85ba6a61-9318-4118-ac4c-e33730f6581d">
+ <modifyDataType tableName="DOCUMENTTEMPLATE" columnName="DOCUMENTTEMPLATEID" newDataType="CHAR(36)"/>
</changeSet>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
index 7de92277180d51eb97a2cb562328e8e46751b43d..237c9fd9e447f01353d895dba2a7c1123e684471 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
@@ -1,10 +1,26 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="b.ulrich" id="77ee7dcd-cf5b-47ea-a59a-2b1230fad818">
- <modifyDataType columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)" tableName="EXPORTTEMPLATEPLACEOFUSE"/>
- <modifyDataType columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)" tableName="EXPORTTEMPLATEFIELD"/>
- <modifyDataType columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)" tableName="EXPORTTEMPLATESELECTION"/>
-
+ <changeSet dbms="derby" author="b.ulrich" id="9c551ee3-f4f0-46e4-a671-943b58c74432">
+ <sql>
+ ALTER TABLE EXPORTTEMPLATEPLACEOFUSE ADD COLUMN EXPORTTEMPLATE_ID_NEW CHAR(36);
+ UPDATE EXPORTTEMPLATEPLACEOFUSE SET EXPORTTEMPLATE_ID_NEW=EXPORTTEMPLATE_ID;
+ ALTER TABLE EXPORTTEMPLATEPLACEOFUSE DROP COLUMN EXPORTTEMPLATE_ID;
+ RENAME COLUMN EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID_NEW TO EXPORTTEMPLATE_ID;
+ ALTER TABLE EXPORTTEMPLATEFIELD ADD COLUMN EXPORTTEMPLATE_ID_NEW CHAR(36);
+ UPDATE EXPORTTEMPLATEFIELD SET EXPORTTEMPLATE_ID_NEW=EXPORTTEMPLATE_ID;
+ ALTER TABLE EXPORTTEMPLATEFIELD DROP COLUMN EXPORTTEMPLATE_ID;
+ RENAME COLUMN EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID_NEW TO EXPORTTEMPLATE_ID;
+ ALTER TABLE EXPORTTEMPLATESELECTION ADD COLUMN EXPORTTEMPLATE_ID_NEW CHAR(36);
+ UPDATE EXPORTTEMPLATESELECTION SET EXPORTTEMPLATE_ID_NEW=EXPORTTEMPLATE_ID;
+ ALTER TABLE EXPORTTEMPLATESELECTION DROP COLUMN EXPORTTEMPLATE_ID;
+ RENAME COLUMN EXPORTTEMPLATESELECTION.EXPORTTEMPLATE_ID_NEW TO EXPORTTEMPLATE_ID;
+ </sql>
+ </changeSet>
+
+ <changeSet dbms="!derby" author="b.ulrich" id="a53a2f38-3788-44a2-a151-13b3853ccb74">
+ <modifyDataType tableName="EXPORTTEMPLATEPLACEOFUSE" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
+ <modifyDataType tableName="EXPORTTEMPLATEFIELD" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
+ <modifyDataType tableName="EXPORTTEMPLATESELECTION" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
</changeSet>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/Notification/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1c9de620455f1a0e782540d3ca7e86c1181d8dbb
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/Notification/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="init_NotificationType.xml"/>
+ <include relativeToChangelogFile="true" file="insert_NotificationState.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3d8f901c79b2216826873ea4664e1f1a401652fc
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml
@@ -0,0 +1,85 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.pongratz" id="b2894de0-4a19-4fcb-9412-0a5e91bfec80">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="f862f71e-9155-4e88-8158-170ddfa4dbf3"/>
+ <column name="KEYID" value="_____SYSTEM_NOTIFICATION_PHONECALL"/>
+ <column name="TITLE" value="Phonecall"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="19876b72-cd7d-4916-b853-22c4d9fe49c2"/>
+ <column name="KEYID" value="_____SYSTEM_NOTIFICATION_EMAIL"/>
+ <column name="TITLE" value="Email"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="16f9fbb5-9b8a-4908-babd-06c86032a22b"/>
+ <column name="KEYID" value="_____SYSTEM_NOTIFICATION_APPOINTMENT"/>
+ <column name="TITLE" value="Appointment"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="53458dba-80f5-427c-a44c-3fc8e74f3380"/>
+ <column name="KEYID" value="_____SYSTEM_NOTIFICATION_TODO"/>
+ <column name="TITLE" value="ToDo"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="3d2393b3-ed13-44d6-9a6f-9280d84252cb"/>
+ <column name="KEYID" value="DownloadReady"/>
+ <column name="TITLE" value="download ready"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="09ce4611-3254-4590-958a-79178924188b"/>
+ <column name="KEYID" value="BulkMailSent"/>
+ <column name="TITLE" value="bulk mail sent"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="df47c6db-2a72-464a-b155-c4e33a4294ba"/>
+ <column name="KEYID" value="Leadimport_Notification"/>
+ <column name="TITLE" value="leadimport notification"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="6"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="58281d88-71a7-4fa7-8ef8-9289fc904697"/>
+ <column name="KEYID" value="WorkflowNotification"/>
+ <column name="TITLE" value="workflow notification"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="7"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35501bf1692b76aa533e32e47930c612f0d97ef2
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml
@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.pongratz" id="b2894de0-4a19-4fcb-9412-0a5e91bfec80">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="daa6d8d8-fdc6-4fb2-9677-9ccc1f8a9b81"/>
+ <column name="KEYID" value="TODELETE"/>
+ <column name="TITLE" value="TODELETE"/>
+ <column name="CONTAINER" value="NotificationState"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 98f643b71426d12718ef4175e9569864d3f0574b..1498b71d126d944c059e0aeb1b00ab3d823310ec 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -1,7 +1,8 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <include file="AlterDocumentTemplatePlaceOfUseDatatype/changelog.xml" relativeToChangelogFile="true"/>
- <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
- <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
+ <include file="AlterDatatypeOfKeyColumnsToChar/changelog.xml" relativeToChangelogFile="true"/>
+ <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
+ <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
+ <include file="Notification/changelog.xml" relativeToChangelogFile="true" />
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml b/.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a4bbbd1638f60b4023e3ccab49955e358c011ba9
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml
@@ -0,0 +1,24 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.listl" id="38b13161-5163-48d9-9791-f9c7027cac62">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="f241b36a-c2fe-40be-9e2e-8293c700d096"/>
+ <column name="KEYID" value="WORKFLOWCATEGORYMARKETING"/>
+ <column name="TITLE" value="Marketing"/>
+ <column name="CONTAINER" value="WorkflowCategory"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="00a72718-554e-46ab-b83c-fb9b81be4be6"/>
+ <column name="KEYID" value="WORKFLOWCATEGORYRELEASE"/>
+ <column name="TITLE" value="Release"/>
+ <column name="CONTAINER" value="WorkflowCategory"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/AlterButtonLabelTitles/AlterButtonLabelTitles.xml b/.liquibase/Data_alias/basic/2020.1.3/AlterButtonLabelTitles/AlterButtonLabelTitles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5bc4d387a4d7bc4cdcc662a0fa1a30bce6ed7580
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/AlterButtonLabelTitles/AlterButtonLabelTitles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="853aca63-8234-4dfd-9fc6-2e8b71af82aa">
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Read"/>
+ <where>AB_KEYWORD_ENTRYID='b5f402a0-29a0-43e9-8db3-454fdbcfc9d1'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="New"/>
+ <where>AB_KEYWORD_ENTRYID='678f61e5-ef27-4e1c-b52b-0e19188b038d'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Archived"/>
+ <where>AB_KEYWORD_ENTRYID='1c40a2de-e6c1-469b-b324-d7089893ca5c'</where>
+ </update>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/DeleteNotificationtypeKeywords.xml b/.liquibase/Data_alias/basic/2020.1.3/DeleteNotificationtypeKeywords.xml
new file mode 100644
index 0000000000000000000000000000000000000000..43d552d2ec9fc93913e088dfa4992289660b4ca1
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/DeleteNotificationtypeKeywords.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.pongratz" id="0b393c2b-c969-41ab-9eeb-3ccaf418e069">
+ <delete tableName="AB_KEYWORD_ENTRY" >
+ <where>CONTAINER = 'NotificationType'</where>
+ </delete>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml b/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b29eab2d9c9e09014ac4199a08f07f0d74e2a60c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet id="3d7f038c-04f1-45a2-9a1c-73c1a8666fea" author="b.ulrich" >
+ <renameColumn
+ columnDataType="CHAR(36)"
+ oldColumnName="ORGANISATION_ID"
+ newColumnName="ORGANISATION_CONTACT_ID"
+ tableName="VISITPLANENTRY"/>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/add_Address_LatLon.xml b/.liquibase/Data_alias/basic/2020.1.3/add_Address_LatLon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cb352481afaa45ad86684e169e4867f64e431cc4
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/add_Address_LatLon.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.listl" id="2f2d806c-8aab-42f0-91c2-c7d15322d89f">
+ <addColumn tableName="ADDRESS">
+ <column name="LAT" type="DECIMAL(10,8)"/>
+ <column name="LON" type="DECIMAL(11,8)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..93e891be3d7887f00f3e9908d368c3be0b68f713
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
+ <include file="DeleteNotificationtypeKeywords.xml" relativeToChangelogFile="true" />
+ <include file="add_Address_LatLon.xml" relativeToChangelogFile="true"/>
+ <include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />
+ <include file="drop_salesorder_unpaid.xml" relativeToChangelogFile="true"/>
+ <include file="drop_salesorder_versnr.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/drop_salesorder_unpaid.xml b/.liquibase/Data_alias/basic/2020.1.3/drop_salesorder_unpaid.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0f1f60e4c2f86f88e434e0a8dd98558a94ad492b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/drop_salesorder_unpaid.xml
@@ -0,0 +1,8 @@
+<?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="a.voegl" id="6d0c57b1-309f-4d60-a801-2107b3c2480e">
+ <dropColumn tableName="SALESORDER">
+ <column name="UNPAID"/>
+ </dropColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.1.3/drop_salesorder_versnr.xml b/.liquibase/Data_alias/basic/2020.1.3/drop_salesorder_versnr.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7e385b320c3641f37f93af95a994d526d73a23e7
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/drop_salesorder_versnr.xml
@@ -0,0 +1,8 @@
+<?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="a.voegl" id="97c84d76-8c2d-4db7-8151-8ef5d70fd7d4">
+ <dropColumn tableName="SALESORDER">
+ <column name="VERSNR"/>
+ </dropColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/add_classificationGrading.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/add_classificationGrading.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c400a89f8ff71d14de30cbb395039d522e920b88
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/add_classificationGrading.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="094af11f-c308-42bf-a78e-99d55883900a">
+ <createTable tableName="CLASSIFICATIONGRADING">
+ <column name="CLASSIFICATIONGRADINGID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONGRADING_CLASSIFICATIONGRADINGID"/>
+ </column>
+ <column name="GRADING" type="CHAR(1)"/>
+ <column name="MAXGRADEFORSCORE" type="INTEGER"/>
+ <column name="CLASSIFICATIONTYPE_GROUP" type="CHAR(36)"/>
+ </createTable>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..be74e7af353709892982cd0f24e7bcde5a848e36
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/changelog.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="update_keywordClassificationOrganisation.xml"/>
+ <include relativeToChangelogFile="true" file="create_classificationGrading.xml"/>
+ <include relativeToChangelogFile="true" file="create_classificationGroup.xml"/>
+ <include relativeToChangelogFile="true" file="create_classificationStorage.xml"/>
+ <include relativeToChangelogFile="true" file="rename_ClassificationTypeToObjectType.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGrading.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGrading.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ee954ba55816f5683a8ac27b33cd4c6f162ddc61
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGrading.xml
@@ -0,0 +1,17 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="094af11f-c308-42bf-a78e-99d55883900a">
+ <createTable tableName="CLASSIFICATIONGRADING">
+ <column name="CLASSIFICATIONGRADINGID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONGRADING_CLASSIFICATIONGRADINGID"/>
+ </column>
+ <column name="GRADING" type="NVARCHAR(1)"/>
+ <column name="MAXGRADEFORSCORE" type="INTEGER"/>
+ <column name="CLASSIFICATIONGROUP_ID" type="CHAR(36)"/>
+ </createTable>
+ <createIndex indexName="IDX_CLASSIFICATION_GRADING" tableName="CLASSIFICATIONGRADING">
+ <column name="CLASSIFICATIONGROUP_ID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGroup.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGroup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2072d1c79a09263757dcef3fa2c51710ca3a5945
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="7d965008-8161-45bd-bb5c-a2d4e623324d">
+ <createTable tableName="CLASSIFICATIONGROUP">
+ <column name="CLASSIFICATIONGROUPID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONGROUP_CLASSIFICATIONGROUPID"/>
+ </column>
+ <column name="TITLE" type="VARCHAR(36)"/>
+ <column name="SORTING" type="SMALLINT"/>
+ </createTable>
+ <addColumn tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONGROUP_ID" type="CHAR(36)"/>
+ </addColumn>
+ <dropColumn tableName="CLASSIFICATIONTYPE" columnName="CLASSIFICATIONGROUP"/>
+ <createIndex indexName="IDX_CLASSIFICATION_TYPE" tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONGROUP_ID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationStorage.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationStorage.xml
new file mode 100644
index 0000000000000000000000000000000000000000..33fe07cd6a5a9a104081b1ca0d4452450a6edd6c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationStorage.xml
@@ -0,0 +1,22 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="7d965008-8161-45bd-bb5c-a2d4e623324d">
+ <createTable tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONSTORAGE_CLASSIFICATIONSTORAGEID"/>
+ </column>
+ <column name="CLASSIFICATIONVALUE" type="VARCHAR(20)"/>
+ <column name="OBJECT_ROWID" type="CHAR(36)"/>
+ <column name="OBJECT_TYPE" type="VARCHAR(63)"/>
+ </createTable>
+ <addUniqueConstraint
+ columnNames="OBJECT_ROWID, OBJECT_TYPE"
+ constraintName="const_classificationstrage"
+ tableName="CLASSIFICATIONSTORAGE"
+ validate="true"/>
+ <createIndex indexName="IDX_CLASSIFICATION_STORAGE" tableName="CLASSIFICATIONSTORAGE">
+ <column name="OBJECT_ROWID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/rename_ClassificationTypeToObjectType.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/rename_ClassificationTypeToObjectType.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d0e3475b1c899ac66901c9745179180f9cdf6cef
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/rename_ClassificationTypeToObjectType.xml
@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="b693a8ff-3267-4813-9a89-e17120e1346a">
+ <renameColumn
+ columnDataType="VARCHAR(63)"
+ newColumnName="OBJECT_TYPE"
+ oldColumnName="CLASSIFICATIONTYPE"
+ tableName="CLASSIFICATIONTYPE"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/update_keywordClassificationOrganisation.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/update_keywordClassificationOrganisation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b08af1e779f10dac5e062a9f96712d4c4990fb31
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/update_keywordClassificationOrganisation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="41e40939-da97-4c11-8c68-9116a57b2a86">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="e36f44a3-88b6-4b1d-a77a-0108b8165b9b"/>
+ <column name="KEYID" value="ORGANISATION"/>
+ <column name="TITLE" value="Organisation"/>
+ <column name="CONTAINER" value="ClassificationType"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9fc9e12d38ffb3a457f219ee37898dd5092e5f08
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="create_district.xml"/>
+ <include relativeToChangelogFile="true" file="create_districtresponsible.xml"/>
+ <include relativeToChangelogFile="true" file="create_districtResponsibleKeyword.xml"/>
+ <include relativeToChangelogFile="true" file="create_indizes.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_district.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_district.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6ea091c954808cffc73235d0378ab1d3d5bbc7aa
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_district.xml
@@ -0,0 +1,21 @@
+<?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="d.tran" id="4bfb41ea-ef43-403a-9a93-48d92294b1cb">
+ <createTable tableName="DISTRICT">
+ <column name="DISTRICTID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_DISTRICT_DISTRICTID"/>
+ </column>
+ <column name="DISTRICT_NAME" type="VARCHAR(50)"/>
+ <column name="DISTRICT_NUMBER" type="INTEGER"/>
+ <column name="DISTRICT_INFO" type="VARCHAR(50)"/>
+ <column name="ISO3" type="VARCHAR(5)"/>
+ <column name="PARENTDISTRICT_DISTRICTID" type="CHAR(36)"/>
+ <column name="DISTRICT_FILTER" type="NCLOB"/>
+ <column name="DISTRICT_STATUS" type="INTEGER"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ <column name="DATE_NEW" type="DATETIME"/>
+ <column name="DATE_EDIT" type="DATETIME"/>
+ </createTable>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5747db8f3688988d77e8645b3a5787e9c35cc6d6
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml
@@ -0,0 +1,14 @@
+<?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="d.tran" id="d95ebf6c-1e34-4ba3-9f0b-386c5059444e">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="66d1563a-a76c-47ca-af6b-38586a2f3ce3"/>
+ <column name="KEYID" value="MEMROLEDISTRICTRESPONSIBLE"/>
+ <column name="TITLE" value="District Responsible"/>
+ <column name="CONTAINER" value="MemberRole"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtresponsible.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtresponsible.xml
new file mode 100644
index 0000000000000000000000000000000000000000..71ac9397e0d2378e4db0a8643cf3f5db376d3b65
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtresponsible.xml
@@ -0,0 +1,17 @@
+<?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="d.tran" id="0e5cc99d-3500-484c-abc4-441e3a5c4b7f">
+ <createTable tableName="DISTRICTRESPONSIBLE">
+ <column name="DISTRICTRESPONSIBLEID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_DISTRICTRESPONSIBLE_DISTRICTRESPONSIBLEID"/>
+ </column>
+ <column name="DISTRICT_ID" type="CHAR(36)"/>
+ <column name="EMPLOYEE_CONTACT_ID" type="CHAR(36)"/>
+ <column name="DEPARTMENT_ATTRIBUTE_ID" type="CHAR(36)"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ <column name="DATE_NEW" type="DATETIME"/>
+ <column name="DATE_EDIT" type="DATETIME"/>
+ </createTable>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_indizes.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_indizes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb677337dfd9f958dfc341532fba299d98adc36c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_indizes.xml
@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="d.tran" id="7dbaa3ae-ba37-4fd1-9b63-fab48975fb87">
+ <createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_DEPARTMENT_ATTRIBUTE_ID">
+ <column name="DEPARTMENT_ATTRIBUTE_ID"/>
+ </createIndex>
+ <createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_DISTRICTRESPONSIBLE_DISTRICT_ID">
+ <column name="DISTRICT_ID"/>
+ </createIndex>
+ <createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_EMPLOYEE_CONTACT_ID">
+ <column name="EMPLOYEE_CONTACT_ID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1c2fd454c2bbc0ff0f784acc0b34a8410110a2a5
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.pongratz" id="99f19a82-62aa-41fc-b756-da4da3be45de">
+ <sql>
+ ALTER TABLE LEAD ADD COLUMN ATTRIBUTE_Industry VARCHAR(100);
+ </sql>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..47f650dddb1342e9ab21265c2aff13292962e154
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/changelog.xml
@@ -0,0 +1,7 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include file="insertAttributeUsage.xml" relativeToChangelogFile="true"/>
+ <include file="insertKewordsImportFields.xml" relativeToChangelogFile="true"/>
+ <include file="alterLead.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertAttributeUsage.xml b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertAttributeUsage.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e30595dadea8184d42ba4cc3239e6690bc8e0330
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertAttributeUsage.xml
@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.pongratz" id="2cc85c98-51e4-48c6-bb22-bf0bee6055f7">
+ <insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="b0d675fc-0f86-476d-89d2-64d8273f9644"/>
+ <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+ <column name="OBJECT_TYPE" value="Leadimport"/>
+ </insert>
+ <insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="01d6548e-c73f-4d61-8407-ba815d07fee7"/>
+ <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+ <column name="OBJECT_TYPE" value="Leadimport"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertKewordsImportFields.xml b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertKewordsImportFields.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e415e56a3e6d65af9775096105401686495d1551
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertKewordsImportFields.xml
@@ -0,0 +1,33 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.pongratz" id="d058a476-66c8-414e-ab2e-d132513d90ad">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="8c24ac4a-23cc-4a16-98a0-362e72b77977"/>
+ <column name="KEYID" value="ATTRIBUTE_Loyalty"/>
+ <column name="TITLE" value="Loyalty"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="26"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="cb227318-924a-4df4-af98-eb6814ce21a1"/>
+ <column name="KEYID" value="ATTRIBUTE_Industry"/>
+ <column name="TITLE" value="Industry"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="27"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="b1cdbbda-5181-4dbd-b786-4d180c1248aa"/>
+ <column name="KEYID" value="CONTACTROLE"/>
+ <column name="TITLE" value="Contactrole"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="28"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/LeadimportMappingAssistant/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/LeadimportMappingAssistant/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0afc65858ec6d0ca8443d144e5f16f34111368bc
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/LeadimportMappingAssistant/changelog.xml
@@ -0,0 +1,5 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include file="create_leadimportMappingAssistant.xml" relativeToChangelogFile="true" />
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml b/.liquibase/Data_alias/basic/2020.2.0/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a9e22a51b9dd14709d9bc9e94c178233c98daa16
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml
@@ -0,0 +1,23 @@
+<?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="s.pongratz" id="546f84b4-b9d5-4b73-a9ea-40b1b8597170">
+ <createTable tableName="LEADIMPORTMAPPINGASSISTANT">
+ <column name="LEADIMPORTMAPPINGASSISTANTID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_LEADIMPORTMAPPINGASSISTANTID"/>
+ </column>
+ <column name="USER_NEW" type="NVARCHAR(50)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="DATE_NEW" type="DATETIME">
+ <constraints nullable="false"/>
+ </column>
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME"/>
+
+ <column name="FIELDNAME" type="VARCHAR(100)"/>
+ <column name="INPUTVALUE" type="VARCHAR(300)"/>
+ <column name="OUTPUTVALUE" type="VARCHAR(300)"/>
+ <column name="LEADIMPORT_ID" type="CHAR(36)"/>
+ </createTable>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml b/.liquibase/Data_alias/basic/2020.2.0/ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d8b506037199897a34e8c6e8660d418fdc986dda
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml
@@ -0,0 +1,55 @@
+<?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="d.tran" id="b16e0a6e-74b7-414a-9cc2-fb7f8f1c3d72">
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="bbd50206-c4d5-42e0-a19a-2d11e957af1f"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+ <column name="PLACEOFUSE" value="DSGVOReport"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="63f5b453-24af-47a2-8ef1-ee5c91003428"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+ <column name="PLACEOFUSE" value="Order"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="910939c0-fe4f-4142-9656-d06ed1fe6d04"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+ <column name="PLACEOFUSE" value="DSGVOReport"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="a5ccf0e5-2c4d-4782-8970-61af4db2dd31"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+ <column name="PLACEOFUSE" value="Order"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="460e8b4c-5124-4b83-ab81-16ad919abe35"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+ <column name="PLACEOFUSE" value="Organisation"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="346113a2-e3b6-41e5-b058-13342e45984a"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+ <column name="PLACEOFUSE" value="DSGVOReport"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="b741dc23-8e46-46a6-9485-56a9033d944a"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+ <column name="PLACEOFUSE" value="Order"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="50cd8a91-5a48-479d-a329-aa9c1d1a3835"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+ <column name="PLACEOFUSE" value="Organisation"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="5e2011ef-87aa-4b51-bea4-34cbfa11722f"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+ <column name="PLACEOFUSE" value="DSGVOReport"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="e1422fa3-dcd2-4863-b972-1a3fb4b4fdc6"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+ <column name="PLACEOFUSE" value="Order"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml b/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9817d49cf3f4f9207324679b50b014dae51f149a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="a.schindlbeck" id="866dab92-b0fe-4a8c-8b90-123824c10ffd">
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Unread"/>
+ <where>AB_KEYWORD_ENTRYID='f568c222-7ac5-475e-b916-cea0e0e8612a'</where>
+ </update>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml b/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c96e25152e85616ffbc3eab34e9b3372af4675b3
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml
@@ -0,0 +1,48 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <!--*****
+ The data type has been changed by accident to CHAR(36) so let's change it back to VARCHAR(36) and update the data that is already persistant.
+ Tested on Apache Derby DB.
+ ******-->
+ <!--first: remove the index (if it's there) because on some dbms this prevents the column from changing/dropping-->
+ <changeSet author="j.goderbauer" id="763ea49e-8c9b-4262-9e2a-c59488358cd4">
+ <preConditions onFail="MARK_RAN">
+ <indexExists indexName="IDX_COMMUNICATION_MEDIUM_ID" tableName="COMMUNICATION"/>
+ </preConditions>
+ <dropIndex indexName="IDX_COMMUNICATION_MEDIUM_ID" tableName="COMMUNICATION" />
+ </changeSet>
+ <!--second: change the type, dependent on the dbms-->
+ <changeSet dbms="derby" author="j.goderbauer" id="c6e4a017-6e48-4238-80d7-41e2b210874d">
+ <sql>
+ ALTER TABLE COMMUNICATION ADD COLUMN MEDIUM_ID_NEW VARCHAR(36);
+ UPDATE COMMUNICATION SET MEDIUM_ID_NEW=MEDIUM_ID;
+ ALTER TABLE COMMUNICATION DROP COLUMN MEDIUM_ID;
+ RENAME COLUMN COMMUNICATION.MEDIUM_ID_NEW TO MEDIUM_ID;
+ </sql>
+ </changeSet>
+ <changeSet dbms="!derby" author="j.goderbauer" id="fbee4d8c-681d-4bea-b665-9fa951c3daa8">
+ <modifyDataType tableName="COMMUNICATION" columnName="MEDIUM_ID" newDataType="VARCHAR(36)"/>
+ </changeSet>
+ <!--third: update data that now contains the data with spaces at the end-->
+ <!--MS SQL supports the regular trim-function with MS SQL 2017 or higher, so lets use the old ltrim/rtrim functions for better compability -->
+ <!--sauce: https://docs.microsoft.com/de-de/sql/t-sql/functions/trim-transact-sql?view=sql-server-ver15-->
+ <changeSet dbms="mssql" author="j.goderbauer" id="74b69edd-74f6-42c6-8164-e41614b47140">
+ <update tableName="COMMUNICATION">
+ <column name="MEDIUM_ID" valueComputed="ltrim(rtrim(MEDIUM_ID))" />
+ <where>MEDIUM_ID is not null</where>
+ </update>
+ </changeSet>
+ <changeSet dbms="!mssql" author="j.goderbauer" id="ee6466ce-ef57-44fd-b3c7-4e8fe305f25e">
+ <update tableName="COMMUNICATION">
+ <column name="MEDIUM_ID" valueComputed="trim(MEDIUM_ID)" />
+ <where>MEDIUM_ID is not null</where>
+ </update>
+ </changeSet>
+ <!--fourth: recreate the index with the original name-->
+ <changeSet author="j.goderbauer" id="071450d1-2cd6-487e-9b12-7f8b042f179c">
+ <createIndex indexName="IDX_COMMUNICATION_MEDIUM_ID" tableName="COMMUNICATION">
+ <column name="MEDIUM_ID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/alter_VisitrecommendationpriorityDatatype.xml b/.liquibase/Data_alias/basic/2020.2.0/alter_VisitrecommendationpriorityDatatype.xml
new file mode 100644
index 0000000000000000000000000000000000000000..23fcaf6c04e4498f779b278eb273a48031d980a0
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/alter_VisitrecommendationpriorityDatatype.xml
@@ -0,0 +1,103 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="2c14c955-e312-4085-bf3e-9a07cf8a39b6">
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="KEYID" value="VISITSTATUSPLANNED"/>
+ <where>AB_KEYWORD_ENTRYID='9d427420-2c87-4ada-9349-a799972bda0f'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="KEYID" value="VISITSTATUSAPPPLANED"/>
+ <where>AB_KEYWORD_ENTRYID='2f740f93-12ed-4e22-a158-adba5da81b40'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="KEYID" value="VISITSTATUSREPORTCREATED"/>
+ <where>AB_KEYWORD_ENTRYID='dd276100-b867-489c-8128-a3b71aa7564f'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="KEYID" value="MANUAL"/>
+ <where>AB_KEYWORD_ENTRYID='2f162837-868a-4517-810e-677cd423be56'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="KEYID" value="VISITFREQUENCY"/>
+ <where>AB_KEYWORD_ENTRYID='17905c4d-1c88-4cee-83da-164c13bbe848'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="KEYID" value="VISITPRIOCRITICAL"/>
+ <where>AB_KEYWORD_ENTRYID='91d7417e-fd45-429e-9ce9-a46f25c0c1d1'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="KEYID" value="VISITPRIOCVERYHIGH"/>
+ <where>AB_KEYWORD_ENTRYID='c0147b73-f678-4136-b3c4-0fde7e943a84'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="KEYID" value="VISITPRIOHIGH"/>
+ <where>AB_KEYWORD_ENTRYID='4ac4c7e1-d73b-4a26-9a6d-bc06505b9611'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="KEYID" value="VISITPRIOMEDIUM"/>
+ <where>AB_KEYWORD_ENTRYID='facb77a6-5bc1-4e2f-8dd0-72200b57c326'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="KEYID" value="VISITPRIOLOW"/>
+ <where>AB_KEYWORD_ENTRYID='036cbf6f-a8bd-4f25-b885-f1a689927bf1'</where>
+ </update>
+ </changeSet>
+ <!--*****
+ The data type has been set to CHAR(36) by accident, so let's change it back to VARCHAR(36) and update the data that is already persistant.
+ Tested on Apache Derby DB.
+ ******-->
+ <!--second: change the type, dependent on the dbms-->
+ <changeSet dbms="derby" author="b.ulrich" id="30bdc4ef-1b99-43c6-8637-da20f64772c9">
+ <sql>
+ ALTER TABLE VISITRECOMMENDATION ADD COLUMN PRIORITY_NEW VARCHAR(36);
+ UPDATE VISITRECOMMENDATION SET PRIORITY_NEW=PRIORITY;
+ ALTER TABLE VISITRECOMMENDATION DROP COLUMN PRIORITY;
+ RENAME COLUMN VISITRECOMMENDATION.PRIORITY_NEW TO PRIORITY;
+ ALTER TABLE VISITPLANENTRY ADD COLUMN STATUS_NEW VARCHAR(36);
+ UPDATE VISITPLANENTRY SET STATUS_NEW=STATUS;
+ ALTER TABLE VISITPLANENTRY DROP COLUMN STATUS;
+ RENAME COLUMN VISITPLANENTRY.STATUS_NEW TO STATUS;
+ ALTER TABLE VISITRECOMMENDATION ADD COLUMN SOURCE_NEW VARCHAR(36);
+ UPDATE VISITRECOMMENDATION SET SOURCE_NEW=SOURCE;
+ ALTER TABLE VISITRECOMMENDATION DROP COLUMN SOURCE;
+ RENAME COLUMN VISITRECOMMENDATION.SOURCE_NEW TO SOURCE;
+ </sql>
+ </changeSet>
+ <changeSet dbms="!derby" author="b.ulrich" id="ec6f82ad-491b-4e0a-a24c-e45ea0e494de">
+ <modifyDataType tableName="VISITRECOMMENDATION" columnName="PRIORITY" newDataType="VARCHAR(36)"/>
+ <modifyDataType tableName="VISITPLANENTRY" columnName="STATUS" newDataType="VARCHAR(36)"/>
+ <modifyDataType tableName="VISITRECOMMENDATION" columnName="SOURCE" newDataType="VARCHAR(36)"/>
+ </changeSet>
+ <!--third: update data that now contains the data with spaces at the end-->
+ <!--MS SQL supports the regular trim-function with MS SQL 2017 or higher, so lets use the old ltrim/rtrim functions for better compability -->
+ <!--sauce: https://docs.microsoft.com/de-de/sql/t-sql/functions/trim-transact-sql?view=sql-server-ver15-->
+ <changeSet dbms="mssql" author="b.ulrich" id="d306d290-c3cf-42e2-8f28-e4a4cfa7d16f">
+ <update tableName="VISITRECOMMENDATION">
+ <column name="PRIORITY" valueComputed="ltrim(rtrim(PRIORITY))" />
+ <where>PRIORITY is not null</where>
+ </update>
+ <update tableName="VISITPLANENTRY">
+ <column name="STATUS" valueComputed="ltrim(rtrim(STATUS))" />
+ <where>STATUS is not null</where>
+ </update>
+ <update tableName="VISITRECOMMENDATION">
+ <column name="SOURCE" valueComputed="ltrim(rtrim(SOURCE))" />
+ <where>SOURCE is not null</where>
+ </update>
+ </changeSet>
+ <changeSet dbms="!mssql" author="b.ulrich" id="3fcc49d0-eb7d-4976-aff4-0e8b911e95af">
+ <update tableName="VISITRECOMMENDATION">
+ <column name="PRIORITY" valueComputed="trim(PRIORITY)" />
+ <where>PRIORITY is not null</where>
+ </update>
+ <update tableName="VISITPLANENTRY">
+ <column name="STATUS" valueComputed="trim(STATUS)" />
+ <where>STATUS is not null</where>
+ </update>
+ <update tableName="VISITRECOMMENDATION">
+ <column name="SOURCE" valueComputed="trim(SOURCE)" />
+ <where>SOURCE is not null</where>
+ </update>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..52e4a7e0cd3f0eebcf81ca34fd66da03d907c30a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="Districts/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Classification/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="ImportFields/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="LeadimportMappingAssistant/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>
+ <include relativeToChangelogFile="true" file="addNotificationStateKeywords/addNotificationStateKeyword.xml"/>
+ <include relativeToChangelogFile="true" file="alter_ComunicationMedium_IdDatatype.xml"/>
+ <include relativeToChangelogFile="true" file="ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml"/>
+ <include relativeToChangelogFile="true" file="alter_VisitrecommendationpriorityDatatype.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c9e5b442ce52ec5f997ac9522326160fb3cc9192
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
@@ -0,0 +1,51 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.listl" id="a303ace0-b324-435a-84d8-7ef4d0419af8">
+ <createIndex tableName="AB_APPOINTMENTLINK" indexName="IDX_APPOINTLINK_AP_ID">
+ <column name="APPOINTMENT_ID"/>
+ </createIndex>
+ <createIndex tableName="AB_APPOINTMENTLINK" indexName="IDX_APPOINTLINK_OBJECT_ROWID">
+ <column name="OBJECT_ROWID"/>
+ </createIndex>
+ <createIndex tableName="EXPORTTEMPLATEPLACEOFUSE" indexName="IDX_EXPORTTEMPLATEUSE_T_ID">
+ <column name="EXPORTTEMPLATE_ID"/>
+ </createIndex>
+ <createIndex tableName="DOCUMENTTEMPLATEPLACEOFUSE" indexName="IDX_DOCUMENTTEMPLATEUSE_DT_ID">
+ <column name="DOCUMENTTEMPLATE_ID"/>
+ </createIndex>
+ <createIndex tableName="EXPORTTEMPLATEFIELD" indexName="IDX_EXPORTTEMPLATEFIELD_ET_ID">
+ <column name="EXPORTTEMPLATE_ID"/>
+ </createIndex>
+ <createIndex tableName="VISITRECOMMENDATION" indexName="IDX_VISITRECOMMEND_CONTACT_ID">
+ <column name="CONTACT_ID"/>
+ </createIndex>
+ <createIndex tableName="VISITPLANEMPLOYEEWEEK" indexName="IDX_VISITPLANWEEK_CONTACT_ID">
+ <column name="CONTACT_ID"/>
+ </createIndex>
+ <createIndex tableName="VISITPLANENTRY" indexName="IDX_VISITPLANENTRY_VPEMW_ID">
+ <column name="VISITPLANEMPLOYEEWEEK_ID"/>
+ </createIndex>
+ <createIndex tableName="LEADIMPORTMAPPINGASSISTANT" indexName="IDX_LEADIMPORTMAPPING_LI_ID">
+ <column name="LEADIMPORT_ID"/>
+ </createIndex>
+ <createIndex tableName="EXPORTTEMPLATESELECTION" indexName="IDX_EXPTEMPLATESEL_TEMPLATE_ID">
+ <column name="EXPORTTEMPLATE_ID"/>
+ </createIndex>
+ <createIndex tableName="AB_PERMISSIONCALENDAR" indexName="IDX_AB_PERMCAL_PROCURER_ROWID">
+ <column name="PERMISSIONPROCURER_ROWID"/>
+ </createIndex>
+ <createIndex tableName="AB_PERMISSIONCALENDAR" indexName="IDX_AB_PERMCAL_DEALER_ROWID">
+ <column name="PERMISSIONDEALER_ROWID"/>
+ </createIndex>
+ <createIndex tableName="VISITPLANENTRY" indexName="IDX_VISITPLNENTRY_VRECOMMND_ID">
+ <column name="VISITRECOMMENDATION_ID"/>
+ </createIndex>
+ <createIndex tableName="VISITPLANENTRY" indexName="IDX_VISITPLNENTRY_CONTCT_ID">
+ <column name="CONTACT_ID"/>
+ </createIndex>
+ <createIndex tableName="VISITPLANENTRY" indexName="IDX_VISITPLNENTRY_ORGCONTCT_ID">
+ <column name="ORGANISATION_CONTACT_ID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
index e6850dd5b6879f44ea9c7feba9b6bbefa4db5809..22fe51ac97046f0037d1bbe244ce1d5b2751ca28 100644
--- a/.liquibase/Data_alias/basic/_demoData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -51,4 +51,7 @@
<include file="generatedData/exporttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
<include file="generatedData/documenttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
<include file="generatedData/visitplan.xml" relativeToChangelogFile="true"/>
+ <include file="generatedData/classificationgrading.xml" relativeToChangelogFile="true"/>
+ <include file="generatedData/classificationgroup.xml" relativeToChangelogFile="true"/>
+ <include file="generatedData/classificationstorage.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml
index 517d9ed46670cb570739a7af571ee61307e1b92b..1a2d9eafc5085339edbd681cc496cd2a81c8be19 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml
@@ -7,7 +7,7 @@
<column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:45:34"/>
<column name="ID_VALUE" value="DELIVERCIF"/>
- <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -25,7 +25,7 @@
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:45:09"/>
<column name="ID_VALUE" value="PRICELISTSPECIAL"/>
- <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -34,7 +34,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:54:10"/>
<column name="ID_VALUE" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
- <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_ROWID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -43,7 +43,7 @@
<column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:47:54"/>
<column name="ID_VALUE" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
- <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -61,7 +61,7 @@
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:51:07"/>
<column name="ID_VALUE" value="SALPROJWEAKLIQUIDITY"/>
- <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -79,7 +79,7 @@
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:44:08"/>
<column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
- <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -96,7 +96,7 @@
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:39"/>
<column name="ID_VALUE" value="PRICELISTSPECIAL"/>
- <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -105,7 +105,7 @@
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:52:25"/>
<column name="ID_VALUE" value="PRICELISTSPECIAL"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -114,7 +114,7 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:47:46"/>
<column name="ID_VALUE" value="PAYTERM7"/>
- <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -123,7 +123,7 @@
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:47:37"/>
<column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
- <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -132,7 +132,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:21:26"/>
<column name="ID_VALUE" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
- <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -141,7 +141,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:24:42"/>
<column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -159,7 +159,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:46:58"/>
<column name="ID_VALUE" value="26385e16-6b2f-428c-9c28-1bfa9c2ccf6f"/>
- <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -168,7 +168,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -186,7 +186,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:18:11"/>
<column name="ID_VALUE" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
- <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -195,7 +195,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:27:34"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -222,7 +222,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:27:08"/>
<column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -231,7 +231,7 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:43:59"/>
<column name="ID_VALUE" value="PAYTERM30"/>
- <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -240,7 +240,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
<column name="ID_VALUE" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -249,7 +249,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:19:47"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -258,7 +258,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:22:05"/>
<column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -267,7 +267,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:26:46"/>
<column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
- <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -276,7 +276,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:17:34"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -303,7 +303,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:51:53"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -330,7 +330,7 @@
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:51:44"/>
<column name="ID_VALUE" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
- <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -348,7 +348,7 @@
<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:47:08"/>
<column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
- <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -357,7 +357,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:27:34"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -366,7 +366,7 @@
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:48:46"/>
<column name="ID_VALUE" value="PRICELISTDEFAULT"/>
- <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -375,7 +375,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:19:47"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -393,7 +393,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:25:55"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -402,7 +402,7 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:10"/>
<column name="ID_VALUE" value="PAYTERMDISCOUNT"/>
- <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -411,7 +411,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:25:55"/>
<column name="ID_VALUE" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
- <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -420,7 +420,7 @@
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
<column name="ID_VALUE" value="SALPROJPOLLOW"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -429,7 +429,7 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
<column name="ID_VALUE" value="PAYTERM30"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -438,7 +438,7 @@
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
<column name="ID_VALUE" value="SALPROJPOLLOW"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -447,7 +447,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -456,7 +456,7 @@
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:44:47"/>
<column name="ID_VALUE" value="SALPROJPOLABO"/>
- <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -474,7 +474,7 @@
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:52:18"/>
<column name="ID_VALUE" value="SALPROJPOLABO"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -483,7 +483,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:20:55"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -501,7 +501,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:56:16"/>
<column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
- <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_ROWID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -510,7 +510,7 @@
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
<column name="ID_VALUE" value="17746b46-2702-447a-b749-a92bfdf4bb38"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -546,7 +546,7 @@
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:36:47"/>
<column name="ID_VALUE" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
- <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -555,7 +555,7 @@
<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:46:41"/>
<column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -573,7 +573,7 @@
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:50:03"/>
<column name="ID_VALUE" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
- <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -582,7 +582,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:26:46"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -591,7 +591,7 @@
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:48:40"/>
<column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
- <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -609,7 +609,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:20:55"/>
<column name="ID_VALUE" value="bb0c6356-33be-4e7c-a409-9ef5145f7aae"/>
- <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -618,7 +618,7 @@
<column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:51:25"/>
<column name="ID_VALUE" value="DELIVEREX"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -627,7 +627,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:01:27"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -645,7 +645,7 @@
<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:54"/>
<column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
- <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -663,7 +663,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -672,7 +672,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:17:34"/>
<column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -681,7 +681,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
<column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -690,7 +690,7 @@
<column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:45:25"/>
<column name="ID_VALUE" value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
- <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -699,7 +699,7 @@
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:46:05"/>
<column name="ID_VALUE" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
- <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -708,7 +708,7 @@
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:50:59"/>
<column name="ID_VALUE" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
- <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -717,7 +717,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:18:12"/>
<column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
- <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -726,7 +726,7 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:46:30"/>
<column name="ID_VALUE" value="PAYTERM30"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -735,7 +735,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:01:27"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -744,7 +744,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
<column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -762,7 +762,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:54:10"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_ROWID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -771,7 +771,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:28:14"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -780,7 +780,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:25:12"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -789,7 +789,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:24:42"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -798,7 +798,7 @@
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:44:55"/>
<column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
- <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -807,7 +807,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:25:12"/>
<column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -816,7 +816,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:22:05"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -825,7 +825,7 @@
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:31"/>
<column name="ID_VALUE" value="SALPROJPOLLOW"/>
- <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -843,7 +843,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:20:19"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -852,7 +852,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:56:16"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_ROWID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -861,7 +861,7 @@
<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
<column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
- <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -870,7 +870,7 @@
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:02"/>
<column name="ID_VALUE" value="SALPROJPOLLOW"/>
- <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -879,7 +879,7 @@
<column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:52:10"/>
<column name="ID_VALUE" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -888,7 +888,7 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:45:57"/>
<column name="ID_VALUE" value="PAYTERM30"/>
- <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -897,7 +897,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml
index b9e7fed8e30fea667314752487316f64aa48f2f3..65cea7ecab918b754bd6311c0872f70c91e83b7d 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml
@@ -220,7 +220,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-13T11:06:51"/>
- <column name="DESCRIPTION" value="Activity Id: "e265a424-b343-4bc1-b1cd-d40b9405ca12", Objekt: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Art: "Organisation" eingefügt."/>
+ <column name="DESCRIPTION" value="Activity Id: "e265a424-b343-4bc1-b1cd-d40b9405ca12", Objekt: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Art: "Organisation" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="ACTIVITYLINK"/>
<column name="TABLENAMEID" value="f1b02cad-2a68-45fb-9313-1983b83bb310"/>
@@ -660,7 +660,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
- <column name="DESCRIPTION" value="Activity Id: "d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b", Objekt: "fc465f2f-803b-4a1f-b79d-7b466d7ecff4", Art: "Organisation" eingefügt."/>
+ <column name="DESCRIPTION" value="Activity Id: "d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b", Objekt: "f7b8f0c3-7702-4466-b502-d21fa4fa0010", Art: "Organisation" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="ACTIVITYLINK"/>
<column name="TABLENAMEID" value="26f94d20-7f3a-4b3e-9655-fcf3e971ce1d"/>
@@ -804,7 +804,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-15T08:57:12"/>
- <column name="DESCRIPTION" value="Activity Id: "9c22ba51-8a09-40f1-b6b8-9787fe43b141", Objekt: "6efb4fab-64f9-4d8e-aa6f-a158d13fc273", Art: "Organisation" eingefügt."/>
+ <column name="DESCRIPTION" value="Activity Id: "9c22ba51-8a09-40f1-b6b8-9787fe43b141", Objekt: "6a92df58-2b98-40da-ba6a-d0ddb1fde234", Art: "Organisation" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="ACTIVITYLINK"/>
<column name="TABLENAMEID" value="fedb7c1b-0a41-4dba-8abb-2e4af7b4ee2d"/>
@@ -836,7 +836,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
- <column name="DESCRIPTION" value="Objekt: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Task Id: "46164eac-62d1-4dbb-a252-93ac49429855", Art: "Organisation" eingefügt."/>
+ <column name="DESCRIPTION" value="Objekt: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Task Id: "46164eac-62d1-4dbb-a252-93ac49429855", Art: "Organisation" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="TASKLINK"/>
<column name="TABLENAMEID" value="eca5c8cb-bd10-4425-b4bc-a2e50f2518b9"/>
@@ -876,7 +876,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-15T11:05:25"/>
- <column name="DESCRIPTION" value="Activity Id: "b8067a42-d059-4d86-88b0-485a194faa36", Objekt: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Art: "Organisation" eingefügt."/>
+ <column name="DESCRIPTION" value="Activity Id: "b8067a42-d059-4d86-88b0-485a194faa36", Objekt: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Art: "Organisation" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="ACTIVITYLINK"/>
<column name="TABLENAMEID" value="60c58962-9b76-4d22-855d-b0cf9ef388dc"/>
@@ -934,7 +934,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-15T01:03:35"/>
- <column name="DESCRIPTION" value="Activity Id: "c7c29526-3138-4264-8eb4-c6876797f8fe", Objekt: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Art: "Organisation" eingefügt."/>
+ <column name="DESCRIPTION" value="Activity Id: "c7c29526-3138-4264-8eb4-c6876797f8fe", Objekt: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Art: "Organisation" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="ACTIVITYLINK"/>
<column name="TABLENAMEID" value="9770d2f3-409c-4fab-a3df-4fd3dcd14693"/>
@@ -1059,7 +1059,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="TABLENAMEID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1067,7 +1067,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Maschinenbau" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="TABLENAMEID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1075,7 +1075,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Handel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="TABLENAMEID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1083,7 +1083,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "gross" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="TABLENAMEID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1091,7 +1091,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="TABLENAMEID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1099,7 +1099,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Bauwesen" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="TABLENAMEID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1107,7 +1107,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="TABLENAMEID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1115,7 +1115,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Service" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="TABLENAMEID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1123,7 +1123,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="TABLENAMEID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1131,7 +1131,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Logistik" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="TABLENAMEID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1139,7 +1139,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="TABLENAMEID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1147,7 +1147,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="TABLENAMEID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1155,7 +1155,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Maschinenbau" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="TABLENAMEID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1163,7 +1163,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Maschinenbau" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="TABLENAMEID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1171,7 +1171,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="TABLENAMEID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1179,7 +1179,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Maschinenbau" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="TABLENAMEID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1187,7 +1187,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="TABLENAMEID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1195,7 +1195,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="TABLENAMEID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1203,7 +1203,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Logistik" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="TABLENAMEID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1211,7 +1211,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Bauwesen" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="TABLENAMEID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1227,7 +1227,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "gross" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="TABLENAMEID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1235,7 +1235,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Bauwesen" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="TABLENAMEID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1243,7 +1243,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="TABLENAMEID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1251,7 +1251,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Bauwesen" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="TABLENAMEID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1312,7 +1312,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-26T08:17:08"/>
- <column name="DESCRIPTION" value="Object 1 row Id: "8707accf-b1fd-4bde-97b1-ab44b75f66f9", Object 2 row Id: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Object relation type 1: "3cee0474-504f-43cc-844a-715f1a0db271", Object relation type 2: "fa879afd-b2c5-4eee-9799-d63c6764b348" eingefügt."/>
+ <column name="DESCRIPTION" value="Object 1 row Id: "13e60843-5d6d-45ee-88c7-46db41874138", Object 2 row Id: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Object relation type 1: "3cee0474-504f-43cc-844a-715f1a0db271", Object relation type 2: "fa879afd-b2c5-4eee-9799-d63c6764b348" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_OBJECTRELATION"/>
<column name="TABLENAMEID" value="e94240b7-4492-43f8-8913-cd7ff6ea2892"/>
@@ -1320,7 +1320,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-26T08:17:20"/>
- <column name="DESCRIPTION" value="Object 1 row Id: "6efb4fab-64f9-4d8e-aa6f-a158d13fc273", Object 2 row Id: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Object relation type 1: "0795a3cd-295b-421b-aed1-decc09b05362", Object relation type 2: "0795a3cd-295b-421b-aed1-decc09b05362" eingefügt."/>
+ <column name="DESCRIPTION" value="Object 1 row Id: "b043cd42-058c-48bd-8326-4c92e0e74c48", Object 2 row Id: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Object relation type 1: "0795a3cd-295b-421b-aed1-decc09b05362", Object relation type 2: "0795a3cd-295b-421b-aed1-decc09b05362" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_OBJECTRELATION"/>
<column name="TABLENAMEID" value="8c09b724-5ff0-4869-add8-803097cd94aa"/>
@@ -1328,7 +1328,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-26T08:17:47"/>
- <column name="DESCRIPTION" value="Object relation type 1: "0795a3cd-295b-421b-aed1-decc09b05362", Object relation type 2: "0795a3cd-295b-421b-aed1-decc09b05362", Object 1 row Id: "6efb4fab-64f9-4d8e-aa6f-a158d13fc273", Object 2 row Id: "dec94545-2487-46d5-978d-26ee0fcf0f5f" gelöscht."/>
+ <column name="DESCRIPTION" value="Object relation type 1: "0795a3cd-295b-421b-aed1-decc09b05362", Object relation type 2: "0795a3cd-295b-421b-aed1-decc09b05362", Object 1 row Id: "b043cd42-058c-48bd-8326-4c92e0e74c48", Object 2 row Id: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43" gelöscht."/>
<column name="LOGTYPE" value="D"/>
<column name="TABLENAME" value="AB_OBJECTRELATION"/>
<column name="TABLENAMEID" value="8c09b724-5ff0-4869-add8-803097cd94aa"/>
@@ -1336,7 +1336,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-26T08:18:26"/>
- <column name="DESCRIPTION" value="Object 1 row Id: "a3fd3c23-12e1-4820-b76e-2cd70103d94d", Object 2 row Id: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Object relation type 1: "0795a3cd-295b-421b-aed1-decc09b05362", Object relation type 2: "0795a3cd-295b-421b-aed1-decc09b05362" eingefügt."/>
+ <column name="DESCRIPTION" value="Object 1 row Id: "62175b31-b432-4ec6-932f-8e69033884c6", Object 2 row Id: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Object relation type 1: "0795a3cd-295b-421b-aed1-decc09b05362", Object relation type 2: "0795a3cd-295b-421b-aed1-decc09b05362" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_OBJECTRELATION"/>
<column name="TABLENAMEID" value="47802bb5-7785-43ba-a860-6b494e8ef593"/>
@@ -1344,7 +1344,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-26T08:19:02"/>
- <column name="DESCRIPTION" value="Object 1 row Id: "019651a4-503e-4e06-aefd-e7e631bf3144", Object 2 row Id: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Object relation type 1: "c9b7ce6b-1100-46f6-8498-2da6ac24189e", Object relation type 2: "259babbd-7827-44d4-b9ec-8245d27b5f70" eingefügt."/>
+ <column name="DESCRIPTION" value="Object 1 row Id: "97b66b3c-a9f5-4dc4-902e-850d69973d1d", Object 2 row Id: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Object relation type 1: "c9b7ce6b-1100-46f6-8498-2da6ac24189e", Object relation type 2: "259babbd-7827-44d4-b9ec-8245d27b5f70" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_OBJECTRELATION"/>
<column name="TABLENAMEID" value="2bd8678c-e621-4e22-b203-2d5d967422c0"/>
@@ -1386,7 +1386,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-26T12:34:38"/>
- <column name="DESCRIPTION" value="Activity Id: "c7c29526-3138-4264-8eb4-c6876797f8fe", Objekt: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Art: "Organisation" gelöscht."/>
+ <column name="DESCRIPTION" value="Activity Id: "c7c29526-3138-4264-8eb4-c6876797f8fe", Objekt: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Art: "Organisation" gelöscht."/>
<column name="LOGTYPE" value="D"/>
<column name="TABLENAME" value="ACTIVITYLINK"/>
<column name="TABLENAMEID" value="9770d2f3-409c-4fab-a3df-4fd3dcd14693"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
index 2bb4e963665200c4c8d9b8fe8b1eb2f04aa967b0..2daffba38d28510da3fe1d4cc1e3b6311a62797c 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
@@ -6,8 +6,8 @@
<column name="AB_OBJECTRELATIONID" value="03c855e5-f236-4e39-b886-91832b3a53fb"/>
<column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
<column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
- <column name="OBJECT1_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="OBJECT2_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT1_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+ <column name="OBJECT2_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
@@ -20,43 +20,43 @@
<column name="AB_OBJECTRELATIONID" value="2bd8678c-e621-4e22-b203-2d5d967422c0"/>
<column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
<column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
- <column name="OBJECT1_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
- <column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT1_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
+ <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="390cd4d2-8231-4dbc-ac9d-0ea7aecc6ef6"/>
<column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
<column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
- <column name="OBJECT1_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
- <column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT1_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+ <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="47802bb5-7785-43ba-a860-6b494e8ef593"/>
<column name="AB_OBJECTRELATIONTYPE1" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
<column name="AB_OBJECTRELATIONTYPE2" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
- <column name="OBJECT1_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
- <column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT1_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
+ <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="4c9bc7f3-c13b-4e55-9c23-012ba40196c9"/>
<column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
<column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
- <column name="OBJECT1_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT1_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
+ <column name="OBJECT2_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="5c545235-231f-4082-9e74-4ec4512eb98d"/>
<column name="AB_OBJECTRELATIONTYPE1" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
<column name="AB_OBJECTRELATIONTYPE2" value="e397b595-38ae-4365-908e-75ee388838eb"/>
<column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT2_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="63ecd05d-f2e5-4957-a496-96a87451a78f"/>
<column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
<column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
- <column name="OBJECT1_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
- <column name="OBJECT2_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT1_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+ <column name="OBJECT2_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="85ad4578-dce2-49df-a844-d162f1bd9f2f"/>
@@ -69,29 +69,29 @@
<column name="AB_OBJECTRELATIONID" value="c8aa4abb-a274-43d6-a067-ee935c443bfb"/>
<column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
<column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
- <column name="OBJECT1_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
- <column name="OBJECT2_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT1_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+ <column name="OBJECT2_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="cfbbce3e-1c0d-4d05-9ccf-8232f7eaaf02"/>
<column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
<column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
- <column name="OBJECT1_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
- <column name="OBJECT2_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT1_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
+ <column name="OBJECT2_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="d4454686-8d4e-42d9-9df8-61f19c69ce93"/>
<column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
<column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
- <column name="OBJECT1_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
- <column name="OBJECT2_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT1_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+ <column name="OBJECT2_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="e94240b7-4492-43f8-8913-cd7ff6ea2892"/>
<column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
<column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
- <column name="OBJECT1_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
- <column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT1_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
+ <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
index affcc88eb56887d1ebf2b23f21050b02c1363fda..4baba39a61134a4829273810fa5e5775a3b7c334 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
@@ -14,7 +14,7 @@
<column name="ACTIVITYLINKID" value="01ff4193-d5b4-41eb-b2db-ea31e5ed7df4"/>
<column name="ACTIVITY_ID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -30,7 +30,7 @@
<column name="ACTIVITYLINKID" value="05ccef04-86cd-4b29-96b7-e106c015a82f"/>
<column name="ACTIVITY_ID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:57:11"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -38,7 +38,7 @@
<column name="ACTIVITYLINKID" value="0aaad19f-daa1-44d3-b7df-cba2a88b2745"/>
<column name="ACTIVITY_ID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:56:54"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -78,7 +78,7 @@
<column name="ACTIVITYLINKID" value="10aa8b38-509c-4385-bfe0-775ab92571a8"/>
<column name="ACTIVITY_ID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:45:07"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -86,7 +86,7 @@
<column name="ACTIVITYLINKID" value="10b9499b-2f14-4251-8001-ac9e838c59a8"/>
<column name="ACTIVITY_ID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:55:56"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -134,7 +134,7 @@
<column name="ACTIVITYLINKID" value="20a50d5d-fe87-4ed2-8f94-b2571b6b34e7"/>
<column name="ACTIVITY_ID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -150,7 +150,7 @@
<column name="ACTIVITYLINKID" value="26b0f97e-30fc-4808-85a1-5d95cd5f6b34"/>
<column name="ACTIVITY_ID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:56:37"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -158,7 +158,7 @@
<column name="ACTIVITYLINKID" value="26f94d20-7f3a-4b3e-9655-fcf3e971ce1d"/>
<column name="ACTIVITY_ID" value="d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b"/>
<column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -174,7 +174,7 @@
<column name="ACTIVITYLINKID" value="2de91976-7c5e-4676-87e6-1869381235b0"/>
<column name="ACTIVITY_ID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:51:56"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -182,7 +182,7 @@
<column name="ACTIVITYLINKID" value="2e4494d3-0160-4e9a-a78a-54884dd465f7"/>
<column name="ACTIVITY_ID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
<column name="DATE_NEW" valueDate="2019-06-11T02:41:00"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -208,7 +208,7 @@
<column name="ACTIVITYLINKID" value="3385ac40-6f0e-45eb-bb71-ca3027325133"/>
<column name="ACTIVITY_ID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:56:49"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -256,7 +256,7 @@
<column name="ACTIVITYLINKID" value="4247ff5e-db95-4114-a1e6-21bbea86098e"/>
<column name="ACTIVITY_ID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:14:49"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -264,7 +264,7 @@
<column name="ACTIVITYLINKID" value="44ae4bcc-ccec-493c-a0db-32b136c450bc"/>
<column name="ACTIVITY_ID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:07:31"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -280,7 +280,7 @@
<column name="ACTIVITYLINKID" value="46d9d317-1b7d-4046-8278-9a4957cc1dfe"/>
<column name="ACTIVITY_ID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -312,7 +312,7 @@
<column name="ACTIVITYLINKID" value="4c526e91-a6b1-4d53-8ecc-a79418c81941"/>
<column name="ACTIVITY_ID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:03:18"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -392,7 +392,7 @@
<column name="ACTIVITYLINKID" value="565f3c19-3a81-4af6-b2ae-5b4fdccb87eb"/>
<column name="ACTIVITY_ID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
<column name="DATE_NEW" valueDate="2019-05-23T09:30:34"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -416,7 +416,7 @@
<column name="ACTIVITYLINKID" value="5a4672ac-99ff-4a2e-a4ca-aad217bef144"/>
<column name="ACTIVITY_ID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:22:44"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -424,7 +424,7 @@
<column name="ACTIVITYLINKID" value="5a4d249a-e3e4-48e5-80a5-2fd1567a82b8"/>
<column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -432,7 +432,7 @@
<column name="ACTIVITYLINKID" value="5ad45b3e-72a0-419e-a183-17aaead38158"/>
<column name="ACTIVITY_ID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -448,7 +448,7 @@
<column name="ACTIVITYLINKID" value="60c58962-9b76-4d22-855d-b0cf9ef388dc"/>
<column name="ACTIVITY_ID" value="b8067a42-d059-4d86-88b0-485a194faa36"/>
<column name="DATE_NEW" valueDate="2019-11-15T11:05:25"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -496,7 +496,7 @@
<column name="ACTIVITYLINKID" value="6c212e64-a9db-4395-a118-5279dbc6761d"/>
<column name="ACTIVITY_ID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -536,7 +536,7 @@
<column name="ACTIVITYLINKID" value="75b42e7c-4748-41ca-9a23-3436b55cadf6"/>
<column name="ACTIVITY_ID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:00:40"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -544,7 +544,7 @@
<column name="ACTIVITYLINKID" value="769721cc-a526-4e61-989f-71296085e7df"/>
<column name="ACTIVITY_ID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:14:26"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -552,7 +552,7 @@
<column name="ACTIVITYLINKID" value="777ed544-bcb2-43b2-914f-31bfa684e5c3"/>
<column name="ACTIVITY_ID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:11:53"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -568,7 +568,7 @@
<column name="ACTIVITYLINKID" value="7a4b1e70-1773-4529-8506-3243c9349ebc"/>
<column name="ACTIVITY_ID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:54:52"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -576,7 +576,7 @@
<column name="ACTIVITYLINKID" value="7f9cbd45-7ff0-4d7d-9412-58db6245f400"/>
<column name="ACTIVITY_ID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:48:02"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -584,7 +584,7 @@
<column name="ACTIVITYLINKID" value="80d3de8f-fd86-401b-aeae-63b389b9310c"/>
<column name="ACTIVITY_ID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -616,7 +616,7 @@
<column name="ACTIVITYLINKID" value="869c8987-7239-4f61-a0dc-b2f9e83ab2db"/>
<column name="ACTIVITY_ID" value="a416d1f7-553a-43b6-a084-021ad1f92dd9"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:47:38"/>
- <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -640,7 +640,7 @@
<column name="ACTIVITYLINKID" value="8d136835-b822-49a2-a516-87d4af34e8e1"/>
<column name="ACTIVITY_ID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:58:03"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -648,7 +648,7 @@
<column name="ACTIVITYLINKID" value="8d2ff9ea-5416-47ac-839f-3f7c7b517129"/>
<column name="ACTIVITY_ID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:42:09"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -656,7 +656,7 @@
<column name="ACTIVITYLINKID" value="8d384436-9989-4571-a193-cc3061249f97"/>
<column name="ACTIVITY_ID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -672,7 +672,7 @@
<column name="ACTIVITYLINKID" value="918ec650-9e5a-430b-b6a7-d0f5e9780935"/>
<column name="ACTIVITY_ID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:19:41"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -680,7 +680,7 @@
<column name="ACTIVITYLINKID" value="93c76b23-fc2c-4544-9e18-2422b2721860"/>
<column name="ACTIVITY_ID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:16:16"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -696,7 +696,7 @@
<column name="ACTIVITYLINKID" value="94ed9437-9050-4358-975b-c07988c36117"/>
<column name="ACTIVITY_ID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:50:27"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -704,7 +704,7 @@
<column name="ACTIVITYLINKID" value="9715d82b-5239-46c3-a651-fdc7ca4c1d0e"/>
<column name="ACTIVITY_ID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:51:50"/>
- <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -736,7 +736,7 @@
<column name="ACTIVITYLINKID" value="9f20ee40-22b8-440a-93e3-749bc6d6e273"/>
<column name="ACTIVITY_ID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:54:23"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -744,7 +744,7 @@
<column name="ACTIVITYLINKID" value="9f2616fb-7d78-44f6-9f5e-94ef5268dad4"/>
<column name="ACTIVITY_ID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:57:56"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -776,7 +776,7 @@
<column name="ACTIVITYLINKID" value="a631ea8d-c09a-4bff-83ab-4573df6dbe4f"/>
<column name="ACTIVITY_ID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:52:12"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -792,7 +792,7 @@
<column name="ACTIVITYLINKID" value="aa944406-61f4-4044-9f69-51a42b270113"/>
<column name="ACTIVITY_ID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:46:52"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -816,7 +816,7 @@
<column name="ACTIVITYLINKID" value="b0fae79b-0b1e-4650-8d94-853d17cca7bd"/>
<column name="ACTIVITY_ID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -856,7 +856,7 @@
<column name="ACTIVITYLINKID" value="baa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
<column name="ACTIVITY_ID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -872,7 +872,7 @@
<column name="ACTIVITYLINKID" value="bc86224f-8266-4c8a-950b-b8cb9e1a5569"/>
<column name="ACTIVITY_ID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:58:08"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -912,7 +912,7 @@
<column name="ACTIVITYLINKID" value="c3751fb7-ae77-402b-8716-3e3a477dc813"/>
<column name="ACTIVITY_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
<column name="DATE_NEW" valueDate="2019-05-15T04:58:50"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -928,7 +928,7 @@
<column name="ACTIVITYLINKID" value="c419929e-2b07-4cc4-9c7d-b0cf8b47b252"/>
<column name="ACTIVITY_ID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:52:55"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -944,7 +944,7 @@
<column name="ACTIVITYLINKID" value="caa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
<column name="ACTIVITY_ID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -960,7 +960,7 @@
<column name="ACTIVITYLINKID" value="cfb3f5f6-c148-42c9-b86c-14900e8d30c9"/>
<column name="ACTIVITY_ID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:54:10"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -976,7 +976,7 @@
<column name="ACTIVITYLINKID" value="d1cfe415-bf05-4ee0-98b6-56ba560a39b6"/>
<column name="ACTIVITY_ID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:00:39"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1040,7 +1040,7 @@
<column name="ACTIVITYLINKID" value="da68ccb2-09c8-4a63-9dc3-16bec0777ad6"/>
<column name="ACTIVITY_ID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:53:44"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1088,7 +1088,7 @@
<column name="ACTIVITYLINKID" value="e090084f-d2e4-42e5-b524-7e79dafcb78e"/>
<column name="ACTIVITY_ID" value="36ec539c-a451-4166-b64d-fb98f1b73481"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:49:00"/>
- <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1128,7 +1128,7 @@
<column name="ACTIVITYLINKID" value="e80cdefe-ff46-49f9-84ce-393882730337"/>
<column name="ACTIVITY_ID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
<column name="DATE_NEW" valueDate="2019-06-11T02:30:33"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1136,7 +1136,7 @@
<column name="ACTIVITYLINKID" value="ef66f553-93f4-4df5-a97c-d7a93b57ae6a"/>
<column name="ACTIVITY_ID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:00:17"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1144,7 +1144,7 @@
<column name="ACTIVITYLINKID" value="f1b02cad-2a68-45fb-9313-1983b83bb310"/>
<column name="ACTIVITY_ID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
<column name="DATE_NEW" valueDate="2019-11-13T11:06:51"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1152,7 +1152,7 @@
<column name="ACTIVITYLINKID" value="f20857e3-3191-4fdf-b803-9ffd1a0668d7"/>
<column name="ACTIVITY_ID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:43:15"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1168,7 +1168,7 @@
<column name="ACTIVITYLINKID" value="f37c2f14-27ce-4782-a7d4-c9f6d6fbcecd"/>
<column name="ACTIVITY_ID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
<column name="DATE_NEW" valueDate="2019-05-23T09:28:27"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1176,7 +1176,7 @@
<column name="ACTIVITYLINKID" value="f43ce26b-e728-41cd-9a93-745718b98972"/>
<column name="ACTIVITY_ID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:49:12"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1200,7 +1200,7 @@
<column name="ACTIVITYLINKID" value="f91f6e28-01f1-4b45-98f5-b0fb42ac3c38"/>
<column name="ACTIVITY_ID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:17:16"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1224,7 +1224,7 @@
<column name="ACTIVITYLINKID" value="fb08245a-d14b-4a41-bfb3-973aa560d079"/>
<column name="ACTIVITY_ID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:57:37"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1232,7 +1232,7 @@
<column name="ACTIVITYLINKID" value="fbd5ad75-92ac-48e2-ae11-d2f6e135123e"/>
<column name="ACTIVITY_ID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
<column name="DATE_NEW" valueDate="2019-05-23T09:07:02"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1240,7 +1240,7 @@
<column name="ACTIVITYLINKID" value="fedb7c1b-0a41-4dba-8abb-2e4af7b4ee2d"/>
<column name="ACTIVITY_ID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
<column name="DATE_NEW" valueDate="2019-11-15T08:57:12"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/address.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/address.xml
index fef08cdf38b829dd95120db15d3fdc5ac0357aab..30f5bc836e26a654835dca620a7b2455c3ff6adc 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/address.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/address.xml
@@ -15,6 +15,8 @@
<column name="PROVINCE" value="Freistaat Bayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="18074"/>
+ <column name="LAT" valueNumeric="50.0711647"/>
+ <column name="LON" valueNumeric="9.3442543"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Neustadt"/>
@@ -30,6 +32,8 @@
<column name="REGION" value="Niederbayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="84034"/>
+ <column name="LAT" valueNumeric="48.5352758"/>
+ <column name="LON" valueNumeric="12.1538109"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Laufertorgraben"/>
@@ -46,6 +50,8 @@
<column name="REGION" value="Mittelfranken"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="90419"/>
+ <column name="LAT" valueNumeric="49.4554978"/>
+ <column name="LON" valueNumeric="11.0892023"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Wilhelm-Straße"/>
@@ -61,6 +67,8 @@
<column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="80807"/>
+ <column name="LAT" valueNumeric="48.15795955"/>
+ <column name="LON" valueNumeric="11.58301632"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Freiberger Str."/>
@@ -71,9 +79,11 @@
<column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
<column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:46:28"/>
- <column name="PROVINCE" value="Bayern"/>
+ <column name="PROVINCE" value="Sachsen"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="01159"/>
+ <column name="LAT" valueNumeric="51.0433705"/>
+ <column name="LON" valueNumeric="13.7049829"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Regensburger Straße"/>
@@ -87,6 +97,8 @@
<column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="85055"/>
+ <column name="LAT" valueNumeric="48.7677535"/>
+ <column name="LON" valueNumeric="11.4433236"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Hildburghausen"/>
@@ -102,6 +114,8 @@
<column name="REGION" value="Niederbayern "/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="84034"/>
+ <column name="LAT" valueNumeric="48.53621870"/>
+ <column name="LON" valueNumeric="12.12398208"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Landshuter Str."/>
@@ -115,6 +129,8 @@
<column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="84144"/>
+ <column name="LAT" valueNumeric="48.4763188"/>
+ <column name="LON" valueNumeric="12.2521511"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Bolzstraße"/>
@@ -125,9 +141,11 @@
<column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
- <column name="PROVINCE" value="Deutschland"/>
+ <column name="PROVINCE" value="Baden-Württemberg"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="70173"/>
+ <column name="LAT" valueNumeric="48.7802679"/>
+ <column name="LON" valueNumeric="9.1771426"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Torstraße"/>
@@ -138,9 +156,11 @@
<column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
<column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:44:21"/>
- <column name="PROVINCE" value="Deutschland"/>
+ <column name="PROVINCE" value="Berlin"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="10115"/>
+ <column name="LAT" valueNumeric="52.5274079"/>
+ <column name="LON" valueNumeric="13.3884627"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Neustadt"/>
@@ -156,6 +176,8 @@
<column name="REGION" value="Niederbayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="84034"/>
+ <column name="LAT" valueNumeric="48.5352758"/>
+ <column name="LON" valueNumeric="12.1538109"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Königstraße"/>
@@ -169,6 +191,8 @@
<column name="PROVINCE" value="Hamburg"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="22767 "/>
+ <column name="LAT" valueNumeric="53.549853"/>
+ <column name="LON" valueNumeric="9.9542231"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Büsingstrasse"/>
@@ -183,6 +207,8 @@
<column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="85230"/>
+ <column name="LAT" valueNumeric="48.1740741"/>
+ <column name="LON" valueNumeric="11.1358621"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Sandstraße"/>
@@ -198,6 +224,8 @@
<column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="90443"/>
+ <column name="LAT" valueNumeric="49.44684405"/>
+ <column name="LON" valueNumeric="11.06877420"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Friedrichshafen"/>
@@ -208,9 +236,11 @@
<column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
- <column name="PROVINCE" value="Deutschland"/>
+ <column name="PROVINCE" value="Baden-Württemberg"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="88046"/>
+ <column name="LAT" valueNumeric="47.66121225"/>
+ <column name="LON" valueNumeric="9.49441404"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Grosse Praesidenten Str."/>
@@ -221,10 +251,11 @@
<column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
- <column name="DISTRICT" value="Oberbayern"/>
- <column name="PROVINCE" value="Bayern"/>
+ <column name="PROVINCE" value="Rheinland-Pfalz"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="67700"/>
+ <column name="LAT" valueNumeric="49.5784546"/>
+ <column name="LON" valueNumeric="7.6955565"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Steinstraße"/>
@@ -238,6 +269,8 @@
<column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="93047"/>
+ <column name="LAT" valueNumeric="49.0135924"/>
+ <column name="LON" valueNumeric="12.1225171"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Kurfürstendamm"/>
@@ -252,6 +285,8 @@
<column name="PROVINCE" value="Mecklenburg-Vorpommern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="18074"/>
+ <column name="LAT" valueNumeric="54.0924445"/>
+ <column name="LON" valueNumeric="12.1286127"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Fliederstraße"/>
@@ -265,6 +300,8 @@
<column name="PROVINCE" value="Baden-Württemberg"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="71229"/>
+ <column name="LAT" valueNumeric="48.7956487"/>
+ <column name="LON" valueNumeric="9.0248443"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Hauptstraße"/>
@@ -280,6 +317,8 @@
<column name="REGION" value="Landsberg am Lech"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="86949"/>
+ <column name="LAT" valueNumeric="48.0642437"/>
+ <column name="LON" valueNumeric="10.9894142"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Augsburger Straße"/>
@@ -293,6 +332,8 @@
<column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="86150"/>
+ <column name="LAT" valueNumeric="48.3641223"/>
+ <column name="LON" valueNumeric="10.87471185"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Landsberger Allee"/>
@@ -307,6 +348,8 @@
<column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="80456"/>
+ <column name="LAT" valueNumeric="48.1394721"/>
+ <column name="LON" valueNumeric="11.5367592"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Oeder Weg"/>
@@ -318,10 +361,11 @@
<column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
<column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
- <column name="DISTRICT" value="Oberbayern"/>
- <column name="PROVINCE" value="Bayern"/>
+ <column name="PROVINCE" value="Hessen"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="60318"/>
+ <column name="LAT" valueNumeric="50.1186864"/>
+ <column name="LON" valueNumeric="8.6798809"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Hildburghausen"/>
@@ -339,6 +383,8 @@
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="84034"/>
+ <column name="LAT" valueNumeric="48.53621870"/>
+ <column name="LON" valueNumeric="12.12398208"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Innere Münchner Straße"/>
@@ -348,9 +394,12 @@
<column name="CITY" value="Landshut"/>
<column name="CONTACT_ID" value="f682daa0-4da9-435c-b40a-552701d89570"/>
<column name="COUNTRY" value="DE"/>
+ <column name="PROVINCE" value="Bayern"/>
<column name="DATE_NEW" valueDate="2019-11-26T08:28:01"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="84028"/>
+ <column name="LAT" valueNumeric="48.53814234"/>
+ <column name="LON" valueNumeric="12.16404283"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Konrad"/>
@@ -362,6 +411,8 @@
<column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="84144"/>
+ <column name="LAT" valueNumeric="48.4772603"/>
+ <column name="LON" valueNumeric="12.2440481"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Neustadt"/>
@@ -377,6 +428,8 @@
<column name="REGION" value="Niederbayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="84034"/>
+ <column name="LAT" valueNumeric="48.5352758"/>
+ <column name="LON" valueNumeric="12.1538109"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Am Alten Viehmarkt"/>
@@ -390,6 +443,8 @@
<column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="84028"/>
+ <column name="LAT" valueNumeric="48.5391499"/>
+ <column name="LON" valueNumeric="12.1573214"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Karlstraße"/>
@@ -403,6 +458,8 @@
<column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="86150"/>
+ <column name="LAT" valueNumeric="48.370795"/>
+ <column name="LON" valueNumeric="10.897609"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Bogenallee"/>
@@ -416,6 +473,8 @@
<column name="PROVINCE" value="Bremen"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="28103"/>
+ <column name="LAT" valueNumeric="51.5033219"/>
+ <column name="LON" valueNumeric="7.9576538"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Julius-Leber-Straße"/>
@@ -429,6 +488,8 @@
<column name="PROVINCE" value="Hamburg"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="22765"/>
+ <column name="LAT" valueNumeric="53.555812"/>
+ <column name="LON" valueNumeric="9.9363988"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Blumenstraße"/>
@@ -444,20 +505,23 @@
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="93055"/>
+ <column name="LAT" valueNumeric="49.01276075"/>
+ <column name="LON" valueNumeric="12.11305452"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Spresstrasse"/>
<column name="ADDRESSID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
<column name="ADDR_TYPE" value="HOMEADDR"/>
<column name="BUILDINGNO" value="67"/>
- <column name="CITY" value="Bielefeld Babenhausen"/>
+ <column name="CITY" value="Bielefeld"/>
<column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
<column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
- <column name="DISTRICT" value="Oberbayern"/>
- <column name="PROVINCE" value="Bayern"/>
+ <column name="PROVINCE" value="Nordrhein-Westfalen"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="33739"/>
+ <column name="LAT" valueNumeric="52.08547342"/>
+ <column name="LON" valueNumeric="8.52114562"/>
</insert>
<insert tableName="address">
<column name="ADDRESS" value="Gotthardstraße"/>
@@ -475,6 +539,8 @@
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="80689"/>
+ <column name="LAT" valueNumeric="48.1358663"/>
+ <column name="LON" valueNumeric="11.4963975"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
index 3df6fdd7675a56f77686c6e082445fa95142c0ea..55d609e113cfa43d2c4d013d5758a8e1f4cdd644 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
@@ -14,7 +14,7 @@
<insert tableName="campaignparticipantlog">
<column name="CAMPAIGNPARTICIPANTLOGID" value="732cb81a-5971-488c-82ea-cf0f3c7c9587"/>
<column name="CAMPAIGNPARTICIPANT_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
- <column name="CAMPAIGNSTEP_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="CAMPAIGNSTEP_ID" value="0168b2eb-048e-4308-9c3c-f7ad9dcc9647"/>
<column name="CAMPAIGN_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
<column name="DATE_NEW" valueDate="2019-11-15T10:45:26"/>
<column name="USER_NEW" value="Admin"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml
index 2ed55d754297b5022b324623fabebbe50a54f6cd..a083c7e957cff30050be004082832eeaf65e4886 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml
@@ -4,59 +4,1813 @@
<delete tableName="classification"/>
<insert tableName="classification">
<column name="CLASSIFICATIONID" value="028181fe-5687-4904-b7cb-c4a1befe7eed"/>
- <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
- <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="90361317-d80e-4466-a45b-3021bf02e2f9"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
</insert>
<insert tableName="classification">
<column name="CLASSIFICATIONID" value="13771cd8-3694-4a44-8793-cd0fc3fb4b53"/>
- <column name="CLASSIFICATIONSCORE_ID" value="636af750-fcd3-4480-bfe7-ead42bf85280"/>
- <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="35d8ae15-8993-4ab2-99f6-e57c2ebf0bb3"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
</insert>
<insert tableName="classification">
<column name="CLASSIFICATIONID" value="13985a1a-1660-4a85-86c1-612bd62df8d7"/>
- <column name="CLASSIFICATIONSCORE_ID" value="ed6a38f7-97bf-4e3d-a34c-4a1e636fa6a7"/>
- <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
</insert>
<insert tableName="classification">
<column name="CLASSIFICATIONID" value="166f3484-53a8-4c44-aad7-ef47a268ae71"/>
- <column name="CLASSIFICATIONSCORE_ID" value="61fe4e4f-e64d-4195-87b5-658f36ce1736"/>
- <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
</insert>
<insert tableName="classification">
<column name="CLASSIFICATIONID" value="421cdeeb-a5d6-4612-b47b-49db966de27f"/>
- <column name="CLASSIFICATIONSCORE_ID" value="7e569319-5885-452e-9331-a507f3365236"/>
- <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
</insert>
<insert tableName="classification">
<column name="CLASSIFICATIONID" value="440d25a3-39c1-412e-90c7-c0a6366f0794"/>
- <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
- <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
</insert>
<insert tableName="classification">
<column name="CLASSIFICATIONID" value="81d75e31-673b-426e-827f-c505b386ce0e"/>
- <column name="CLASSIFICATIONSCORE_ID" value="ec51d975-bda6-415e-9b91-32f0e981ecd8"/>
- <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
</insert>
<insert tableName="classification">
<column name="CLASSIFICATIONID" value="c7b46dff-956a-47e1-8a7f-7d3f56c81da1"/>
- <column name="CLASSIFICATIONSCORE_ID" value="b1c55bcd-16c6-4b2f-8f73-e16397b40e93"/>
- <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+ <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="1743c169-ef67-42b9-81af-99fc753d7a64"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+ <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="0a7ec07b-d429-4b0a-aebb-0a194e76428e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+ <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="b6d36680-909d-4470-9bf4-0a8b8a7807b1"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
</insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="93f4dfdf-b07b-4dc5-91a3-7db80cc314fc"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+ <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="1180d429-0453-4b67-a805-7dc101e6ead2"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+ <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="b38101bf-3d36-4509-9637-a428beb9999a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+ <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="c28d914e-ad91-4202-9fe6-0d0d41e53836"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+ <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="0969044c-33eb-41eb-9aec-fa3795d8c49f"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+ <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="6e187a9b-2e57-4da2-8132-9f576a28d6f7"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+ <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="4d67d40e-4656-46b0-b5a0-9c299c1ef9d3"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+ <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="58642867-f8fc-45c1-a926-06306498a9c8"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+ <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="6bbe5de0-4302-4467-9f3b-a0292485b214"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+ <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="1ec41224-e21c-4adf-8b7c-235eca10801c"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+ <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="4164397b-a129-4e37-9586-af6e6133befd"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+ <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="6111dd76-4786-43bf-b6ce-74b36415ad03"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+ <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9cc46dc2-f40a-4c3b-aabd-c77858f5d770"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+ <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="045365c1-9561-4e4f-ad9b-9ce6ef0d0279"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+ <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="cd531b73-1390-498e-a83d-a50c964c24ea"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+ <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="8f44739a-7103-4dd3-8f1f-25afbae07cd0"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+ <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="02f2f9a4-0d34-472a-b8b2-461fad057c4e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+ <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="3f410195-bca5-41ac-a819-a8d29506f9e5"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+ <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="77a11bd3-a521-4701-b564-7f8b07000f0b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+ <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9aa3789c-bc9d-43cf-a121-2575090c2dc4"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+ <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="fbc32ea9-8350-463a-846e-71a30851f15a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+ <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="3e9b7598-39a6-4ebc-aa49-8ec3a20f9eb4"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+ <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="80beaf88-415d-49da-ae0b-c4d6528747a2"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+ <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="053f18d1-8fe2-4a79-978d-03cc37454ffe"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+ <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="208c8324-e7f9-41b9-93ec-ac7e7f7262b7"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+ <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9f85a0f0-6576-4077-99fc-953d8ab53352"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+ <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="c4dc8a62-edc1-4af6-b7c6-f91f6ab700c5"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+ <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="122116f6-e858-4605-af18-6c8b21da6455"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+ <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="3da8549a-762a-438f-9878-271c52943fd2"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="7e569319-5885-452e-9331-a507f3365236"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+ <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="28405f79-a635-4ede-8b11-11284c5e7190"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="636af750-fcd3-4480-bfe7-ead42bf85280"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+ <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="905cae71-9e4b-48f2-9de3-fcb8607d01a1"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+ <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="d33aeb65-0c28-48a1-9a81-105faa882a4c"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="c9d4e28d-7935-42c5-9da5-5ce0b51b425a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+ <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="da44d022-9ea6-4fcb-9491-c5b7236c642f"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+ <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="3672003e-0624-4a51-bb15-48f93bbd4342"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="39547328-ccc6-47ad-b31a-d6a149081c44"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+ <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a027bccd-c894-443e-bdde-f32ee0b88285"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="1f924d71-c500-4cdd-bc52-4718a6b88e45"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+ <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="e10a5ecb-b0f3-4b08-a380-de1a04fbc87f"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a177b155-4665-4af1-b50e-0b59e8ac2752"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+ <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="b7d6e658-96b3-4664-b7db-139b73add7e3"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="e70a23b4-f2a9-4438-8ba6-742c6c17e5cc"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+ <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="6382b5d7-06a3-4584-8314-e00abdd8e8e9"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+ <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="94a83ec1-8e6d-4c1b-90a0-54eeac52277b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+ <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="6017fea2-7e31-4220-86f4-cf72123af805"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+ <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="dfaec9c0-d9fa-4362-a955-341addc3a76d"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+ <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a28dd724-cd0b-48f4-afd5-840ddc611026"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+ <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="25bfa0ce-433a-4bb9-992c-df66b02a76da"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="6bd19de4-691b-4e78-84dc-cf6f41231978"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+ <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="b06e62a0-53b0-4046-b024-b00293e632f2"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+ <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="58671a19-6522-46e6-93ba-8f62bf580048"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+ <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="2a9353ec-78c3-42ae-836f-dcec0a4cfaad"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+ <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="2abfbf1f-8f2c-4713-a61b-13ba593d1055"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+ <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a3e22367-c33f-4f2c-ad0c-8f9eb6ab572a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+ <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="297cc1a1-1813-4f30-ad70-b452292c3371"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+ <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="0521dd6e-49ca-4a3a-9906-12e8359e3db9"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+ <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="0fcfa75f-9844-49d7-a088-56e570be4cd0"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+ <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9452b219-64af-4c27-8f35-0ba81210abf3"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+ <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="4e96b522-209b-48ca-b04d-f328416aacdd"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+ <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="f47c0ea2-3a6d-4d7b-8f89-bb2d9799fd0e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+ <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="e90c4086-db5f-4099-ba26-67799eb25e44"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+ <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="35b79ed1-7002-44f1-af61-891cdf863ac9"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="8502a2c8-fb7e-44f2-91cb-3d44d2d50d98"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="8c133476-7e1a-4120-8127-b45228bd5403"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="965bd86a-ad6d-4440-a7a3-e4bcf1b0a505"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="0027e606-7932-4e40-9e20-43717b687a64"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="2a447c40-23b0-4e45-b932-067c08515da0"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="d5db188e-4e30-4179-8c3a-339bc16fa2ab"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="6685c781-a87d-4102-8764-27f0fcb0dc60"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9af237aa-daa0-4195-a301-a815497a75b6"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="55569485-c1f8-4bef-9e94-2b64c9b6bd4e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="2800c5de-2174-46fb-a50a-d5ae4a28c28d"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="12280a78-1bc8-411d-9556-57b6ea12343f"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="c9208276-8f53-424d-821b-e37f041f864a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="19cd3898-cb8e-4fa3-ade8-89cacb181b7d"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="085d5901-9ab4-4747-a758-660d952a7a2c"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="fcdedb8a-a863-47a8-93af-379c451fedb0"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="971cee9d-9b1f-4b57-9635-9bbfdb792958"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="39dc9940-eb00-4ed5-82ec-521f5cc62239"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="f7f7022f-57a2-4944-a9d3-e092e1be43b3"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="2119cb62-b57c-40be-aff8-ace8e40378d4"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="6dadd578-7e24-41cd-ab27-7baa29e4691b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="008ac315-31ab-4320-bf29-6681708eda88"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="568cebf1-2494-44e0-9eb8-91bbcf1189eb"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="d3932d83-8afe-47ff-aff9-7d23bd443669"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="e567dc3e-fb98-4b17-b503-499497b691a6"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="5f0cdce4-81b4-4c05-9011-4d76bdc21b65"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="1af00ea1-11fe-49d7-8a21-29bee4f31991"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="f724bcdf-ac46-4296-be41-2febc7747ce1"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="79cc0205-25f8-44a9-b682-a31df2068e3f"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="f7118dce-dac9-4821-a709-bb7e9db8170a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="3561883e-bec9-4be7-8f0f-985ca694ff04"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="98d2e3c1-f308-4a7a-a12f-4d24b45d4db9"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="bb5ee550-320f-491a-a48f-b1ecf41ef90c"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="0759e286-007b-4568-b4d6-0542900d7ba1"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="94bbfbe5-136f-40f2-af1f-8a47e1414a8c"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="84ca4de3-ba44-40b4-8727-c5e23861c2c9"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="efe87026-b813-4bb7-a3c8-4ef72e2076b8"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="e14fd7cc-abca-4296-bbd6-d9605d1e6f00"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="ddb5083d-9410-4b9c-82a4-496370b868e3"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="4a61a0fe-394e-4b2f-897a-092fc2c109b2"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="55401dae-a111-4e69-9c26-21fa9badd973"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="6048f088-dde7-4134-a101-f5e8f8b70cf5"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="ccaea5d2-64c3-4255-9825-c91784ba5f54"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="048a95bd-0a82-494d-b7fd-90f5d750f2c7"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="8fbd5ec4-bb9a-4c33-aa8d-73185d4b0746"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="1249cfe4-d2cd-42c2-9df8-93b8f6c1f272"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="2e3d4c1e-24b2-4362-bee9-b11fa9847d42"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="8b59888b-ba5c-4a77-b06d-d522037fe3b3"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="bc4a31b1-f2e2-4caf-8dcd-ac754c1d7290"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="813a990d-a17a-4481-a49d-7fb3a9c6513a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="d6bf1068-83a5-4bcc-9d97-2efc72cc57a8"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="c5d4a548-7a5a-4695-b746-526ef41f5035"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="1897cf27-f472-4d25-88fe-64bd08915817"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="75fd708e-78a9-442f-8ddb-913b8fd29cdf"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="5bb7b949-cc0b-4724-a5e9-37bfcfe55813"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="3cc8a674-7934-4b8f-b200-bd19ddcb4689"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="57a2e5d3-0aa9-48a1-89f8-2db8967ffed6"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a3081728-77d9-4c92-96b5-6fa21659a33f"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="342c7c38-ca79-4e46-9677-5da074ceb60b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a3e2d764-bd51-4f06-a0a0-0e5f4b37d41b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="f7504a50-2748-434a-ae08-cff2f4f8035a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="cea579d4-35fa-4376-b791-8b91cbe05d3a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="c6fe5361-777d-4047-99dd-e8495ebb8c73"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="aa291e2a-646d-4b73-b826-85bd357fd5c0"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="d70e23a7-bc3c-43ae-8b2c-44d85fc7a2d3"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="4e21e953-7146-43dd-a888-92d9f55f561e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a63b089c-f856-4513-8691-57422e400dc4"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9772b8f6-08c6-40aa-af16-df68bcecb77f"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="83537aae-14a3-499f-a94b-9c630745110b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a1591490-e7c3-46b1-8d7e-843acbe93b41"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="76990230-73ec-4026-8a28-871ac5b4edc6"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="326d5aff-cb21-4bb6-9c32-7fcac48d175c"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="8d830242-7eb6-4185-b1cc-3e7977e6c340"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a5ce852a-83e6-4b0e-b3fa-310ea99c7e87"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="fc10831b-65ea-4ecb-b52e-98c6f54b2a9a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="058a9ef7-adca-4278-840a-720665fa3cd3"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="f11eeaac-645d-416e-a50d-259f6ead0c30"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="cb7df4e3-e15c-4e65-92f4-ecd5cda09f95"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="dccab9b9-5306-4325-896f-99646139b5ba"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="03bb8bbb-0644-4376-99fb-b21fc2807f14"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="5ce0c1b0-c040-462e-bd19-c8e109449b8e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a728d498-dd75-4b96-a5e5-cbdccd10b0b2"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="b923621f-e48e-4a77-9f67-f63f5a0b0fbb"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9c457191-c7c7-4a4f-bb91-8a48d27add92"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="d6d64590-9299-4348-8e21-0cac9f84f51a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="da16c6c0-3bdf-4af5-b810-e85babe83e69"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9fcf5382-f070-4698-a011-748c8584733b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a0120295-79d1-429f-aef4-b9cce9c92de2"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="8c792586-2d2d-41a3-933b-6f679dd4011e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="7d131f29-0430-44ad-b4ec-7044a67e0e3b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="5c1b2604-da33-4268-8400-5fb4b23c436b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="f25ef82a-6466-49c7-aa35-1f4d750218ca"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="fd0fea13-2322-4664-bf15-8026a91bebd2"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a7b9862c-6a25-4bbc-92ec-7bfb25cdb6c0"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="eba1581a-1235-4139-a33a-687513436777"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="c61069c1-fe41-4585-9d75-cef27d534ceb"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="81deaf11-9f63-4cc8-b83c-8711f5e3f734"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a7d7fd5c-624c-4d64-929b-2b0eb146ab9d"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="d3b5f0ad-1a66-4eee-a40d-36daf317d510"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="597de33c-b223-4d55-bed7-aeb1d161fc2e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="6d3464fa-eadd-4afd-b4e1-3031726770d5"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="1ac75382-0af9-42d2-8fe5-22295a93e8b3"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="522566b0-6eca-40bb-977c-c9a26f730890"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="caaa6b4e-34e3-4337-b65f-abe761a8c24c"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="e4d83d98-fcf8-402e-9d81-17f374654df7"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="62b9dacc-7d6f-4e05-81f8-6a425e369489"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="77941d3d-e876-44b3-b824-3a075d7dd398"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a03201a8-0858-45e0-a0e2-9b70f5a35061"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="3056c0b4-5e4b-4580-ab89-75ac80920415"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="00c30050-c850-46b0-8e1d-d70f889655e3"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="4444b22f-02d1-4e8f-9073-82d61eba18e0"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="f5e4ebc2-e0a7-4ab0-b7e1-dc43c2913135"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="b6ed4614-ea3d-4b2d-a9c3-44d146724b71"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="e7a7da18-7283-4d75-ab9f-06f62972293c"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="d6443737-e23b-42fa-81a8-d5e86636fb79"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="94a737b7-d4f6-4a13-b06b-05a225d9225b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="319dec0d-5ed5-40f8-8c98-b912582a8817"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="22429945-9c82-493c-a0a6-ff31ecaa4b56"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a898ffe5-96ec-4eef-9e0c-6a2622fc74fc"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="0f77577a-7a45-4c3f-be39-35ec364e8242"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="cf051c11-5f8e-401c-8e57-aabc55496eb8"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="d18a0dec-5161-488d-958d-3d9ea88f32f3"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="0359b7b8-7526-4165-8b01-e90403b206eb"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="91cd0603-ac46-420b-81d4-0e1c72a916bf"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="62cc115a-f80e-4a0f-899e-8060e9ed575e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="31a22039-ac7d-4bb9-9f36-d1f91c6c4052"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="289cea03-2c65-4557-b0f9-0dd29b26cecc"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="e27e1f4b-bca2-4928-9652-950762723531"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="95f0f027-799b-48fd-b1b5-49f70760a008"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="52c6bccc-1055-48dc-ad5d-311e80a12d2a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="5dd419ab-971f-42fd-9bb6-2247a6b4175b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="beb7f0ec-3331-49f9-b440-0099f62205c0"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="359fddf8-baae-497f-8ad6-d2cab1438473"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="2314864a-76f7-4fe9-a01f-c5be6ba0669e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="203fb867-ee2f-4c01-8fb5-8e49da32be64"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a51c9515-80bc-4902-8d9b-115179ab40df"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9260ed8f-3b4a-4c5a-9077-0fe59105883b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="1a093afe-066e-4bbc-b6c9-b913ab8dfdc0"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="bc61586b-a63e-4d69-82ad-62b02ea2b28a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="051e9f0f-fc99-4046-90b9-6cfb403844e9"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="32b4f1b2-6cc2-4702-a9e0-0a75184c5698"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="f5dd89ed-f6ae-4676-aa83-906211570a5b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="b3846b7c-e70a-43fe-9637-ea74ed1fe0d7"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="f60f8fe8-5ee9-43b4-a0cd-50b0f354bf79"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="83d2e0f5-b7f5-4305-8da7-69e27da99f98"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="717dfb2c-2e2c-46c8-b72c-8d81e61b94c1"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="0423c091-7e65-43eb-9ab3-f5a847350845"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="d9cce938-36d9-4a80-9bc2-9e37e6ed64ce"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9ec7bc3e-dc4c-40e4-bcee-bd59ab949d42"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="14f31249-544a-46f9-a2e4-c3bdcf3e49a3"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="3807eda2-aa0f-4caf-b3ab-0ff341eb887b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="36b1ed8c-a4d4-4203-aa20-52cf10f8d8a0"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="d74914a9-05f6-4433-9121-87755b724fb4"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a69faa8d-afaa-40cd-97e6-65a851f5dde1"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="c179fe12-4bb0-495d-99d0-0159d0466bc0"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="ed2a3c86-814d-4212-a2da-5875d0d3c598"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="688cdc0d-d1a7-46ad-95c3-7503c054ee2c"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="77f0f0bd-eaca-44ef-abfa-9156eac6eb7e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9f5975c7-3df6-4fa4-87e4-7a1c0dbd967c"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="d03c3aa2-c97f-4bd4-b92f-7e09d594cdb8"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="6800e69f-33b1-44ae-b3a2-d7362bfddbf8"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="218f1794-26e6-45f2-a26d-98185a49bf4f"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="f738a3d6-b4e0-491e-8d51-a83ce039fbc8"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a653069f-927d-425a-8956-aeb15a2c4bc8"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a8c2d3c5-423f-45fa-a8db-cd2ab59c5045"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="fa07168c-6aa5-4b9d-935e-6ece6e1c5bdb"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="14148c9a-8afb-42ad-a4c5-d1102241e9f8"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="2b0e75e0-0a36-4397-988d-2ae60e5d2658"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="b828dfb2-943a-4f81-b950-fbe4db3d19b7"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="5a5e780b-01af-4a0f-bcd6-74c0c588210a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="1dc7de76-80d9-4240-97ae-cab241301a68"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="a76fcafb-a84d-4505-8c68-1b221482e292"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9ea74c40-7732-4d0a-a489-f50bc60caf8b"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="2c644b64-0404-4eac-841c-d8579ff25fa6"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="ac0944d2-b184-45f5-983a-6c873aadfb8e"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="5bb5e000-5bba-4895-a5b8-374c2c5bd3a4"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="b49911f5-fccc-4dba-a46a-32fd56cf8b8f"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="65f45f0d-ab41-4a83-b5f7-795dc21d0fd4"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="13f634ef-70ba-440b-91af-e6324cdb20bb"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="555a280b-a2e4-4eb5-bbec-87bca3987395"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="c58b5e5a-b4fe-4dec-a93d-79848e564b87"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="85b54389-50f9-4bd3-838b-d3941bda2cc1"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="9286af56-8942-4e30-8ed3-cde6bf2e77d5"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="445ccf23-4d44-489a-8054-b46194e104e7"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="46065d3f-a811-430d-8fa2-e048aee894c7"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="7884869d-85ab-458f-9078-e2dd7234be91"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="6a6dfe13-6fcc-4ae9-b12b-dced4a55daef"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="740bcc4c-b621-458e-874e-034cf70965bc"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="20092371-2723-45e2-aae0-3a697b1265fc"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="classification">
+ <column name="CLASSIFICATIONID" value="b1cb759c-f17c-4277-bee1-e50717d8934a"/>
+ <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ad66344241be6327710070a36e7995a24f0e6ca2
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml
@@ -0,0 +1,127 @@
+<?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="autogenerated" id="2365bd93-fb40-4701-b3c2-4c7fd483261">
+ <delete tableName="classificationgrading"/>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="68dd4d91-d472-477d-935c-70cbe5606c51"/>
+ <column name="GRADING" value="A"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="9437f368-bea1-47f4-b76e-d6a391af438d"/>
+ <column name="GRADING" value="B"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="348a2af8-ec01-4a58-8ff6-5e3a837852a4"/>
+ <column name="GRADING" value="C"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="9a823957-0ca9-4972-95df-d894d4e4fc25"/>
+ <column name="GRADING" value="D"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="4ef54a02-ddf8-4238-b9fd-f5a043032b7d"/>
+ <column name="GRADING" value="A"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="748ef65c-af41-42d8-8ac4-480bc9390591"/>
+ <column name="GRADING" value="B"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="8e73dd97-4428-4316-882d-7b2af56330ef"/>
+ <column name="GRADING" value="C"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="76af9750-a714-4a35-bfd2-6eab3c316e5b"/>
+ <column name="GRADING" value="D"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="c021718f-b6ca-4d4d-87f7-e4450d103fe2"/>
+ <column name="GRADING" value="A"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="8f702450-83fc-4085-92c2-ac09f96dcd6b"/>
+ <column name="GRADING" value="B"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="14da2618-88be-425c-92c3-68d8584aa0bf"/>
+ <column name="GRADING" value="C"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="5e5c3ffe-3fa6-41e3-8659-1b03e7e1a1cd"/>
+ <column name="GRADING" value="D"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+ </insert>
+
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="5e46e499-00c2-4cc2-9f4c-952290484623"/>
+ <column name="GRADING" value="D"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="8c982beb-bc53-4bcf-8b76-7ee919bbf653"/>
+ <column name="GRADING" value="C"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="a89c81df-9380-41b1-9c7c-52d3a1862ac7"/>
+ <column name="GRADING" value="B"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="7afd58ad-6eae-4d6b-8d4b-2ca4bdd177e6"/>
+ <column name="GRADING" value="A"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="8408ca43-a4dc-4767-8127-e52c08276815"/>
+ <column name="GRADING" value="D"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="03aa277d-873b-4913-9051-d44aa4f77627"/>
+ <column name="GRADING" value="C"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="29226adf-eb79-4696-a4b8-7be73c9488e6"/>
+ <column name="GRADING" value="B"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+ </insert>
+ <insert tableName="classificationgrading">
+ <column name="CLASSIFICATIONGRADINGID" value="f8e1c5a4-b0d0-4b73-9700-11ff916adfdd"/>
+ <column name="GRADING" value="A"/>
+ <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgroup.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgroup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..73d7c48a4deb1285b92370ea121501217089f2d6
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgroup.xml
@@ -0,0 +1,31 @@
+<?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="autogenerated" id="c71ca120-5de6-4a44-a795-1127653c25df">
+ <delete tableName="classificationgroup"/>
+ <insert tableName="classificationgroup">
+ <column name="CLASSIFICATIONGROUPID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+ <column name="TITLE" value="1. Classification"/>
+ <column name="SORTING" valueNumeric="1"/>
+ </insert>
+ <insert tableName="classificationgroup">
+ <column name="CLASSIFICATIONGROUPID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+ <column name="TITLE" value="2. Classification"/>
+ <column name="SORTING" valueNumeric="2"/>
+ </insert>
+ <insert tableName="classificationgroup">
+ <column name="CLASSIFICATIONGROUPID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+ <column name="TITLE" value="3. Classification"/>
+ <column name="SORTING" valueNumeric="3"/>
+ </insert>
+ <insert tableName="classificationgroup">
+ <column name="CLASSIFICATIONGROUPID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+ <column name="TITLE" value="1. Target group"/>
+ <column name="SORTING" valueNumeric="1"/>
+ </insert>
+ <insert tableName="classificationgroup">
+ <column name="CLASSIFICATIONGROUPID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+ <column name="TITLE" value="2. Customer value"/>
+ <column name="SORTING" valueNumeric="2"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml
index f95ec00da2ad45dc02dde006adba59dfcad72567..69ade9eca1dc3ec054bef0ae3121314a9c234b2e 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml
@@ -184,13 +184,6 @@
<column name="SORT" valueNumeric="40"/>
<column name="TITLE" value="50 to 99T"/>
</insert>
- <insert tableName="classificationscore">
- <column name="CLASSIFICATIONSCOREID" value="77a0088c-a665-4feb-9f60-99c1eb710015"/>
- <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
- <column name="SCORE" valueNumeric="33.30"/>
- <column name="SORT" valueNumeric="50"/>
- <column name="TITLE" value="Lifesience"/>
- </insert>
<insert tableName="classificationscore">
<column name="CLASSIFICATIONSCOREID" value="7d6f716a-97c7-417b-a8c0-3cb71e403dde"/>
<column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
@@ -413,7 +406,317 @@
<column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
<column name="SCORE" valueNumeric="20.00"/>
<column name="SORT" valueNumeric="20"/>
- <column name="TITLE" value="Within 12 months"/>
+ <column name="TITLE" value="unknown"/>
+ </insert>
+
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="2cd8d11f-ee3f-429b-a16a-7839cf30b62d"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ <column name="TITLE" value="51-100"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ <column name="TITLE" value="0-50"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="SCORE" valueNumeric="15.00"/>
+ <column name="SORT" valueNumeric="40"/>
+ <column name="TITLE" value="251-1000"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="d578aa09-5d14-4ace-8cd0-572c5efcd82e"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="50"/>
+ <column name="TITLE" value="ab 1000"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="SCORE" valueNumeric="25.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ <column name="TITLE" value="101-250"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ <column name="TITLE" value="Commodity group 1"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="fd8a348a-dc1f-414b-b95e-b1a6aeb9a8d4"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ <column name="TITLE" value="Commodity group 2"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ <column name="TITLE" value="Commodity group 3"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="206fd02f-68ec-42f2-83d1-92848f51dc1a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="SCORE" valueNumeric="25.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ <column name="TITLE" value="Switzerland"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="8d7bc557-e020-42c9-83d9-ff84fcbd12b7"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="SCORE" valueNumeric="35.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ <column name="TITLE" value="Austria"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="2745d6c3-fffb-4f72-8bc2-92439a14e919"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="40"/>
+ <column name="TITLE" value="Other"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="SCORE" valueNumeric="35.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ <column name="TITLE" value="Germany"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="9181a683-dcab-47fc-af7b-e282505348d6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="90"/>
+ <column name="TITLE" value="Energy"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ <column name="TITLE" value="Machinery and equipment"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ <column name="TITLE" value="Logistics"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="130"/>
+ <column name="TITLE" value="Trade"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="6632b510-7094-45d6-b7ef-946e759429a3"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="140"/>
+ <column name="TITLE" value="Automotive"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="180"/>
+ <column name="TITLE" value="Service"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="fd022500-4cbc-461f-abb9-b0ec3d8e1dd1"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="80"/>
+ <column name="TITLE" value="Food"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="904e2dbe-49a1-42a0-a5db-0f274334dd7f"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="160"/>
+ <column name="TITLE" value="Electric"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="9ac96400-9c47-4d4f-be5b-e053f92a54ce"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="40"/>
+ <column name="TITLE" value="IT"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="09559e61-09ed-4f85-b0cb-fa7b0c66e488"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="15.00"/>
+ <column name="SORT" valueNumeric="150"/>
+ <column name="TITLE" value="Publishing house"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="d2a75f81-d0b3-48ce-be97-5e6add962cbb"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="15.00"/>
+ <column name="SORT" valueNumeric="70"/>
+ <column name="TITLE" value="Consultation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="92c8f126-b31e-4011-bbf0-cb5e57bfc3e5"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="60"/>
+ <column name="TITLE" value="Finance"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="107c199b-b315-4093-add5-48c496794bc9"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="110"/>
+ <column name="TITLE" value="Lottery"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="df7ea293-1fd6-4e98-ba3f-7d975fa8eaeb"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="170"/>
+ <column name="TITLE" value="Environment"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="2119cb62-b57c-40be-aff8-ace8e40378d4"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="120"/>
+ <column name="TITLE" value="Education"/>
+ </insert>
+
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="SCORE" valueNumeric="15.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ <column name="TITLE" value="high"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ <column name="TITLE" value="low"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="d0f5c576-e1cd-463e-82d2-e09c46ccb2a0"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ <column name="TITLE" value="medium"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ <column name="TITLE" value="low"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="0b671383-ecc3-440c-aff4-ff485da2755d"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ <column name="TITLE" value="medium"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ <column name="TITLE" value="high"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ <column name="TITLE" value="0-49 D€"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ <column name="TITLE" value="100-199 D€"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="733323d6-ff3d-4ccb-b179-ad1fea05dfe8"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="SCORE" valueNumeric="15.00"/>
+ <column name="SORT" valueNumeric="40"/>
+ <column name="TITLE" value="200-349 D€"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="839cd672-5981-4207-8a82-caddd00107e4"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ <column name="TITLE" value="50-99 D€"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="f02cfd28-5a09-42ca-b805-07b7b38e3363"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="50"/>
+ <column name="TITLE" value="ab 350 D€"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="SCORE" valueNumeric="5.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ <column name="TITLE" value="high"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="08764209-9b5e-4893-96d0-e2a347bccf60"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="SCORE" valueNumeric="20.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ <column name="TITLE" value="low"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="6fe28489-2383-412b-9bbd-4f01a9421775"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ <column name="TITLE" value="medium"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="cddaf52d-37b7-426c-b858-c986e58544e6"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="SCORE" valueNumeric="10.00"/>
+ <column name="SORT" valueNumeric="20"/>
+ <column name="TITLE" value="Stagnated"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="SCORE" valueNumeric="0.00"/>
+ <column name="SORT" valueNumeric="30"/>
+ <column name="TITLE" value="Negative"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSCORE">
+ <column name="CLASSIFICATIONSCOREID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="SCORE" valueNumeric="25.00"/>
+ <column name="SORT" valueNumeric="10"/>
+ <column name="TITLE" value="Positive"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationstorage.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationstorage.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aa7419f65cf9a1919623b21eee01fbba8a344b18
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationstorage.xml
@@ -0,0 +1,162 @@
+<?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="autogenerated" id="c71ca120-5de6-4a44-a795-1127653c25df">
+ <delete tableName="CLASSIFICATIONSTORAGE"/>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="166e729d-45c6-4dab-bff2-940d2b618f6b"/>
+ <column name="CLASSIFICATIONVALUE" value="BBB"/>
+ <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="1aafcbf6-6feb-4916-a4fd-58c138eb8f8f"/>
+ <column name="CLASSIFICATIONVALUE" value="DBA"/>
+ <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="04b4ac80-a316-437a-b113-e7de14e181a8"/>
+ <column name="CLASSIFICATIONVALUE" value="ABB"/>
+ <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="42cc772e-53c6-4849-be29-ebb4e18ab860"/>
+ <column name="CLASSIFICATIONVALUE" value="ACB"/>
+ <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="7f7dfe1d-cb98-44c8-8106-858d991d2b06"/>
+ <column name="CLASSIFICATIONVALUE" value="ACA"/>
+ <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="471aafd5-a348-453f-8b2a-64bb365fd0ee"/>
+ <column name="CLASSIFICATIONVALUE" value="ACB"/>
+ <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="63dd36bb-74b8-487b-811f-521438ef9491"/>
+ <column name="CLASSIFICATIONVALUE" value="AC"/>
+ <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="4ce62df5-f0ea-4593-a152-6704c61d7cef"/>
+ <column name="CLASSIFICATIONVALUE" value="BD"/>
+ <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="821c7eed-7bee-4879-97ec-44d2014a192b"/>
+ <column name="CLASSIFICATIONVALUE" value="BD"/>
+ <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="7e59d485-01a8-4e43-9655-ba751d5983a4"/>
+ <column name="CLASSIFICATIONVALUE" value="BC"/>
+ <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="c64c9f31-a108-4df9-b515-6e523b1341c1"/>
+ <column name="CLASSIFICATIONVALUE" value="AC"/>
+ <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="1251e4b0-195d-4556-a10e-7942f1b0e337"/>
+ <column name="CLASSIFICATIONVALUE" value="AB"/>
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="3893da8a-f357-46e0-a0b9-65aa58b0dfa6"/>
+ <column name="CLASSIFICATIONVALUE" value="BC"/>
+ <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="84a92c36-88df-4c06-a36a-650ed92d4d0a"/>
+ <column name="CLASSIFICATIONVALUE" value="BD"/>
+ <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="f451479f-97dc-4570-b342-c8d53f04b493"/>
+ <column name="CLASSIFICATIONVALUE" value="AC"/>
+ <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="80eac6e6-f237-455e-96fd-8484722a79d4"/>
+ <column name="CLASSIFICATIONVALUE" value="BD"/>
+ <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="25a1b340-538d-4c4f-8b1e-25126286cd53"/>
+ <column name="CLASSIFICATIONVALUE" value="BB"/>
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="bbc19466-8d76-4f35-be56-8458f677d4a9"/>
+ <column name="CLASSIFICATIONVALUE" value="BC"/>
+ <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="0adb8953-1685-45cf-bcf7-c2c2098aa215"/>
+ <column name="CLASSIFICATIONVALUE" value="BB"/>
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="b4d2847f-0548-4cc8-b002-7723b5fc9184"/>
+ <column name="CLASSIFICATIONVALUE" value="BD"/>
+ <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="e2142492-eeab-482d-a37e-b1c8fe7b2545"/>
+ <column name="CLASSIFICATIONVALUE" value="BC"/>
+ <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="7a4762f5-90a3-4b6c-8a5d-93125381c18a"/>
+ <column name="CLASSIFICATIONVALUE" value="AC"/>
+ <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="fc665249-9efc-4d90-839d-cdffb4c3f407"/>
+ <column name="CLASSIFICATIONVALUE" value="AC"/>
+ <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="7b2eb62a-b686-4eaf-bde1-2e1dd1028f65"/>
+ <column name="CLASSIFICATIONVALUE" value="BC"/>
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="2ab913d3-e1a8-4fe2-904b-77b02f6be689"/>
+ <column name="CLASSIFICATIONVALUE" value="BB"/>
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONSTORAGE">
+ <column name="CLASSIFICATIONSTORAGEID" value="8db70618-5840-4d4b-90e2-66e1919fc6c1"/>
+ <column name="CLASSIFICATIONVALUE" value="AC"/>
+ <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml
index 88d262c0d8a6a78e9f33e0a5da803080c4cb3a0b..f758025469ed08e0bb3af66cdd6e83883584e8fd 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml
@@ -3,70 +3,125 @@
<changeSet author="autogenerated" id="de26cf22-891e-4584-97cd-fe877ebc790c">
<delete tableName="classificationtype"/>
<insert tableName="classificationtype">
- <column name="CLASSIFICATIONGROUP" value="2. Classification"/>
- <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
<column name="CLASSIFICATIONTYPEID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
<column name="SCORETYPE" value="ScoreCustomizing"/>
</insert>
<insert tableName="classificationtype">
- <column name="CLASSIFICATIONGROUP" value="2. Classification"/>
- <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
<column name="CLASSIFICATIONTYPEID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
<column name="SCORETYPE" value="ScoreStandard"/>
</insert>
<insert tableName="classificationtype">
- <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
- <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
<column name="CLASSIFICATIONTYPEID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
<column name="SCORETYPE" value="ScoreDepartment"/>
</insert>
<insert tableName="classificationtype">
- <column name="CLASSIFICATIONGROUP" value="1. Classification"/>
- <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
<column name="CLASSIFICATIONTYPEID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
<column name="SCORETYPE" value="ScoreUsers"/>
</insert>
<insert tableName="classificationtype">
- <column name="CLASSIFICATIONGROUP" value="1. Classification"/>
- <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
<column name="CLASSIFICATIONTYPEID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="SCORETYPE" value="ScoreBranch"/>
</insert>
<insert tableName="classificationtype">
- <column name="CLASSIFICATIONGROUP" value="1. Classification"/>
- <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
<column name="CLASSIFICATIONTYPEID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
<column name="SCORETYPE" value="ScoreBased"/>
</insert>
<insert tableName="classificationtype">
- <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
- <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
<column name="CLASSIFICATIONTYPEID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
<column name="SCORETYPE" value="ScoreDecisionPhase"/>
</insert>
<insert tableName="classificationtype">
- <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
- <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
<column name="CLASSIFICATIONTYPEID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
<column name="SCORETYPE" value="ScoreCloud"/>
</insert>
<insert tableName="classificationtype">
- <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
- <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
<column name="CLASSIFICATIONTYPEID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
<column name="SCORETYPE" value="ScorePosition"/>
</insert>
<insert tableName="classificationtype">
- <column name="CLASSIFICATIONGROUP" value="2. Classification"/>
- <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
<column name="CLASSIFICATIONTYPEID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
<column name="SCORETYPE" value="ScoreBudget"/>
</insert>
<insert tableName="classificationtype">
- <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
- <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+ <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
<column name="CLASSIFICATIONTYPEID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
<column name="SCORETYPE" value="ScoreProjectStart"/>
</insert>
+
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="CLASSIFICATIONTYPEID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+ <column name="SCORETYPE" value="Number of employees"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="CLASSIFICATIONTYPEID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+ <column name="SCORETYPE" value="Product preference"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="CLASSIFICATIONTYPEID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+ <column name="SCORETYPE" value="Headquarters"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="CLASSIFICATIONTYPEID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+ <column name="SCORETYPE" value="Industry"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="CLASSIFICATIONTYPEID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+ <column name="SCORETYPE" value="Creditworthiness"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="CLASSIFICATIONTYPEID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+ <column name="SCORETYPE" value="Loyalty"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="CLASSIFICATIONTYPEID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+ <column name="SCORETYPE" value="Purchasing potential p. a."/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="CLASSIFICATIONTYPEID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+ <column name="SCORETYPE" value="Current supply share"/>
+ </insert>
+ <insert tableName="CLASSIFICATIONTYPE">
+ <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="CLASSIFICATIONTYPEID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+ <column name="SCORETYPE" value="Business development"/>
+ </insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml
index 0965fb8004c3544a45d40a3cb727eaf902b2191e..0646343dd382759bef111b0464dbfb7e0b393c35 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml
@@ -16,7 +16,7 @@
<column name="CONTACTID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="ORGANISATION_ID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -25,7 +25,7 @@
<column name="CONTACTID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:43:42"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="PERSON_ID" value="09514fe1-a0d6-465e-883b-6cc93cc758a2"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -37,7 +37,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:39:57"/>
<column name="DEPARTMENT" value="Vertrieb"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="PERSON_ID" value="9f4528ce-3d83-4292-ae23-d9b314271f69"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -47,7 +47,7 @@
<column name="CONTACTID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -57,7 +57,7 @@
<column name="CONTACTID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:42:37"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="PERSON_ID" value="22a497cb-39c3-4e72-9f88-423d7630c7e1"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -67,7 +67,7 @@
<column name="CONTACTID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:42:16"/>
<column name="ISOLANGUAGE" value="eng"/>
- <column name="ORGANISATION_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="ORGANISATION_ID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -78,7 +78,7 @@
<column name="DATE_NEW" valueDate="2019-05-16T01:25:07"/>
<column name="DEPARTMENT" value="Marketing"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="PERSON_ID" value="e35de858-6eca-4328-9efb-dc705ca6792c"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -88,7 +88,7 @@
<column name="CONTACTID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="ORGANISATION_ID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -99,7 +99,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:03:16"/>
<column name="DEPARTMENT" value="Marketing"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="PERSON_ID" value="9874de9b-d517-42f2-81b9-b5f3f0b0dae3"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -109,7 +109,7 @@
<column name="CONTACTID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
<column name="ISOLANGUAGE" value="eng"/>
- <column name="ORGANISATION_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="ORGANISATION_ID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -120,7 +120,7 @@
<column name="DATE_NEW" valueDate="2019-05-15T05:08:54"/>
<column name="DEPARTMENT" value="Marketing"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="PERSON_ID" value="b4c37f47-b4b8-4fe4-812a-9043530cce84"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -132,7 +132,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:41:40"/>
<column name="DEPARTMENT" value="Marketing"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="PERSON_ID" value="c41afea2-c4b5-45dd-a4a7-05826b9dd38c"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -142,7 +142,7 @@
<column name="CONTACTID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -152,7 +152,7 @@
<column name="CONTACTID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="ORGANISATION_ID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -162,7 +162,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:02:26"/>
<column name="DEPARTMENT" value="Management"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="PERSON_ID" value="528d7307-295c-4829-a2e4-9b59e43cf3bb"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -174,7 +174,7 @@
<column name="DATE_NEW" valueDate="2019-05-15T03:54:25"/>
<column name="DEPARTMENT" value="Vertrieb"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="PERSON_ID" value="08c36adc-cd2b-4ce9-a51b-944667084f7f"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -184,7 +184,7 @@
<column name="CONTACTID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:23:13"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -213,7 +213,7 @@
<column name="CONTACTID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="ORGANISATION_ID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -224,7 +224,7 @@
<column name="DATE_NEW" valueDate="2019-11-25T01:52:05"/>
<column name="DEPARTMENT" value="Vertrieb"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="ORGANISATION_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -236,7 +236,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:04:06"/>
<column name="DEPARTMENT" value="IT"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="PERSON_ID" value="3660abd7-73de-4825-83a1-e1992469cf56"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -246,7 +246,7 @@
<column name="CONTACTID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="ORGANISATION_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -255,7 +255,7 @@
<column name="CONTACTID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="ORGANISATION_ID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -264,7 +264,7 @@
<column name="CONTACTID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -274,7 +274,7 @@
<column name="CONTACTID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="ORGANISATION_ID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -285,7 +285,7 @@
<column name="DATE_NEW" valueDate="2019-05-16T01:23:15"/>
<column name="DEPARTMENT" value="Produktion"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -295,7 +295,7 @@
<column name="CONTACTID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -304,7 +304,7 @@
<column name="CONTACTID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="b16282bd-254e-4569-a56e-675449821467"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -314,7 +314,7 @@
<column name="CONTACTID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="ORGANISATION_ID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -323,7 +323,7 @@
<column name="CONTACTID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -335,7 +335,7 @@
<column name="DATE_NEW" valueDate="2019-05-15T05:11:10"/>
<column name="DEPARTMENT" value="IT"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="PERSON_ID" value="c4e24800-e9f3-4226-afd7-cfd5dd670d93"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -346,7 +346,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:06:15"/>
<column name="DEPARTMENT" value="Vertrieb"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="PERSON_ID" value="44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -356,7 +356,7 @@
<column name="CONTACTID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -368,7 +368,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:04:51"/>
<column name="DEPARTMENT" value="Vertrieb"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="PERSON_ID" value="57ec6707-e4a4-4702-9356-ee43dd4c5b00"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -378,7 +378,7 @@
<column name="CONTACTID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:16:58"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -387,7 +387,7 @@
<column name="CONTACTID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="ORGANISATION_ID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -396,7 +396,7 @@
<column name="CONTACTID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="ORGANISATION_ID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -405,7 +405,7 @@
<column name="CONTACTID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="ORGANISATION_ID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -414,7 +414,7 @@
<column name="CONTACTID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="ORGANISATION_ID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -423,7 +423,7 @@
<column name="CONTACTID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -433,7 +433,7 @@
<column name="CONTACTID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -445,7 +445,7 @@
<column name="DATE_NEW" valueDate="2019-11-26T08:27:11"/>
<column name="DEPARTMENT" value="Produktion"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -455,7 +455,7 @@
<column name="CONTACTID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
<column name="ISOLANGUAGE" value="eng"/>
- <column name="ORGANISATION_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="ORGANISATION_ID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -464,7 +464,7 @@
<column name="CONTACTID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:33:57"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -473,7 +473,7 @@
<column name="CONTACTID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="ORGANISATION_ID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml
index dd6292ff8c823888bb0e0c86990b1ff464df95d6..318aef6335157a010473ca66a808fe5354e4a421 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml
@@ -16,11 +16,6 @@
<column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
<column name="PLACEOFUSE" value="Organisation"/>
</insert>
- <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
- <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="b4fafa76-73f2-43ee-8a88-12d30946f1bb"/>
- <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
- <column name="PLACEOFUSE" value="Organisation"/>
- </insert>
<insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
<column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="256dad02-7433-45b3-9584-ec335e0bdcab"/>
<column name="DOCUMENTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
index a025550ab5edd40b5d2edb0666f0a2a63248a554..3833595792a7081d91668f501d94935763a0814f 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
@@ -4,7 +4,7 @@
<delete tableName="dsgvoinfo"/>
<insert tableName="dsgvoinfo">
<column name="CONTACT_ID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
- <column name="DATASOURCE" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="DATASOURCE" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="DSGVOINFOID" value="6b117aad-02f4-4746-985a-de931059b72e"/>
<column name="TRANSMISSION" value="DSGVONONE"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
index e1c57fcd49efdb883e3bf6bf15b5ccf4f4b58877..c68b0f2baaa28d6c55c52996768f2260aecbb83b 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
@@ -8,7 +8,7 @@
<column name="FILTER_NAME" value="PersonDuplicates" />
<column name="EXTERNAL_SERVICE_USAGE_ALLOWED" valueNumeric="0" />
<column name="ID_FIELD_NAME" value="CONTACTID" />
- <column name="SCAN_PATTERN" value="firstname:({"entityfield": "FIRSTNAME"}) AND lastname:({"entityfield": "LASTNAME"})" />
+ <column name="SCAN_PATTERN" value="{"entity":"Person_entity","provider":"indexP","filter":{"type":"group","operator":"AND","childs":[{"type":"row","name":"FIRSTNAME","operator":"ISNOTNULL","value":"","key":"","contenttype":"TEXT"},{"type":"row","name":"LASTNAME","operator":"ISNOTNULL","value":"","key":"","contenttype":"TEXT"}]}}" />
<column name="USER_NEW" value="Admin" />
<column name="DATE_NEW" valueDate="2020-06-26T00:00:00" />
<column name="USER_EDIT" value="Admin" />
@@ -20,7 +20,7 @@
<column name="FILTER_NAME" value="OrganisationDuplicates" />
<column name="EXTERNAL_SERVICE_USAGE_ALLOWED" valueNumeric="0" />
<column name="ID_FIELD_NAME" value="CONTACTID" />
- <column name="SCAN_PATTERN" value="name:({"entityfield": "NAME", "exclude": ["gmbh", "co", "kg", "ag", "bank", "deutsche", "van", "software", "medien", "print"] }) AND city:({"entityfield": "STANDARD_CITY"})" />
+ <column name="SCAN_PATTERN" value="{"entity":"Organisation_entity","provider":"indexP","filter":{"type":"group","operator":"AND","childs":[{"type":"row","name":"NAME","operator":"CONTAINSNOT","value":"[\"gmbh\", \"co\", \"kg\", \"ag\", \"bank\", \"deutsche\", \"van\", \"software\", \"medien\", \"print\"]","key":"[\"gmbh\", \"co\", \"kg\", \"ag\", \"bank\", \"deutsche\", \"van\", \"software\", \"medien\", \"print\"]","contenttype":"LONG_TEXT"},{"type":"row","name":"STANDARD_CITY","operator":"ISNOTNULL","value":"","key":"","contenttype":"TEXT"}]}}" />
<column name="USER_NEW" value="Admin" />
<column name="DATE_NEW" valueDate="2020-06-26T00:00:00" />
<column name="USER_EDIT" value="Admin" />
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
index ef15452df78b7a61fe5b096a1ea87f7c1cbf17ed..631d6e9831c2fafe38303b9dc3bf00db1a669569 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
@@ -14,7 +14,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:17:51"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
<column name="NAME" value="Bucher Unternehmensgruppe"/>
- <column name="ORGANISATIONID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="ORGANISATIONID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -25,7 +25,7 @@
<column name="INFO" value="Automobilvermietung"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Sevent SE"/>
- <column name="ORGANISATIONID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="ORGANISATIONID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -35,7 +35,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
<column name="KIND" value="ORGMANUF"/>
<column name="NAME" value="Netro AG"/>
- <column name="ORGANISATIONID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="ORGANISATIONID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -45,7 +45,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
<column name="KIND" value="ORGMANUF"/>
<column name="NAME" value="Aquire GmbH"/>
- <column name="ORGANISATIONID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="ORGANISATIONID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -54,7 +54,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:28:03"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
<column name="NAME" value="Waken Neuser SE"/>
- <column name="ORGANISATIONID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="ORGANISATIONID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -65,7 +65,7 @@
<column name="INFO" value="Die Transatlantik Logistic Gruppe ist ein Zusammenschluss aus mehreren Logistik Unternehmen. Über 3.000 Mitarbeiter sind bei dem europäischen Logistikriesen beschäftigt. "/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Transatlantik Logistics GmbH"/>
- <column name="ORGANISATIONID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="ORGANISATIONID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -75,7 +75,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
<column name="KIND" value="ORGPARTNER"/>
<column name="NAME" value="Schild AG"/>
- <column name="ORGANISATIONID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="ORGANISATIONID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -85,7 +85,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Firmengruppe Matthias Bogen"/>
- <column name="ORGANISATIONID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="ORGANISATIONID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -95,7 +95,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="SuperBauer AG"/>
- <column name="ORGANISATIONID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="ORGANISATIONID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -104,7 +104,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:21:07"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
<column name="NAME" value="Kronen AG"/>
- <column name="ORGANISATIONID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="ORGANISATIONID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -114,7 +114,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="meine Firma"/>
- <column name="ORGANISATIONID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATIONID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -124,7 +124,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="JPM Touristik GmbH"/>
- <column name="ORGANISATIONID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="ORGANISATIONID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -135,7 +135,7 @@
<column name="INFO" value="Die Industrial Steal AG ist einer der führenden Stahlhersteller weltweit. Das Unternehmen agiert mit über 5.000 Mitarbeitern in über 30 Ländern. "/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Industrial Steel AG"/>
- <column name="ORGANISATIONID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATIONID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -145,7 +145,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Grobbe-Werk GmbH"/>
- <column name="ORGANISATIONID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="ORGANISATIONID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -154,7 +154,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:24:53"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="MNF Versicherung"/>
- <column name="ORGANISATIONID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="ORGANISATIONID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -163,7 +163,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:21:44"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="Lichtenstein Document Solutions GmbH "/>
- <column name="ORGANISATIONID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="ORGANISATIONID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -172,7 +172,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:20:08"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="International Kältetechnik AG "/>
- <column name="ORGANISATIONID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="ORGANISATIONID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -182,7 +182,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Glob Group"/>
- <column name="ORGANISATIONID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="ORGANISATIONID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -193,7 +193,7 @@
<column name="INFO" value="Die Skyscraper Bau GmbH zählt zu den führenden Unternehmen in der Baubranche. Mit ihrem breiten Portfolio überzeugen sie regelmäßig und diversifizieren sich von ihren Mitbewerbern. "/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Skyscraper Bau GmbH"/>
- <column name="ORGANISATIONID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATIONID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -202,7 +202,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:25:36"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="Pichelmaier Financial AG "/>
- <column name="ORGANISATIONID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="ORGANISATIONID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
index d7fcac18bbbd52254b740ac4c70efb3142767f54..224f7fea667137bc3b3ecdc8d77cbb80cda80a1f 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
@@ -24,7 +24,6 @@
<column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
<column name="SALESORDERID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
<column name="VAT" valueNumeric="0.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -42,7 +41,6 @@
<column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
<column name="SALESORDERID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
<column name="VAT" valueNumeric="39.90"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="1"/>
@@ -61,7 +59,6 @@
<column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
<column name="SALESORDERID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
<column name="VAT" valueNumeric="119.70"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="1"/>
@@ -80,7 +77,6 @@
<column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
<column name="SALESORDERID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
<column name="VAT" valueNumeric="79.80"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -102,7 +98,6 @@
<column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
<column name="SALESORDERID" value="41197800-027b-47f5-923a-f1004d09a969"/>
<column name="VAT" valueNumeric="79.80"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -120,7 +115,6 @@
<column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
<column name="SALESORDERID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
<column name="VAT" valueNumeric="79.80"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -143,7 +137,6 @@
<column name="SALESORDERDATE" valueDate="2018-09-11T12:00:00"/>
<column name="SALESORDERID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
<column name="VAT" valueNumeric="10070.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -162,7 +155,6 @@
<column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
<column name="SALESORDERID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
<column name="VAT" valueNumeric="79.80"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -181,7 +173,6 @@
<column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
<column name="SALESORDERID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
<column name="VAT" valueNumeric="79.80"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -208,7 +199,6 @@
<column name="SALESORDERDATE" valueDate="2017-10-10T12:00:00"/>
<column name="SALESORDERID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
<column name="VAT" valueNumeric="10165.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="1"/>
@@ -231,7 +221,6 @@
<column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
<column name="SALESORDERID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
<column name="VAT" valueNumeric="0.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -252,7 +241,6 @@
<column name="SALESORDERDATE" valueDate="2019-05-17T02:00:00"/>
<column name="SALESORDERID" value="a846d596-b9ce-4a73-a842-e9084ebf612a"/>
<column name="VAT" valueNumeric="0.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -271,7 +259,6 @@
<column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
<column name="SALESORDERID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
<column name="VAT" valueNumeric="39.90"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -290,7 +277,6 @@
<column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
<column name="SALESORDERID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
<column name="VAT" valueNumeric="79.80"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -312,7 +298,6 @@
<column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
<column name="SALESORDERID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
<column name="VAT" valueNumeric="119.70"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -338,7 +323,6 @@
<column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
<column name="SALESORDERID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
<column name="VAT" valueNumeric="0.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -362,7 +346,6 @@
<column name="SALESORDERDATE" valueDate="2019-11-15T12:00:00"/>
<column name="SALESORDERID" value="ff049e6e-06ef-4c27-bcce-5b5b244e4054"/>
<column name="VAT" valueNumeric="0.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
index 9b2fdd69c1ace8740fa0d86c8da091fd180e3a85..d63eb70db4ecdaf189b79da48b621c0906dc7b35 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
@@ -9,7 +9,7 @@
<column name="TASK_ID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a"/>
</insert>
<insert tableName="tasklink">
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="TASKLINKID" value="44c1f582-7681-4f6f-b592-6221ebbdee52"/>
<column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
@@ -21,7 +21,7 @@
<column name="TASK_ID" value="f8fcdce1-da60-46d6-9ce3-3866e093730d"/>
</insert>
<insert tableName="tasklink">
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="TASKLINKID" value="6c2f84af-ff2e-4b70-b4d0-607a2bd0d941"/>
<column name="TASK_ID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e"/>
@@ -33,13 +33,13 @@
<column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
</insert>
<insert tableName="tasklink">
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="TASKLINKID" value="b618fb87-d39d-41d8-be41-2b03bce29538"/>
<column name="TASK_ID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9"/>
</insert>
<insert tableName="tasklink">
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="TASKLINKID" value="eca5c8cb-bd10-4425-b4bc-a2e50f2518b9"/>
<column name="TASK_ID" value="46164eac-62d1-4dbb-a252-93ac49429855"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
index af7e5d06f6b435f4ed23b000313f51c786bc0dfc..b42ed242866150438b2746e05e37d226b41137d8 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
@@ -1,7 +1,6 @@
<?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="autogenerated" id="62ad16a9-7312-4dda-9e4b-460673b9af82">
-
<insert tableName="VISITPLANEMPLOYEEWEEK">
<column name="VISITPLANEMPLOYEEWEEKID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
<column name="VISITPLAN_YEAR" valueNumeric="2020"/>
@@ -15,40 +14,40 @@
<column name="ENTRYDATE" valueDate="2020-05-18"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_CONTACT_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name ="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
- <column name="STATUS" value="VISITSTATUSPLANNED "/>
+ <column name="STATUS" value="VISITSTATUSPLANNED"/>
</insert>
<insert tableName="VISITPLANENTRY">
<column name="VISITPLANENTRYID" value="9c6b378b-4738-47b6-9f19-3a1e26f3428e"/>
<column name="ENTRYDATE" valueDate="2020-05-19"/>
<column name="BEGIN_TIME" value="14:00"/>
<column name="END_TIME" value="17:00"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_CONTACT_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name ="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
- <column name="STATUS" value="VISITSTATUSPLANNED "/>
+ <column name="STATUS" value="VISITSTATUSPLANNED"/>
</insert>
<insert tableName="VISITPLANENTRY">
<column name="VISITPLANENTRYID" value="bd7b38d1-9ae1-4424-8c65-d9b0f3b000ba"/>
<column name="ENTRYDATE" valueDate="2020-05-19"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_CONTACT_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name ="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
- <column name="STATUS" value="VISITSTATUSPLANNED "/>
+ <column name="STATUS" value="VISITSTATUSPLANNED"/>
</insert>
<insert tableName="VISITPLANENTRY">
<column name="VISITPLANENTRYID" value="5102104c-6baa-404f-9c71-157a8c79663a"/>
<column name="ENTRYDATE" valueDate="2020-05-20"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
- <column name="ORGANISATION_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="ORGANISATION_CONTACT_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name ="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
- <column name="STATUS" value="VISITSTATUSPLANNED "/>
+ <column name="STATUS" value="VISITSTATUSPLANNED"/>
</insert>
<insert tableName="VISITPLANEMPLOYEEWEEK">
@@ -64,38 +63,37 @@
<column name="ENTRYDATE" valueDate="2020-05-25"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_CONTACT_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
- <column name="STATUS" value="VISITSTATUSPLANNED "/>
+ <column name="STATUS" value="VISITSTATUSPLANNED"/>
</insert>
<insert tableName="VISITPLANENTRY">
<column name="VISITPLANENTRYID" value="f799a0cd-31bb-4be3-9fd9-0cbd0a3d55ac"/>
<column name="ENTRYDATE" valueDate="2020-05-26"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
- <column name="ORGANISATION_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="ORGANISATION_CONTACT_ID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
- <column name="STATUS" value="VISITSTATUSPLANNED "/>
+ <column name="STATUS" value="VISITSTATUSPLANNED"/>
</insert>
<insert tableName="VISITPLANENTRY">
<column name="VISITPLANENTRYID" value="ad325402-616c-495e-a7f5-a5ae6def0399"/>
<column name="ENTRYDATE" valueDate="2020-05-27"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
- <column name="ORGANISATION_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="ORGANISATION_CONTACT_ID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
- <column name="STATUS" value="VISITSTATUSPLANNED "/>
+ <column name="STATUS" value="VISITSTATUSPLANNED"/>
</insert>
<insert tableName="VISITRECOMMENDATION">
<column name="VISITRECOMMENDATIONID" value="487eeff9-6807-41f6-95e9-5f0f61b45a05"/>
<column name="DUE_DATE" valueDate="2020-04-16T10:43:23"/>
- <column name="PRIORITY" value="VISITPRIOMEDIUM "/>
- <column name="SOURCE" value="MANUAL "/>
+ <column name="PRIORITY" value="VISITPRIOMEDIUM"/>
+ <column name="SOURCE" value="MANUAL"/>
<column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="INFO" value="Kontrolltermin"/>
</insert>
-
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index c82520447852c5b1b96f80238842b0081bb79022..485c35f91ac22cfccdf075f4f328069eef23e903 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -13,9 +13,11 @@
<include relativeToChangelogFile="true" file="basic/2020.0.3/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/>
- <!--<include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>-->
+ <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.2.1/MSTeams/changelog.xml"/>
-
- <!--enable this only when you definetly want to overwrite the existing data with demo records:-->
- <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
+
+ <!--enable this only when you definetly want to overwrite the existing data with demo records:-->
+ <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>--
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/RecordContainerCache.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/RecordContainerCache.xml
new file mode 100644
index 0000000000000000000000000000000000000000..930cb4f1c91fd3722143cd4b09a29f2c4fa8ae0f
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/RecordContainerCache.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.4">
+ <name>RecordContainerCache_default</name>
+ <serverId>default</serverId>
+ <definitionName>RecordContainerCache</definitionName>
+ <aliasConfigSub>
+ <aliasSubRecordContainerInMemoryCache />
+ </aliasConfigSub>
+</aliasConfig>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
index 4d4a0a7d7a49bb32b08971869d8a8d73d6d342fc..3069c0fabce3f4f08b02fcd710664a6d4232fbd2 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<sysDbVersion xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/sysDbVersion/1.2.0">
<name>_____SYSTEM_SYSDB_VERSION</name>
- <systemDbVersion>2.8.3</systemDbVersion>
+ <systemDbVersion>2.8.5</systemDbVersion>
</sysDbVersion>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
index d2a594927532b438e24ac4e98074ca1322a68617..6d12b9e01e434b2fa48c0344532be9766eeafba5 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
@@ -51,20 +51,17 @@
<column name="USER_NEW" value="_____DESIGNERANONYM"/>
<column name="XMLDATA" valueBlobFile="defaultBlob/defaultDbRepository.xml"/>
</insert>
-
- <rollback>
- <delete tableName="ASYS_ALIASCONFIG">
- <where>ID = ?</where>
- <whereParams>
- <param value="f4a33c35-5033-4699-b55a-9520b465b4c5" />
- </whereParams>
- </delete>
- <delete tableName="ASYS_ALIASCONFIG">
- <where>ID = ?</where>
- <whereParams>
- <param value="23cba7a4-e8dd-48a0-b61e-f5f0f789d02b" />
- </whereParams>
- </delete>
- </rollback>
+ <insert tableName="ASYS_ALIASCONFIG">
+ <column name="ALIASID" value="RecordContainerCache"/>
+ <column name="DATE_EDIT" valueDate="2020-08-24 17:43:39"/>
+ <column name="DATE_NEW" valueDate="2020-08-24 17:43:38"/>
+ <column name="ID" value="dbe6d005-37ed-4fa0-b164-a3d4450932a2"/>
+ <column name="KIND" valueNumeric="105"/>
+ <column name="NAME" value="RecordContainerCache_default"/>
+ <column name="SERVERID" value="default"/>
+ <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
+ <column name="USER_NEW" value="_____DESIGNERANONYM"/>
+ <column name="XMLDATA" valueBlobFile="defaultBlob/RecordContainerCache.xml"/>
+ </insert>
</changeSet>
</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
index ca53b5a37ac699700f1c7a68524167d5460a1f44..b194d0c6dc85e01729f400bce0a957556307bfd0 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
@@ -7,7 +7,7 @@
<column name="DATE_NEW" valueDate="2018-05-24T14:53:57.763"/>
<column name="KIND" valueNumeric="600"/>
<column name="NAME" value="_____SYSTEM_SYSDB_VERSION"/>
- <column name="TITLE" value="2.8.3"/>
+ <column name="TITLE" value="2.8.5"/>
<column name="USER_EDIT" value="_____DESIGNERANONYM"/>
<column name="USER_NEW" value="_____DESIGNERANONYM"/>
<column name="XMLDATA" valueBlobFile="defaultBlob/_____system_sysdb_version.xml"/>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
index ec3bbf339d9920366069b620809eff4e28deb3e7..540e5ac07739f0524bb0296de3a9505762c3ee0e 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
@@ -23,6 +23,8 @@
<include relativeToChangelogFile="true" file="struct/create_asys_roles.xml"/>
<include relativeToChangelogFile="true" file="struct/create_asys_roles_children.xml"/>
<include relativeToChangelogFile="true" file="struct/create_asys_usertoken.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_record.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_asys_recordgroup.xml"/>
<include relativeToChangelogFile="true" file="data/insert_asys_aliasconfig.xml"/>
<include relativeToChangelogFile="true" file="data/insert_asys_system.xml"/>
<include relativeToChangelogFile="true" file="data/insert_asys_permissionset.xml"/>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
index 13b4d9f0eecbd0a517c9fee465b830cc51ad6f70..7783a9014a9046cefdf3be6154b1c0f1b68e37a7 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
@@ -21,5 +21,8 @@
<column name="DATE_EDIT" type="DATETIME"/>
<column name="DATE_NEW" type="DATETIME"/>
</createTable>
+ <createIndex tableName="ASYS_BINARIES" indexName="IDX_ASYS_BINARIES_ROW_ID">
+ <column name="ROW_ID"/>
+ </createIndex>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml
index 8da1987f7f317b85caeeb264cb4869f7e412aa26..fb1ae2f5ee87ef81421765227ffdeca8682dd681 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml
@@ -18,5 +18,9 @@
<column name="TYPECODE" type="VARCHAR(63)"/>
<column name="VERSION" type="INTEGER"/>
</createTable>
+
+ <createIndex indexName="idx_asysnoticontents_contid" tableName="ASYS_NOTIFICATIONCONTENTS">
+ <column name="CONTENTID"/>
+ </createIndex>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
index 0175584524b3645f90e5898a4b27b1369ec87035..f3ff1e9ae1ccab5ab2fc46dba3c28bc9e0a783ac 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
@@ -10,5 +10,14 @@
<column name="USERID" type="VARCHAR(63)"/>
<column name="RESOLVEDPRIORITY" type="VARCHAR(15)"/>
</createTable>
+ <createIndex indexName="idx_asysnoti_contentid" tableName="ASYS_NOTIFICATIONS">
+ <column name="CONTENTID"/>
+ </createIndex>
+ <createIndex indexName="idx_asysnoti_state" tableName="ASYS_NOTIFICATIONS">
+ <column name="STATE"/>
+ </createIndex>
+ <createIndex indexName="idx_asysnoti_userid" tableName="ASYS_NOTIFICATIONS">
+ <column name="USERID"/>
+ </createIndex>
</changeSet>
</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml
new file mode 100644
index 0000000000000000000000000000000000000000..49b6b2e62f03fed725a285f95c4d070b06d006b8
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml
@@ -0,0 +1,22 @@
+<?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="a.schindlbeck" id="55fc4812-a4b7-4a53-a369-8b644ec78cae">
+ <createTable tableName="ASYS_RECORD">
+ <column name="ID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_ASYS_RECORD_ID"/>
+ </column>
+ <column name="OBJECT_TYPE" type="VARCHAR(64)"/>
+ <column name="ROW_ID" type="CHAR(36)"/>
+ <column name="RECORDGROUP_ID" type="CHAR(36)"/>
+ </createTable>
+ <createIndex indexName="idx_asysrecord_objecttype" tableName="ASYS_RECORD">
+ <column name="OBJECT_TYPE"/>
+ </createIndex>
+ <createIndex indexName="idx_asysrecord_rowid" tableName="ASYS_RECORD">
+ <column name="ROW_ID"/>
+ </createIndex>
+ <createIndex indexName="idx_asysrecord_rdgpid" tableName="ASYS_RECORD">
+ <column name="RECORDGROUP_ID"/>
+ </createIndex>
+</changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c8fae3a479ec0862f068aee234a572c3f092d5c7
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
@@ -0,0 +1,22 @@
+<?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="a.schindlbeck" id="56a34dfc-3c0d-48e1-8890-31c0c93f1942">
+ <createTable tableName="ASYS_RECORDGROUP">
+ <column name="ID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_ASYS_RECORD_GROUP_ID"/>
+ </column>
+ <column name="USER_ID" type="CHAR(46)"/>
+ <column name="TITLE" type="VARCHAR(256)"/>
+ <column name="GROUP_TYPE" type="VARCHAR(64)"/>
+ </createTable>
+ <createIndex indexName="idx_asysrecordgroup_id" tableName="ASYS_RECORDGROUP">
+ <column name="ID"/>
+ </createIndex>
+ <createIndex indexName="idx_asysrecordgroup_userid" tableName="ASYS_RECORDGROUP">
+ <column name="USER_ID"/>
+ </createIndex>
+ <createIndex indexName="idx_asysrecordgroup_title" tableName="ASYS_RECORDGROUP">
+ <column name="TITLE"/>
+ </createIndex>
+</changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
index b9105d5ca550931b9ea46ff6c7e7e66672a863ae..00947fe252c330e80ed185bab38e3023c5485fc7 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
@@ -23,5 +23,8 @@
<createIndex indexName="idx_asysusers_groupid" tableName="ASYS_USERS">
<column name="GROUPID"/>
</createIndex>
+ <createIndex indexName="IDX_ASYS_USERS_NAME" tableName="ASYS_USERS">
+ <column name="NAME"/>
+ </createIndex>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 4000432b088839e7d8fb77d31c23e30c7e8b521a..fdce1bb8c09b13dbd72a5cfc9a3ab528db11f30e 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1139,6 +1139,34 @@
<title>Creation user</title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>LON</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="3" />
+ <size v="11" />
+ <scale v="8" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>LAT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="3" />
+ <size v="10" />
+ <scale v="8" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -4114,27 +4142,6 @@
</customStringProperty>
</customProperties>
</entityFieldDb>
- <entityFieldDb>
- <name>VERSNR</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>Vers. no.</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- </customProperties>
- </entityFieldDb>
<entityFieldDb>
<name>VAT</name>
<dbName></dbName>
@@ -4505,20 +4512,6 @@
</customBooleanProperty>
</customProperties>
</entityFieldDb>
- <entityFieldDb>
- <name>UNPAID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="3" />
- <size v="14" />
- <scale v="2" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>DUNNINGLEVEL</name>
<dbName></dbName>
@@ -6861,7 +6854,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>{$OBJECTLINK_OBJECT}</title>
<description></description>
@@ -6896,7 +6889,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Appointment Id</title>
<description></description>
@@ -8117,7 +8110,7 @@
<columnType v="93" />
<size v="29" />
<scale v="9" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -8395,7 +8388,7 @@
<columnType v="93" />
<size v="29" />
<scale v="9" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -8527,7 +8520,7 @@
<columnType v="93" />
<size v="29" />
<scale v="9" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -8771,7 +8764,7 @@
<columnType v="93" />
<size v="29" />
<scale v="9" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -9091,7 +9084,7 @@
<columnType v="93" />
<size v="29" />
<scale v="9" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -9203,25 +9196,25 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>CLASSIFICATIONTYPE</name>
+ <name>CLASSIFICATIONGROUP_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
+ <columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>CLASSIFICATIONGROUP</name>
+ <name>OBJECT_TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="80" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -11259,7 +11252,7 @@
<columnType v="93" />
<size v="29" />
<scale v="9" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -11571,7 +11564,7 @@
<columnType v="93" />
<size v="29" />
<scale v="9" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -13386,6 +13379,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>ATTRIBUTE_INDUSTRY</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="100" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -13632,7 +13639,7 @@
<name>EXPORTTEMPLATE_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
+ <columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
@@ -13678,7 +13685,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -13951,7 +13958,7 @@
<name>EXPORTTEMPLATE_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
+ <columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
@@ -13999,7 +14006,7 @@
<name>EXPORTTEMPLATE_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
+ <columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
@@ -14143,7 +14150,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -14157,7 +14164,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -14347,7 +14354,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="255" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -14379,7 +14386,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -14388,7 +14395,7 @@
<name>PRIORITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
+ <columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
@@ -14455,7 +14462,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -14526,7 +14533,7 @@
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
+ <columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
@@ -14573,7 +14580,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -14587,21 +14594,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ORGANISATION_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -14733,6 +14726,700 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ORGANISATION_CONTACT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>CLASSIFICATIONGRADING</name>
+ <dbName></dbName>
+ <idColumn>CLASSIFICATIONGRADINGID</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>CLASSIFICATIONGRADINGID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>GRADING</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="1" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>MAXGRADEFORSCORE</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>CLASSIFICATIONGROUP_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>CLASSIFICATIONSTORAGE</name>
+ <dbName></dbName>
+ <idColumn>CLASSIFICATIONSTORAGEID</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>OBJECT_ROWID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CLASSIFICATIONVALUE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="20" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CLASSIFICATIONSTORAGEID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OBJECT_TYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="63" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>CLASSIFICATIONGROUP</name>
+ <dbName></dbName>
+ <idColumn>CLASSIFICATIONGROUPID</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>CLASSIFICATIONGROUPID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SORTING</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="5" />
+ <size v="5" />
+ <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="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>LEADIMPORTMAPPINGASSISTANT</name>
+ <dbName></dbName>
+ <idColumn>LEADIMPORTMAPPINGASSISTANTID</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>LEADIMPORTMAPPINGASSISTANTID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>FIELDNAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="100" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>INPUTVALUE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="300" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OUTPUTVALUE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="300" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</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>
+ <entityFieldDb>
+ <name>LEADIMPORT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</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>
+ <entityDb>
+ <name>DISTRICT</name>
+ <dbName></dbName>
+ <idColumn>DISTRICTID</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>DISTRICT_NAME</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>
+ <entityFieldDb>
+ <name>DISTRICT_INFO</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>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DISTRICT_STATUS</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>PARENTDISTRICT_DISTRICTID</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>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</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>
+ <entityFieldDb>
+ <name>DISTRICT_NUMBER</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>ISO3</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="5" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DISTRICTID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</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>
+ <entityFieldDb>
+ <name>DISTRICT_FILTER</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2005" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>DISTRICTRESPONSIBLE</name>
+ <dbName></dbName>
+ <idColumn>DISTRICTRESPONSIBLEID</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>DISTRICTRESPONSIBLEID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DEPARTMENT_ATTRIBUTE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DISTRICT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>EMPLOYEE_CONTACT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</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>
+ <entityFieldDb>
+ <name>USER_EDIT</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>
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js
index 633ea8076f023b45b5944ebcb37cdab18455ab1d..013c797ac6b08eb3d113c1bb045c0e12cbc51558 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("Contact_lib");
-import("system.db");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = OrganisationUtils.getNameByContactId(params.value);
-result.string(res);
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
+result.string(res);
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js
index 26c85ce005d6c71d8ddb60561653f4d1330bd24c..f35d37ab09f059046b3b6f3d672cf01c66fe58c4 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
index d5c240bd0adf3af2b3e0c1dd3c61e6a753e95577..4bd7c6c1a52c9aad21e9de60dde26fb5ba4de177 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("system.translate");
-import("system.vars");
-import("system.result");
-import("system.text");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
result.string(text.formatDouble(params.value, "#,##0.00", true));
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
index d5c240bd0adf3af2b3e0c1dd3c61e6a753e95577..4bd7c6c1a52c9aad21e9de60dde26fb5ba4de177 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("system.translate");
-import("system.vars");
-import("system.result");
-import("system.text");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
result.string(text.formatDouble(params.value, "#,##0.00", true));
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js
index 0046811b3b14af08f749b46cdc3151f2109c0220..9f7c5917a2317799200776b01469d749759bd6bb 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("Contact_lib");
-import("system.db");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = OrganisationUtils.getNameByContactId(params.value);
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js
index 26c85ce005d6c71d8ddb60561653f4d1330bd24c..f35d37ab09f059046b3b6f3d672cf01c66fe58c4 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js
index 633ea8076f023b45b5944ebcb37cdab18455ab1d..013c797ac6b08eb3d113c1bb045c0e12cbc51558 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("Contact_lib");
-import("system.db");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = OrganisationUtils.getNameByContactId(params.value);
-result.string(res);
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
+result.string(res);
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js
index 26c85ce005d6c71d8ddb60561653f4d1330bd24c..f35d37ab09f059046b3b6f3d672cf01c66fe58c4 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js
index 26c85ce005d6c71d8ddb60561653f4d1330bd24c..f35d37ab09f059046b3b6f3d672cf01c66fe58c4 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/RecordContainerCache/RecordContainerCache.aod b/aliasDefinition/RecordContainerCache/RecordContainerCache.aod
new file mode 100644
index 0000000000000000000000000000000000000000..55a9e4afb31e94edc34435e03913817547d0edc5
--- /dev/null
+++ b/aliasDefinition/RecordContainerCache/RecordContainerCache.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aliasDefinition xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasDefinition/1.2.0">
+ <name>RecordContainerCache</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <datasourceType v="16" />
+</aliasDefinition>
diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
index 3c5aedffe5464e5e778a25b4372abeb59ea701e4..6f4f1b2dca5291f2a8a2ad8cbb2b4d47552c98ff 100644
--- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
@@ -391,7 +391,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -844,7 +844,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -870,7 +870,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -1120,7 +1120,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -1146,7 +1146,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -1159,7 +1159,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -3079,6 +3079,158 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>ASYS_RECORDGROUP</name>
+ <dbName></dbName>
+ <idColumn>ID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="0" />
+ <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>GROUP_TYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="64" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TITLE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="256" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="46" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>ASYS_RECORD</name>
+ <dbName></dbName>
+ <idColumn>ID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="0" />
+ <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>ID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OBJECT_TYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="64" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>RECORDGROUP_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ROW_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <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 cea18a1f2ce3aae7c8cc7cf3696a52189e579750..6113055f4ea0e82e8866b0fd0a2076e478584453 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -38,6 +38,10 @@
<name>Task</name>
<kind v="10077" />
</entityNode>
+ <entityNode>
+ <name>Favorite</name>
+ <kind v="10077" />
+ </entityNode>
</childNodes>
</entityNode>
</childNodes>
@@ -298,6 +302,14 @@
<kind v="10077" />
<title></title>
</entityNode>
+ <entityNode>
+ <name>Userhelp</name>
+ <kind v="10077" />
+ </entityNode>
+ <entityNode>
+ <name>District</name>
+ <kind v="10077" />
+ </entityNode>
</childNodes>
</entityNode>
</childNodes>
@@ -313,15 +325,14 @@
<kind v="123" />
<title></title>
<childNodes>
- <entityNode>
- <name>PROJECT_HumanResources</name>
- <kind v="159" />
- <title></title>
- </entityNode>
<entityNode>
<name>Employee</name>
<kind v="10077" />
</entityNode>
+ <entityNode>
+ <name>INTERNAL_ADMINISTRATOR</name>
+ <kind v="159" />
+ </entityNode>
</childNodes>
</entityNode>
<entityNode>
@@ -337,7 +348,6 @@
<entityNode>
<name>INTERNAL_ADMINISTRATOR</name>
<kind v="159" />
- <title></title>
</entityNode>
<entityNode>
<name>PermissionMetaData</name>
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 3ca98a082b746337cb9a5350356b790754247056..87fc35a2bf575d8cd011a433bfb52389f1242752 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>360Degree_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/360Degree_entity/documentation.adoc</documentation>
@@ -172,6 +172,10 @@
<name>ObjectStatus_param</name>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index 557b1ba4d81152d2f08cc024de03d17cd20a7148..60a8312eb2110569467ed50c786a3b7c1286e35a 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.util");
import("system.db");
import("system.vars");
@@ -12,7 +11,6 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
var selectMap = ContextUtils.getSelectMap();
if(vars.exists("$local.filter") && vars.get("$local.filter") )
{
- logging.log(JSON.stringify(vars.get("$local.filter")))
var filter = vars.get("$local.filter");
if (filter.filter)
if(filter.filter.childs != null && filter.filter.childs.length > 0)
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 160401972fae1dc06f3cc91e002a38504ca61fe7..e5518fff2fac73d9b45fcd177cd580a8edf2a289 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ActivityLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ActivityLink_entity/documentation.adoc</documentation>
@@ -98,6 +98,10 @@
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
index 174ad7f6d1a52dda34c6476bf86ec19f02b242a2..8c0ab0e94b135d4b1b475ecbbde7900cd3fd109e 100644
--- a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.db");
import("system.result");
import("Sql_lib");
-var cond = newWhereIfSet("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param");
+var cond = newWhereIfSet("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param", SqlBuilder.EQUAL());
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index a4390983dd236f1e5dcc2060050e5113c82f8acc..197e56b300e505a1251bc9ee59caee119dc0fadd 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -1,9 +1,12 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Activity_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
<title>Activity</title>
+ <siblings>
+ <element>ActivityLink_entity</element>
+ </siblings>
<grantDeleteProcess>%aditoprj%/entity/Activity_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Activity_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Activity_entity/afterUiInit.js</afterUiInit>
@@ -24,7 +27,7 @@
</entityField>
<entityField>
<name>ENTRYDATE</name>
- <title>Entrydate</title>
+ <title>Date</title>
<contentType>DATE</contentType>
<resolution>MINUTE</resolution>
<outputFormat>dd.MM.yyyy HH:mm</outputFormat>
@@ -154,7 +157,7 @@
</entityConsumer>
<entityField>
<name>ENTRYMONTH</name>
- <title>Entrydate (Month)</title>
+ <title>Date (Month)</title>
<contentType>TEXT</contentType>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrymonth/valueProcess.js</valueProcess>
@@ -392,7 +395,7 @@
</entityConsumer>
<entityField>
<name>ENTRYDAY</name>
- <title>Entrydate (Day)</title>
+ <title>Date (Day)</title>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryday/valueProcess.js</valueProcess>
</entityField>
@@ -560,7 +563,7 @@
</entityConsumer>
<entityField>
<name>ENTRYYEAR</name>
- <title>Entrydate (Year)</title>
+ <title>Date (Year)</title>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryyear/valueProcess.js</valueProcess>
</entityField>
@@ -633,6 +636,10 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -662,13 +669,13 @@
<name>DIRECTION.value</name>
<recordfield>ACTIVITY.DIRECTION</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>INFO.value</name>
<recordfield>ACTIVITY.INFO</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SUBJECT.value</name>
@@ -680,13 +687,13 @@
<name>ENTRYDATE.value</name>
<recordfield>ACTIVITY.ENTRYDATE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CATEGORY.value</name>
<recordfield>ACTIVITY.CATEGORY</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DIRECTION.displayValue</name>
@@ -728,7 +735,7 @@
<name>RESPONSIBLE.value</name>
<recordfield>ACTIVITY.RESPONSIBLE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>entryDateDateFormat.value</name>
@@ -740,8 +747,19 @@
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
<dbRecordFieldMapping>
- <name>COUNT.value</name>
- <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
+ <name>ENTRYDAY.value</name>
+ <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js</expression>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ENTRYMONTH.value</name>
+ <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js</expression>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ENTRYYEAR.value</name>
+ <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js</expression>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
<filterExtensions>
@@ -752,6 +770,15 @@
<filterConditionProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
<filtertype>BASIC</filtertype>
</filterExtensionSet>
+ <filterExtension>
+ <name>IsUnlinked</name>
+ <title>Is unlinked activity</title>
+ <contentType>BOOLEAN</contentType>
+ <filterValuesProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js</filterValuesProcess>
+ <filterConditionProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js</filterConditionProcess>
+ <isLookupFilter v="false" />
+ <filtertype>BASIC</filtertype>
+ </filterExtension>
</filterExtensions>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Activity_entity/entityfields/entrydate/onValidation.js b/entity/Activity_entity/entityfields/entrydate/onValidation.js
index 437a5ee635ebbcb597bd5445d14249f9ac93f1c9..67c94e8d006ded8f2616674868960c1611226c68 100644
--- a/entity/Activity_entity/entityfields/entrydate/onValidation.js
+++ b/entity/Activity_entity/entityfields/entrydate/onValidation.js
@@ -6,4 +6,4 @@ import("Entity_lib");
var entryDate = vars.get("local.value");
if (!DateUtils.validateNotInFuture(entryDate))
- result.string(translate.text("Entrydate must not be in the future"));
\ No newline at end of file
+ result.string(translate.text("Date must not be in the future"));
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index 6b1c96c3d19779e42de1168ab94b5e132eac7264..2abb513731d34f425411549b15ca8996d499a131 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("Employee_lib");
import("system.vars");
import("system.db");
@@ -23,7 +24,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
.arrayColumn();
if (allPersonRelatedContactIds.length === 0)
- condition.and("1=2");
+ condition.noResult();
else
{
activityLinkSubselect.and("ACTIVITYLINK.OBJECT_ROWID", allPersonRelatedContactIds, SqlBuilder.IN());
@@ -40,16 +41,19 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
if (vars.exists("$param.ActivityIDs_param") && vars.get("$param.ActivityIDs_param"))
{
var acticityIds = JSON.parse(vars.get("$param.ActivityIDs_param"));
- condition.and("ACTIVITY.ACTIVITYID", acticityIds, SqlBuilder.IN());
+ if (acticityIds.length == 0)
+ condition.noResult();
+ else
+ condition.and("ACTIVITY.ACTIVITYID", acticityIds, SqlBuilder.IN());
}
-if (vars.getString("$param.OnlyInnate_param") == "true")
+if (Utils.toBoolean(vars.get("$param.OnlyInnate_param")))
{
var ownContactId = EmployeeUtils.getCurrentContactId();
if (ownContactId)
condition.and("ACTIVITY.RESPONSIBLE", ownContactId);
else
- condition.clearWhere().and("1=2");
+ condition.noResult();
}
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
diff --git a/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3e01b63784b6fc8afc75c743bfdcff5b64ad2268
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js
@@ -0,0 +1,23 @@
+import("KeywordRegistry_basic");
+import("system.logging");
+import("Sql_lib");
+import("system.vars");
+import("system.result");
+
+var operator = vars.get("$local.operator");
+var rawvalue = vars.get("$local.rawvalue");
+var operator2 = vars.get("$local.operator2");
+var sqlCond = "";
+
+if(operator == "1" && rawvalue == "1" || operator == "2" && rawvalue == "0")
+ operator2 = SqlBuilder.IN();
+else if(operator == "1" && rawvalue == "0" || operator == "2" && rawvalue == "1")
+ operator2 = SqlBuilder.NOT_IN();
+else
+ sqlCond = "1=1";
+
+if (sqlCond == "")
+ sqlCond = new SqlBuilder().where("ACTIVITY.ACTIVITYID", new SqlBuilder().select("ACTIVITYLINK.ACTIVITY_ID").from("ACTIVITYLINK").groupBy("ACTIVITYLINK.ACTIVITY_ID"), operator2);
+
+
+result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..06bc384309a3db6addc57a81c5894543c69f0ece
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.result");
+import("system.translate");
+
+result.object([["true", translate.text("Yes")], ["false", translate.text("No")]]);
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/onDBInsert.js b/entity/Activity_entity/recordcontainers/db/onDBInsert.js
index ce851e0d4489f20cf098f2573e0b08dab9cc7665..c50343f5ee151ae93ea0838053e69c138540a21b 100644
--- a/entity/Activity_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Activity_entity/recordcontainers/db/onDBInsert.js
@@ -28,9 +28,8 @@ if(vars.exists("$param.VisitPlanEntryId_param") && vars.get("$param.VisitPlanEnt
{
var values = [$KeywordRegistry.visitPlanEntryStatus$Visitreportcreated()];
var columns = ["STATUS"];
- var columnTypes = db.getColumnTypes("VISITPLANENTRY", columns, db.getCurrentAlias());
var update = newWhere("VISITPLANENTRY.VISITPLANENTRYID", vars.get("$param.VisitPlanEntryId_param"))
- .updateData(true, "VISITPLANENTRY", columns, columnTypes, values);
+ .updateData(true, "VISITPLANENTRY", columns, null, values);
}
if (vars.exists("$param.InsertLinks_param") && vars.get("$param.InsertLinks_param"))
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..16e52cf56f25ce13d1ec215f89b0ff025c3e28aa
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Sql_lib");
+
+var helper = new SqlMaskingUtils();
+result.string(helper.dayFromDate("ACTIVITY.ENTRYDATE"));
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..b6df066c20a80a4d681fd728675fd4fdbcbf581e
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Sql_lib");
+
+var helper = new SqlMaskingUtils();
+result.string(helper.monthFromDate("ACTIVITY.ENTRYDATE"));
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..a882e16947555c4a61161d10feb39b8fe0041ae5
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Sql_lib");
+
+var helper = new SqlMaskingUtils();
+result.string(helper.yearFromDate("ACTIVITY.ENTRYDATE"));
\ No newline at end of file
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index 57c846d008cda3ebff21f4080d3a72934344e198..44fe6f291552d9072dd56043974aaaf7e422024e 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>AddressType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AddressType_entity/documentation.adoc</documentation>
@@ -44,6 +44,10 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index d3842d9a8ed5c361a9bba21d83e61588dc3b04b0..4f1ed59385145f4ad623b3590763ae1ff9ad8a25 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>AddressValidation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AddressValidation_entity/documentation.adoc</documentation>
@@ -130,6 +130,7 @@
</entityField>
<entityField>
<name>BUILDINGNO</name>
+ <title>House number</title>
</entityField>
<entityProvider>
<name>StreetValidation</name>
@@ -154,6 +155,14 @@
<name>City_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>STREET_AND_BUILDINGNO</name>
+ <title>Street</title>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -198,14 +207,17 @@
<name>BUILDINGNO.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>LON.value</name>
+ <name>LAT.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>LAT.value</name>
+ <name>LON.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>VALUE.value</name>
</jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>STREET_AND_BUILDINGNO.value</name>
+ </jDitoRecordFieldMapping>
</recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
index 5e2e5870c7195119f5df38e56725201094ccb404..e92fed1fd8c707472ada73dd1673279aeb618992 100644
--- a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
@@ -16,16 +16,15 @@ if (vars.get("$local.idvalues") != null)
else
{
var type = "";
+ var params = {};
if (vars.exists("$param.Type_param") && vars.get("$param.Type_param"))
type = vars.get("$param.Type_param");
- var country = "";
if (vars.exists("$param.Country_param") && vars.get("$param.Country_param"))
- country = vars.get("$param.Country_param");
+ params.country = vars.get("$param.Country_param");
- var city = "";
if (vars.exists("$param.City_param") && vars.get("$param.City_param"))
- city = vars.get("$param.City_param");
+ params.city = vars.get("$param.City_param");
// get the value typed by the user
var filter = "";
@@ -38,9 +37,26 @@ else
if (!filter && vars.exists("$param.CurrentValue_param") && vars.get("$param.CurrentValue_param"))
filter = vars.get("$param.CurrentValue_param");
- var foundAddresses = WsValidationUtils.validate(filter, type, country, city);
+ var foundAddresses = WsValidationUtils.validate(filter, type, params);
- result.object(foundAddresses.map(function(row) {
- return row.concat([filter])
+ result.object(foundAddresses.map(function(row)
+ {
+ return [
+ JSON.stringify(row),
+ row.displayName,
+ row.zipCode,
+ row.city,
+ row.cityExt,
+ row.country,
+ row.district,
+ row.region,
+ row.state,
+ row.road,
+ row.buildingNo,
+ row.lat,
+ row.lon,
+ row.value,
+ row.road && row.buildingNo ? row.road + " " + row.buildingNo : row.road
+ ];
}));
}
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index a8fab2595e8795a739e854e715f1669bbd0477ac..b1cf501940c85a3f845264d1a6a8bca878db1948 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Address_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
@@ -15,8 +15,6 @@
<mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
<textInputAllowed v="true" />
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/address/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/address/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/address/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Address_entity/entityfields/address/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
@@ -471,6 +469,24 @@
<name>ReplaceStandardAddress_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>LAT</name>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/lat/documentation.adoc</documentation>
+ <title>Latitude</title>
+ <contentType>NUMBER</contentType>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityField>
+ <name>LON</name>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/lon/documentation.adoc</documentation>
+ <title>Longitude</title>
+ <contentType>NUMBER</contentType>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -579,6 +595,14 @@
<name>COUNTRY.displayValue</name>
<expression>%aditoprj%/entity/Address_entity/recordcontainers/db/recordfieldmappings/country.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LAT.value</name>
+ <recordfield>ADDRESS.LAT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LON.value</name>
+ <recordfield>ADDRESS.LON</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Address_entity/documentation.adoc b/entity/Address_entity/documentation.adoc
index e50f759d6ac0cc4e9633c6e52571914239f2fc68..af4ee8b4a1306ddc2b05ef8e27fd1f5958a1df35 100644
--- a/entity/Address_entity/documentation.adoc
+++ b/entity/Address_entity/documentation.adoc
@@ -7,6 +7,7 @@ an entity for logic behind a postal address
The entity manages storing postal addresses and provides features like validation.
Every `CONTACT` has one standard address value that is used by default for some actions. Keep in mind that this standard address has a special status and therefore may cannot be deleted.
+The geographical location of an address can be stored in the fields 'LAT' (latitude) and 'LON' (longitude).
Webservice Validation: See WsValidation_lib
To enable the nominatim webservice: go to Preferences -> _____PREFERENCES_PROJECT -> _____PREFERENCES_PROJECT
diff --git a/entity/Address_entity/entityfields/address/displayValueProcess.js b/entity/Address_entity/entityfields/address/displayValueProcess.js
deleted file mode 100644
index 18985f7a004b046c160746de13e8970eb6c87ece..0000000000000000000000000000000000000000
--- a/entity/Address_entity/entityfields/address/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-
-// Needed for instant refresh if set by neon.setFieldValue
-// use the code if address webservice is active
-//result.string(vars.get("$field.ADDRESS"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/address/valueProcess.js b/entity/Address_entity/entityfields/address/valueProcess.js
deleted file mode 100644
index 2c9d496185be419f31c762709ca97d83a1ae4bd4..0000000000000000000000000000000000000000
--- a/entity/Address_entity/entityfields/address/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("WsValidation_lib");
-import("system.vars");
-
-// use the code if address webservice is active
-//result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/address_ws/valueProcess.js b/entity/Address_entity/entityfields/address_ws/valueProcess.js
index 5ccdf5a99f70f8b801158a56c1fa7b8136854130..ef17405a27a609b387beeebfc31499535e5d7b3f 100644
--- a/entity/Address_entity/entityfields/address_ws/valueProcess.js
+++ b/entity/Address_entity/entityfields/address_ws/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.vars");
import("WsValidation_lib");
WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js b/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js
index 2c348afa93c82ff8f11312242f9eb36fcd174111..bd8a97253004119f2c8b0a249ebdc2a79a90adad 100644
--- a/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js
+++ b/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js
@@ -1,10 +1,6 @@
import("system.vars");
import("system.result");
+import("Util_lib");
-var isStandard = vars.getString("$field.IS_STANDARD") == "true";
-var res;
-if (isStandard)
- res = "IMAGE";
-else
- res = "TEXT";
-result.string(res);
\ No newline at end of file
+var isStandard = Utils.toBoolean(vars.get("$field.IS_STANDARD"));
+result.string(isStandard ? "IMAGE" : "TEXT");
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js b/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js
index 7420487f08a230ce60f272cdd253abf4331667c2..e755ca5103769d7d3b62a617b17f1c00396c13de 100644
--- a/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js
+++ b/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js
@@ -1,10 +1,6 @@
import("system.result");
import("system.vars");
+import("Util_lib");
-var isStandard = vars.getString("$field.IS_STANDARD") == "true";
-var res;
-if (isStandard)
- res = "VAADIN:MAP_MARKER";
-else
- res = "";
-result.string(res);
\ No newline at end of file
+var isStandard = Utils.toBoolean(vars.getString("$field.IS_STANDARD"));
+result.string(isStandard ? "VAADIN:MAP_MARKER" : "");
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/lat/documentation.adoc b/entity/Address_entity/entityfields/lat/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..848d26373626ba9a82ea8b80b74ec676bcb21c09
--- /dev/null
+++ b/entity/Address_entity/entityfields/lat/documentation.adoc
@@ -0,0 +1,5 @@
+= Latitude
+
+The field "LAT" is used to store the geolocation latitude of the address.
+
+Currently, the field is not filled with data, this will be implemented in the future.
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/lon/documentation.adoc b/entity/Address_entity/entityfields/lon/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..47eed872dbeaa2bfb811df52e01615d28e866a49
--- /dev/null
+++ b/entity/Address_entity/entityfields/lon/documentation.adoc
@@ -0,0 +1,5 @@
+= Longitude
+
+The field "LON" is used to store the geolocation longitude of the address.
+
+Currently, the field is not filled with data, this will be implemented in the future.
\ No newline at end of file
diff --git a/entity/Address_entity/recordcontainers/db/onDBInsert.js b/entity/Address_entity/recordcontainers/db/onDBInsert.js
index bc66933dac2bbe757bf545283d13fa4ef9f373f3..ac6e09eee06255c378346ac58f1c219f5b7670fb 100644
--- a/entity/Address_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Address_entity/recordcontainers/db/onDBInsert.js
@@ -5,6 +5,8 @@ import("DataPrivacy_lib");
import("system.vars");
import("StandardObject_lib");
import("Keyword_lib");
+import("Location_lib");
+import("Address_lib");
var rowdata = vars.get("$local.rowdata");
var addrType = rowdata["ADDRESS.ADDR_TYPE"];
@@ -47,3 +49,14 @@ if(scopeType == "Organisation")
}
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["ADDRESS.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
+
+var address = new AddressObject(rowdata["ADDRESS.ADDRESS"], rowdata["ADDRESS.BUILDINGNO"], rowdata["ADDRESS.ZIP"], rowdata["ADDRESS.CITY"], rowdata["ADDRESS.COUNTRY"], rowdata["ADDRESS.STATE"]);
+var addressLocation = new LocationFinder().getGeoLocation(address);
+if (addressLocation)
+{
+ newWhere("ADDRESS.ADDRESSID", "$local.uid")
+ .updateFields({
+ "LAT": addressLocation.lat,
+ "LON": addressLocation.lon
+ });
+}
\ No newline at end of file
diff --git a/entity/Address_entity/recordcontainers/db/onDBUpdate.js b/entity/Address_entity/recordcontainers/db/onDBUpdate.js
index 70056d7ef369d32d2c42adc14a9afea82ef68414..80e0c649be5a71951c695bfc2e3eda0f29f9048c 100644
--- a/entity/Address_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Address_entity/recordcontainers/db/onDBUpdate.js
@@ -1,6 +1,31 @@
+import("Sql_lib");
+import("Location_lib");
+import("Address_lib");
import("system.vars");
import("DataPrivacy_lib");
var rowdata = vars.get("$local.rowdata");
-DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["ADDRESS.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
\ No newline at end of file
+DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["ADDRESS.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
+
+var changed = vars.get("$local.changed");
+var isAddressChanged = changed.includes("ADDRESS.ADDRESS")
+ || changed.includes("ADDRESS.BUILDINGNO")
+ || changed.includes("ADDRESS.ZIP")
+ || changed.includes("ADDRESS.CITY")
+ || changed.includes("ADDRESS.STATE")
+ || changed.includes("ADDRESS.COUNTRY");
+
+if (isAddressChanged)
+{
+ var address = new AddressObject(rowdata["ADDRESS.ADDRESS"], rowdata["ADDRESS.BUILDINGNO"], rowdata["ADDRESS.ZIP"], rowdata["ADDRESS.CITY"], rowdata["ADDRESS.COUNTRY"], rowdata["ADDRESS.STATE"]);
+ var addressLocation = new LocationFinder().getGeoLocation(address);
+ if (addressLocation)
+ {
+ newWhere("ADDRESS.ADDRESSID", "$local.uid")
+ .updateFields({
+ "LAT": addressLocation.lat,
+ "LON": addressLocation.lon
+ });
+ }
+}
\ No newline at end of file
diff --git a/entity/AdminViewRow_entity/AdminViewRow_entity.aod b/entity/AdminViewRow_entity/AdminViewRow_entity.aod
index 8a4e552f143a58a7c9cad3776bf068038d76c1f1..75795a8f2a19547b7ca64bdadba1dc2bea26f996 100644
--- a/entity/AdminViewRow_entity/AdminViewRow_entity.aod
+++ b/entity/AdminViewRow_entity/AdminViewRow_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>AdminViewRow_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AdminViewRow_entity/documentation.adoc</documentation>
@@ -38,6 +38,10 @@
<entityField>
<name>CONTENTTYPE</name>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index 4dae1e91fc5fae5758eb90e0d713c77e28865763..3eadc589a83baf6a21f36a19f48a7053ac9cec8b 100644
--- a/entity/Analyses_entity/Analyses_entity.aod
+++ b/entity/Analyses_entity/Analyses_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Analyses_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Analyses_entity/documentation.adoc</documentation>
@@ -50,6 +50,10 @@
<title>My Turnover</title>
<valueProcess>%aditoprj%/entity/Analyses_entity/entityfields/myturnover/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index b9e852b3b2ae077b24a41200d051dad37e408a9a..0d0c5d1d960ce42545577c9ad79cde469d73d4a9 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -1,10 +1,10 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>AnyContact_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
<contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
- <onInit>%aditoprj%/entity/AnyContact_entity/onInit.js</onInit>
+ <initFilterProcess>%aditoprj%/entity/AnyContact_entity/initFilterProcess.js</initFilterProcess>
<imageProcess>%aditoprj%/entity/AnyContact_entity/imageProcess.js</imageProcess>
<recordContainer>db</recordContainer>
<entityFields>
@@ -14,19 +14,19 @@
<entityDependency>
<name>5d8b421e-a234-4d03-bfec-ed01f464a54c</name>
<entityName>Contract_entity</entityName>
- <fieldName>Relations</fieldName>
+ <fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>94e4fa2c-7525-49f9-b933-353d200b829c</name>
<entityName>Offer_entity</entityName>
- <fieldName>Relations</fieldName>
+ <fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>f1f7d959-ecb5-4438-9762-fc11f1bc5334</name>
<entityName>Order_entity</entityName>
- <fieldName>Relations</fieldName>
+ <fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -79,15 +79,35 @@
</entityDependency>
</dependencies>
</entityProvider>
+ <entityProvider>
+ <name>ContactsByIds</name>
+ <documentation>%aditoprj%/entity/AnyContact_entity/entityfields/contactsbyids/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>0206f7a8-fd58-47e8-8b7a-5ff4531e56fb</name>
+ <entityName>QuickEntry_entity</entityName>
+ <fieldName>OrgAndPersDuplicates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ContactIds_param</name>
+ <expose v="true" />
+ </entityParameter>
<entityField>
<name>ADDRESS_ID</name>
<title>standard address</title>
- <groupable v="true" />
<displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>LANGUAGE</name>
- <groupable v="true" />
</entityField>
<entityField>
<name>ORGANISATION_ID</name>
@@ -100,7 +120,6 @@
</entityField>
<entityField>
<name>STATUS</name>
- <groupable v="true" />
</entityField>
<entityField>
<name>contactType</name>
@@ -180,27 +199,9 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/avatartext_param/valueProcess.js</valueProcess>
</entityParameter>
<entityProvider>
- <name>ContactsByIds</name>
- <documentation>%aditoprj%/entity/AnyContact_entity/entityfields/contactsbyids/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>0206f7a8-fd58-47e8-8b7a-5ff4531e56fb</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>OrgAndPersDuplicates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
</entityProvider>
- <entityParameter>
- <name>ContactIds_param</name>
- <expose v="true" />
- </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -293,18 +294,19 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<dbRecordFieldMapping>
<name>PERSON_MIDDLENAME.value</name>
<recordfield>PERSON.MIDDLENAME</recordfield>
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_TITLE.value</name>
<recordfield>PERSON.TITLE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_SALUTATION.value</name>
<recordfield>PERSON.SALUTATION</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_PICTURE.value</name>
diff --git a/entity/AnyContact_entity/initFilterProcess.js b/entity/AnyContact_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c33a0cbce2a1e1a58e2c625c13dc34e40af3f62f
--- /dev/null
+++ b/entity/AnyContact_entity/initFilterProcess.js
@@ -0,0 +1,24 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
+{
+ var statusInactive = $KeywordRegistry.contactStatus$inactive();
+ var filter = {
+ type: "group",
+ operator: "AND",
+ childs: [{
+ type: "row",
+ name: "STATUS",
+ operator: "NOT_EQUAL",
+ contenttype: "TEXT",
+ key: statusInactive,
+ value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+ }]
+ };
+
+ result.string(JSON.stringify(filter));
+}
\ No newline at end of file
diff --git a/entity/AnyContact_entity/onInit.js b/entity/AnyContact_entity/onInit.js
deleted file mode 100644
index a75a8d405e273b1b3e026251a305676c2ccbd9ad..0000000000000000000000000000000000000000
--- a/entity/AnyContact_entity/onInit.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import("system.neon");
-import("Keyword_lib");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-var statusFilterElement = {
- "type":"row",
- "name":"STATUS",
- "operator":"NOT_EQUAL",
- "key":$KeywordRegistry.contactStatus$inactive(),
- "contenttype": "TEXT"
-};
-
-statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
-
-var filter = {
- "type":"group",
- "operator":"AND",
- "childs": [statusFilterElement]
-};
-
-filter = JSON.stringify(filter);
-neon.setFilter("#ENTITY", filter);
\ No newline at end of file
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 58aaa1c134d0aef45cc2e8c2b0d482ff4b95680f..a60f3736b97b1a8f533330412d5d8414e5c1d742 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>AppointmentLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AppointmentLink_entity/documentation.adoc</documentation>
@@ -102,6 +102,10 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 28c70af66100db91d5c2b61eea6d9ff584fb5832..d91f52f018b02ef0a9c86c163927ee0cc6dbd5b7 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Appointment_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
@@ -183,6 +183,7 @@
<entityParameter>
<name>AppointmentState_param</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentstate_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -207,7 +208,7 @@
<entityDependency>
<name>74dea3cd-a528-4616-b468-cd27f3f1a795</name>
<entityName>Activity_entity</entityName>
- <fieldName>Appointments</fieldName>
+ <fieldName>LinkedAppointments</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -248,6 +249,10 @@
<entityField>
<name>OWNER</name>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Appointment_entity/entityfields/begin/valueProcess.js b/entity/Appointment_entity/entityfields/begin/valueProcess.js
index eca54b63828df7f3d8624fd9f8ea12f33358e3d9..87e3ad4739d488a6973d66b2320eac4c6e31dfd4 100644
--- a/entity/Appointment_entity/entityfields/begin/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/begin/valueProcess.js
@@ -19,8 +19,8 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
/**
* Sets explicitly the start date when a preset is sent from the core, due to a move or resize event from the user. Do not remove.
*/
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
-{
- var event = JSON.parse(vars.getString("$param.Entry_param"));
- result.string(event[calendars.DTSTART]);
-}
\ No newline at end of file
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
+//{
+// var event = JSON.parse(vars.getString("$param.Entry_param"));
+// result.string(event[calendars.DTSTART]);
+//}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/end/valueProcess.js b/entity/Appointment_entity/entityfields/end/valueProcess.js
index b953112d2ccabc54e8eebea2d9766346addafcdd..818bd4a4c9e76ed021ca131fe26ffcb03c43e09c 100644
--- a/entity/Appointment_entity/entityfields/end/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/end/valueProcess.js
@@ -19,8 +19,8 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
/**
* Sets explicitly the end date when a preset is sent from the core, due to a move or resize event from the user. Do not remove.
*/
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
-{
- var event = JSON.parse(vars.getString("$param.Entry_param"));
- result.string(event[calendars.DTEND]);
-}
\ No newline at end of file
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
+//{
+// var event = JSON.parse(vars.getString("$param.Entry_param"));
+// result.string(event[calendars.DTEND]);
+//}
\ No newline at end of file
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index 7e8972a145953d11163f3fccc1879487dea6e31b..e56415a0faf52007f91bcc4e92f9ae20aebfa819 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -13,7 +13,25 @@ import("system.neon");
var appointmentSelect = newSelect("APPOINTMENT_ID").from("AB_APPOINTMENTLINK");
var appointmentUids;
-if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW && vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
+/**
+ * Will be used, if the user is operating the calendar.
+ */
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
+ var entry = JSON.parse(vars.getString("$param.Entry_param"));
+
+ var masterEntry = null;
+ if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
+ masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
+ }
+
+ //@TODO Icon
+ result.object([
+ buildEntry(entry, masterEntry)
+ ]);
+}
+
+else if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW && vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
{
var selectedids = vars.get("$local.idvalues");
result.object([buildEntry(calendars.getEntry(selectedids, null, null), null)]);
@@ -35,23 +53,6 @@ else if(vars.getString("$param.LinkedObjectId_param") != undefined)
appointmentSelect.whereIfSet("AB_APPOINTMENTLINK.OBJECT_ROWID", "$param.LinkedObjectId_param")
result.object(buildEntriesFromUids(appointmentSelect.table()));
}
-/**
- * Will be used, if the user is operating the calendar.
- */
-else if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
-{
- var entry = JSON.parse(vars.getString("$param.Entry_param"));
-
- var masterEntry = null;
- if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
- masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
- }
-
- //@TODO Icon
- result.object([
- buildEntry(entry, masterEntry)
- ]);
-}
function buildEntriesFromUids(appointmentUids)
{
diff --git a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
index d9c947a770aed397a837cdea2483289f3d0ef2de..32ea225c34405b2ce25a50d2199e8c1800ae20c6 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
@@ -56,7 +56,7 @@ if(event)
event[calendars.REMINDER_DURATION] = fields["REMINDER.value"];
}
- if(event[calendars.RRULE])
+ if(fields["RRULE.value"])
event[calendars.RRULE] = [fields["RRULE.value"]];
// Adds the required X-Header for status actions needed by Exchange and Domino
diff --git a/entity/AroundLocation_entity/AroundLocation_entity.aod b/entity/AroundLocation_entity/AroundLocation_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c91531dc4c43f5cb38c9324e78b6c69f15d6251f
--- /dev/null
+++ b/entity/AroundLocation_entity/AroundLocation_entity.aod
@@ -0,0 +1,86 @@
+<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+ <name>AroundLocation_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/AroundLocation_entity/documentation.adoc</documentation>
+ <onValidation>%aditoprj%/entity/AroundLocation_entity/onValidation.js</onValidation>
+ <recordContainer>dataless</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>SearchRadius</name>
+ <title>Radius in km</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#</outputFormat>
+ <inputFormat>#</inputFormat>
+ <state>EDITABLE</state>
+ <onValidation>%aditoprj%/entity/AroundLocation_entity/entityfields/searchradius/onValidation.js</onValidation>
+ </entityField>
+ <entityConsumer>
+ <name>Organisations</name>
+ <state>READONLY</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>OrganisationsViaIndex</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>OnlyShowContactIds_param</name>
+ <valueProcess>%aditoprj%/entity/AroundLocation_entity/entityfields/organisations/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>Open</name>
+ <title>${ACTION_DO_OPEN}</title>
+ <onActionProcess>%aditoprj%/entity/AroundLocation_entity/entityfields/open/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:FOLDER_OPEN</iconId>
+ <state>DISABLED</state>
+ <stateProcess>%aditoprj%/entity/AroundLocation_entity/entityfields/open/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityField>
+ <name>ContactIds</name>
+ <valueProcess>%aditoprj%/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>LocationLat_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>LocationLon_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityField>
+ <name>RecordCountInformation</name>
+ <color>readonly-color</color>
+ <valueProcess>%aditoprj%/entity/AroundLocation_entity/entityfields/recordcountinformation/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>HitCount</name>
+ </entityField>
+ <entityField>
+ <name>TotalHitCount</name>
+ </entityField>
+ <entityParameter>
+ <name>OriginUid_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <documentation>%aditoprj%/entity/AroundLocation_entity/entityfields/originuid_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <datalessRecordContainer>
+ <name>dataless</name>
+ <alias>Data_alias</alias>
+ </datalessRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/AroundLocation_entity/documentation.adoc b/entity/AroundLocation_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a84e68c8974026bf4ef27cdbd091b59a26142b9c
--- /dev/null
+++ b/entity/AroundLocation_entity/documentation.adoc
@@ -0,0 +1,19 @@
+= AroundLocation_entity
+
+Entity with a _dataless_ recordContainer that enables the user to enter a distance for a radius search and determinig the result records.
+This is done as following:
+
+. After a distance is entered, a indexsearch is run that determines the affected records that are within the given distance
+. the UIDs of the records are collected
+. the collected UIDs are passed to other entities via a param, and the other entites can filter for these uids
+
+IMPORTANT: It's necessary to determine only the IDs and pass them to next entity because there is currently no way to filter the results by distance
+in the next entity. This is due to a restriction of how solr handels such radius search requests.
+
+== Related Entities
+
+* `Organisation_entity`: This entity lists organisation that were found around a specific location.
+
+== FAQ
+
+_No questions have been added yet. You can help expanding this section by adding the first questions._
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js b/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c501306c787ed2ea99fafce699b725c12c5d94bf
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js
@@ -0,0 +1,61 @@
+import("system.result");
+import("system.util");
+import("system.vars");
+import("system.indexsearch");
+import("system.neon");
+
+var contactIds = [];
+var hitCount = 0;
+var totalHitCount = 0;
+
+var radius = vars.get("$field.SearchRadius");
+var lat = vars.get("$param.LocationLat_param");
+var lon = vars.get("$param.LocationLon_param");
+
+if (radius && lat && lon && !vars.get("$sys.validationerrors"))
+{
+ //filter our origin uid because otherwise we would have the origin organisation in our resultset
+ var excludedUid = vars.get("$param.OriginUid_param");
+ var pattern;
+ if (excludedUid)
+ {
+ var patternConfig = indexsearch.createPatternConfig();
+ var searchTerm = indexsearch.createTerm(excludedUid);
+ patternConfig.not(searchTerm);
+ pattern = indexsearch.buildPattern(patternConfig);
+ }
+ //spatial filter
+ var spatialSearchExtension = indexsearch.createSpatialSearchExtension()
+ .setDistance(radius)
+ .setCenterPoint(lat, lon);
+ /*
+ We need to limit the resulting records since we only collect ids and pass them as parameter via a consumer.
+ It would be bad for performance reasons to set no limit an e.g. pass 400k IDs there.
+
+ However increasing the RECORD_LIMIT does not necessarily increase the amount of loaded data by the indexsearch. There is another internal handled
+ limit of the indexsarch. The RECORD_LIMIT will not overwrite that internal limit.
+ For example: If the RECORD_LIMIT is 500, and the interal limit 250 only 250 records are returned by the indexsearch.
+ However, if the RECORD_LIMIT is 100, and the interal limit 250 only 100 records are returned by the indexsearch.
+ */
+ var RECORD_LIMIT = 250;
+ var indexQuery = indexsearch.createIndexQuery()
+ .addExtension(spatialSearchExtension)
+ .setRows(RECORD_LIMIT)
+ .addIndexGroups("Organisation")
+ .addResultIndexFields([indexsearch.FIELD_ID]);
+
+ if (pattern)
+ indexQuery.setPattern(pattern);
+
+ var indexResult = indexsearch.searchIndex(indexQuery);
+ if (indexResult.TOTALHITS > 0)
+ contactIds = indexResult.HITS.map(function (e){
+ return e[indexsearch.FIELD_ID];
+ });
+ hitCount = contactIds.length;
+ totalHitCount = indexResult.TOTALHITS;
+}
+
+neon.setFieldValue("$field.HitCount", hitCount);
+neon.setFieldValue("$field.TotalHitCount", totalHitCount);
+result.string(JSON.stringify(contactIds));
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/open/onActionProcess.js b/entity/AroundLocation_entity/entityfields/open/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..064f8348f4474ef01e4dfb061e6abdfff8ba6427
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/open/onActionProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.neon");
+
+var contactIds = vars.get("$field.ContactIds");
+
+if (contactIds)
+ contactIds = JSON.parse(contactIds);
+
+neon.openContext("Organisation", "OrganisationFilter_view", contactIds, neon.OPERATINGSTATE_SEARCH, null, null);
+//neon.openContext("Organisation", null, contactIds, null, null, null);
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/open/stateProcess.js b/entity/AroundLocation_entity/entityfields/open/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d2425e027506ebdec35dc892611b4917fee71b8c
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/open/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var res;
+var hitCount = vars.get("$field.HitCount");
+if (vars.get("$sys.validationerrors") || hitCount == null || hitCount == "" || parseInt(hitCount) == 0)
+ res = neon.COMPONENTSTATE_DISABLED;
+else
+ res = neon.COMPONENTSTATE_EDITABLE;
+
+result.string(res);
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/organisations/children/onlyshowcontactids_param/valueProcess.js b/entity/AroundLocation_entity/entityfields/organisations/children/onlyshowcontactids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c81f940ed40e3b79f9ff0d16fc020b2368b7da04
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/organisations/children/onlyshowcontactids_param/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("system.util");
+import("system.result");
+
+var contactIds = vars.get("$field.ContactIds");
+
+if (contactIds)
+ contactIds = JSON.parse(contactIds);
+else
+ contactIds = [];
+
+if (contactIds.length == 0)
+ contactIds = ["###dummy###" + util.getNewUUID() + "###dummy###"];
+
+result.string(JSON.stringify(contactIds));
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/originuid_param/documentation.adoc b/entity/AroundLocation_entity/entityfields/originuid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..45e00239aa673ad42984fb8db513ee36c46805d3
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/originuid_param/documentation.adoc
@@ -0,0 +1 @@
+This parameter is used to exclude ourself from the search results.
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/recordcountinformation/valueProcess.js b/entity/AroundLocation_entity/entityfields/recordcountinformation/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ead2ce1444fae0574f407200d08a8efbb8f2ee45
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/recordcountinformation/valueProcess.js
@@ -0,0 +1,32 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.logging");
+
+var displayedHitCount = vars.get("$field.HitCount");
+var totalHitCount = vars.get("$field.TotalHitCount");
+
+var res;
+if (displayedHitCount && totalHitCount)
+{
+ if (parseInt(displayedHitCount) == 0)
+ {
+ res = "";
+ }
+ else if (parseInt(displayedHitCount) == 1)
+ {
+ res = translate.withArguments("${DISPLAY_AND_OPEN_ONE_HIT}", [displayedHitCount]);
+ }
+ else if (displayedHitCount == totalHitCount)
+ {
+ res = translate.withArguments("${DISPLAY_AND_OPEN_%0_HITS}", [displayedHitCount]);
+ }
+ else
+ {
+ res = translate.withArguments("${DISPLAY_AND_OPEN_%0_OF_%1_HITS}", [displayedHitCount, totalHitCount]);
+ }
+}
+else
+ res = "";
+
+result.string(res);
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/searchradius/onValidation.js b/entity/AroundLocation_entity/entityfields/searchradius/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..d616454144bedf5bfa669c4c37b63bf37b486462
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/searchradius/onValidation.js
@@ -0,0 +1,17 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+var value = vars.get("$local.value");
+var res;
+if (value)
+{
+ value = parseInt(value);
+ if (value < 1)
+ res = translate.withArguments("The radius has to be at least %0.", ["1"]);
+ else if (value > 100)
+ res = translate.withArguments("The radius has to be %0 or lesser.", ["100"]);
+}
+
+if (res)
+ result.string(res);
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/onValidation.js b/entity/AroundLocation_entity/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..fb43d2d307d7656739b69f7d88e46821853f95fe
--- /dev/null
+++ b/entity/AroundLocation_entity/onValidation.js
@@ -0,0 +1,15 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+var res;
+var lat = vars.get("$param.LocationLat_param");
+var lon = vars.get("$param.LocationLon_param");
+
+if (lat == null || lon == null)
+{
+ res = translate.text("The given starting location is empty. An area search can not be performed.");
+}
+
+if (res)
+ result.string(res);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 2065c6199bd233cd58fb4263640ca5cbbcd89a66..74b45b0ba684f198d4f6897975a03b1b056ff32b 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>AttributeRelation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AttributeRelation_entity/documentation.adoc</documentation>
@@ -342,6 +342,10 @@
<entityField>
<name>AB_ATTRIBUTERELATIONID</name>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 325447f14b090878e5f194eca9c6083d2a0645f3..281daa5f5aafefe0a4307b836fefb819ed97670a 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>AttributeUsage_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
@@ -102,6 +102,10 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js b/entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 7acb3c80848f54a4c6dfee5efa7a5b8514dd4a71..0000000000000000000000000000000000000000
--- a/entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js b/entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index a8a5e28793c742f8f3e10907976e746faf43c67c..0000000000000000000000000000000000000000
--- a/entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 81ed998586bd298aa9203da5bcbb1f50c2da615f..6f00c57a63fb54566d003715a274b58dcc3ffbc0 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Attribute_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
@@ -7,7 +7,6 @@
<grantDeleteProcess>%aditoprj%/entity/Attribute_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Attribute_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Attribute_entity/afterUiInit.js</afterUiInit>
- <onValidation>%aditoprj%/entity/Attribute_entity/onValidation.js</onValidation>
<iconId>VAADIN:TAG</iconId>
<titlePlural>Attributes</titlePlural>
<recordContainer>jdito</recordContainer>
@@ -157,6 +156,12 @@
<fieldName>Departments</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>71cfeddd-a315-4692-8299-08813ca1dc19</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>Departments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -181,8 +186,8 @@
<expose v="false" />
</entityParameter>
<entityParameter>
- <name>ParentIdPreset_param</name>
- <expose v="false" />
+ <name>ParentId_param</name>
+ <description>parent id, this is used for filtering by the parent in the content process</description>
</entityParameter>
</children>
</entityProvider>
@@ -218,6 +223,18 @@
<name>ParentId_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>AttributeCount_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>IncludeParentRecord_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityConsumer>
@@ -367,10 +384,6 @@
<name>ParentId_param</name>
<expose v="false" />
</entityParameter>
- <entityParameter>
- <name>ParentIdPreset_param</name>
- <expose v="false" />
- </entityParameter>
</children>
</entityProvider>
<entityParameter>
@@ -379,15 +392,99 @@
<description>parent id, this is used for filtering by the parent in the content process</description>
</entityParameter>
<entityParameter>
- <name>ParentIdPreset_param</name>
+ <name>IncludeParentRecord_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Attribute_entity/entityfields/includeparentrecord_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityProvider>
+ <name>AttributeChildren</name>
+ <sortingField>SORTING</sortingField>
+ <documentation>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/documentation.adoc</documentation>
+ <titlePlural>Child Attributes</titlePlural>
+ <dependencies>
+ <entityDependency>
+ <name>80023321-1954-483f-a4be-b7207557c068</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>ChildAttributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ChildId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeCount_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ChildType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>FilteredAttributeIds_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>IncludeParentRecord_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ThemeObjectRowId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>GetOnlyFirstLevelChildren_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/getonlyfirstlevelchildren_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ParentId_param</name>
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>ChildAttributes</name>
+ <refreshParent v="true" />
+ <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/childattributes/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>AttributeChildren</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DisplaySimpleName_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/childattributes/children/displaysimplename_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ParentId_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/childattributes/children/parentid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ParentType_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/childattributes/children/parenttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>GetOnlyFirstLevelChildren_param</name>
<expose v="true" />
- <description>parent id that is used to preset the parent when the action newChildAttribute is used</description>
</entityParameter>
<entityParameter>
- <name>IncludeParentRecord_param</name>
+ <name>ParentType_param</name>
<expose v="true" />
- <documentation>%aditoprj%/entity/Attribute_entity/entityfields/includeparentrecord_param/documentation.adoc</documentation>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js b/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js
index 75b9d2d76b1ed08357942b55f75e82760472fdcc..33e1114869871a9be530cbab4d1b51d75c762a0f 100644
--- a/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js
@@ -2,5 +2,5 @@ import("system.neon");
import("system.result");
import("system.vars");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.ParentIdPreset_param") && vars.get("$this.value") == null)
- result.string(vars.get("$param.ParentIdPreset_param"));
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.ParentId_param") && vars.get("$this.value") == null)
+ result.string(vars.get("$param.ParentId_param"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
index 930a7e565b1e08fe77d8d7e5cfc5e672b2300697..dc1197f692b7e6a903fd8ab7534f286e234530d5 100644
--- a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
@@ -11,7 +11,6 @@ var state = neon.COMPONENTSTATE_EDITABLE;
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
var type = vars.get("$field.ATTRIBUTE_TYPE");
- var parentType = AttributeUtil.getAttributeType(vars.get("$field.ATTRIBUTE_PARENT_ID"));
if (AttributeTypeUtil.isGroupType(type))
{
var hasSubordinate = newSelect("count(*)")
@@ -24,4 +23,4 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.r
else if (AttributeUtil.hasRelations(vars.get("$field.UID")))
state = neon.COMPONENTSTATE_READONLY;
}
-result.string(state)
\ No newline at end of file
+result.string(state);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js b/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js
index 20745951e995fd452c09c29f9160ca4e87f77458..c33f753be3ba531e5b340fa08e6c6afd4d612658 100644
--- a/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js
@@ -4,9 +4,9 @@ import("system.result");
import("system.vars");
import("Attribute_lib");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.ATTRIBUTE_PARENT_ID"))
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && (vars.get("$param.ParentType_param") || vars.get("$field.ATTRIBUTE_PARENT_ID")))
{
- var parentType = AttributeUtil.getAttributeType(vars.get("$field.ATTRIBUTE_PARENT_ID"));
+ var parentType = vars.get("$param.ParentType_param") || AttributeUtil.getAttributeType(vars.get("$field.ATTRIBUTE_PARENT_ID"));
var type = vars.get("$this.value");
var possibleTypes = AttributeTypeUtil.getPossibleChildren(parentType);
diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
index f78e4a184498a645cf9c755557da15876d94dadb..20effae6f92340f071b940437ec00ad1af7db88e 100644
--- a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
+++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
@@ -8,8 +8,8 @@ if (vars.exists("$local.rows"))
var row = vars.get("$local.rows");
var type = row[0].ATTRIBUTE_TYPE.trim();
if (AttributeTypeUtil.isGroupType(type))
- params["ParentIdPreset_param"] = row[0].UID;
+ params["ParentId_param"] = row[0].UID;
else if (row[0].ATTRIBUTE_PARENT_ID)
- params["ParentIdPreset_param"] = row[0].ATTRIBUTE_PARENT_ID;
+ params["ParentId_param"] = row[0].ATTRIBUTE_PARENT_ID;
}
neon.openContext("Attribute", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js
index 1d16d29705904d8d5e24c0c3990b0d6b9693bcca..a1ee18e84b4a9407a6334fc9924ef885a41c7176 100644
--- a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js
@@ -3,7 +3,7 @@ import("system.result");
import("system.vars");
import("system.neon");
-if(vars.get("$sys.selection").length == 1 && (vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.GROUP.toString() || vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.OBJECTSELECTION.toString()))
+if(vars.get("$sys.selection").length == 1 && AttributeTypeUtil.isGroupType(vars.get("$field.ATTRIBUTE_TYPE")))
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetypeclassification_param/valueProcess.js b/entity/Attribute_entity/entityfields/attributechildren/children/getonlyfirstlevelchildren_param/valueProcess.js
similarity index 54%
rename from entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetypeclassification_param/valueProcess.js
rename to entity/Attribute_entity/entityfields/attributechildren/children/getonlyfirstlevelchildren_param/valueProcess.js
index a46ac9a3378678da98d0d297323d08fc1e7b9d07..40effa0178464da0c7850912345f19c7fa95975a 100644
--- a/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetypeclassification_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attributechildren/children/getonlyfirstlevelchildren_param/valueProcess.js
@@ -1,2 +1,3 @@
-import("system.result");
-result.string("3");
\ No newline at end of file
+import("system.result");
+
+result.string(true);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributechildren/documentation.adoc b/entity/Attribute_entity/entityfields/attributechildren/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..f9ca1e5e2252e6299b78d0d10174f0a83a3d24e0
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attributechildren/documentation.adoc
@@ -0,0 +1,4 @@
+= AttributeChildren
+
+This provider can be used to get all child Attributes of a given parent. It is intended for displaying and editing the childs of an Attribute in the
+Attribute context and allows to sort them. Only the direct children are returned.
\ No newline at end of file
diff --git a/entity/Context_entity/entityfields/dummyyy/valueProcess.js b/entity/Attribute_entity/entityfields/childattributes/children/displaysimplename_param/valueProcess.js
similarity index 54%
rename from entity/Context_entity/entityfields/dummyyy/valueProcess.js
rename to entity/Attribute_entity/entityfields/childattributes/children/displaysimplename_param/valueProcess.js
index 9c705ff52951c0e86b46d5b2ed2edaea260f0313..40effa0178464da0c7850912345f19c7fa95975a 100644
--- a/entity/Context_entity/entityfields/dummyyy/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/childattributes/children/displaysimplename_param/valueProcess.js
@@ -1,2 +1,3 @@
import("system.result");
-result.string("asdf")
\ No newline at end of file
+
+result.string(true);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js b/entity/Attribute_entity/entityfields/childattributes/children/parentid_param/valueProcess.js
similarity index 55%
rename from entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
rename to entity/Attribute_entity/entityfields/childattributes/children/parentid_param/valueProcess.js
index 338565e60f882ba76571f3ad005c6d1fa262b045..16c85500b5355a72548030867e3d300661e9d4aa 100644
--- a/entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/childattributes/children/parentid_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$sys.uid"));
\ No newline at end of file
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/contacts/children/orgid_param/valueProcess.js b/entity/Attribute_entity/entityfields/childattributes/children/parenttype_param/valueProcess.js
similarity index 50%
rename from entity/Organisation_entity/entityfields/contacts/children/orgid_param/valueProcess.js
rename to entity/Attribute_entity/entityfields/childattributes/children/parenttype_param/valueProcess.js
index ff5cde1a5236528856146a6a98ec6305039b3ba2..f3f6d6590569c32720d32a9781ca28787a732b97 100644
--- a/entity/Organisation_entity/entityfields/contacts/children/orgid_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/childattributes/children/parenttype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
+result.string(vars.get("$field.ATTRIBUTE_TYPE"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/childattributes/stateProcess.js b/entity/Attribute_entity/entityfields/childattributes/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cf9174819ce75ac5bd5c0d335e118577ecbb333a
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/childattributes/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Attribute_lib");
+
+result.string(AttributeTypeUtil.isGroupType(vars.get("$field.ATTRIBUTE_TYPE")) ? neon.COMPONENTSTATE_EDITABLE : neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/date_new/valueProcess.js b/entity/Attribute_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 7acb3c80848f54a4c6dfee5efa7a5b8514dd4a71..0000000000000000000000000000000000000000
--- a/entity/Attribute_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js b/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
deleted file mode 100644
index dc6dfca332983312b5fc1181f8a357c182ac603f..0000000000000000000000000000000000000000
--- a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.attributeType());
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js b/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js
index e6e7f7340b215f64ec6c42da86c14581a0c13ff3..847edb29078d3b70b31c6dbaa2768c4044666a5f 100644
--- a/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js
@@ -7,7 +7,9 @@ import("Attribute_lib");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
var type;
- if (vars.get("$field.ATTRIBUTE_PARENT_ID"))
+ if (vars.get("$param.ParentType_param"))
+ type = vars.get("$param.ParentType_param");
+ else if (vars.get("$field.ATTRIBUTE_PARENT_ID"))
type = AttributeUtil.getAttributeType(vars.get("$field.ATTRIBUTE_PARENT_ID"));
else
type = $AttributeTypes.GROUP.toString(); //GROUP can have everything except COMBOVALUE as child
diff --git a/entity/Attribute_entity/entityfields/user_new/valueProcess.js b/entity/Attribute_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index a8a5e28793c742f8f3e10907976e746faf43c67c..0000000000000000000000000000000000000000
--- a/entity/Attribute_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/onValidation.js b/entity/Attribute_entity/onValidation.js
deleted file mode 100644
index f1b6c7fc1f437ab9ba090ab87e297514e884eb3a..0000000000000000000000000000000000000000
--- a/entity/Attribute_entity/onValidation.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import("system.translate");
-import("system.db");
-import("system.vars");
-import("system.text");
-import("system.neon");
-import("Sql_lib");
-
-//TODO: this should no happen in onValidation; waiting for #1032668
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- var parentId = vars.get("$field.ATTRIBUTE_PARENT_ID");
- if (parentId)
- {
- var maskingHelper = new SqlMaskingUtils();
- var newCodeNumber = newSelect(maskingHelper.max("AB_ATTRIBUTE.SORTING"))
- .from("AB_ATTRIBUTE")
- .where("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", parentId)
- .cell();
-
- newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
- if (isNaN(newCodeNumber))
- throw new TypeError(translate.text("The code number is not a valid number."));
- neon.setFieldValue("$field.SORTING", ++newCodeNumber);
- }
-}
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
index 9d50cc58b4426a6edc78c8f787084914be798653..c5b4ef81cd90cbed5092819e4282f71ea2d97322 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
@@ -14,98 +14,90 @@ var childId = vars.get("$param.ChildId_param");
var childType = vars.get("$param.ChildType_param");
var objectType = vars.get("$param.ObjectType_param");
-var filteredIds = vars.getString("$param.FilteredAttributeIds_param") ? JSON.parse(vars.getString("$param.FilteredAttributeIds_param")) : null
+var filteredIds = vars.get("$param.FilteredAttributeIds_param") ? JSON.parse(vars.getString("$param.FilteredAttributeIds_param")) : null
var attributeCountObj = vars.get("$param.AttributeCount_param") ? JSON.parse(vars.getString("$param.AttributeCount_param")) : null;
-var displaySimpleName = vars.getString("$param.DisplaySimpleName_param") == "true" ? true : false;
+var displaySimpleName = Utils.toBoolean(vars.get("$param.DisplaySimpleName_param"));
var themeObjectRowId = vars.get("$param.ThemeObjectRowId_param");
var parentId = vars.get("$param.ParentId_param");
-var includeParentRecord = vars.get("$param.IncludeParentRecord_param");
+var includeParentRecord = Utils.toBoolean(vars.get("$param.IncludeParentRecord_param"));
+var onlyFirstLevelChildren = Utils.toBoolean(vars.get("$param.GetOnlyFirstLevelChildren_param"));
var fetchUsages = false;
var translateName = false;
var condition = newWhere();
-var emptyResult = function ()
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
{
- if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
- {
- condition.andIfSet("AB_ATTRIBUTE.AB_ATTRIBUTEID", vars.get("$local.idvalues"), SqlBuilder.IN());
- fetchUsages = true;
- return false;
- }
-
- if (childId) //if a childId is given, it is the lookup for selecting the superordinate attribute
- {
- condition.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypeUtil.getGroupTypes(childType), SqlBuilder.IN());
-
- //filter out the child and all children of the child, because an attribute can't have itself or a subordinate attribute as parent
- condition.andIfSet("AB_ATTRIBUTE.AB_ATTRIBUTEID", [childId].concat(AttributeUtil.getAllChildren(childId)), SqlBuilder.NOT_IN());
- }
- else if (objectType) //if there's an objectType, it comes from the AttributeRelation entity (lookup for the attribute selection)
- {
- translateName = true;
-
- var ids = AttributeUtil.getPossibleAttributes(objectType, true, filteredIds, attributeCountObj);
-
- if (ids.length === 0)
- return true;
-
- condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID", ids, SqlBuilder.IN());
-
- condition.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.THEME, !themeObjectRowId ? SqlBuilder.NOT_EQUAL() : undefined);
- }
- else if (parentId)
+ condition.andIfSet("AB_ATTRIBUTE.AB_ATTRIBUTEID", vars.get("$local.idvalues"), SqlBuilder.IN());
+ fetchUsages = true;
+}
+else if (childId) //if a childId is given, it is the lookup for selecting the superordinate attribute
+{
+ condition.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypeUtil.getGroupTypes(childType), SqlBuilder.IN());
+
+ //filter out the child and all children of the child, because an attribute can't have itself or a subordinate attribute as parent
+ condition.andIfSet("AB_ATTRIBUTE.AB_ATTRIBUTEID", [childId].concat(AttributeUtil.getAllChildren(childId)), SqlBuilder.NOT_IN());
+}
+else if (objectType) //if there's an objectType, it comes from the AttributeRelation entity (lookup for the attribute selection)
+{
+ translateName = true;
+
+ var ids = AttributeUtil.getPossibleAttributes(objectType, true, filteredIds, attributeCountObj);
+
+ if (Utils.isEmpty(ids))
+ condition.noResult();
+
+ condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID", ids, SqlBuilder.IN());
+ condition.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.THEME, !themeObjectRowId ? SqlBuilder.NOT_EQUAL() : undefined);
+}
+else if (parentId)
+{
+ if (onlyFirstLevelChildren)
+ condition.and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", parentId);
+ else
{
condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID", AttributeUtil.getAllChildren(parentId), SqlBuilder.IN());
translateName = true;
- if(includeParentRecord == "true")
+ if(includeParentRecord)
condition.or("AB_ATTRIBUTE.AB_ATTRIBUTEID", parentId);
}
- else
- {
- fetchUsages = true;
- }
+}
+else
+{
+ fetchUsages = true;
+}
- //when there are filters selected, add them to the conditon
- if (vars.exists("$local.filter") && vars.get("$local.filter"))
- {
- var filter = vars.get("$local.filter");
- if (filter.filter)
- condition.andIfSet(JditoFilterUtils.getSqlCondition(filter.filter, "AB_ATTRIBUTE", undefined, {
- // special filter for usage
- USAGE_FILTER : function (pValue, pOperator)
- {
- var cond = newWhere();
- var subSelect = newSelect("1").from("AB_ATTRIBUTEUSAGE", "attrUse").where("attrUse.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID");
-
- switch (pOperator)
- {
- case "EQUAL":
- case "NOT_EQUAL":
- subSelect.and(["AB_ATTRIBUTEUSAGE", "AB_ATTRIBUTE_ID", "attrUse"], pValue);
- case "ISNULL":
- case "ISNOTNULL":
- return cond.and(null, subSelect, pOperator == "NOT_EQUAL" || pOperator == "ISNULL" ? SqlBuilder.NOT_EXISTS() : SqlBuilder.EXISTS());
- }
- return cond;
- }
- }));
- }
-
- return false;
-}();
+var filterCondition = new FilterSqlTranslator(vars.get("$local.filter"), "AB_ATTRIBUTE")
+ .addSpecialFieldConditionFn("USAGE_FILTER", function (pValue, pOperator)
+ {
+ var cond = newWhere();
+ var subSelect = newSelect("1").from("AB_ATTRIBUTEUSAGE", "attrUse").where("attrUse.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID");
+
+ switch (pOperator)
+ {
+ case "EQUAL":
+ case "NOT_EQUAL":
+ subSelect.and(["AB_ATTRIBUTEUSAGE", "AB_ATTRIBUTE_ID", "attrUse"], pValue);
+ case "ISNULL":
+ case "ISNOTNULL":
+ return cond.and(null, subSelect, pOperator == "NOT_EQUAL" || pOperator == "ISNULL" ? SqlBuilder.NOT_EXISTS() : SqlBuilder.EXISTS());
+ }
+ return cond;
+ })
+ .getSqlCondition();
+condition.andIfSet(filterCondition);
var usages;
if (fetchUsages) //this query is only necessary in Attribute, not in AttributeRelation
{
var usageTbl = newSelect("AB_ATTRIBUTE_ID, OBJECT_TYPE")
- .from("AB_ATTRIBUTEUSAGE")
- .join("AB_ATTRIBUTE", newWhere("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID"))
- .whereIfSet(condition)
- .table();
+ .from("AB_ATTRIBUTEUSAGE")
+ .join("AB_ATTRIBUTE", "AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID")
+ .whereIfSet(condition)
+ .table();
usages = {};
for (let i = 0, l = usageTbl.length; i < l; i++)
{
@@ -117,16 +109,18 @@ if (fetchUsages) //this query is only necessary in Attribute, not in AttributeRe
}
}
-var attributes = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME, ATTRIBUTE_ACTIVE, DROPDOWNDEFINITION, DROPDOWNFILTER, SORTING, ATTRIBUTE_TYPE, "
- + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "ATTRIBUTE_TYPE") //3
- + ", '', '', ''")
+var attributes = newSelect(["AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME, ATTRIBUTE_ACTIVE, DROPDOWNDEFINITION, DROPDOWNFILTER, SORTING, ATTRIBUTE_TYPE",
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "ATTRIBUTE_TYPE"), //3
+ "'', '', ''"])
.from("AB_ATTRIBUTE")
.whereIfSet(condition)
- .orderBy("ATTRIBUTE_PARENT_ID asc, SORTING asc")
- .table(emptyResult);
+ .orderBy("ATTRIBUTE_PARENT_ID, SORTING, ATTRIBUTE_NAME")
+ .table();
-//TODO: attribute name caching like keywords
-var allNames = !emptyResult ? newSelect("AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME").from("AB_ATTRIBUTE").table() : [];
+var allNames = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME")
+ .from("AB_ATTRIBUTE")
+ .table(Utils.isEmpty(attributes));
+
var attrNameData = {};
for (let i = 0, l = allNames.length; i < l; i++)
{
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onDelete.js b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
index e4969d923b154c36b50971efb6eb54c7b3bba6b2..fc8ed47c69525e9245891887cc24da1f9e59797a 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
@@ -2,10 +2,10 @@ import("Sql_lib");
import("system.vars");
import("Attribute_lib");
-newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID")
+newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$local.uid")
.deleteData();
-var attributeId = vars.get("$field.UID");
+var attributeId = vars.get("$local.uid");
var childIds = AttributeUtil.getAllChildren(attributeId).concat(attributeId);
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onInsert.js b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
index 45e6ba816ff07ce267d88079ccc55bb1996c25c5..9678a3d086a347c391ac075a2efc38028f26259f 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
@@ -1,15 +1,44 @@
import("system.vars");
import("Sql_lib");
+import("Attribute_lib");
var rowdata = vars.get("$local.rowdata");
+var sorting = rowdata["SORTING.value"];
+var parentId = rowdata["ATTRIBUTE_PARENT_ID.value"];
+if (!sorting && parentId)
+{
+ sorting = newSelect("max(SORTING) + 1")
+ .from("AB_ATTRIBUTE")
+ .where("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", parentId)
+ .cell() || 0;
+}
+
new SqlBuilder().insertFields({
"AB_ATTRIBUTEID" : rowdata["UID.value"],
- "ATTRIBUTE_PARENT_ID" : rowdata["ATTRIBUTE_PARENT_ID.value"],
+ "ATTRIBUTE_PARENT_ID" : parentId,
"DROPDOWNDEFINITION" : rowdata["DROPDOWNDEFINITION.value"],
"ATTRIBUTE_ACTIVE" : rowdata["ATTRIBUTE_ACTIVE.value"],
"ATTRIBUTE_NAME" : rowdata["ATTRIBUTE_NAME.value"],
"ATTRIBUTE_TYPE" : rowdata["ATTRIBUTE_TYPE.value"],
"DROPDOWNFILTER" : rowdata["DROPDOWNFILTER.value"],
- "SORTING" : rowdata["SORTING.value"]
-}, "AB_ATTRIBUTE");
\ No newline at end of file
+ "SORTING" : sorting
+}, "AB_ATTRIBUTE");
+
+if (rowdata["ATTRIBUTE_PARENT_ID.value"] && rowdata["ATTRIBUTE_TYPE.value"] !== $AttributeTypes.COMBOVALUE.toString() && vars.get("$param.GetOnlyFirstLevelChildren_param"))
+{
+ var parentUsages = newSelect("OBJECT_TYPE")
+ .from("AB_ATTRIBUTEUSAGE")
+ .where("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", rowdata["ATTRIBUTE_PARENT_ID.value"])
+ .arrayColumn();
+
+ var usageValues = {};
+ if (AttributeTypeUtil.isSingleSelection(rowdata["ATTRIBUTE_TYPE.value"]))
+ usageValues["MAX_COUNT"] = 1;
+
+ parentUsages.forEach(function (usageContext)
+ {
+ usageValues["OBJECT_TYPE"] = usageContext;
+ new SqlBuilder().insertFields(usageValues, "AB_ATTRIBUTEUSAGE", "AB_ATTRIBUTEUSAGEID");
+ });
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
index f12f4d44912d1711867309fac4c4eb76bedb9633..b3012b5a5b5ff44e63a53a1dbd5c0df4b797764b 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
@@ -20,5 +20,5 @@ vars.get("$local.changed").forEach(function (field)
fieldValues[dbField] = rowdata[field] || "";
});
-newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID")
+newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$local.uid")
.updateFields(fieldValues);
diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
index ff7e67f3d3dfeaa8822e618b673ec1a17e76d5ee..f700c676730f785fc86082479f65f757b7be0b58 100644
--- a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
+++ b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>BulkMailAddRecipients_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/documentation.adoc</documentation>
@@ -58,6 +58,29 @@
<state>EDITABLE</state>
<valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/recipientcount/valueProcess.js</valueProcess>
</entityField>
+ <entityParameter>
+ <name>comingFrom_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>currentRecipients</name>
+ <documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/documentation.adoc</documentation>
+ <title>Current Recipients</title>
+ <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>notAddedRecipients</name>
+ </entityField>
+ <entityField>
+ <name>futureRecipients</name>
+ <documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/documentation.adoc</documentation>
+ <title>Recipients after adding</title>
+ <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/documentation.adoc b/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..74e2caafdf491b4df68860937a0817c4ce434251
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/documentation.adoc
@@ -0,0 +1,2 @@
+== currentRecipients;
+needed for the score card, to display extra information.
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ab684915b04cac155e1a7c5ef4e4f008443ab5fc
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var currentCount = newSelect("count(BULKMAILRECIPIENT.CONTACT_ID)")
+ .from("BULKMAILRECIPIENT")
+ .where("BULKMAILRECIPIENT.BULKMAIL_ID", vars.get("$field.BULKMAIL_ID"))
+ .cell()
+if(currentCount)
+ result.string(currentCount)
+else
+ result.string("0")
+
+
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/documentation.adoc b/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..b3fd706b46e908ad4dd49cd1fb023137ed6717ae
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/documentation.adoc
@@ -0,0 +1,2 @@
+== futureRecipients;
+needed for the score card, to display extra information.
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9c50bb1b4d3e3e9076cff47ff37abfb2b665a600
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("system.eMath")
+
+var res = eMath.addInt(vars.get("$field.recipientCount"), vars.get("$field.currentRecipients"));
+if(res)
+ result.string(res);
+else
+ result.string(0);
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
index 9705275249c269d4a34d59acf53a49f83fa02521..4b3206dc22331837d39d9e4aa4e7634336c3e2da 100644
--- a/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
+++ b/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
@@ -1,13 +1,37 @@
+import("system.eMath");
+import("FilterviewMenuAction_lib");
+import("Contact_lib");
import("system.result");
import("Bulkmail_lib");
+import("KeywordRegistry_basic");
+import("system.util");
+import("system.db");
+import("Sql_lib");
import("system.vars");
+import("system.neon");
+
+var selection = JSON.parse(vars.getString("$param.ContactIds_param"));
+var comingfrom = vars.getString("$param.comingFrom_param");
+var contactIds;
+
+if(!Array.isArray(selection)) //if selection is an array, data has been selected
+{
+ var condition = selection.condition;
+ if(comingfrom == "Organisation")
+ contactIds = FilterviewMenuActionUtils.organisationIdsFilter(condition);
+ else if (comingfrom == "Person")
+ contactIds = FilterviewMenuActionUtils.contactIdsFilter(condition);
+}
-var contactIds = JSON.parse(vars.getString("$param.ContactIds_param"));
var bulkMailId = vars.get("$field.BULKMAIL_ID");
var res;
if (bulkMailId)
- res = JSON.stringify(BulkMailUtils.filterNewRecipients(bulkMailId, contactIds));
+{
+ var recipients = BulkMailUtils.filterNewRecipients(bulkMailId, contactIds);
+ res = JSON.stringify(recipients);
+ neon.setFieldValue("$field.notAddedRecipients", eMath.subInt(parseInt(contactIds.length), parseInt(recipients.length)));
+}
else
res = null;
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js
index ca3a11b99b6ee086734022d909edae33de24f635..80f08142f07db6851da182a44860374521000e27 100644
--- a/entity/BulkMailAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js
+++ b/entity/BulkMailAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js
@@ -2,14 +2,21 @@ import("system.translate");
import("system.result");
import("system.vars");
-var count = vars.getString("$field.recipientCount")
+var count = vars.get("$field.recipientCount")
var res = "";
+var resNotAdded = "\n\
+";
if (count && !vars.get("$sys.validationerrors"))
{
if (count == "0")
res = translate.text("No new recipients found that can be added to the bulk mail.");
else
+ {
res = translate.withArguments("%0 new recipients will be added to the bulk mail.", [count]);
+ var notAdded = vars.get("$field.notAddedRecipients")
+ if (notAdded > 0)
+ resNotAdded += translate.withArguments("%0 of the chosen records are already recipients or don't have an e-mail set", [notAdded]);
+ }
}
-result.string(res);
\ No newline at end of file
+result.string(res + resNotAdded);
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index e8de32709bad04999ad1d732f7e1395571e694d1..bae83161b6a2b2580cbc7734093346ce3596a028 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>BulkMailRecipient_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMailRecipient_entity/documentation.adoc</documentation>
@@ -141,6 +141,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
index 981bffc0474afa211bf0599539fdf0d70fbbbfe2..63f5f1d40783c0f29bc9f33e89dc4e21ff058271 100644
--- a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
+++ b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>BulkMailStatusChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMailStatusChart_entity/documentation.adoc</documentation>
@@ -40,6 +40,10 @@
</entityDependency>
</dependencies>
</entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
index d67a06830c8c9cabe3954d472316b74750cf663c..e31136e9154a320dae7d3e9f07fc88a06f86d6ed 100644
--- a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
+++ b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>BulkMailTesting_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMailTesting_entity/documentation.adoc</documentation>
@@ -56,6 +56,10 @@
<onActionProcess>%aditoprj%/entity/BulkMailTesting_entity/entityfields/testmail/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CLIPBOARD_CHECK</iconId>
</entityActionField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index e2e46ded6f8c1b63b5ed6aa1f2432491c0edd213..a6e8b3db47b37d15f43098189957c08b86595414 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>BulkMail_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMail_entity/documentation.adoc</documentation>
@@ -314,6 +314,10 @@
<name>templateType</name>
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/templatetype/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -349,7 +353,7 @@
<name>DESCRIPTION.value</name>
<recordfield>BULKMAIL.DESCRIPTION</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DOCUMENTTEMPLATE_ID.value</name>
@@ -371,7 +375,7 @@
<name>SENDER.value</name>
<recordfield>BULKMAIL.SENDER</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DOCUMENTTEMPLATE_ID.displayValue</name>
@@ -381,7 +385,7 @@
<name>STATUS.value</name>
<recordfield>BULKMAIL.STATUS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.displayValue</name>
diff --git a/entity/BulkMail_entity/afterUiInit.js b/entity/BulkMail_entity/afterUiInit.js
index 666ca1d3edadc9d16442625a76723f3ed168f0a9..bde0a224e86797c6d06ce4de6652cf63cef908f1 100644
--- a/entity/BulkMail_entity/afterUiInit.js
+++ b/entity/BulkMail_entity/afterUiInit.js
@@ -28,7 +28,7 @@ if (!vars.exists("$context.dataCopied") && vars.get("$param.CopyBulkMailId_param
{
var data = entities.getRows(conf)[0];
- for (field in data)
+ for (let field in data)
{
vars.set("$field." + field, data[field]);
}
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index fcaefe8fd53d2a52baedb64c9d35692c3ab4c4e1..92059b338a29768c365734a9dc7d5a23884f6c45 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>CampaignAddParticipants_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignAddParticipants_entity/documentation.adoc</documentation>
@@ -36,11 +36,11 @@
<mandatory v="true" />
<state>EDITABLE</state>
<displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>campaignParticipantMessage</name>
<state>EDITABLE</state>
+ <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js</valueProcess>
<onValueChangeTypes>
<element>PROCESS</element>
</onValueChangeTypes>
@@ -102,14 +102,17 @@
</entityConsumer>
<entityField>
<name>campaignStepCurrentParticipantCount</name>
+ <documentation>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/documentation.adoc</documentation>
<title>Current participants</title>
<state>EDITABLE</state>
<displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>campaignStepMaxParticipantCount</name>
+ <documentation>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/documentation.adoc</documentation>
<title>Max participants</title>
<state>EDITABLE</state>
+ <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
@@ -138,13 +141,25 @@
<state>DISABLED</state>
<stateProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/addparticipants/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>campaignparticipantContactIds</name>
+ <documentation>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/documentation.adoc</documentation>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>comingFrom_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<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>
<recordFieldMappings>
<jDitoRecordFieldMapping>
<name>UID.value</name>
diff --git a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
index bbf377c5c3803bd9e8c294d1de8ce1ccca72e0d6..da55ecfd803c8c1409ddc353064db1f037f49583 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
@@ -22,7 +22,7 @@ if(participantRowIds != null && participantRowIds.length > 0)
let contactIdsToHandle = participantRowIds;
if(isUpdate == "false")
- contactIdsToHandle = CampaignUtils.GetContactIdsNotInCampaignByRowIds(campaignId, participantRowIds);
+ contactIdsToHandle = vars.get("$field.campaignparticipantContactIds");
_handleRowIds(contactIdsToHandle, campaignId);
}
@@ -97,7 +97,7 @@ function _handleRowIds(pParticipantRowIds, pCampaignId)
let statementArray = [];
let logArray = [];
- for (participant in pParticipantRowIds)
+ for (let participant in pParticipantRowIds)
{
let campaignParticipantLogId = util.getNewUUID();
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/documentation.adoc b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d5d2cbde80798127495f89dcbf32fb7fbfc51cc8
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/documentation.adoc
@@ -0,0 +1,3 @@
+== campaignparticipantContactIds;
+
+The ContactIds or OrganisationIds of the selected/filtered records.
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e831ec632cbba7601e7085e0e59fdbf772e58725
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js
@@ -0,0 +1,29 @@
+import("Campaign_lib");
+import("system.eMath");
+import("FilterviewMenuAction_lib");
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if(vars.get("$field.CAMPAIGN_ID"))
+{
+ var comingfrom = vars.getString("$param.dataSourceTableName_param");
+ var contactIds;
+ var filteredContactIds;
+ var selection = vars.getString("$param.campaignParticipantsRowIds_param");
+
+ if(vars.exists("$param.campaignParticipantsCondition_param") && vars.get("$param.campaignParticipantsCondition_param"))
+ {
+ selection = JSON.parse(vars.getString("$param.campaignParticipantsCondition_param")).condition;
+ if(comingfrom == "Organisation")
+ filteredContactIds = FilterviewMenuActionUtils.organisationIdsFilter(selection);
+ else if(comingfrom == "Person")
+ filteredContactIds = FilterviewMenuActionUtils.contactIdsFilter(selection)
+ contactIds = CampaignUtils.GetContactIdsNotInCampaignByRowIds(vars.get("$field.CAMPAIGN_ID"), filteredContactIds);
+ }
+ else
+ {
+ contactIds = CampaignUtils.GetContactIdsNotInCampaignByRowIds(vars.get("$field.CAMPAIGN_ID"), JSON.parse(selection));
+ }
+ result.string(JSON.stringify(contactIds));
+}
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b08b067a18d8abf3bfcb5b27d61390176a9141de
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
@@ -0,0 +1,36 @@
+import("system.eMath");
+import("FilterviewMenuAction_lib");
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+var res = "";
+var resNotAdded = "\n\
+";
+if(vars.get("$field.CAMPAIGN_ID") && vars.get("$field.campaignparticipantContactIds") && !vars.get("$sys.validationerrors"))
+{
+ var validCount = JSON.parse(vars.get("$field.campaignparticipantContactIds")).length;
+ var selectedIds;
+ var comingfrom = vars.get("$param.dataSourceTableName_param");
+
+ if (validCount && !vars.get("$sys.validationerrors") && vars.get("$field.CAMPAIGN_ID"))
+ {
+ if (validCount != 0)
+ {
+ res = translate.withArguments("%0 new participants will be added to the campaign.", [validCount]);
+ if(vars.exists("$param.campaignParticipantsRowIds_param") && vars.getString("$param.campaignParticipantsRowIds_param"))
+ selectedIds = JSON.parse(vars.getString("$param.campaignParticipantsRowIds_param")).length;
+ else
+ {
+ var selection = JSON.parse(vars.getString("$param.campaignParticipantsCondition_param")).condition;
+ if(comingfrom == "Organisation")
+ selectedIds = FilterviewMenuActionUtils.organisationIdsFilter(selection).length;
+ else if(comingfrom == "Person")
+ selectedIds = FilterviewMenuActionUtils.contactIdsFilter(selection).length;
+ }
+ var alreadyParticipant = eMath.subInt(selectedIds, validCount)
+ resNotAdded += translate.withArguments("%0 of the chosen records are already in the campaign", [alreadyParticipant]);
+ }
+ }
+}
+result.string(res + resNotAdded);
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValueChange.js b/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValueChange.js
deleted file mode 100644
index 20f59c4bac6dd3416e26c27959f49ce0be78d680..0000000000000000000000000000000000000000
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValueChange.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.neon");
-neon.refresh(["$field.campaignParticipantMessage"])
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/documentation.adoc b/entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..223c3e99d1b36fc7eac1298a7bd629b6f491eaf9
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/documentation.adoc
@@ -0,0 +1,2 @@
+== campaignStepCurrentParticipantCount;
+needed for the score card, to display extra information.
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/documentation.adoc b/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..cc579ceb749024fa9a933344a3d38d0e6ca4920e
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/documentation.adoc
@@ -0,0 +1,2 @@
+== campaignStepMaxParticipantCount;
+needed for the score card, to display extra information.
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..824a3331dba66661c7d1108166e08d31c4d3ad6a
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("Campaign_lib");
+
+if(vars.get("$field.CAMPAIGNSTEP_ID"))
+ result.string(CampaignUtils.getMaxParticipantCountForStep(vars.get("$field.CAMPAIGNSTEP_ID")));
+else
+ result.string(0)
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
index 47fb5627a5b21a786a83cdb783128ca40cdfcdfc..512ffebcbe138c38a1bb1d1160217ff6fc6d8e69 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
@@ -111,7 +111,6 @@ if(selectedCampaignId != '')
resultValue = "true";
}
}
- neon.setFieldValue("$field.campaignParticipantMessage", messageString);
result.string(resultValue);
}
diff --git a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js
deleted file mode 100644
index e197aca8b7760073849e21fb581b065c47215654..0000000000000000000000000000000000000000
--- a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.vars");
-
-//TODO: This dummy implementation shouldn't be nescessary here. Remove this process eventually. #1051003
-var rows = [];
-if (vars.get("$local.idvalues"))
- rows = vars.get("$local.idvalues").map(function (id) {return [id];});
-
-result.object(rows);
\ No newline at end of file
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index 5a8389da5c7b44b7da7429e0fa450c213078b9f4..137b70c4aa991ae7a2e366e78c7658701dd62d68 100644
--- a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
+++ b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>CampaignAnalysis_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignAnalysis_entity/documentation.adoc</documentation>
@@ -109,6 +109,10 @@
<name>Currency</name>
<valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/currency/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
index 7ee286a6e7eb4f60ced34836fcdcf1c3c013264c..de366ec455d550396f8e3fbbbb404e73f7c8b02b 100644
--- a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
+++ b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>CampaignCostChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignCostChart_entity/documentation.adoc</documentation>
@@ -42,6 +42,10 @@
</entityDependency>
</dependencies>
</entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index b60d5661605b282cdd6e811d37b77972c734ec3d..2af24acc0d0ade0e8fbe9d0df0397c5b4c1a2ced 100644
--- a/entity/CampaignCost_entity/CampaignCost_entity.aod
+++ b/entity/CampaignCost_entity/CampaignCost_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>CampaignCost_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignCost_entity/documentation.adoc</documentation>
@@ -184,17 +184,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityActionGroup>
- <name>alter</name>
- <children>
- <entityActionField>
- <name>edit</name>
- <onActionProcess>%aditoprj%/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
- <iconId>NEON:PENCIL</iconId>
- </entityActionField>
- </children>
- </entityActionGroup>
<entityParameter>
<name>CampaignId_param</name>
<expose v="true" />
@@ -243,6 +232,10 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/CampaignCost_entity/entityfields/currency/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js
deleted file mode 100644
index 2f19601f3e8f533982bac2823f085588c6f8dd7e..0000000000000000000000000000000000000000
--- a/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.vars");
-
-var params = {
- "Uid_param" : vars.get("$sys.uid")
-}
-neon.openContext("CampaignCost", "CampaignCostEdit_view", null, neon.OPERATINGSTATE_EDIT, params);
\ No newline at end of file
diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
index 4ce08409c199f576dc8301bd97d6d07fac283306..9f4d833b4dd531b6cd9df80f061ed1cd12be9704 100644
--- a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
+++ b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>CampaignParticipantChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignParticipantChart_entity/documentation.adoc</documentation>
@@ -44,6 +44,10 @@
<mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 8905d49054e0f73bac14cc2798d6071a9b0b338f..d6224666455e9a5cd83cec9e3a0a03cb60ccc19c 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>CampaignParticipant_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignParticipant_entity/documentation.adoc</documentation>
@@ -186,7 +186,7 @@
<entityField>
<name>campaignStepMaxParticipantCount</name>
<title>Max participants</title>
- <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
+ <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ADVERTISINGBAN_ICON</name>
@@ -226,6 +226,10 @@
<title>Phone</title>
<state>READONLY</state>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js b/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
index 07c57c1e196e3db902ee7f56434ab85cdcda55af..6db4d90300246ab7382bfbcf8db4efe6ec9572e7 100644
--- a/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
+++ b/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
@@ -4,6 +4,6 @@ import("system.vars");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
- var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("local.value"));
+ var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("$local.value"));
neon.setFieldValue("$field.CAMPAIGNSTEP_ID", stepId);
}
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js b/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js
deleted file mode 100644
index eb835646c71fb97012fc1d90d0e8d8c144b04064..0000000000000000000000000000000000000000
--- a/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Campaign_lib");
-
-result.string(CampaignUtils.getMaxParticipantCountForStep(vars.get("$field.CAMPAIGNSTEP_ID")));
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js b/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..824a3331dba66661c7d1108166e08d31c4d3ad6a
--- /dev/null
+++ b/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("Campaign_lib");
+
+if(vars.get("$field.CAMPAIGNSTEP_ID"))
+ result.string(CampaignUtils.getMaxParticipantCountForStep(vars.get("$field.CAMPAIGNSTEP_ID")));
+else
+ result.string(0)
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js b/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js
deleted file mode 100644
index f5825a6c09c99e0530939a270bcd81cfbc0c2d5b..0000000000000000000000000000000000000000
--- a/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js b/entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js
deleted file mode 100644
index 2bf64744b6548030c6db0cb825f376192bfdf5e1..0000000000000000000000000000000000000000
--- a/entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.neon");
-
-
-neon.setFieldValue("$field.SYSTEMTEMPLATE", templateId);
\ No newline at end of file
diff --git a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
index 051deb0ceea090c270fb0b24b3896c9ec9959094..2de87bf6e8cb49f4aa8850d0674b0e85d81a2767 100644
--- a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
+++ b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>CampaignPlanning_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignPlanning_entity/documentation.adoc</documentation>
@@ -92,6 +92,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 4b36e31d21405f4df2a56b34fd8bc4fd6b32b80a..3d7c9f806c352bfc9482f5053276afb8d7d19479 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>CampaignStep_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignStep_entity/documentation.adoc</documentation>
@@ -414,6 +414,10 @@
<expose v="true" />
<documentation>%aditoprj%/entity/CampaignStep_entity/entityfields/predecessorstepid_param/documentation.adoc</documentation>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -461,6 +465,7 @@
<dbRecordFieldMapping>
<name>NAME.value</name>
<recordfield>CAMPAIGNSTEP.NAME</recordfield>
+ <isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SORTING.value</name>
diff --git a/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js b/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
index b91c3634ae7fa3229e120ed364433b3f7787b276..04d8b224fd5596fc97753ed1afd61ad16cee5b4c 100644
--- a/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
@@ -3,5 +3,5 @@ import("system.result");
import("system.vars");
//For creation of new Step in CampaignMainView
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.campaignId_param") && vars.get("$param.campaignId_param"))
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.campaignId_param") && vars.get("$param.campaignId_param") && !vars.get("$this.value"))
result.string(vars.get("$param.campaignId_param"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js b/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
deleted file mode 100644
index f0e8a44adee3749dafae8e5cba1b67c52701e01a..0000000000000000000000000000000000000000
--- a/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.campaignStepState(), "CAMPAIGNSTEP.STATUS");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index a9420fd4fbb060bb56b80f2efa888981a719029e..d53f98b1c051076175ed65fda62b0ca261df1d52 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Campaign_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Campaign_entity/documentation.adoc</documentation>
@@ -14,6 +14,7 @@
<grantDeleteProcess>%aditoprj%/entity/Campaign_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Campaign_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Campaign_entity/afterUiInit.js</afterUiInit>
+ <useFavorites v="true" />
<iconId>VAADIN:GROUP</iconId>
<imageProcess>%aditoprj%/entity/Campaign_entity/imageProcess.js</imageProcess>
<titlePlural>Campaigns</titlePlural>
@@ -51,8 +52,7 @@
<title>Start</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
- <outputFormat></outputFormat>
- <inputFormat></inputFormat>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_start/valueProcess.js</valueProcess>
</entityField>
@@ -517,6 +517,26 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>CAMPAIGN_OBEJCTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaign_obejcttype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>PersonConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>OrganisationConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
<entityField>
<name>COUNT</name>
<title>Count</title>
@@ -527,18 +547,23 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
- <name>f3893829-3af2-4e55-ae85-c3a24411a8b8</name>
+ <name>f95b8870-15cd-4302-99ec-8a104ae2262d</name>
<tableName>CAMPAIGN</tableName>
<primaryKey>CAMPAIGNID</primaryKey>
<isUIDTable v="true" />
@@ -558,13 +583,13 @@
<name>DESCRIPTION.value</name>
<recordfield>CAMPAIGN.DESCRIPTION</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>EMPLOYEE_CONTACT_ID.value</name>
<recordfield>CAMPAIGN.EMPLOYEE_CONTACT_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NAME.value</name>
@@ -592,13 +617,13 @@
<name>DATE_START.value</name>
<expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js</expression>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_END.value</name>
<expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js</expression>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<consumerMapping>
<name>Activities</name>
@@ -610,7 +635,7 @@
<name>STATUS.value</name>
<recordfield>CAMPAIGN.STATUS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.displayValue</name>
@@ -624,15 +649,23 @@
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>COUNT.value</name>
- <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
- </dbRecordFieldMapping>
<aggregateFieldDbMapping>
<name>COUNT_aggregate.value</name>
<recordfield>CAMPAIGN.CAMPAIGNID</recordfield>
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
+ <consumerMapping>
+ <name>PersonConsumer</name>
+ <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/personconsumer/filterConditionProcess.js</filterConditionProcess>
+ <isFilterable v="true" />
+ <filtertype>BASIC</filtertype>
+ </consumerMapping>
+ <consumerMapping>
+ <name>OrganisationConsumer</name>
+ <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/organisationconsumer/filterConditionProcess.js</filterConditionProcess>
+ <isFilterable v="true" />
+ <filtertype>BASIC</filtertype>
+ </consumerMapping>
</recordFieldMappings>
<filterExtensions>
<filterExtensionSet>
@@ -642,6 +675,44 @@
<filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
<filtertype>BASIC</filtertype>
</filterExtensionSet>
+ <filterExtension>
+ <name>DateStart_filter</name>
+ <title>Startdatum</title>
+ <contentType>DATE</contentType>
+ <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js</filterConditionProcess>
+ <filtertype>BASIC</filtertype>
+ </filterExtension>
+ <filterExtension>
+ <name>DateEnd_filter</name>
+ <title>Enddatum</title>
+ <contentType>DATE</contentType>
+ <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/dateend_filter/filterConditionProcess.js</filterConditionProcess>
+ <filtertype>BASIC</filtertype>
+ </filterExtension>
+ <filterExtension>
+ <name>Participant_filter</name>
+ <title>Participants</title>
+ <contentType>TEXT</contentType>
+ <filterValuesProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterValuesProcess.js</filterValuesProcess>
+ <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterConditionProcess.js</filterConditionProcess>
+ <filtertype>BASIC</filtertype>
+ </filterExtension>
+ <filterExtension>
+ <name>CampaignStep_filter</name>
+ <title>Steps</title>
+ <contentType>TEXT</contentType>
+ <filterValuesProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterValuesProcess.js</filterValuesProcess>
+ <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterConditionProcess.js</filterConditionProcess>
+ <filtertype>BASIC</filtertype>
+ </filterExtension>
+ <filterExtension>
+ <name>Member_filter</name>
+ <title>Members</title>
+ <contentType>TEXT</contentType>
+ <filterValuesProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js</filterValuesProcess>
+ <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterConditionProcess.js</filterConditionProcess>
+ <filtertype>BASIC</filtertype>
+ </filterExtension>
</filterExtensions>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Campaign_entity/entityfields/campaign_obejcttype/valueProcess.js b/entity/Campaign_entity/entityfields/campaign_obejcttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2377055cd4a75ec7ce753a700248b5b215b93a75
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/campaign_obejcttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Campaign");
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
index 5f3455bc5b51c66cf6a7cd0ed14899bc09356fd9..80bfe7f5212f2df2dac845d90873e9f2315c379d 100644
--- a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
@@ -1,11 +1,19 @@
-import("Employee_lib");
import("system.db");
import("system.result");
-import("Sql_lib");
import("system.vars");
+import("Employee_lib");
+import("Sql_lib");
+
if(vars.get("$param.ShowOnlyCurrentUsersCampaigns_param") == 'true')
{
//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
result.string(newWhere("CAMPAIGN.EMPLOYEE_CONTACT_ID", EmployeeUtils.getCurrentContactId()).toString());
+} else {
+ var condition = new SqlBuilder()
+ .whereIfSet("STEPDATESTART_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+ .andIfSet("STEPDATEEND_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+ ;
+
+ result.string(condition.toString());
}
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d0dddcc8b370c4307bd88e167744ee1c2be730ac
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterConditionProcess.js
@@ -0,0 +1,27 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+import("Util_lib");
+import("Campaign_lib");
+
+
+var valueSubSelect = "(select CAMPAIGNSTEPID from CAMPAIGNSTEP where CAMPAIGN.CAMPAIGNID = CAMPAIGNSTEP.CAMPAIGN_ID)";
+var countSubSelect = "(select count(*) from CAMPAIGNSTEP where CAMPAIGNSTEP.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID)";
+var condition = "";
+
+switch(vars.get("$local.comparison")) {
+ case "ISNOTNULL":
+ condition = countSubSelect + " > 0";
+ break;
+ case "ISNULL":
+ condition = countSubSelect + " = 0";
+ break;
+ case "NOT_EQUAL":
+ condition = vars.get("$local.value") + " not in " + valueSubSelect;
+ break;
+ case "EQUAL":
+ condition = vars.get("$local.value") + " in " + valueSubSelect;
+ break;
+}
+
+result.object(condition);
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterValuesProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..13b3ff34c39b81bad62a1a11c9ade92ac14078fc
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterValuesProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("Sql_lib");
+
+
+var campaignStepValues = new SqlBuilder()
+ .select("CAMPAIGNSTEPID, NAME")
+ .from("CAMPAIGNSTEP")
+ .orderBy("NAME")
+ .table();
+
+result.object(campaignStepValues);
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/dateend_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/dateend_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c5895859892cd384192c63b347d7c054bb6efc3d
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/dateend_filter/filterConditionProcess.js
@@ -0,0 +1,17 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+import("Util_lib");
+
+
+var subSelect = new SqlBuilder()
+ .select("max(CAMPAIGNSTEP.DATE_END)")
+ .from("CAMPAIGNSTEP")
+ .where("CAMPAIGNSTEP.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+ .toString();
+
+subSelect = "(" + subSelect + ")";
+
+var condition = StringUtils.replaceAll(vars.get("$local.condition"), vars.get("$local.columnPlaceholder"), subSelect);
+
+result.object(condition);
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d15b9e58f29554efe52a565d2033e5ba2f448ab
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js
@@ -0,0 +1,17 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+import("Util_lib");
+
+
+var subSelect = new SqlBuilder()
+ .select("min(CAMPAIGNSTEP.DATE_START)")
+ .from("CAMPAIGNSTEP")
+ .where("CAMPAIGNSTEP.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+ .toString();
+
+subSelect = "(" + subSelect + ")";
+
+var condition = StringUtils.replaceAll(vars.get("$local.condition"), vars.get("$local.columnPlaceholder"), subSelect);
+
+result.object(condition);
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..48c84a8dcbb02d59429f6b681c2186b3c1767b6b
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterConditionProcess.js
@@ -0,0 +1,26 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+import("Util_lib");
+
+
+var valueSubSelect = "(select CONTACT_ID from OBJECTMEMBER where OBJECTMEMBER.OBJECT_ROWID = CAMPAIGN.CAMPAIGNID)";
+var countSubSelect = "(select count(*) from OBJECTMEMBER where OBJECTMEMBER.OBJECT_ROWID = CAMPAIGN.CAMPAIGNID)";
+var condition = "";
+
+switch(vars.get("$local.comparison")) {
+ case "ISNOTNULL":
+ condition = countSubSelect + " > 0";
+ break;
+ case "ISNULL":
+ condition = countSubSelect + " = 0";
+ break;
+ case "NOT_EQUAL":
+ condition = vars.get("$local.value") + " not in " + valueSubSelect;
+ break;
+ case "EQUAL":
+ condition = vars.get("$local.value") + " in " + valueSubSelect;
+ break;
+}
+
+result.object(condition);
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..569b13dcd324261da56d6e462a80f7b0a718c1df
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("Sql_lib");
+import("Person_lib");
+
+
+var query = new SqlBuilder()
+ .select("OBJECTMEMBER.CONTACT_ID, (" + PersUtils.getResolvingDisplaySubSql("OBJECTMEMBER.CONTACT_ID") + ") as C")
+ .from("OBJECTMEMBER")
+ .join("CAMPAIGN", "OBJECTMEMBER.OBJECT_ROWID = CAMPAIGN.CAMPAIGNID")
+ .join("CONTACT", "OBJECTMEMBER.CONTACT_ID = CONTACT.CONTACTID")
+ ;
+
+result.object(query.table());
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..be23e1087b366a1211fadd6672a3ac0a0e9de033
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterConditionProcess.js
@@ -0,0 +1,26 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+import("Util_lib");
+
+
+var valueSubSelect = "(select CONTACT_ID from CAMPAIGNPARTICIPANT where CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID)";
+var countSubSelect = "(select count(*) from CAMPAIGNPARTICIPANT where CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID)";
+var condition = "";
+
+switch(vars.get("$local.comparison")) {
+ case "ISNOTNULL":
+ condition = countSubSelect + " > 0";
+ break;
+ case "ISNULL":
+ condition = countSubSelect + " = 0";
+ break;
+ case "NOT_EQUAL":
+ condition = vars.get("$local.value") + " not in " + valueSubSelect;
+ break;
+ case "EQUAL":
+ condition = vars.get("$local.value") + " in " + valueSubSelect;
+ break;
+}
+
+result.object(condition);
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterValuesProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0ff2d9c975bfceec9ad15b02e8b0a921abf3081b
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterValuesProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("Sql_lib");
+import("Person_lib");
+
+
+var contactDisplaySelect = "case when CONTACT.PERSON_ID is null"
+ + " then (select ORGANISATION.NAME FROM ORGANISATION join CONTACT on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID where CONTACT.CONTACTID = CAMPAIGNPARTICIPANT.CONTACT_ID)"
+ + " else (" + PersUtils.getResolvingDisplaySubSql("CAMPAIGNPARTICIPANT.CONTACT_ID") + ")"
+ + " end";
+var query = new SqlBuilder()
+ .select("distinct CAMPAIGNPARTICIPANT.CONTACT_ID, (" + contactDisplaySelect + ") as C")
+ .from("CAMPAIGNPARTICIPANT")
+ .join("CONTACT on CAMPAIGNPARTICIPANT.CONTACT_ID = CONTACT.CONTACTID", "", "", "inner")
+ ;
+
+result.object(query.table());
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js b/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5eec4c678e0303f56f160d22534f7c2fbe2bd302
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+var recordState = vars.get("$sys.recordstate");
+var res = "CAMPAIGN";
+
+if (recordState != neon.OPERATINGSTATE_NEW && recordState != neon.OPERATINGSTATE_EDIT) {
+ var subSelectDateStart = "(select min(DATE_START) as STEPDATESTART_ALIAS, CAMPAIGN_ID from CAMPAIGNSTEP group by CAMPAIGN_ID) as STEPDATESTART_TABLEALIAS";
+ var subSelectDateEnd = "(select max(DATE_END) as STEPDATEEND_ALIAS, CAMPAIGN_ID from CAMPAIGNSTEP group by CAMPAIGN_ID) as STEPDATEEND_TABLEALIAS";
+
+ res += ", " + subSelectDateStart + ", " + subSelectDateEnd;
+}
+
+result.string(res);
diff --git a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js
index ace40927ffdb20b663900cf4e9d2366690e8a66f..11c77729428dc5d1d87aa9a2a1e4a46366a4c9e1 100644
--- a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js
+++ b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js
@@ -1,3 +1,4 @@
import("system.result");
-result.string("(select max(DATE_END) from campaignstep where campaign_id = campaignid)");
\ No newline at end of file
+
+result.string("STEPDATEEND_ALIAS");
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js
index bf0fecca3cb5c6eb05471b61c1c89135d7314ffa..ab23a74c472325d5e8bfd26ddf91f1687fbbf718 100644
--- a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js
+++ b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js
@@ -1,3 +1,4 @@
import("system.result");
-result.string("(select min(DATE_START) from campaignstep where campaign_id = campaignid)");
\ No newline at end of file
+
+result.string("STEPDATESTART_ALIAS");
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/organisationconsumer/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/organisationconsumer/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0d442ba6a67ca572b6d39d5ec3fc18240c514e60
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/organisationconsumer/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.result");
+
+
+//it's necessary to join the organistion-contact since you may want to search for things like status, language, etc. from an organisation
+var from = "CAMPAIGNPARTICIPANT"
+ + " join CONTACT on (CONTACT.CONTACTID = CAMPAIGNPARTICIPANT.CONTACT_ID)"
+ + " join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID)"
+;
+
+result.string("CAMPAIGNID in (select CAMPAIGNPARTICIPANT.CAMPAIGN_ID from " + from + " where " + vars.get("$local.condition")+ ")");
diff --git a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/personconsumer/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/personconsumer/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bab6edf775eaa0affc6a192912814173c5e28a2d
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/personconsumer/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.result");
+
+
+//it's necessary to join the person-contact since you may want to search for things like status, language, etc. from an organisation
+var from = "CAMPAIGNPARTICIPANT"
+ + " join CONTACT on (CONTACT.CONTACTID = CAMPAIGNPARTICIPANT.CONTACT_ID)"
+ + " join PERSON on (PERSON.PERSONID = CONTACT.PERSON_ID)"
+;
+
+result.string("CAMPAIGNID in (select CAMPAIGNPARTICIPANT.CAMPAIGN_ID from " + from + " where " + vars.get("$local.condition")+ ")");
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index 20d8afd44791a32ce10d69690f979999a47f9fc6..dc74f4716b87e075d26e2926315c508bdf77726c 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -1,18 +1,22 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ClassificationAdmin_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ClassificationAdmin_entity/documentation.adoc</documentation>
<icon>VAADIN:LIST_OL</icon>
<title>Classification</title>
+ <grantUpdateProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/ClassificationAdmin_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:LIST_OL</iconId>
+ <iconIdProcess>%aditoprj%/entity/ClassificationAdmin_entity/iconIdProcess.js</iconIdProcess>
<titlePlural>Classifications</titlePlural>
- <recordContainer>db</recordContainer>
+ <recordContainer>jDito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
+ <targetContextField>TARGET_CONTEXT</targetContextField>
+ <targetIdField>TARGET_ID</targetIdField>
</entityProvider>
<entityParameter>
<name>ClassificationType_param</name>
@@ -34,105 +38,129 @@
</entityParameter>
<entityField>
<name>CLASSIFICATIONTYPEID</name>
+ <title>Indicator</title>
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>CLASSIFICATIONGROUP</name>
- <title>Group</title>
+ <title>Classification</title>
<contentType>TEXT</contentType>
<groupable v="true" />
- <mandatoryProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js</mandatoryProcess>
+ <mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
- <titleProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js</onValidation>
</entityField>
- <entityConsumer>
- <name>KeywordClassificationTypes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>ClassificationScores</name>
- <state>EDITABLE</state>
- <dependency>
- <name>dependency</name>
- <entityName>ClassificationScore_entity</entityName>
- <fieldName>ClassificationScores</fieldName>
- </dependency>
+ <entityParameter>
+ <name>group_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityField>
+ <name>CLASSIFICATION_PARENT_ID</name>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>OBJECT_TYPE</name>
+ <title>Place Of Use</title>
+ <mandatory v="true" />
+ <dropDownProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_type/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>TARGET_CONTEXT</name>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TARGET_ID</name>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/target_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityActionGroup>
+ <name>FilterviewActionGroup</name>
<children>
- <entityParameter>
- <name>ClassificationGroup_param</name>
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ClassificationTypeId_param</name>
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ClassificationType_param</name>
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js</valueProcess>
- </entityParameter>
+ <entityActionField>
+ <name>UpdateClassification</name>
+ <title>Recalculate all Classifications</title>
+ <onActionProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/filterviewactiongroup/children/updateclassification/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:AUTOMATION</iconId>
+ </entityActionField>
</children>
- </entityConsumer>
+ </entityActionGroup>
<entityField>
- <name>CLASSIFICATIONTYPE</name>
- <title>Usage</title>
- <consumer>KeywordClassificationTypes</consumer>
- <groupable v="true" />
+ <name>SORTING</name>
+ <title>Sorting</title>
+ <contentType>NUMBER</contentType>
<mandatory v="true" />
- <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js</displayValueProcess>
+ <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/sorting/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/sorting/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>SCORETYPE</name>
- <title>Scoretype</title>
+ <name>CLASSIFICATIONTYPEIDDISPLAYVALUE</name>
+ <title>Indicator</title>
<mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
+ <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>recordCategory</name>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/recordcategory/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <orderClauseProcess>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>2f70bf47-42e3-40a2-b076-0da34cfb80d9</name>
- <tableName>CLASSIFICATIONTYPE</tableName>
- <primaryKey>CLASSIFICATIONTYPEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <jDitoRecordContainer>
+ <name>jDito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <hasDependentRecords v="false" />
+ <onInsert>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFieldMappings>
- <dbRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATION_PARENT_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
<name>CLASSIFICATIONGROUP.value</name>
- <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONGROUP</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SCORETYPE.value</name>
- <recordfield>CLASSIFICATIONTYPE.SCORETYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CLASSIFICATIONTYPE.value</name>
- <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONTYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONGROUP.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
<name>CLASSIFICATIONTYPEID.value</name>
- <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID</recordfield>
- </dbRecordFieldMapping>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONTYPEID.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OBJECT_TYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OBJECT_TYPE.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SORTING.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>recordCategory.value</name>
+ </jDitoRecordFieldMapping>
</recordFieldMappings>
- </dbRecordContainer>
+ </jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/ClassificationAdmin_entity/contentTitleProcess.js b/entity/ClassificationAdmin_entity/contentTitleProcess.js
index 2031cfeaec00a131c455e4152bb6917b74d6e85f..9cedc1b443b456616494927893d95f000ee5532c 100644
--- a/entity/ClassificationAdmin_entity/contentTitleProcess.js
+++ b/entity/ClassificationAdmin_entity/contentTitleProcess.js
@@ -1,4 +1,10 @@
-import("system.vars");
import("system.result");
+import("system.vars");
+
+var objectType = vars.get("$field.OBJECT_TYPE.displayValue");
+var classificationGroupTitle = vars.get("$field.CLASSIFICATIONGROUP.displayValue");
+var classificationTypeTitle = vars.get("$field.CLASSIFICATIONTYPEID.displayValue");
+
+var res = objectType || classificationGroupTitle || classificationTypeTitle || "";
-result.string(vars.get("$field.CLASSIFICATIONTYPE.displayValue"))
\ No newline at end of file
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/documentation.adoc b/entity/ClassificationAdmin_entity/documentation.adoc
index f54fafb3971823af90b05751146b05b0840ba92e..390fb4c5dca8e222225334788788753279bc5d4b 100644
--- a/entity/ClassificationAdmin_entity/documentation.adoc
+++ b/entity/ClassificationAdmin_entity/documentation.adoc
@@ -1,3 +1,75 @@
= ClassificationAdmin_entity
-The administrative representation of the classification which is used among other things in the sales project (see also Classification_entity)
\ No newline at end of file
+Definition:
+
+ The administrative representation of the classification which is used among other things in the sales project and organisation (see also Classification_entity)
+ The classification can be dynamically configured at runtime.
+
+Purpose:
+
+ This Entity gives the administrators an easy way to change the classification.
+ Classifications get stored in the Classification table with their own uid, the ids of the classification type, classification score, object_rowId and object_type.
+
+ This entity displays the classifications (classificationGroup) and indicators (classificationType) grouped with the usage (object_type) in an treetable.
+ with the usage (object_type) as the first group, followed by the classifications (classificationgroup) of that group and it's indicators.
+ The grading of the classification can be changed in the preview of an classification.
+ The possible values of an indicator can be changed when opening the preview of the indicator.
+
+ TreeTable Example:
+
+ USAGE CLASSIFICATION INDICATOR
+ Organisation
+ 1. Target Group
+ Industry
+ Headquarters
+ Product preference
+ 2. Customer value
+ Salesproject
+ 1. Classification
+ 2. Classification
+ 3. Classification
+
+Particularities:
+
+ The classification gets updated via the "updateClassifications_serverProcess", which runs periodically,
+ you can also start it manually using the action of this entity (currently invisible).
+
+ The Classification consists of the following entities:
+ Classification_entity,
+ ClassificationAdmin_entity,
+ ClassificationGrading_entity,
+ ClassificationGroup_entity,
+ ClassificationScore_entity,
+ ClassificationType_entity
+
+ Our terms in the db and entity structure differ from the technical terms the user gets to see, to make it easier to understand
+ for the developer that doesn't have the technical know-how:
+
+ Our term: Technical term: Example:
+ Object_Type Usage Organisation
+ ClassificationGroup Classification 1. Target Group
+ ClassificationType Indicator Industry
+ ClassificationScore (Possible-)Value/Selection Service
+
+Adding the classification to other modules:
+
+ The Classification is only implemented for Organisation and Salesproject at the moment but can easily be used in other modules aswell by doing the following:
+
+ Add the Consumers "Classifications" and "ClassificationGroups" to the module you want to add the classification functionality
+ and configure them the same way as in organisation and salesproject.
+ If you want to also have the classification in the preview and Filterview you also have to add the field "CLASSIFICATIONSTORAGE_ID"
+ and configure the following things:
+ -add CLASSIFICATIONSTORAGE at the Linkinformation of the recordContainer (Primary key: CLASSIFICATIONSTORAGEID, UID Table: false, Read only: true)
+ -add the left join in the fromClauseProcess to CLASSIFICATIONSTORAGE using CLASSIFICATIONSTORAGE.OBJECT_ROWID = TableName.TableUid
+ -add the recordfieldmapping to the field (CLASSIFICATIONSTORAGE.CLASSIFICATIONSTORAGEID)
+ -add the CLASSIFICATIONSTORAGE_ID to the Filterview and Preview
+ Add the reference to the ClassificationView to the Mainview Context (see als organsiation and salesproject)
+
+ Extend the Keywordregistry and the classificationTypes in AB_KEYWORD_ENTRY by the new Module you are implementing the classification for.
+ Also extend the CLASSIFICATIONADMIN_entity.CLASSIFICATIONTYPEPLACEOFUSE DropDownProcess.
+ Add ClassificationUtils.insertEmptyClassification() with the Uid und vars.get("$sys.currentcontextname") to the onInsert of the Module
+ and also add the delete conditon to the onDelete (newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID", eigeneUid).deleteData();)
+ !Important: if you are adding or deleting these datasets you always have to also insert/delete the dataset into CLASSIFICATIONSTORAGE entry,
+ so add the above mentioned delete condition and onInsertFunction to all actions that delete/create those datasets.!
+
+ Now you can either configure your classifications in the client or via liquibase
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js
index 4fb0aeb79a76fae66af37083cc83e38fc26d051e..ebda1413e2f9de5fcc2e42e7d505fe0ac1a1d786 100644
--- a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js
@@ -1,5 +1,9 @@
import("system.vars");
-import("system.translate");
+import("Context_lib");
import("system.result");
-result.string(translate.text(vars.get("$field.CLASSIFICATIONGROUP")));
\ No newline at end of file
+var groupId = vars.get("$field.CLASSIFICATIONGROUP");
+if(groupId != "" && groupId != undefined)
+ result.string(ContextUtils.loadContentTitle("ClassificationGroup_entity", groupId));
+else
+ result.string("")
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js
index 6c4ff0ba3d89251bc6d64bbce56aed7d53932d33..917fbdf4fd535892b9a297d66d82bd0e16e21c92 100644
--- a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js
@@ -1,13 +1,16 @@
-import("system.logging");
import("Classification_lib");
import("system.neon");
import("system.vars");
-import("system.db");
import("system.result");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+//no Translation since the same logic as in the Keywords applies (Admin User is able to change the title)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
- var classificationType = vars.get("$field.CLASSIFICATIONTYPE")
- if (classificationType)
- result.object(ClassificationUtils.getAllGroups(classificationType, true));
+ var objectType = vars.get("$field.OBJECT_TYPE")
+ if (objectType)
+ {
+ var obj = ClassificationUtils.getAllGroups(objectType);
+
+ result.object(obj);
+ }
}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js
deleted file mode 100644
index 7bbc5aa02d8beaf00c4458e4297646209f00ad91..0000000000000000000000000000000000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-result.object(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js
deleted file mode 100644
index 52077bf9d455c013960c8ec4d139b1fb1be0861b..0000000000000000000000000000000000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import("system.neon");
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("Classification_lib");
-import("Entity_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-{
- var newGroup = vars.get("local.value");
-
- // use param if available or current selectionRows
- var classificationType = ClassificationUtils.getUsageType("$param.ClassificationType_param", "$sys.selectionRows");
-
- if (classificationType)
- {
- var groups = ClassificationUtils.getAllGroups(classificationType, false)
-
- if (groups.indexOf(newGroup, 0) != -1 && ClassificationUtils.getGroupFromDb(vars.get("$field.CLASSIFICATIONTYPEID")) != newGroup)
- {
- //result.string(translate.text("The new Classification name already exists."));
- }
- }
- else
- {
- result.string(translate.text("Could not determine the current Classification type (usage)."));
- }
-}
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js
deleted file mode 100644
index de080516afe4fe1620bf99bbd2dd36fe97d7e62a..0000000000000000000000000000000000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.neon");
-import("system.translate");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- result.string(translate.text("Group"));
-}
-else
-{
- result.string(translate.text("Group name"));
-}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cffd6f2044378635903b26620a407559cbe19f58
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js
@@ -0,0 +1,34 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Sql_lib");
+
+if(!vars.get("$this.value") && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ var sysSelection = vars.get("$sys.selection");
+ var uid = vars.get("$field.UID");
+ var id;
+ if(sysSelection.length > 0)
+ {
+ var res;
+ var value = vars.get("$field.CLASSIFICATION_PARENT_ID");
+ if(value)
+ {
+ if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
+ id = text.decodeMS(uid)[1];
+ else
+ {
+ decodedIdvalues = text.decodeMS(value);
+ if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
+ id = text.decodeMS(text.decodeMS(uid)[0])[1];
+ }
+ var classificationGroupId = newSelect("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+ .from("CLASSIFICATIONGROUP")
+ .where("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", id)
+ .cell();
+
+ result.string(classificationGroupId);
+ }
+ }
+}
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js
deleted file mode 100644
index 199c2e918d4673239e59167d4b95f64bbe9a3331..0000000000000000000000000000000000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CLASSIFICATIONGROUP"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
deleted file mode 100644
index d3275a8eaa916bbbb9604617cb2fb5385bc01cfe..0000000000000000000000000000000000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CLASSIFICATIONTYPE"))
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js
deleted file mode 100644
index 9a93d9382887643fcc081de68214ba526ed930ac..0000000000000000000000000000000000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.classificationType(), vars.get("$field.CLASSIFICATIONTYPE")));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js
deleted file mode 100644
index aaef9be6b3921ec62b37843d0c65b43aeedd7fdf..0000000000000000000000000000000000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) && vars.get("$this.value") == null)
-{
- result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
-}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b340e81667db36f7dffb5a63892cd49786faba16
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("Context_lib");
+import("system.result");
+
+result.string(ContextUtils.loadContentTitle("ClassificationType_entity", vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/stateProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..04d6ba3c02af036fc51b33769653aaf8c06e1088
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/stateProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_EDIT && vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW)
+ result.string(neon.COMPONENTSTATE_EDITABLE)
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE)
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c575abe671e6435262aa761d4723c350accdbba
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Classification_lib");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+ result.string(util.getNewUUID());
+else if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$this.value")) // this means we are editing one of the classificationgroups
+ result.string($ClassificationPlaceholder.TOPSECRETPLACEHOLDER()); //this placeholder is set for the onUpdateProcess further explanation in there
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/stateProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9366c2e0e8a8d10e0f2e70beb8f3c82662b588a1
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/stateProcess.js
@@ -0,0 +1,12 @@
+import("Classification_lib");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ && vars.get("$this.value") != $ClassificationPlaceholder.TOPSECRETPLACEHOLDER())
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE)
+}
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE)
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..85208cfbe4e8e978e2a67702710029f6fbb49a71
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/valueProcess.js
@@ -0,0 +1,21 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Sql_lib");
+import("Classification_lib");
+
+var res = vars.get("$this.value");
+if(!res)
+{
+ var classificationTypeId = vars.get("$field.CLASSIFICATIONTYPEID");
+ if(classificationTypeId != $ClassificationPlaceholder.TOPSECRETPLACEHOLDER())
+ {
+ res = newSelect("CLASSIFICATIONTYPE.SCORETYPE")
+ .from("CLASSIFICATIONTYPE")
+ .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId)
+ .cell();
+ }
+ else
+ res = $ClassificationPlaceholder.TOPSECRETPLACEHOLDER();
+}
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/filterviewactiongroup/children/updateclassification/onActionProcess.js b/entity/ClassificationAdmin_entity/entityfields/filterviewactiongroup/children/updateclassification/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f1a169ba0ebfedb7c8278fc11103f02750888169
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/filterviewactiongroup/children/updateclassification/onActionProcess.js
@@ -0,0 +1,21 @@
+import("system.process");
+import("system.question");
+import("system.text");
+import("system.translate");
+import("system.util");
+import("system.vars");
+
+var execute = question.askYesNo(translate.text("Start Serveprocess"), translate.text("Are you sure you want to reload all classifications using the current classificationgradings?"), false);
+if(execute)
+{
+ var processConfig = process.createStartAsyncConfig()
+ .setName("updateClassifications_serverProcess")
+ .setUser( vars.get("$sys.user"))
+ .setThreadPriority(process.THREADPRIORITY_LOW)
+ .setTimerType(process.TIMERTYPE_SERVER);
+
+
+ process.startAsync(processConfig);
+
+ question.showMessage(translate.text("Serverprocess has been started"), question.INFORMATION, translate.text("Classification"));
+}
diff --git a/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js
deleted file mode 100644
index b5e82ac38396ff9ccda20b257c1d0820f5294683..0000000000000000000000000000000000000000
--- a/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("KeywordRegistry_basic")
-
-result.string($KeywordRegistry.classificationType())
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js
deleted file mode 100644
index 00c91dc0b75c8cb002fa9eafe58ad40ab16a0e3a..0000000000000000000000000000000000000000
--- a/entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == null)
-{
- result.string(vars.get("$param.ObjectRowid_param"));
-}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/object_type/dropDownProcess.js b/entity/ClassificationAdmin_entity/entityfields/object_type/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..560b0480a1fe6f4ed45d7a8e68a6f4387f1f2178
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/object_type/dropDownProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.translate");
+import("Context_lib");
+
+result.object([["Salesproject", ContextUtils.getTitle("Salesproject", true)],
+ ["Organisation", ContextUtils.getTitle("Organisation", true)]]);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js b/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..22539b26e09b6166510840fc3fd9c28e751c9a5f
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js
@@ -0,0 +1,3 @@
+import("system.neon");
+
+neon.setFieldValue("$field.CLASSIFICATIONGROUP", "");
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js
index 6a340688081d8317de45c8b656f6ffcbe9520e1e..66c794c838207d952cf4cbd9bd2a07461762d83e 100644
--- a/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js
@@ -1,8 +1,27 @@
-import("system.result");
import("system.neon");
import("system.vars");
+import("system.result");
+import("system.text");
+import("Sql_lib");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == null)
+if(!vars.get("$this.value") && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
{
- result.string(vars.get("$param.ObjectType_param"));
-}
\ No newline at end of file
+ var sysSelection = vars.get("$sys.selection");
+ var uid = vars.get("$field.UID");
+ var id;
+ if(sysSelection.length > 0)
+ {
+ var res;
+ var value = vars.get("$field.CLASSIFICATION_PARENT_ID");
+ if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
+ res = text.decodeMS(uid)[0];
+ else
+ {
+ decodedIdvalues = text.decodeMS(value);
+ if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
+ res = text.decodeMS(text.decodeMS(uid)[0])[0];
+ }
+
+ result.string(res);
+ }
+}
diff --git a/entity/ClassificationAdmin_entity/entityfields/recordcategory/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/recordcategory/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ec5e2a1a830a6627d578f34e9759d0bfd7df9a55
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/recordcategory/valueProcess.js
@@ -0,0 +1,34 @@
+import("Classification_lib");
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+var res;
+
+if(vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW)
+{
+ if(vars.get("$field.CLASSIFICATIONTYPEID") && vars.get("$field.CLASSIFICATIONTYPEID") != $ClassificationPlaceholder.TOPSECRETPLACEHOLDER())
+ {
+ res = $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE();
+ }
+ else if(vars.get("$field.CLASSIFICATIONGROUP"))
+ {
+ res = $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP();
+ }
+ else
+ {
+ res = $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE();
+ }
+}
+else if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+ var classificationGroup = vars.get("$field.CLASSIFICATIONGROUP");
+ if(classificationGroup.length == 36 && ((classificationGroup.match(/-/g) || []).length == 4))
+ res = $ClassificationRecordCategories.CLASSIFICATION_GROUP_EXISTS();
+ else
+ res = $ClassificationRecordCategories.CLASSIFICATION_GROUP_EXISTS();
+}
+
+if(res)
+ result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/sorting/stateProcess.js b/entity/ClassificationAdmin_entity/entityfields/sorting/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cd13f04b8ed1f8cd3f762168f0b3208ada7cf1e
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/sorting/stateProcess.js
@@ -0,0 +1,16 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Classification_lib");
+
+var state;
+var recordCategory = vars.get("$field.recordCategory");
+
+if(recordCategory == $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE())
+ state = neon.COMPONENTSTATE_INVISIBLE;
+else if(recordCategory == $ClassificationRecordCategories.CLASSIFICATION_GROUP_EXISTS())
+ state = neon.COMPONENTSTATE_DISABLED;
+else
+ state = neon.COMPONENTSTATE_EDITABLE;
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/sorting/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/sorting/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6eaad20db1e0a95b1bfa4842971a4e69a037b151
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/sorting/valueProcess.js
@@ -0,0 +1,43 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Sql_lib");
+
+if(!vars.get("$this.value"))
+{
+ var sysSelection = vars.get("$sys.selection");
+ var uid = vars.get("$field.UID");
+ var id;
+ if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT )
+ {
+ if(sysSelection.length > 0)
+ {
+ var res;
+ var value = vars.get("$field.CLASSIFICATION_PARENT_ID");
+ if(value)
+ {
+ if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
+ id = text.decodeMS(uid)[1];
+ else
+ {
+ decodedIdvalues = text.decodeMS(value);
+ if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
+ id = text.decodeMS(text.decodeMS(uid)[0])[1];
+ }
+ }
+ }
+ }
+ else if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ id = vars.get("$field.CLASSIFICATIONGROUP");
+
+ var sorting = newSelect("CLASSIFICATIONGROUP.SORTING")
+ .from("CLASSIFICATIONGROUP")
+ .where("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", id)
+ .cell();
+ if(sorting)
+ result.string(sorting);
+ else
+ result.string("1");
+}
+
diff --git a/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..45336b55ef94109330b4bc6ec35aebcf28a1a83b
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
@@ -0,0 +1,24 @@
+import("system.neon");
+import("Classification_lib");
+import("system.result");
+import("system.vars");
+
+var cat = vars.get("$field.recordCategory");
+var res;
+switch (cat)
+{
+ case $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE():
+ res = "ClassificationType";
+ break;
+ case $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP():
+ res = "ClassificationGroup";
+ break;
+ case $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE():
+ res = "ClassificationGroup";
+ break;
+ default:
+ res = "";
+ break;
+}
+
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/target_id/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/target_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b6727d8fca61a92e76b5c7332d494e2ad00797ba
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/target_id/valueProcess.js
@@ -0,0 +1,28 @@
+import("system.neon");
+import("system.result");
+import("system.text");
+import("system.vars");
+import("Classification_lib");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
+{
+ var recordCategory = vars.get("$field.recordCategory");
+ var sysSelection = vars.get("$sys.selection");
+ if(sysSelection.length > 0)
+ {
+ var res;
+ switch(recordCategory)
+ {
+ case $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP():
+ res = vars.get("$field.CLASSIFICATIONGROUP");
+ break;
+ case $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE():
+ res = vars.get("$field.CLASSIFICATIONTYPEID");
+ break;
+ default:
+ break;
+ }
+ if(res)
+ result.string(res);
+ }
+}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/grantDeleteProcess.js b/entity/ClassificationAdmin_entity/grantDeleteProcess.js
index 4e17fa5f17ffabc50c3fdc60bf6e268c36233869..8cec1516432afced32ec5a217377b69e2507f93e 100644
--- a/entity/ClassificationAdmin_entity/grantDeleteProcess.js
+++ b/entity/ClassificationAdmin_entity/grantDeleteProcess.js
@@ -1,11 +1,9 @@
import("system.result");
-import("system.db");
import("system.vars");
-import("Sql_lib");
+import("Classification_lib");
-var count = newSelect("count(*)")
- .from("CLASSIFICATION")
- .whereIfSet("CLASSIFICATION.CLASSIFICATIONTYPE_ID", "$field.CLASSIFICATIONTYPEID")
- .cell(true, "0");
-
-result.object(parseInt(count) <= 0);
\ No newline at end of file
+var recordCategory = vars.get("$field.recordCategory");
+if(recordCategory != $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE())
+ result.string(true);
+else
+ result.string(false);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/grantUpdateProcess.js b/entity/ClassificationAdmin_entity/grantUpdateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8cec1516432afced32ec5a217377b69e2507f93e
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/grantUpdateProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+import("Classification_lib");
+
+var recordCategory = vars.get("$field.recordCategory");
+if(recordCategory != $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE())
+ result.string(true);
+else
+ result.string(false);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/iconIdProcess.js b/entity/ClassificationAdmin_entity/iconIdProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..82b69514355bf1fe9a366c719bfd2ac7c430bd2b
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/iconIdProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.get("$field.#CONTENTTITLE"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/db/orderClauseProcess.js b/entity/ClassificationAdmin_entity/recordcontainers/db/orderClauseProcess.js
deleted file mode 100644
index 519d6f1ab431849ac7f43915cf1e4a5756e1f193..0000000000000000000000000000000000000000
--- a/entity/ClassificationAdmin_entity/recordcontainers/db/orderClauseProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.db");
-
-result.object({
- "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP": db.ASCENDING
-})
\ 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..62e3899f1be13fb9086e3539720f58b0a177adc3
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,81 @@
+import("Classification_lib");
+import("Sql_lib");
+import("system.result");
+import("system.text");
+import("system.translate");
+import("system.util");
+import("system.vars");
+
+var idvalues = vars.get("$local.idvalues");
+var decodedIdvalues;
+var res = [];
+if(idvalues)
+{
+ if(idvalues[0].charAt(0) != ";" && idvalues[0].charAt(idvalues[0].length) != ";")
+ res.push([idvalues[0], "", "", "", "", "", idvalues[0], translate.text(idvalues[0]),
+ "", $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE()])
+ else
+ {
+ decodedIdvalues = text.decodeMS(idvalues[0]);
+ if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
+ {
+ var groupName = newSelect("CLASSIFICATIONGROUP.TITLE")
+ .from("CLASSIFICATIONGROUP")
+ .where("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", decodedIdvalues[1])
+ .cell();
+ res.push([idvalues[0], decodedIdvalues[0], decodedIdvalues[1], translate.text(groupName), "", "", "",
+ "", "", $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP()]);
+ }
+
+ else
+ {
+ var scoreType = newSelect("CLASSIFICATIONTYPE.SCORETYPE")
+ .from("CLASSIFICATIONTYPE")
+ .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", decodedIdvalues[1])
+ .orderBy("CLASSIFICATIONTYPE.SCORETYPE")
+ .cell();
+ res.push([idvalues[0], decodedIdvalues[0], "", "",decodedIdvalues[1], translate.text(scoreType),
+ "", "","", $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE()]);
+ }
+ }
+}
+else
+{
+ var savedData = {};
+ var classificationData = newSelect("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, \n\
+ CLASSIFICATIONGROUP.TITLE, CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE.SCORETYPE")
+ .from("CLASSIFICATIONGROUP")
+ .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+ .orderBy("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONGROUP.SORTING")
+ .table()
+
+ var objectType, classificationGroupId, classificationGroupName, classificationTypeId, classificationScoreType, uidClassificationGroup, uidClassificationType;
+ for (let i = 0; i < classificationData.length; i++)
+ {
+ [objectType, classificationGroupId, classificationGroupName, classificationTypeId, classificationScoreType] = classificationData[i];
+
+ uidClassificationGroup = text.encodeMS([objectType, classificationGroupId]);
+ uidClassificationType = text.encodeMS([uidClassificationGroup, classificationTypeId]);
+
+
+ if(!savedData.hasOwnProperty(classificationData[i][0])) //objectType
+ {
+ res.push([objectType, "", "", "", "", "", objectType, translate.text(objectType),
+ "", $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE()]);
+ savedData[classificationData[i][0]] = "";
+ }
+ if(!savedData.hasOwnProperty(classificationData[i][1])) //classificationGroup
+ {
+ res.push([uidClassificationGroup, objectType, classificationGroupId, translate.text(classificationGroupName), "", "", "",
+ "", "", $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP()]);
+ savedData[classificationData[i][1]] = "";
+ }
+ if(!savedData.hasOwnProperty(classificationData[i][3])) //classificationType
+ {
+ res.push([uidClassificationType, uidClassificationGroup, "", "", classificationTypeId, translate.text(classificationScoreType),
+ "", "", "", $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE()]);
+ savedData[classificationData[i][3]] = "";
+ }
+ }
+}
+result.object(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..b0b953dde1e57131c6c8c5eade9b4d7d9fdada09
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,78 @@
+import("system.entities");
+import("Classification_lib");
+import("Sql_lib");
+import("system.util");
+import("system.db");
+import("system.vars");
+
+try
+{
+ _delete();
+}
+finally //always make sure that the cache is as valid as possible
+{
+ //ClassificationType_entity accesses the CLASSIFICATIONSCORE (max value of scores) so we need to update the cache to prevent inconsesty
+ entities.invalidateCache("ClassificationType_entity", "db");
+ //dependecies are deleted so the cache needs to be updated
+ entities.invalidateCache("ClassificationGrading_entity", "db");
+ entities.invalidateCache("ClassificationGroup_entity", "db");
+ entities.invalidateCache("ClassificationScore_entity", "db");
+}
+
+//private helper function for better code readability
+function _delete()
+{
+ var rowData = vars.get("$local.rowdata");
+ var groupID;
+ var groupValue = rowData["CLASSIFICATIONGROUP.value"];
+ var classificationType = rowData["CLASSIFICATIONTYPEID.value"];
+ var objectType = rowData["OBJECT_TYPE.value"];
+ var table;
+ var columns;
+ var values;
+ var classificationGroup = rowData["CLASSIFICATIONGROUP.value"];
+ var recordCategory = rowData["recordCategory.value"];
+
+
+ if(recordCategory == $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE()) // the deleted dataset must be an classificationType
+ {
+ classificationGroup = ClassificationUtils.getClassificationGroup(classificationType); //get the group before deleting the classificationtype dataset
+ newWhere("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", classificationType).deleteData(); //deletes the classificationscores that are linked to the classificationtype
+ newWhere("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationType).deleteData(); //deletes the classificationtype
+ newWhere("CLASSIFICATION.CLASSIFICATIONTYPE_ID", classificationType).deleteData(); //deletes all the classifications
+
+ var gradingTable = ClassificationUtils.getGradingTableByGroupId(classificationGroup);
+
+ var maxScore = ClassificationUtils.getMaxScore(classificationGroup) //important to do this AFTER deleting the classificationscores to get the new value
+
+ if(gradingTable[0][1] != maxScore)
+ {
+ var column = ["MAXGRADEFORSCORE"];
+ table = ["CLASSIFICATIONGRADING"];
+ var multiplicand = maxScore/gradingTable[0][1];
+ var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+ .updateData(true, table, column, db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
+
+ for (let i = 1; i < gradingTable.length; i++)
+ {
+ update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+ .updateData(true, table, column, db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplicand)]);
+ }
+ }
+ }
+
+ else if(recordCategory == $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP()) //the deleted dataset must be an classificationGroup
+ {
+ var classificationTypes = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
+ .from("CLASSIFICATIONTYPE")
+ .where("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", classificationGroup)
+
+ //delete the classificationscores, types and that are linked to the classificationtypes of te classificationgroup
+ newWhere("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", classificationTypes, SqlBuilder.IN()).deleteData(true, "CLASSIFICATIONSCORE");
+ newWhere("CLASSIFICATION.CLASSIFICATIONTYPE_ID", classificationTypes, SqlBuilder.IN()).deleteData(true, "CLASSIFICATION");
+ classificationTypes.deleteData(true, "CLASSIFICATIONTYPE");
+
+ newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGROUP_ID", classificationGroup).deleteData();
+ newWhere("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", classificationGroup).deleteData();
+ }
+}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..62d83bc0564f53c4c851555ceaf91d428fe5a234
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,78 @@
+import("system.entities");
+import("system.util");
+import("system.db");
+import("system.vars");
+
+try
+{
+ _insert();
+}
+finally //always make sure that the cache is as valid as possible
+{
+ //ClassificationType_entity accesses the CLASSIFICATIONSCORE (max value of scores) so we need to update the cache to prevent inconsesty
+ entities.invalidateCache("ClassificationType_entity", "db");
+ //Grading-values are dependent since they are inserted within this process (maxgrade)
+ entities.invalidateCache("ClassificationGrading_entity", "db");
+ //groups are dependent since they are inserted within this process
+ entities.invalidateCache("ClassificationGroup_entity", "db");
+}
+
+//private helper function for better code readability
+function _insert()
+{
+ var rowData = vars.get("$local.rowdata");
+ var groupID;
+ var groupValue = rowData["CLASSIFICATIONGROUP.value"];
+ if(groupValue.length != 36 && (groupValue.match(/-/g) || []).length != 4) //if classificationGroup is no Id -> insert new group
+ {
+ groupID = util.getNewUUID();
+ var groupValues = [
+ groupValue,
+ groupID,
+ rowData["SORTING.value"]
+ ];
+
+ var groupColumns = [
+ "TITLE",
+ "CLASSIFICATIONGROUPID",
+ "SORTING"
+ ];
+
+ db.insertData("CLASSIFICATIONGROUP", groupColumns, null, groupValues);
+
+ var gradingColumns = [
+ "CLASSIFICATIONGRADINGID",
+ "GRADING",
+ "MAXGRADEFORSCORE",
+ "CLASSIFICATIONGROUP_ID"
+ ];
+
+ var gradingValues = [
+ util.getNewUUID(),
+ "A",
+ 0,
+ groupID
+ ];
+
+ db.insertData("CLASSIFICATIONGRADING", gradingColumns, null, gradingValues); // insert a "dummy" classificationGradingValue
+ }
+ else{
+ groupID = groupValue; //else the groupValue is the groupId
+ }
+
+ var typeValues = [
+ vars.get("$field.CLASSIFICATIONTYPEIDDISPLAYVALUE"),
+ util.getNewUUID(),
+ groupID,
+ rowData["OBJECT_TYPE.value"]
+ ]
+
+ var typeColumns = [
+ "SCORETYPE",
+ "CLASSIFICATIONTYPEID",
+ "CLASSIFICATIONGROUP_ID",
+ "OBJECT_TYPE"
+ ];
+
+ db.insertData("CLASSIFICATIONTYPE", typeColumns, null, typeValues); // always insert the classificationtype
+}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..43a6304543f7b01dab728e1774e8d6f9e06980e0
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,207 @@
+import("Classification_lib");
+import("Sql_lib");
+import("system.db");
+import("system.eMath");
+import("system.entities");
+import("system.neon");
+import("system.text");
+import("system.util");
+import("system.vars");
+
+try
+{
+ _update();
+}
+finally //always make sure that the cache is as valid as possible
+{
+ //ClassificationType_entity accesses the CLASSIFICATIONSCORE (max value of scores) so we need to update the cache to prevent inconsesty
+ entities.invalidateCache("ClassificationType_entity", "db");
+ //Grading-values are dependent since they are modified within this process (maxgrade)
+ entities.invalidateCache("ClassificationGrading_entity", "db");
+ //groups are dependent since they are modified within this process
+ entities.invalidateCache("ClassificationGroup_entity", "db");
+}
+
+//private helper function for better code readability
+function _update()
+{
+ var rowdata = vars.get("$local.rowdata");
+ var uid = vars.get("$field.UID");
+
+ //for changes of the place of use (object_type), group, and title of an scoretpye dataset
+ var dbFields = {
+ "OBJECT_TYPE.value": "OBJECT_TYPE",
+ "CLASSIFICATIONTYPEID.value" : "CLASSIFICATIONTYPEID",
+ "CLASSIFICATIONGROUP.value": "CLASSIFICATIONGROUP_ID",
+ "CLASSIFICATIONTYPEID.displayValue": "SCORETYPE",
+ "SORTING.value": "SORTING",
+ "CLASSIFICATIONTYPEIDDISPLAYVALUE.value": "CLASSIFICATIONTYPEID"
+ };
+
+ var table = "CLASSIFICATIONTYPE";
+ var cond;
+ var values = [];
+ var columns = [];
+
+ var i;
+ var isGroupDataSet = false;
+// the classificationtypeId.value has the placeholder set when editing a classificationgroup dataset to allow us
+// to handle the updating differently depending on whether its an classifcation group dataset or an classification type dataset
+// since you want changes to the name of groups to effect only the group name and changes to the group of an classificationtype to change it's group
+ if(rowdata["CLASSIFICATIONTYPEID.value"] == $ClassificationPlaceholder.TOPSECRETPLACEHOLDER())
+ isGroupDataSet = true;
+
+ vars.get("$local.changed").forEach(function (field, i)
+ {
+ var dbField = dbFields[field];
+ if (dbField)
+ {
+ columns[i] = dbField;
+ values[i] = rowdata[field] || "";
+ }
+ });
+
+
+ if(!isGroupDataSet) //-> update the classification type dataset
+ {
+ var groupIds = ClassificationUtils.getAllGroups(vars.get("$field.OBJECT_TYPE")); //gets all existing groups of the object_type
+ var newGroupId;
+ var newGroupName;
+ var insertGroup = false;
+ var groupchange = true;
+ var newId;
+ for (i = 0; i < columns.length; i++) {
+ if(columns[i] == "CLASSIFICATIONGROUP_ID")//if the classificationgroup_Id changed: determine whether or not a new group has to be inserted
+ {
+ if(!groupIds.toString().includes(values[i]))
+ {
+ newGroupName = values[i];
+ newGroupId = util.getNewUUID();
+ values[i] = newGroupId;
+ insertGroup = true;
+ groupchange = true;
+ }
+ else if(values[i] == text.decodeMS(text.decodeMS(uid)[0])[1])
+ {
+ groupchange = false;
+ insertGroup = true;
+ break;
+ }
+ }
+ else if(columns[i] == "CLASSIFICATIONTYPEID")
+ {
+ columns.splice(i, 1);
+ values.splice(i, 1);
+ i = i-1
+ }
+ else if(columns[i] == "SORTING")
+ {
+ columns.splice(i, 1);
+ values.splice(i, 1);
+ i = i-1
+ }
+ }
+
+ if(groupchange == true)
+ {
+ var gradeColumn, gradeTable, multiplicand, update, gradingTable;
+ var oldGroup = ClassificationUtils.getClassificationGroup(text.decodeMS(uid)[1]);
+ var newMax = ClassificationUtils.getMaxScoreExcludeType(oldGroup, text.decodeMS(uid)[1]);
+ gradingTable = ClassificationUtils.getGradingTableByGroupId(oldGroup);
+
+ var lostScore = parseInt(newSelect("max(SCORE)")
+ .from("CLASSIFICATIONSCORE")
+ .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", text.decodeMS(uid)[1])
+ .cell()); //the greatest score of the "moved" classificationtype affects the classificationGradings
+
+ if(insertGroup) //new group has to be inserted
+ {
+ var maxSorting = newSelect("distinct CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, CLASSIFICATIONGROUP.SORTING")
+ .from("CLASSIFICATIONGROUP")
+ .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+ .where("CLASSIFICATIONTYPE.OBJECT_TYPE", vars.get("$field.OBJECT_TYPE"))
+ .orderBy("CLASSIFICATIONGROUP.SORTING desc")
+ .table()[0][1]; //gets the greatest sorting value of the object_type
+ db.insertData("CLASSIFICATIONGROUP", ["CLASSIFICATIONGROUPID", "TITLE", "SORTING"], null, [newGroupId, newGroupName, eMath.addInt(maxSorting, 1)]) //insert the new group (sorting is greater than the greatest one
+
+ var gradingColumns = [
+ "CLASSIFICATIONGRADINGID",
+ "GRADING",
+ "MAXGRADEFORSCORE",
+ "CLASSIFICATIONGROUP_ID"
+ ];
+
+ var gradingValues = [
+ util.getNewUUID(),
+ "A",
+ lostScore,
+ newGroupId
+ ];
+
+ db.insertData("CLASSIFICATIONGRADING", gradingColumns, null, gradingValues); // insert a "dummy" classificationGradingValue, since not having one results in problems
+ }
+ else // classificationtype has to be moved to another classificatingroup
+ {
+ newId = vars.get("$field.CLASSIFICATIONGROUP"); //we know that the field has the classificationgroupId of the new group set
+ newGradingTable = ClassificationUtils.getGradingTableByGroupId(newId); //we use this id to get the gradingtable of the new group
+ newNewMax = eMath.addInt(newGradingTable[0][1], lostScore) //maxvalue of the gradingtable with the added lostScore = the new maxValue
+ if(newGradingTable[0][1] != newNewMax) //update existing classificationGrading if the maxValue has changed
+ {
+ gradeColumn = ["MAXGRADEFORSCORE"];
+ gradeTable = "CLASSIFICATIONGRADING";
+ multiplicand = newNewMax/newGradingTable[0][1];
+ update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", newGradingTable[0][0])
+ .updateData(true, gradeTable, gradeColumn, null, [parseInt(newGradingTable[0][1] * multiplicand)]);
+
+ for (i = 1; i < newGradingTable.length; i++)
+ {
+ update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", newGradingTable[i][0])
+ .updateData(true, gradeTable, gradeColumn, null, [parseInt(newGradingTable[i][1] * multiplicand)]);
+ }
+ }
+
+ }
+
+ if(gradingTable[0][1] != newMax) //update old classificationGrading if the maxValue has changed
+ {
+ gradeColumn = ["MAXGRADEFORSCORE"];
+ gradeTable = "CLASSIFICATIONGRADING";
+ multiplicand = newMax/gradingTable[0][1];
+ update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+ .updateData(true, gradeTable, gradeColumn, null, [newMax]);
+
+ for (i = 0; i < gradingTable.length; i++)
+ {
+ update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+ .updateData(true, gradeTable, gradeColumn, null, [parseInt(gradingTable[i][1] * multiplicand)]);
+ }
+ }
+ }
+
+ cond = newWhereIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID = '" + text.decodeMS(uid)[1] + "'");
+ columns.push("SCORETYPE");
+ values.push(vars.get("$field.CLASSIFICATIONTYPEIDDISPLAYVALUE"));
+ cond.updateData(true, table, columns, null, values);
+ }
+ else //-> update the classification group dataset
+ {
+ var value = vars.get("$field.CLASSIFICATION_PARENT_ID");
+
+ if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
+ id = text.decodeMS(uid)[1];
+
+ var classificationGroupId = newSelect("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+ .from("CLASSIFICATIONGROUP")
+ .where("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", id)
+ .cell();
+
+ cond = newWhereIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = '" + classificationGroupId + "'");
+
+ var groupTable = "CLASSIFICATIONGROUP";
+ var groupColumns = ["SORTING", "TITLE"];
+ var groupName = rowdata["CLASSIFICATIONGROUP.value"] == classificationGroupId ? rowdata["CLASSIFICATIONGROUP.displayValue"] : rowdata["CLASSIFICATIONGROUP.value"];
+ var groupValues = [vars.get("$field.SORTING"), groupName];
+ var groupCond = newWhereIfSet("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID = '" + classificationGroupId + "'");
+ groupCond.updateData(true, groupTable, groupColumns, null, groupValues);
+ }
+}
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e82162ec53830890f0318084f9f519df8e11eb08
--- /dev/null
+++ b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
@@ -0,0 +1,101 @@
+<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+ <name>ClassificationGrading_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/ClassificationGrading_entity/documentation.adoc</documentation>
+ <title>Grading</title>
+ <titlePlural>Gradings</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONGRADINGID</name>
+ <valueProcess>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgradingid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>GRADING</name>
+ <title>Scoretype</title>
+ </entityField>
+ <entityField>
+ <name>MAXGRADEFORSCORE</name>
+ <title>Max Value</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#####</outputFormat>
+ <inputFormat>#####</inputFormat>
+ <valueProcess>%aditoprj%/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATIONGROUP_ID</name>
+ <title>Classification</title>
+ <valueProcess>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgroup_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ClassificationTypeId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>ClassificationGradings</name>
+ <documentation>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgradings/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>e0c6b86e-dcc1-43e1-9581-2b10c5c3d0cd</name>
+ <entityName>ClassificationGroup_entity</entityName>
+ <fieldName>ClassificationGradings</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ClassificationTypeId_param</name>
+ <valueProcess>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <isPageable v="false" />
+ <conditionProcess>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <cacheType>GLOBAL</cacheType>
+ <cacheKeyProcess>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>9a9482d5-005a-4dc5-8b58-e07c44420b64</name>
+ <tableName>CLASSIFICATIONGRADING</tableName>
+ <primaryKey>CLASSIFICATIONGRADINGID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>MAXGRADEFORSCORE.value</name>
+ <recordfield>CLASSIFICATIONGRADING.MAXGRADEFORSCORE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GRADING.value</name>
+ <recordfield>CLASSIFICATIONGRADING.GRADING</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONGROUP_ID.value</name>
+ <recordfield>CLASSIFICATIONGRADING.CLASSIFICATIONGROUP_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONGRADINGID.value</name>
+ <recordfield>CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/ClassificationGrading_entity/documentation.adoc b/entity/ClassificationGrading_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..faa566900db907439f90781456e63e894d2ccf2d
--- /dev/null
+++ b/entity/ClassificationGrading_entity/documentation.adoc
@@ -0,0 +1,56 @@
+= ClassificationGrading_entity
+
+Definition:
+
+ This entity is used for storing the classification grading and making it possible for the admin to change the grading of the clasification (classificationGroup).
+ The classification can be dynamically configured at runtime.
+ (For more information about the classification see also Classification_entity)
+
+Purpose:
+
+ This Entity gives the administrators an easy way to change the classification grading in the preview of classificationAdmin
+ when selecting a classification (classificationGroup).
+ The classificationgrading gets stored in the table classificationgrading with it's own classificationgradingId, the classificationGroup_id,
+ the grading (e.g. "A", "B", "C") and the max score you this grade for.
+
+ This entity only has one view: the ClassificationGradingMultipleEdit_view which has both the MaxGradeForScore and the grading column.
+ making it possible for the admin to configure something like this:
+
+ ClassificationAdminPreviewOfClassification Example:
+
+ USAGE: Organisation
+ CLASSIFICATION: 1. Target Group
+ SORTING: 1
+ A 100
+ B 75
+ C 50
+ D 25
+
+ --> The Score "72" would lead to the grade "B" (<<<not included in the preview, just for easier understanding of how this works)
+
+Particularities:
+
+ The MaxGradeForScore of the best possible score (in our example for "A") has to always be the largest possibly achievable value,
+ otherwise it would lead to errors, which is why this field always get's the maximum value set as default
+ and it's not possible to save something greater than that (validationProcess).
+
+ Also, since the indicators under the classification and the possible values of those indicators can be changed:
+ The grading get's updated automatically after changes to the maximum possible value,
+ using the rule of three (see onInsert-, onUpdate- and onDelete- processes of classificationScore).
+
+ The Classification consists of the following entities:
+ Classification_entity,
+ ClassificationAdmin_entity,
+ ClassificationGrading_entity,
+ ClassificationGroup_entity,
+ ClassificationScore_entity,
+ ClassificationType_entity
+
+ Our terms in the db and entity structure differ from the technical terms the user gets to see, to make it easier to understand
+ for the developer that doesn't have the technical know-how:
+
+ Our term: Technical term: Example:
+ Object_Type Usage Organisation
+ ClassificationGroup Classification 1. Target Group
+ ClassificationType Indicator Industry
+ ClassificationScore (Possible-)Value/Selection Service
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/user_new/valueProcess.js b/entity/ClassificationGrading_entity/entityfields/classificationgradingid/valueProcess.js
similarity index 73%
rename from entity/Orderitem_entity/entityfields/user_new/valueProcess.js
rename to entity/ClassificationGrading_entity/entityfields/classificationgradingid/valueProcess.js
index 71110834d7d401e78c24401e044211bfb0b4ef55..6ff4a9c1959d04bc196a5b0f742958ac9cb73152 100644
--- a/entity/Orderitem_entity/entityfields/user_new/valueProcess.js
+++ b/entity/ClassificationGrading_entity/entityfields/classificationgradingid/valueProcess.js
@@ -1,6 +1,7 @@
-import("system.vars");
-import("system.result");
import("system.neon");
+import("system.result");
+import("system.util");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js b/entity/ClassificationGrading_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
similarity index 100%
rename from entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
rename to entity/ClassificationGrading_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
diff --git a/entity/ClassificationGrading_entity/entityfields/classificationgradings/documentation.adoc b/entity/ClassificationGrading_entity/entityfields/classificationgradings/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..6a527bdbe73ecd9102b4defab2b3b1d78ae24e35
--- /dev/null
+++ b/entity/ClassificationGrading_entity/entityfields/classificationgradings/documentation.adoc
@@ -0,0 +1,3 @@
+= ClassificationGradings;
+
+Provider for ClassificationAdmin using the ClassificationGrading.ClassificationTypeId_param, because the grading is linked to a classificationtype
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/classificationgroup_id/valueProcess.js b/entity/ClassificationGrading_entity/entityfields/classificationgroup_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ddf20047b196c623deca6de174982c218d39e016
--- /dev/null
+++ b/entity/ClassificationGrading_entity/entityfields/classificationgroup_id/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ if(vars.exists("$param.ClassificationTypeId_param") && vars.get("$param.ClassificationTypeId_param") != null)
+ result.string(vars.getString("$param.ClassificationTypeId_param"));
+}
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/documentation.adoc b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d42cd1657ab6afe2b94c0306d9a901d4097059a2
--- /dev/null
+++ b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/documentation.adoc
@@ -0,0 +1,17 @@
+== ClassificationGrading.MaxGradeForScore:
+
+Used to store the highest value for the Grade.
+
+Example:
+A 100-75,
+B 74-50,
+C 49-25,
+D 24-0
+--> maxGradeForScore: A:100, B:74, C:49, D:24
+
+The maxGradeForScore of the best possible grading (In our Example A), should always be the highest possible value,
+that's why it's set as the default value of the field.
+The maxGradeForScore should never be greater than the highest possible value, that's why this field has it's onValidationProcess.
+
+The highest possible value get's calculated by calculating the sum of all the classificationScores of the types under the group.
+(ClassificationUtils.getMaxScore)
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..1e60bc18fdb2d3ec65ba10aa47ce63f7e225e579
--- /dev/null
+++ b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js
@@ -0,0 +1,13 @@
+import("Classification_lib");
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+var classificationTypeGroup = vars.get("$field.CLASSIFICATIONGROUP_ID");
+var maxValue = ClassificationUtils.getMaxScore(classificationTypeGroup);
+
+if (maxValue == "")
+ maxValue = 100;
+
+if (parseFloat(vars.get("local.value")) > maxValue)
+ result.string(translate.withArguments("${HIGHER_THAN_MAX} max: %0", [maxValue]));
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..24571535a888b634c3f4381ed280eda6321a0555
--- /dev/null
+++ b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js
@@ -0,0 +1,11 @@
+import("Classification_lib");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if(((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) &&
+ (vars.get("$this.value") == null || vars.get("$this.value") == undefined)))
+{
+ var group = vars.getString("$param.ClassificationTypeId_param");
+ result.string(ClassificationUtils.getMaxScore(group));
+}
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/recordcontainers/db/cacheKeyProcess.js b/entity/ClassificationGrading_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2bf96b8a4fe5e3cbd59023cdb58325511d518059
--- /dev/null
+++ b/entity/ClassificationGrading_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,5 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey("$param.ClassificationTypeId_param");
+result.string(res);
diff --git a/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js b/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..83116f272303015e6b9d02504d4adb0a326ca3be
--- /dev/null
+++ b/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhereIfSet("CLASSIFICATIONGRADING.CLASSIFICATIONGROUP_ID", "$param.ClassificationTypeId_param");
+result.string(cond.toString());
+
diff --git a/entity/ClassificationGrading_entity/recordcontainers/db/orderClauseProcess.js b/entity/ClassificationGrading_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7d2ce489cafba9b89d7db5fedf9ef221da7f8bad
--- /dev/null
+++ b/entity/ClassificationGrading_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.db");
+
+result.object({
+ "CLASSIFICATIONGRADING.MAXGRADEFORSCORE": db.DESCENDING
+ });
\ No newline at end of file
diff --git a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
deleted file mode 100644
index fe7204329ca371bf056ea63870996dc271d4939d..0000000000000000000000000000000000000000
--- a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
+++ /dev/null
@@ -1,79 +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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
- <name>ClassificationGroupAnalyses_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/ClassificationGroupAnalyses_entity/documentation.adoc</documentation>
- <contentTitleProcess>%aditoprj%/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js</contentTitleProcess>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </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>GroupAnalyses</name>
- <documentation>%aditoprj%/entity/ClassificationGroupAnalyses_entity/entityfields/groupanalyses/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>c20a7d8b-00ab-4edf-adf5-89fc94385e65</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>ClassificationGroupChart</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8dfbe502-aa7a-4514-aaed-a1decf2b4344</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>ClassificationGroups</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>SCORE</name>
- </entityField>
- <entityField>
- <name>GROUP</name>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFieldMappings>
- <jDitoRecordFieldMapping>
- <name>UID.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>GROUP.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>GROUP.displayValue</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>SCORE.value</name>
- </jDitoRecordFieldMapping>
- </recordFieldMappings>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js b/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js
deleted file mode 100644
index ce766e6646d01313ec7914dd4c9a2d110db92ef1..0000000000000000000000000000000000000000
--- a/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$field.UID"))
\ No newline at end of file
diff --git a/entity/ClassificationGroupAnalyses_entity/documentation.adoc b/entity/ClassificationGroupAnalyses_entity/documentation.adoc
deleted file mode 100644
index ba6c7d1f310c1eb7fd791cd0bc612c80d4aa8a66..0000000000000000000000000000000000000000
--- a/entity/ClassificationGroupAnalyses_entity/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= ClassificationGroupAnalyses_entity
-
-This entity is there for grouping the information in the classification_entity
\ No newline at end of file
diff --git a/entity/ClassificationGroupAnalyses_entity/entityfields/groupanalyses/documentation.adoc b/entity/ClassificationGroupAnalyses_entity/entityfields/groupanalyses/documentation.adoc
deleted file mode 100644
index f5014870cb87669b987f575b44ecc6c0c15638ad..0000000000000000000000000000000000000000
--- a/entity/ClassificationGroupAnalyses_entity/entityfields/groupanalyses/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= ClassificationGroupAnalyses_entity - GroupAnalyses
-
-Provides the information to display them in the Classification
\ No newline at end of file
diff --git a/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js b/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js
deleted file mode 100644
index 142d69350bde00927db3911f77d92bc924cc0ee3..0000000000000000000000000000000000000000
--- a/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("Classification_lib");
-
-var scores = ClassificationUtils.getScore(vars.get("$param.ClassificationType_param"), vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowid_param"));
-var data = [];
-
-for (group in scores)
-{
-
- data.push([group, group, translate.text(group), scores[group]]);
-}
-
-result.object(data);
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod b/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..546a64d948001e538ed6a971478016d6ae568b0f
--- /dev/null
+++ b/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
@@ -0,0 +1,112 @@
+<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+ <name>ClassificationGroup_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/ClassificationGroup_entity/documentation.adoc</documentation>
+ <title>Classification</title>
+ <contentTitleProcess>%aditoprj%/entity/ClassificationGroup_entity/contentTitleProcess.js</contentTitleProcess>
+ <titlePlural>Classifications</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONGROUPID</name>
+ <valueProcess>%aditoprj%/entity/ClassificationGroup_entity/entityfields/classificationgroupid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ <title>Classification</title>
+ <displayValueProcess>%aditoprj%/entity/ClassificationGroup_entity/entityfields/title/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>ClassificationGroups</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ClassificationType_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ClassificationGradings</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ClassificationGrading_entity</entityName>
+ <fieldName>ClassificationGradings</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ClassificationTypeId_param</name>
+ <valueProcess>%aditoprj%/entity/ClassificationGroup_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>SORTING</name>
+ <title>Sorting</title>
+ </entityField>
+ <entityField>
+ <name>object_type</name>
+ <title>Place Of Use</title>
+ <valueProcess>%aditoprj%/entity/ClassificationGroup_entity/entityfields/object_type/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>SpecificObjectTypeGroups</name>
+ <documentation>%aditoprj%/entity/ClassificationGroup_entity/entityfields/specificobjecttypegroups/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>translatedTitle</name>
+ <valueProcess>%aditoprj%/entity/ClassificationGroup_entity/entityfields/translatedtitle/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <isPageable v="false" />
+ <conditionProcess>%aditoprj%/entity/ClassificationGroup_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/ClassificationGroup_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <cacheType>GLOBAL</cacheType>
+ <cacheKeyProcess>%aditoprj%/entity/ClassificationGroup_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>b0606861-e080-4441-94ac-fce33bbf7747</name>
+ <tableName>CLASSIFICATIONGROUP</tableName>
+ <primaryKey>CLASSIFICATIONGROUPID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>TITLE.value</name>
+ <recordfield>CLASSIFICATIONGROUP.TITLE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SORTING.value</name>
+ <recordfield>CLASSIFICATIONGROUP.SORTING</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONGROUPID.value</name>
+ <recordfield>CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/ClassificationGroup_entity/contentTitleProcess.js b/entity/ClassificationGroup_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1f578714f795a0c4eefd533ba9c4b9b11e43d470
--- /dev/null
+++ b/entity/ClassificationGroup_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.translatedTitle"));
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/documentation.adoc b/entity/ClassificationGroup_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..457450a735bf0dbd9e574703697e18a531d46c67
--- /dev/null
+++ b/entity/ClassificationGroup_entity/documentation.adoc
@@ -0,0 +1,49 @@
+= ClassificationGroup_entity
+
+Definition:
+
+ Used to make it possible to store the classification groups in their own table with their own UUID instead of using the title as the key.
+ The classification can be dynamically configured at runtime.
+ (For more information about the classification see also Classification_entity)
+
+Purpose:
+
+ This entity is used for storing the classification groups and making it possible for the admin to change
+ the details of the clasification (classificationGroup) like the name, sorting or it's usage
+ or to change the classification of an indicator without affecting the classification itself.
+ In the past the classificationgroup was only a name, which limited the functionality, which is why it got changed.
+
+ This entity only has one view: the ClassificationGroupPreview which has the usage (object_type), title, and sorting fields
+ and the ClassificationGradingMultipleEdit_view.
+ making it possible for the admin to configure something like this:
+
+ ClassificationAdminPreviewOfClassification Example:
+
+ USAGE: Organisation
+ CLASSIFICATION: 1. Target Group
+ SORTING: 1
+ A 100
+ B 75
+ C 50
+ D 25
+
+ (For more information about the grading see also ClassifiactionGrading_entity)
+
+Particularities:
+
+ The Classification consists of the following entities:
+ Classification_entity,
+ ClassificationAdmin_entity,
+ ClassificationGrading_entity,
+ ClassificationGroup_entity,
+ ClassificationScore_entity,
+ ClassificationType_entity
+
+ Our terms in the db and entity structure differ from the technical terms the user gets to see, to make it easier to understand
+ for the developer that doesn't have the technical know-how:
+
+ Our term: Technical term: Example:
+ Object_Type Usage Organisation
+ ClassificationGroup Classification 1. Target Group
+ ClassificationType Indicator Industry
+ ClassificationScore (Possible-)Value/Selection Service
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js b/entity/ClassificationGroup_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..955830d8a9b4611e081d03a118f0dfa0b3427682
--- /dev/null
+++ b/entity/ClassificationGroup_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CLASSIFICATIONGROUPID"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js b/entity/ClassificationGroup_entity/entityfields/classificationgroupid/valueProcess.js
similarity index 61%
rename from entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js
rename to entity/ClassificationGroup_entity/entityfields/classificationgroupid/valueProcess.js
index 2bccd5eb7fbb2311971da0e6ae2ed3b56ed21268..16c47d8b58490ac63829673a531ffce4e6896745 100644
--- a/entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js
+++ b/entity/ClassificationGroup_entity/entityfields/classificationgroupid/valueProcess.js
@@ -1,8 +1,10 @@
+import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
- result.string(vars.get("$param.ClassificationType_param"));
+ var newId = util.getNewUUID();
+ result.string(newId);
}
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/entityfields/object_type/valueProcess.js b/entity/ClassificationGroup_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d24b532449fc6ef9f0f016d27e0d277bb202d0c2
--- /dev/null
+++ b/entity/ClassificationGroup_entity/entityfields/object_type/valueProcess.js
@@ -0,0 +1,14 @@
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+
+var groupId = vars.get("$field.CLASSIFICATIONGROUPID")
+
+if(groupId)
+{
+ var res = newSelect("distinct CLASSIFICATIONTYPE.OBJECT_TYPE")
+ .from("CLASSIFICATIONTYPE")
+ .where("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", vars.get("$field.CLASSIFICATIONGROUPID"))
+ .cell();
+ result.string(res);
+}
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/entityfields/specificobjecttypegroups/documentation.adoc b/entity/ClassificationGroup_entity/entityfields/specificobjecttypegroups/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..69ef4700107cb6e201bec2c78d205421cf124623
--- /dev/null
+++ b/entity/ClassificationGroup_entity/entityfields/specificobjecttypegroups/documentation.adoc
@@ -0,0 +1,2 @@
+Provider that returns ClassificationGroups of one given Object_type (e.g. `Organisation`)
+This may be used for `entities.getRows`.
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/entityfields/title/displayValueProcess.js b/entity/ClassificationGroup_entity/entityfields/title/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1bd5882b79ef1bdc97ba4ed6d408b4401eeb35a2
--- /dev/null
+++ b/entity/ClassificationGroup_entity/entityfields/title/displayValueProcess.js
@@ -0,0 +1,4 @@
+import("system.result")
+import("system.vars")
+
+result.string(vars.get("$this.value"));
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/entityfields/translatedtitle/valueProcess.js b/entity/ClassificationGroup_entity/entityfields/translatedtitle/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c7ea27ae7a5b7b3be6958633bda20ec4b71c2f57
--- /dev/null
+++ b/entity/ClassificationGroup_entity/entityfields/translatedtitle/valueProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+var res;
+var title = vars.get("$field.TITLE");
+if (title)
+ res = translate.text(title);
+else
+ res = "";
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/recordcontainers/db/cacheKeyProcess.js b/entity/ClassificationGroup_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..944498d6bd81fef429957cc685756728ced7dbee
--- /dev/null
+++ b/entity/ClassificationGroup_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,5 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey("$param.ObjectType_param");
+result.string(res);
diff --git a/entity/ClassificationGroup_entity/recordcontainers/db/conditionProcess.js b/entity/ClassificationGroup_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d43dba815cd2dea8e2a5eeb8335aa36c8e3746c
--- /dev/null
+++ b/entity/ClassificationGroup_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,20 @@
+import("Employee_lib");
+import("AttributeRegistry_basic");
+import("Attribute_lib");
+import("system.logging");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+import("Context_lib");
+
+var cond = newWhere();
+
+var objectType = vars.get("$param.ObjectType_param");
+if (objectType)
+ cond.and("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID")
+ .from("CLASSIFICATIONTYPE")
+ .where("CLASSIFICATIONTYPE.OBJECT_TYPE", objectType), SqlBuilder.IN());
+
+//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/recordcontainers/db/orderClauseProcess.js b/entity/ClassificationGroup_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d4100626b34a30ef46be15f8132398218b1ec81e
--- /dev/null
+++ b/entity/ClassificationGroup_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,7 @@
+import("system.db");
+import("system.result");
+
+var res = {
+ "CLASSIFICATIONGROUP.TITLE": db.ASCENDING
+};
+result.object(res);
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 2c0285db54dfd211baf7a5287a690b598278f540..b24809498150ef8eca45712cbaa279277a9607d6 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ClassificationScore_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ClassificationScore_entity/documentation.adoc</documentation>
@@ -33,15 +33,15 @@
</entityField>
<entityField>
<name>SCORE</name>
- <title>Score</title>
+ <title>Points</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<mandatory v="true" />
- <onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/score/onValidation.js</onValidation>
</entityField>
<entityProvider>
<name>ClassificationScores</name>
+ <sortingField>SORT</sortingField>
<documentation>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationscores/documentation.adoc</documentation>
<children>
<entityParameter>
@@ -51,6 +51,7 @@
</entityParameter>
<entityParameter>
<name>ClassificationTypeId_param</name>
+ <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js</valueProcess>
<expose v="true" />
<mandatory v="true" />
</entityParameter>
@@ -66,10 +67,6 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
- <entityField>
- <name>MaxValue</name>
- <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js</valueProcess>
- </entityField>
<entityParameter>
<name>ClassificationGroup_param</name>
<expose v="true" />
@@ -80,14 +77,32 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityField>
+ <name>classificationgroup_id</name>
+ <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationgroup_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationgroup_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>translatedTitle</name>
+ <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/translatedtitle/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <isPageable v="false" />
<conditionProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <cacheType>GLOBAL</cacheType>
+ <cacheKeyProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
<linkInformation>
<linkInformation>
<name>e2fecaf8-bc95-4a4d-bd96-88731568b1a4</name>
diff --git a/entity/ClassificationScore_entity/documentation.adoc b/entity/ClassificationScore_entity/documentation.adoc
index 89c3ea4f996f8537873b516195a6e80cdb00fe15..b726994060331781c42824c0019eb30c1f2df4b6 100644
--- a/entity/ClassificationScore_entity/documentation.adoc
+++ b/entity/ClassificationScore_entity/documentation.adoc
@@ -1,3 +1,47 @@
= ClassificationScore_entity
-Presentation of the grouping via ScoreCard
\ No newline at end of file
+Definition:
+
+ Stores the possible Values of Classification score types and their score and the sorting value.
+ (For more information about the classification see also Classification_entity)
+
+Purpose:
+
+ This Entity gives the administrators an easy way to edit the possible values, their scoring and sorting in the preview of classificationAdmin
+ when selecting a indicator (classificationType).
+ The values gets stored in the table classificationscore with their own classificationScoreId, the classificationType_Id, title, score und sort.
+
+ This entity only has one view: the ClassificationScoreMultipleEdit_view which has title as the title field and score and sort as columns
+ making it possible for the admin to configure something like this:
+
+ ClassificationAdminPreviewOfIndicator Example:
+
+ USAGE: Organisation
+ CLASSIFICATION: 1. Target Group
+ INDICATOR: Headquarters
+ Germany 35,00, 10
+ Austria 35,00 20
+ Switzerland 25,00, 30
+ Other 0,00, 40
+
+Particularities:
+
+ The biggest possible score is being used by classificationGrading to calculate the value for the best possible grade,
+ if this value is changed the grading get's updated using the rule of three (see onInsert-, onUpdate- and onDelete- processes).
+
+ The Classification consists of the following entities:
+ Classification_entity,
+ ClassificationAdmin_entity,
+ ClassificationGrading_entity,
+ ClassificationGroup_entity,
+ ClassificationScore_entity,
+ ClassificationType_entity
+
+ Our terms in the db and entity structure differ from the technical terms the user gets to see, to make it easier to understand
+ for the developer that doesn't have the technical know-how:
+
+ Our term: Technical term: Example:
+ Object_Type Usage Organisation
+ ClassificationGroup Classification 1. Target Group
+ ClassificationType Indicator Industry
+ ClassificationScore (Possible-)Value/Selection Service
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/classificationgroup_id/displayValueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationgroup_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..98e4c5bc2b43a98addc28f2a80374c3e81721c5c
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/classificationgroup_id/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("Context_lib");
+import("system.result");
+
+var groupId = vars.get("$field.classificationgroup_id");
+if(groupId != "" && groupId != undefined)
+ result.string(ContextUtils.loadContentTitle("ClassificationGroup_entity", groupId));
+else
+ result.string("")
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/classificationgroup_id/valueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationgroup_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..65f65e71046bb7d45bb66d599db775f3e4274b4a
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/classificationgroup_id/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("Sql_lib");
+import("system.result");
+
+var groupId = vars.get("$param.ClassificationGroup_param");
+if(groupId)
+ result.string(groupId);
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js
index 2e1eadc780ee959ee845885c8bca4d35d4eece3d..394e2a4a036323a90283bed48ca7ee378dd6200c 100644
--- a/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js
+++ b/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js
@@ -3,7 +3,5 @@ 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
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f87c7071f1ad16f7349cb6c114f0b32548c75b00
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONTYPE_ID"));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js
index 419fe78a30db83fdeda7d426e0f4083b914a555e..8806f470d922646ce6c4127ee42e945e86119076 100644
--- a/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js
+++ b/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js
@@ -3,6 +3,4 @@ import("system.neon");
import("system.vars");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- result.string(vars.get("$param.ClassificationTypeId_param"));
-}
\ No newline at end of file
+ result.string(vars.get("$param.ClassificationTypeId_param"));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js b/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js
deleted file mode 100644
index d46b81f5b8e7d48b7aa69224399a0a67feb5502d..0000000000000000000000000000000000000000
--- a/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.db");
-import("Sql_lib");
-
-if (!vars.get("$this.value"))
-{
- var classificationTypeId = vars.get("$param.ClassificationTypeId_param");
- var maxValue = newSelect("100.0 - sum(maxScore)")
- .from(newSelect("max(SCORE) maxScore")
- .from("CLASSIFICATIONTYPE")
- .join("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
- .whereIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId, SqlBuilder.NOT_EQUAL())
- .andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", "$param.ClassificationGroup_param")
- .andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", "$param.ClassificationType_param")
- .groupBy("CLASSIFICATIONTYPE.SCORETYPE"), "maxScores")
- .cell();
- if (maxValue == "")
- maxValue = 100;
-
- result.string(maxValue);
-}
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/score/onValidation.js b/entity/ClassificationScore_entity/entityfields/score/onValidation.js
deleted file mode 100644
index 83ad4d951b6ef20e15e38a4e4ad81c1ba7738e3b..0000000000000000000000000000000000000000
--- a/entity/ClassificationScore_entity/entityfields/score/onValidation.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("Entity_lib");
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-var max = parseFloat(vars.getString("$field.MaxValue"));
-if (parseFloat(vars.get("local.value")) > max)
- result.string(translate.withArguments("${HIGHER_THAN_MAX} max: %0", [max]));
\ No newline at end of file
diff --git a/entity/DocumentTemplateTypeCategory_entity/titleProcess.js b/entity/ClassificationScore_entity/entityfields/translatedtitle/valueProcess.js
similarity index 97%
rename from entity/DocumentTemplateTypeCategory_entity/titleProcess.js
rename to entity/ClassificationScore_entity/entityfields/translatedtitle/valueProcess.js
index 4c4e2663bd53256524a7f8c0e7e725909de92093..c6340e758de70df1385e315040916acaded94e84 100644
--- a/entity/DocumentTemplateTypeCategory_entity/titleProcess.js
+++ b/entity/ClassificationScore_entity/entityfields/translatedtitle/valueProcess.js
@@ -1,5 +1,5 @@
-import("system.vars");
-import("system.translate");
-import("system.result");
-
+import("system.result");
+import("system.translate");
+import("system.vars");
+
result.string(translate.text(vars.get("$field.TITLE")));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/cacheKeyProcess.js b/entity/ClassificationScore_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1edaa2e881b707c23ac3baf2d780bf5d77fd795f
--- /dev/null
+++ b/entity/ClassificationScore_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,5 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey("$param.ClassificationGroup_param", "$param.ClassificationTypeId_param", "$param.ClassificationType_param");
+result.string(res);
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js b/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
index 4ff706b929e67b911e790162b380fbdd782dbbf0..4feb1dc30761452716df0f169ffef60f0945c21a 100644
--- a/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
@@ -1,3 +1,39 @@
import("Sql_lib");
+import("system.db");
+import("system.vars");
+import("Classification_lib");
+import("system.eMath");
+import("system.entities");
-newWhere("CLASSIFICATION.CLASSIFICATIONSCORE_ID", "$field.CLASSIFICATIONSCOREID").deleteData();
\ No newline at end of file
+try
+{
+ newWhere("CLASSIFICATION.CLASSIFICATIONSCORE_ID", "$field.CLASSIFICATIONSCOREID").deleteData();
+ var classificationScoreId = vars.get("$field.CLASSIFICATIONSCOREID")
+
+ var classificationType = ClassificationUtils.getClassificationType(classificationScoreId);
+ var classificationGroup = ClassificationUtils.getClassificationGroup(classificationType);
+ var gradingTable = ClassificationUtils.getGradingTableByGroupId(classificationGroup);
+ var maxScore = ClassificationUtils.getMaxScore(classificationGroup)
+
+ if(gradingTable[0][1] != maxScore) //the gradingTable is already sorted, so gradingTable[0][1] is the maxGradeForScore of the best possible Grade
+ {
+ var column = ["MAXGRADEFORSCORE"];
+ var table = ["CLASSIFICATIONGRADING"];
+ var multiplicand = maxScore/gradingTable[0][1];
+ var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+ .updateData(true, table, column, db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
+
+ for (let i = 1; i < gradingTable.length; i++)
+ {
+ update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+ .updateData(true, table, column, db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplicand)]);
+ }
+ }
+}
+finally //always make sure that the cache is as valid as possible
+{
+ //ClassificationType_entity accesses the CLASSIFICATIONSCORE (max value of scores) so we need to update the cache to prevent inconsesty
+ entities.invalidateCache("ClassificationType_entity", "db");
+ //Grading-values are dependent since they are modified within this process (maxgrade)
+ entities.invalidateCache("ClassificationGrading_entity", "db");
+}
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js b/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..0dfe964c1e25974c57ac6b79e9f09adf783cdc26
--- /dev/null
+++ b/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,41 @@
+import("system.entities");
+import("system.db");
+import("Sql_lib");
+import("system.vars");
+import("Classification_lib");
+import("system.eMath")
+
+try
+{
+ var classificationScoreId = vars.get("$field.CLASSIFICATIONSCOREID")
+
+ var classificationType = ClassificationUtils.getClassificationType(classificationScoreId);
+ var classificationGroup = ClassificationUtils.getClassificationGroup(classificationType);
+ var gradingTable = ClassificationUtils.getGradingTableByGroupId(classificationGroup);
+ var maxScore = ClassificationUtils.getMaxScore(classificationGroup)
+
+ if(gradingTable.length > 0 && gradingTable != undefined && gradingTable != null)
+ {
+ if(gradingTable[0][1] != maxScore)
+ {
+ var column = ["MAXGRADEFORSCORE"];
+ var table = ["CLASSIFICATIONGRADING"];
+ var multiplicand = maxScore/gradingTable[0][1];
+ var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+ .updateData(true, table, column, null, [maxScore]);
+
+ for (let i = 1; i < gradingTable.length; i++)
+ {
+ update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+ .updateData(true, table, column, null, [parseInt(gradingTable[i][1] * multiplicand)]);
+ }
+ }
+ }
+}
+finally //always make sure that the cache is as valid as possible
+{
+ //ClassificationType_entity accesses the CLASSIFICATIONSCORE (max value of scores) so we need to update the cache to prevent inconsesty
+ entities.invalidateCache("ClassificationType_entity", "db");
+ //Grading-values are dependent since they are modified within this process (maxgrade)
+ entities.invalidateCache("ClassificationGrading_entity", "db");
+}
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js b/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..5cfa69ab83d180289ed03ff802d37ecd44d023b5
--- /dev/null
+++ b/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js
@@ -0,0 +1,38 @@
+import("system.entities");
+import("system.db");
+import("Sql_lib");
+import("system.vars");
+import("Classification_lib");
+import("system.eMath")
+
+try
+{
+ var classificationScoreId = vars.get("$field.CLASSIFICATIONSCOREID")
+
+ var classificationType = ClassificationUtils.getClassificationType(classificationScoreId);
+ var classificationGroup = ClassificationUtils.getClassificationGroup(classificationType);
+ var gradingTable = ClassificationUtils.getGradingTableByGroupId(classificationGroup);
+ var maxScore = ClassificationUtils.getMaxScore(classificationGroup)
+
+ if(gradingTable[0][1] != maxScore)
+ {
+ var column = ["MAXGRADEFORSCORE"];
+ var table = ["CLASSIFICATIONGRADING"];
+ var multiplicand = maxScore/gradingTable[0][1];
+ var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+ .updateData(true, table, column, db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
+
+ for (let i = 1; i < gradingTable.length; i++)
+ {
+ update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+ .updateData(true, table, column, db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplicand)]);
+ }
+ }
+}
+finally //always make sure that the cache is as valid as possible
+{
+ //ClassificationType_entity accesses the CLASSIFICATIONSCORE (max value of scores) so we need to update the cache to prevent inconsesty
+ entities.invalidateCache("ClassificationType_entity", "db");
+ //Grading-values are dependent since they are modified within this process (maxgrade)
+ entities.invalidateCache("ClassificationGrading_entity", "db");
+}
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index 71e9814dfada92d92562977ec2574a004ceac8eb..d86c079f7b68f2f527fb56ee8044e50dab3afbbf 100644
--- a/entity/ClassificationType_entity/ClassificationType_entity.aod
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -1,29 +1,99 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ClassificationType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ClassificationType_entity/documentation.adoc</documentation>
+ <title>Indicator</title>
+ <contentTitleProcess>%aditoprj%/entity/ClassificationType_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>908ca339-4dca-41c6-a32b-472617e1742e</name>
+ <entityName>ClassificationGroup_entity</entityName>
+ <fieldName>ClassificationGroups</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>CLASSIFICATIONTYPEID</name>
+ <valueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/classificationtypeid/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>TYPE</name>
+ <name>OBJECT_TYPE</name>
+ <title>Place Of Use</title>
+ <displayValueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
- <name>CLASS</name>
+ <name>SCORETYPE</name>
+ <title>Indicator</title>
+ <displayValueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
</entityField>
+ <entityField>
+ <name>CLASSIFICATIONGROUP_ID</name>
+ <title>Classification</title>
+ <displayValueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/classificationgroup_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>ClassificationScores</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ClassificationScore_entity</entityName>
+ <fieldName>ClassificationScores</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ClassificationTypeId_param</name>
+ <valueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ClassificationGroup_param</name>
+ <valueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>infoField</name>
+ <title>Hint</title>
+ <valueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/infofield/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityField>
+ <name>maxScore</name>
+ <valueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/maxscore/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ClassificationGroupId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>ClassificationTypesForGroup</name>
+ <documentation>%aditoprj%/entity/ClassificationType_entity/entityfields/classificationtypesforgroup/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>ClassificationGroupId_param</name>
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <isPageable v="false" />
+ <conditionProcess>%aditoprj%/entity/ClassificationType_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <cacheType>GLOBAL</cacheType>
+ <cacheKeyProcess>%aditoprj%/entity/ClassificationType_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
<linkInformation>
<linkInformation>
- <name>0a0944fd-a72f-4c95-8c42-b1e7d3e17721</name>
+ <name>0c764b72-f55b-4b87-8dc1-9a491a143f44</name>
<tableName>CLASSIFICATIONTYPE</tableName>
<primaryKey>CLASSIFICATIONTYPEID</primaryKey>
<isUIDTable v="true" />
@@ -36,12 +106,20 @@
<recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>CLASS.value</name>
- <recordfield>CLASSIFICATIONTYPE.CLASS</recordfield>
+ <name>OBJECT_TYPE.value</name>
+ <recordfield>CLASSIFICATIONTYPE.OBJECT_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONGROUP_ID.value</name>
+ <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SCORETYPE.value</name>
+ <recordfield>CLASSIFICATIONTYPE.SCORETYPE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>TYPE.value</name>
- <recordfield>CLASSIFICATIONTYPE.TYPE</recordfield>
+ <name>maxScore.value</name>
+ <expression>%aditoprj%/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js b/entity/ClassificationType_entity/contentTitleProcess.js
similarity index 100%
rename from entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js
rename to entity/ClassificationType_entity/contentTitleProcess.js
index 87d569a0e2dc50c0ef3859fdbc0f22c3d9ac89e3..4bb76faf06af8296cc8290169d0de052f10976f1 100644
--- a/entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js
+++ b/entity/ClassificationType_entity/contentTitleProcess.js
@@ -1,5 +1,5 @@
-import("system.vars");
import("system.translate");
+import("system.vars");
import("system.result");
result.string(translate.text(vars.get("$field.SCORETYPE")));
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/documentation.adoc b/entity/ClassificationType_entity/documentation.adoc
index 4b63abbd0ed13d766d3a223ac89f4707a3555f9b..a09562ce3a4c852c52ff3a616d3838531b041890 100644
--- a/entity/ClassificationType_entity/documentation.adoc
+++ b/entity/ClassificationType_entity/documentation.adoc
@@ -1,3 +1,48 @@
= ClassificationType_entity
-Defines types for the classifications (see Classification_entity)
\ No newline at end of file
+Definition:
+
+ Stores the possible Indicators (classificationTypes).
+ (For more information about the classification see also Classification_entity)
+
+Purpose:
+
+ This entity is used for storing the indicators and making it possible for the admin to change
+ the details of the indicator (classificationType) like the name, it's usage or it's classification (classificationGroup)
+
+ This entity only has one view: the ClassificationTypePreview which has the usage (object_type),
+ classification (classificationgroup_Id), and title (scoretype)
+ and the ClassificationScoreMultipleEdit_view.
+ making it possible for the admin to configure something like this:
+
+ ClassificationAdminPreviewOfIndicator Example:
+
+ USAGE: Organisation
+ CLASSIFICATION: 1. Target Group
+ INDICATOR: Headquarters
+ Germany 35,00, 10
+ Austria 35,00 20
+ Switzerland 25,00, 30
+ Other 0,00, 40
+
+Particularities:
+
+ The biggest possible score of the subordinated classificationScores is being used by classificationGrading to calculate the value for the best possible grade,
+ if this value is changed the grading get's updated using the rule of three (see onInsert-, onUpdate- and onDelete- processes of classificationScore_entity).
+
+ The Classification consists of the following entities:
+ Classification_entity,
+ ClassificationAdmin_entity,
+ ClassificationGrading_entity,
+ ClassificationGroup_entity,
+ ClassificationScore_entity,
+ ClassificationType_entity
+
+ Our terms in the db and entity structure differ from the technical terms the user gets to see, to make it easier to understand
+ for the developer that doesn't have the technical know-how:
+
+ Our term: Technical term: Example:
+ Object_Type Usage Organisation
+ ClassificationGroup Classification 1. Target Group
+ ClassificationType Indicator Industry
+ ClassificationScore (Possible-)Value/Selection Service
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/classificationgroup_id/displayValueProcess.js b/entity/ClassificationType_entity/entityfields/classificationgroup_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dcd3cf5a9c6467169516adeb67ef468628df172a
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/classificationgroup_id/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("Context_lib");
+import("system.result");
+
+var groupId = vars.get("$field.CLASSIFICATIONGROUP_ID");
+if(groupId != "" && groupId != undefined)
+ result.string(ContextUtils.loadContentTitle("ClassificationGroup_entity", groupId));
+else
+ result.string("")
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js b/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..83df30fd1c6821c89dcf48519ebec595fc7078c3
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONGROUP_ID"));
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js b/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b11d099579d9bf35111e31b13a41336731c28540
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/classificationtypeid/valueProcess.js b/entity/ClassificationType_entity/entityfields/classificationtypeid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..268ab03c9af220bfb8b2ac3915197667b73f18b2
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/classificationtypeid/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result")
+import("system.vars")
+
+if(vars.exists("ObjectRowid_param"))
+ result.string(vars.get("ObjectRowid_param"));
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/classificationtypesforgroup/documentation.adoc b/entity/ClassificationType_entity/entityfields/classificationtypesforgroup/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..15bbce2b2ee994c354076d1b836c2384ebfde656
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/classificationtypesforgroup/documentation.adoc
@@ -0,0 +1 @@
+Used for providing classification types per group.
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/infofield/valueProcess.js b/entity/ClassificationType_entity/entityfields/infofield/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..07815a1f88e787ef8647c0580f565279772f5efc
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/infofield/valueProcess.js
@@ -0,0 +1,75 @@
+import("system.translate");
+import("Entity_lib");
+import("system.result");
+import("Sql_lib");
+import("system.vars");
+import("Classification_lib");
+import("system.eMath");
+
+//references needed for auto refresh:
+"$field.ClassificationScores.insertedRows";
+"$field.ClassificationScores.changedRows";
+"$field.ClassificationScores.deletedRows";
+
+var rows = EntityConsumerRowsHelper.getCurrentConsumerRows("ClassificationScores", ["SCORE"]);
+var maxScore = 0;
+var i;
+var randomScoreId;
+
+result.string(translate.text("Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!"))
+if(rows.length > 0)
+{
+ for (i = 0; i < rows.length; i++)
+ {
+ randomScoreId = rows[i]["#UID"];
+ break;
+ }
+ var classificationGroup = vars.get("$field.CLASSIFICATIONGROUP_ID");
+ var classificationType = ClassificationUtils.getClassificationType(randomScoreId);
+ var gradingTable = ClassificationUtils.getGradingTableByGroupId(classificationGroup);
+ for (i = 0; i < rows.length; i++)
+ {
+ if(parseFloat(rows[i]["SCORE"]) > maxScore)
+ maxScore = parseFloat(rows[i]["SCORE"]);
+ }
+ if(classificationType.length > 0)
+ {
+ maxScore = eMath.addDec(parseFloat(maxScore), parseFloat(ClassificationUtils.getMaxScoreExcludeType(classificationGroup, classificationType)));
+ }
+ else
+ {
+ maxScore = eMath.addDec(parseFloat(maxScore), parseFloat(ClassificationUtils.getMaxScore(classificationGroup)));
+ }
+
+ if(gradingTable.length > 0 && gradingTable != undefined && gradingTable != null)
+ {
+ var greatestGrading = gradingTable[0][1];
+ if(gradingTable[0][1] != maxScore)
+ {
+ var multiplicand;
+ var oldToNewValueString = "";
+ if(greatestGrading != 0)
+ {
+ multiplicand = maxScore/greatestGrading;
+ for (i = 0; i < gradingTable.length; i++)
+ {
+ oldToNewValueString += gradingTable[i][2] + ": " + gradingTable[i][1] + "->" + parseInt(gradingTable[i][1] * multiplicand) + "\n\
+ ";
+ }
+ }
+ else
+ {
+ greatestGrading = maxScore;
+ multiplicand = 1;
+ for (i = 0; i < gradingTable.length; i++)
+ {
+ oldToNewValueString += gradingTable[i][2] + ": " + gradingTable[i][1] + "->" + greatestGrading * multiplicand + "\n\
+ ";
+ }
+ }
+ var resString = translate.text("This is how the Classification Gradings of the Classification will get affected by these changes:") + "\n\
+ "+ oldToNewValueString;
+ result.string(resString);
+ }
+ }
+}
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/maxscore/valueProcess.js b/entity/ClassificationType_entity/entityfields/maxscore/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..49d9c5de791ae6d83bb8a6f61da2927d509ebddd
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/maxscore/valueProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("Sql_lib");
+import("system.vars");
+
+var classificationTypeId = vars.get("$field.CLASSIFICATIONTYPEID");
+
+var score = null;
+if (classificationTypeId)
+{
+ score = newSelect("max(CLASSIFICATIONSCORE.SCORE)")
+ .from("CLASSIFICATIONSCORE")
+ .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", classificationTypeId)
+ .cell();
+}
+
+result.string(score);
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/object_type/displayValueProcess.js b/entity/ClassificationType_entity/entityfields/object_type/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..86c8786764dfb70e4874f95658d07af7aae99d50
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/object_type/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("Sql_lib");
+import("Classification_lib");
+import("system.result");
+import("system.vars");
+
+var classificationType = vars.get("$this.value");
+
+result.string(translate.text(classificationType));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/titleProcess.js b/entity/ClassificationType_entity/entityfields/scoretype/displayValueProcess.js
similarity index 55%
rename from entity/DocumentTemplate_entity/titleProcess.js
rename to entity/ClassificationType_entity/entityfields/scoretype/displayValueProcess.js
index e7185d981056a9950a37b0cce1f2ef04a40f94c6..29c6cf6dc29eb3898120f2e480fecc0cc2edbeec 100644
--- a/entity/DocumentTemplate_entity/titleProcess.js
+++ b/entity/ClassificationType_entity/entityfields/scoretype/displayValueProcess.js
@@ -1,5 +1,5 @@
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(translate.text(vars.get("$field.NAME")));
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+result.string(translate.text(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/recordcontainers/db/cacheKeyProcess.js b/entity/ClassificationType_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d6595b81408d7f508732c607760733e4e410da36
--- /dev/null
+++ b/entity/ClassificationType_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,5 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey("$param.ClassificationGroupId_param");
+result.string(res);
diff --git a/entity/ClassificationType_entity/recordcontainers/db/conditionProcess.js b/entity/ClassificationType_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..14721e02d30f3d70942c9a5cafa2b346958bb754
--- /dev/null
+++ b/entity/ClassificationType_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhereIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", "$param.ClassificationGroupId_param");
+result.string(cond.toString());
+
diff --git a/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js b/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..d8c6a26ee9e7e6851db78a9c24172140d0d2aa8d
--- /dev/null
+++ b/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.result");
+import("Sql_lib");
+
+var statement = newSelect("max(CLASSIFICATIONSCORE.SCORE)")
+ .from("CLASSIFICATIONSCORE")
+ .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID");
+
+result.string(statement.toString());
\ No newline at end of file
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index 2a9be2268441851c4dde39206cf556d2f790bdc1..011426f28c49b46e51582e167bf98d6a18abd991 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Classification_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Classification_entity/documentation.adoc</documentation>
@@ -50,6 +50,12 @@
<fieldName>Classifications</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>ed17d4ca-1bdd-45b2-8a38-d7a73b1669e7</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Classifications</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityField>
@@ -58,7 +64,8 @@
</entityField>
<entityField>
<name>CLASSIFICATIONGROUP</name>
- <title>Group name</title>
+ <documentation>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/documentation.adoc</documentation>
+ <title>Classification</title>
<contentType>TEXT</contentType>
<groupable v="true" />
<mandatoryProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js</mandatoryProcess>
@@ -138,7 +145,7 @@
</entityConsumer>
<entityField>
<name>SCORETYPE</name>
- <title>Scoretype</title>
+ <title>Indicator</title>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
</entityField>
@@ -146,6 +153,16 @@
<name>GroupScore</name>
<valueProcess>%aditoprj%/entity/Classification_entity/entityfields/groupscore/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>GRADINGVALUE</name>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONGROUP_ID</name>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -165,9 +182,18 @@
<jDitoRecordFieldMapping>
<name>CLASSIFICATIONGROUP.value</name>
</jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONGROUP.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONGROUP_ID.displayValue</name>
+ </jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CLASSIFICATIONSCORE_ID.value</name>
</jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONSCORE_ID.displayValue</name>
+ </jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CLASSIFICATIONTYPEID.value</name>
</jDitoRecordFieldMapping>
@@ -175,10 +201,10 @@
<name>CLASSIFICATIONTYPE_ID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>OBJECT_ROWID.value</name>
+ <name>OBJECT_TYPE.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>OBJECT_TYPE.value</name>
+ <name>OBJECT_ROWID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>SCORETYPE.value</name>
@@ -189,6 +215,9 @@
<jDitoRecordFieldMapping>
<name>SCORE_RESULTS.value</name>
</jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>GroupScore.value</name>
+ </jDitoRecordFieldMapping>
</recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/Classification_entity/afterOperatingState.js b/entity/Classification_entity/afterOperatingState.js
index 09213cf5619c0ad05c151b3eb5bcb3db792aba72..6ce8bdeeee1b7858a4475e780bc7ea61de0b3aa3 100644
--- a/entity/Classification_entity/afterOperatingState.js
+++ b/entity/Classification_entity/afterOperatingState.js
@@ -1,8 +1,9 @@
-import("system.vars");
-import("system.neon");
+/*
+ *this refresh should not be necessary:
+ */
-// "$local.value" contains the previous operationg state
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && vars.get("$local.value") == neon.OPERATINGSTATE_EDIT)
-{
- neon.refreshAll()
-}
+//// "$local.value" contains the previous operationg state
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && vars.get("$local.value") == neon.OPERATINGSTATE_EDIT)
+//{
+// neon.refreshAll();
+//}
diff --git a/entity/Classification_entity/contentProcess.js b/entity/Classification_entity/contentProcess.js
deleted file mode 100644
index bb0a011684fcc7b40aefaaac225bd985aa83c0ec..0000000000000000000000000000000000000000
--- a/entity/Classification_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/Classification_entity/documentation.adoc b/entity/Classification_entity/documentation.adoc
index a233f0ddd65b389f852dd38257a5a091755c6da4..6fb30333ca4369806f0dd63d76773d4e580df977 100644
--- a/entity/Classification_entity/documentation.adoc
+++ b/entity/Classification_entity/documentation.adoc
@@ -1,3 +1,45 @@
= Classification_entity
-Offers the possibility to flexibly classify sales projects. The classification can be dynamically configured at runtime.
\ No newline at end of file
+Definition:
+
+ Offers the possibility to flexibly classify sales projects, organisations, or any other data.
+ The classification can be dynamically configured at runtime.
+
+Purpose:
+
+ Classifications get stored in the Classification table with their own uid, the ids of the classification type, classification score, object_rowId and object_type.
+
+ This entity displays the classification of an dataset in an treetable,
+ with the classification (classificationgroup), including the archieved and possible points and the resulting grading, as the groupfield.
+ And Columns for the indicators (classificationtype) and the selected values (selection).
+
+ Example:
+ INDICATOR SELECTION
+ 1. Target Group: 60/100Points = B
+ Industry Service
+ Headquarters Germany
+ Product preference Commodity group 1
+
+ 2. Customer value: 15/100Points = D
+ Current supply share High
+ Purchasing potential p. a. 100-199 D?
+ Loyalty Low
+
+Particularities:
+
+ The Classification consists of the following entities:
+ Classification_entity,
+ ClassificationAdmin_entity,
+ ClassificationGrading_entity,
+ ClassificationGroup_entity,
+ ClassificationScore_entity,
+ ClassificationType_entity
+
+ Our terms in the db and entity structure differ from the technical terms the user gets to see, to make it easier to understand
+ for the developer that doesn't have the technical know-how:
+
+ Our term: Technical term: Example:
+ Object_Type Usage Organisation
+ ClassificationGroup Classification 1. Target Group
+ ClassificationType Indicator Industry
+ ClassificationScore (Possible-)Value/Selection Service
diff --git a/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js b/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js
index 6f677fee2cb374dfea6c759cd9611407428f8b89..d0b202c003896906849e53907d10e67333faf168 100644
--- a/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js
+++ b/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
import("Classification_lib");
import("system.translate");
import("system.result");
@@ -6,6 +7,8 @@ import("system.vars");
if (vars.getString("$field.CLASSIFICATIONGROUP"))
{
var score = vars.getString("$field.GroupScore");
- result.string(translate.text(vars.get("$field.CLASSIFICATIONGROUP")) + ": " + score + " " + translate.text("points") + " = " + ClassificationUtils.mapToClass(score));
-
+ var group = vars.getString("$field.CLASSIFICATIONGROUP");
+ var groupName = vars.getString("$field.CLASSIFICATIONGROUP_ID.displayValue");
+ var res = ClassificationUtils.formatDisplaySummaryForGroup(score, group, groupName);
+ result.string(res);
}
diff --git a/entity/Classification_entity/entityfields/classificationgroup/documentation.adoc b/entity/Classification_entity/entityfields/classificationgroup/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..93bd1542a90b5187c8e0d0da47bfd24b144d9973
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationgroup/documentation.adoc
@@ -0,0 +1 @@
+This is the field that is used for automatic grouping.
\ 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
index 7865e4544cd6eaba5d15e15937bffca31e2675fa..5f69ddae0ef78a61fc8be88201023c420f4dfb09 100644
--- a/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js
+++ b/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js
@@ -6,4 +6,4 @@ import("system.translate");
if (vars.get("$sys.recordstate") && vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW)
{
result.string(translate.text(vars.get("$field.SCORETYPE")));
-}
\ No newline at end of file
+}
diff --git a/entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js b/entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
index d3275a8eaa916bbbb9604617cb2fb5385bc01cfe..66d1a9ae5a70ffada860ab15cf8caffd67aea623 100644
--- a/entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
+++ b/entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CLASSIFICATIONTYPE"))
\ No newline at end of file
+result.string(vars.get("$field.OBJECT_TYPE"))
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationtype/displayValueProcess.js b/entity/Classification_entity/entityfields/classificationtype/displayValueProcess.js
index 9a93d9382887643fcc081de68214ba526ed930ac..55fc33359a0fc8b9496e9dc12f56e15eb3a7b4ce 100644
--- a/entity/Classification_entity/entityfields/classificationtype/displayValueProcess.js
+++ b/entity/Classification_entity/entityfields/classificationtype/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string(KeywordUtils.getViewValue($KeywordRegistry.classificationType(), vars.get("$field.CLASSIFICATIONTYPE")));
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.classificationType(), vars.get("$field.OBJECT_TYPE")));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationtype/stateProcess.js b/entity/Classification_entity/entityfields/classificationtype/stateProcess.js
index bcc88cc57c128d8971d6880133fb2584129a802e..2a616f4edfa3c6e68a81c8d99b17d08c353ceb69 100644
--- a/entity/Classification_entity/entityfields/classificationtype/stateProcess.js
+++ b/entity/Classification_entity/entityfields/classificationtype/stateProcess.js
@@ -1,11 +1,9 @@
import("system.result");
import("system.neon");
import("system.vars");
+
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
result.string(neon.COMPONENTSTATE_EDITABLE);
-}
+
else
-{
- result.string(neon.COMPONENTSTATE_READONLY);
-}
\ No newline at end of file
+ result.string(neon.COMPONENTSTATE_READONLY);
\ 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
index aaef9be6b3921ec62b37843d0c65b43aeedd7fdf..e294cffd162af0b88230b7052c38c407862add9e 100644
--- a/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js
+++ b/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js
@@ -2,7 +2,6 @@ import("system.result");
import("system.neon");
import("system.vars");
-if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) && vars.get("$this.value") == null)
-{
- result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
-}
\ No newline at end of file
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ && vars.get("$this.value") == null)
+ result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
\ 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
index 00c91dc0b75c8cb002fa9eafe58ad40ab16a0e3a..fe14f896ec8a83c8570a94ad6b64c9585c122e99 100644
--- a/entity/Classification_entity/entityfields/object_rowid/valueProcess.js
+++ b/entity/Classification_entity/entityfields/object_rowid/valueProcess.js
@@ -2,7 +2,7 @@ import("system.result");
import("system.neon");
import("system.vars");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == null)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == null && vars.get("$param.ObjectRowid_param"))
{
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
index 6a340688081d8317de45c8b656f6ffcbe9520e1e..f51252e64ad7fb10b50c67ab339385859219f11b 100644
--- a/entity/Classification_entity/entityfields/object_type/valueProcess.js
+++ b/entity/Classification_entity/entityfields/object_type/valueProcess.js
@@ -3,6 +3,4 @@ import("system.neon");
import("system.vars");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == null)
-{
- result.string(vars.get("$param.ObjectType_param"));
-}
\ No newline at end of file
+ result.string(vars.get("$param.ObjectType_param"));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/points/valueProcess.js b/entity/Classification_entity/entityfields/points/valueProcess.js
deleted file mode 100644
index 5b74382810fde5dda8a728acd2e9c6ce0b1709bf..0000000000000000000000000000000000000000
--- a/entity/Classification_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/Classification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js b/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js
deleted file mode 100644
index 098d87cfa55579898b8da11975f3fb345672247f..0000000000000000000000000000000000000000
--- a/entity/Classification_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/Classification_entity/recordcontainers/jdito/contentProcess.js b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
index 0060716a7dfc788ca41cec5b2dd705d7be19b79c..0827f9f533b96112b07307a62f704bdde271f52a 100644
--- a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
@@ -1,62 +1,165 @@
-import("JditoFilter_lib");
+import("system.text");
import("Classification_lib");
-import("system.vars");
+import("Contact_lib");
+import("JditoFilter_lib");
import("Sql_lib");
import("system.db");
import("system.result");
+import("system.util");
+import("system.vars");
+import("system.translate");
-var scores = JSON.stringify(ClassificationUtils.getScore(vars.get("$param.ClassificationType_param"), vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowid_param")));
+//helper object for coding/decoding the uid of a record in this entity
+function _UidEncoder(){}
-var classificationId = null;
-var classificationTypeId = null;
+_UidEncoder.encode = function (pClassifactionTypeId, pObjectRowId, pObjectType)
+{
+ var res = text.encodeMS(Array.from(arguments));
+ return res;
+}
-// 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)
+_UidEncoder.decode = function (pEncodedUid)
{
- 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 vals = text.decodeMS(pEncodedUid);
+ return {
+ classifactionTypeId: vals[0],
+ objectRowId: vals[1],
+ objectType: vals[2]
+ };
}
+//grouping is not done in this recordContainer but in it is done in the ClassificaitonTree_view via the defaultGroupFields
+
+var objectRowIdParam = vars.get("$param.ObjectRowid_param");
+var objectTypeParam = vars.get("$param.ObjectType_param");
+var scoresPerGroup = ClassificationUtils.getScoreAsObject(objectTypeParam, objectRowIdParam);
+
var masking = new SqlMaskingUtils();
-var select = newSelect("case when CLASSIFICATIONID is not null then " + masking.concat(["'C,'", "CLASSIFICATIONID"], "", false) + " else " + masking.concat(["'T,'", "CLASSIFICATIONTYPEID"], "", false) + " end, CLASSIFICATIONID, CLASSIFICATIONGROUP, CLASSIFICATIONSCORE_ID, CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE_ID, OBJECT_TYPE, OBJECT_ROWID, SCORETYPE, CLASSIFICATIONTYPE.CLASSIFICATIONTYPE")
+//store the content of $local.idValues depending on the provided type in the idvalues
+var filterClassificationIds = [];
+var filterClassificationTypeIds = [];
+// 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").forEach(function (pIdValue) {
+ var decodedId = _UidEncoder.decode(pIdValue);
+ filterClassificationTypeIds.push(decodedId.classifactionTypeId);
+ });
+}
+
+//this is the main select for the data
+var select = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID \n\
+ ,CLASSIFICATION.CLASSIFICATIONID, CLASSIFICATION.CLASSIFICATIONSCORE_ID, CLASSIFICATION.OBJECT_ROWID \n\
+ ,CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID, CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONTYPE.SCORETYPE \n\
+ ,CLASSIFICATIONSCORE.TITLE\n\
+ ,CLASSIFICATIONGROUP.TITLE ")
.from("CLASSIFICATION")
.rightJoin("CLASSIFICATIONTYPE", newWhere()
- .and("CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPEID")
+ .and("CLASSIFICATION.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
.andIfSet("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
- .andIfSet("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param"))
- .orderBy("CLASSIFICATIONGROUP asc")
- .whereIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", "$param.ClassificationType_param")
- .andIfSet("CLASSIFICATION.CLASSIFICATIONID", classificationId)
+ .andIfSet("CLASSIFICATION.OBJECT_ROWID", objectRowIdParam))
+ .join("CLASSIFICATIONGROUP", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+ .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID = CLASSIFICATION.CLASSIFICATIONSCORE_ID")
+ .whereIfSet("CLASSIFICATIONTYPE.OBJECT_TYPE", "$param.ClassificationType_param")
+ .andIfSet(
+ newWhereIfSet("CLASSIFICATION.CLASSIFICATIONID", filterClassificationIds, SqlBuilder.IN())
+ .orIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", filterClassificationTypeIds, SqlBuilder.IN())
+ )
+ .orderBy("CLASSIFICATIONGROUP.SORTING");
-if (!classificationId)
+if (filterClassificationIds.length == 0 && filterClassificationTypeIds.length == 0)//no idvalues for filtering
{
- select.andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId)
- .and(newWhereIfSet("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
+ select.and(newWhereIfSet("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
.or("CLASSIFICATION.OBJECT_TYPE is null"))
- .and(newWhereIfSet("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param")
+ .and(newWhereIfSet("CLASSIFICATION.OBJECT_ROWID", objectRowIdParam)
.or("CLASSIFICATION.OBJECT_ROWID is null"));
}
-if (vars.exists("$local.filter") && vars.get("$local.filter"))
+_addLocalFilter();
+_updateScore();
+
+/* After loading the data from the database the data some preparation for the record container is done like translating display values into the
+ * correct locale or calculating some values
+ */
+var classificationTypeGroupDisplayCache = {};
+var resultSet = [];
+//declaration needs to be separated because if declaration is done in the deconstructioning the IDE (designer) autocomplete does not work anymore
+var uid, classificationId, classificationScoreId, classificationObjectRowId, classificationTypeGroupId, classificationTypeId
+ , classificationTypeObjectType, classificationTypeScoreType, classificationScoreTitle, classificationGroupTitle;
+select.table().forEach(function (pRow){
+ //deconstructioning for easy access when the selected data changes
+ [uid, classificationId, classificationScoreId, classificationObjectRowId, classificationTypeGroupId, classificationTypeId
+ , classificationTypeObjectType, classificationTypeScoreType, classificationScoreTitle, classificationGroupTitle] = pRow;
+
+ uid = _UidEncoder.encode(uid, objectRowIdParam, objectTypeParam);
+ if (classificationScoreTitle)
+ classificationScoreTitle = translate.text(classificationScoreTitle);
+ if (classificationGroupTitle)
+ classificationGroupTitle = translate.text(classificationGroupTitle);
+
+ var currentGroupScore = scoresPerGroup[classificationTypeGroupId] || 0;
+
+ //display value is the same for every groupId, so let's cache it that we do not need to load it in every row => better performance
+ if (classificationTypeGroupDisplayCache[classificationTypeGroupId] == undefined)
+ {
+ classificationTypeGroupDisplayCache[classificationTypeGroupId] = ClassificationUtils.formatDisplaySummaryForGroup(currentGroupScore
+ , classificationTypeGroupId, classificationGroupTitle);
+ }
+ var classificationTypeGroupDisplay = classificationTypeGroupDisplayCache[classificationTypeGroupId];
+
+ //a field can only contain a string so format complex data into string
+ scoresPerGroup = JSON.stringify(scoresPerGroup);
+
+ resultSet.push([uid, classificationId, classificationTypeGroupId, classificationTypeGroupDisplay, classificationGroupTitle
+ , classificationScoreId, classificationScoreTitle, classificationTypeId, classificationTypeId, classificationTypeObjectType
+ , objectRowIdParam, classificationTypeScoreType, classificationTypeObjectType, scoresPerGroup, currentGroupScore]);
+});
+
+result.object(resultSet);
+
+/* private helper functions for better readability are following now
+ * variable scope is shared so there is no need to pass the values as parameters
+ */
+
+/**
+ * adds the $local.filter to the sql condition
+ */
+function _addLocalFilter()
{
- var filter = vars.get("$local.filter");
- if (filter.filter)
- select.andIfSet((JditoFilterUtils.getSqlCondition(filter.filter, "CLASSIFICATION", undefined, {
- CLASSIFICATIONTYPE : "CLASSIFICATIONTYPE.CLASSIFICATIONTYPE"
- })));
+ if (vars.exists("$local.filter") && vars.get("$local.filter"))
+ {
+ var filter = vars.get("$local.filter");
+ if (filter.filter)
+ select.andIfSet((JditoFilterUtils.getSqlCondition(filter.filter, "CLASSIFICATION", undefined, {
+ OBJECT_TYPE : "CLASSIFICATIONTYPE.OBJECT_TYPE"
+ })));
+ }
}
-result.object(select.table()
- .map(function(pRow)
- {
- pRow.push(scores);
- return pRow;
- }));
\ No newline at end of file
+
+/**
+ * performs an update in the precalculated classification-stoarge information if there is a missmatch between the IS-value and the SHOULD-BE-value
+ */
+function _updateScore()
+{
+ var calculatedScore = ClassificationUtils.getScore(objectTypeParam, objectRowIdParam)
+
+ var calculatedClassification = "";
+ for (let i = 0; i < calculatedScore.length; i++) {
+ calculatedClassification += ClassificationUtils.getClassifications(calculatedScore[i][0], calculatedScore[i][1]);
+ }
+
+ var storedClassification = newSelect("CLASSIFICATIONSTORAGE.CLASSIFICATIONSTORAGEID, CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE ")
+ .from("CLASSIFICATIONSTORAGE")
+ .where("CLASSIFICATIONSTORAGE.OBJECT_ROWID", objectRowIdParam)
+ .arrayRow();
+
+ var table = "CLASSIFICATIONSTORAGE";
+ var columns = ["CLASSIFICATIONVALUE"];
+ var values = [calculatedClassification];
+
+ if(storedClassification[1] != undefined && calculatedClassification != storedClassification[1]) //Update the stored classification if the freshly calculated one differs
+ newWhere("CLASSIFICATIONSTORAGE.CLASSIFICATIONSTORAGEID", storedClassification[0]).updateData(true, table, columns, null, values);
+}
\ No newline at end of file
diff --git a/entity/CommRestriction_Entity/CommRestriction_Entity.aod b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
index 3da4230788552ebb7b64f9e0ec2c4eb6dbedd8a9..102c450de9e00d97a4f3e8329bc4d5b528787b1f 100644
--- a/entity/CommRestriction_Entity/CommRestriction_Entity.aod
+++ b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>CommRestriction_Entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CommRestriction_Entity/documentation.adoc</documentation>
@@ -74,6 +74,7 @@
</entityConsumer>
<entityProvider>
<name>CommRestrictions</name>
+ <documentation>%aditoprj%/entity/CommRestriction_Entity/entityfields/commrestrictions/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>b50e33cd-e20f-4bdf-b0ee-2ecdab921ffd</name>
@@ -114,6 +115,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CommRestriction_Entity/entityfields/commrestrictions/documentation.adoc b/entity/CommRestriction_Entity/entityfields/commrestrictions/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..c912348a6cbf0f8841ac1b24d48a2cc918fe5e8c
--- /dev/null
+++ b/entity/CommRestriction_Entity/entityfields/commrestrictions/documentation.adoc
@@ -0,0 +1 @@
+Basic provider for communication restrictions (advertising bans) for one contact. Therefor the ContactId is a mandatory parameter.
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index dd820facadf5bd472f4688b4ef619645d590acf1..dbc7bf89b31da1c696fa6870dea497360ae54ea7 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Communication_entity</name>
<description>former Comm</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -60,6 +60,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
<entityProvider>
<name>AllCommunications</name>
+ <documentation>%aditoprj%/entity/Communication_entity/entityfields/allcommunications/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -111,6 +112,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityProvider>
<entityProvider>
<name>PhoneCommunications</name>
+ <documentation>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -152,6 +154,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityProvider>
<entityProvider>
<name>EmailCommunications</name>
+ <documentation>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -259,6 +262,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityField>
<entityProvider>
<name>QuickEntryCommunications</name>
+ <documentation>%aditoprj%/entity/Communication_entity/entityfields/quickentrycommunications/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>85bc11c4-7226-4b3e-82cb-947dfb05a972</name>
@@ -276,6 +280,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>CountryForValidation_param</name>
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/countryforvalidation_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Communication_entity/entityfields/allcommunications/documentation.adoc b/entity/Communication_entity/entityfields/allcommunications/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..79b0805cc2ca97d7457b807c3720163341406393
--- /dev/null
+++ b/entity/Communication_entity/entityfields/allcommunications/documentation.adoc
@@ -0,0 +1 @@
+Provides all communication entries for a single contact, regardless of the communication type.
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/commid/valueProcess.js b/entity/Communication_entity/entityfields/commid/valueProcess.js
deleted file mode 100644
index 9cf79dfccbe19963d8013ab6077339cc1c5bbce5..0000000000000000000000000000000000000000
--- a/entity/Communication_entity/entityfields/commid/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-//do not check if own value is null or empty because the own value is currently not set correctly when you've got several COMMUNICATION entries (e.g. in a list edit)
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/emailcommunications/documentation.adoc b/entity/Communication_entity/entityfields/emailcommunications/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..de362bf3fc3de20991939a4bcad1ad9c1f967116
--- /dev/null
+++ b/entity/Communication_entity/entityfields/emailcommunications/documentation.adoc
@@ -0,0 +1 @@
+Provides all communication entries of the type "email". For example, this can be used to provide a list of choose able standard email addresses for a contact.
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/valueProcess.js b/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/valueProcess.js
deleted file mode 100644
index 8f3681332b390618660138d7ac4fac9c61abe5fb..0000000000000000000000000000000000000000
--- a/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.communicationMedium());
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/phonecommunications/documentation.adoc b/entity/Communication_entity/entityfields/phonecommunications/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..2d3c2d405cb995a16f544ae4a2624e9f1e2d34e0
--- /dev/null
+++ b/entity/Communication_entity/entityfields/phonecommunications/documentation.adoc
@@ -0,0 +1 @@
+Provides all communication entries of the type "phone". For example, this can be used to provide a list of choose able standard phone addresses for a contact.
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/quickentrycommunications/documentation.adoc b/entity/Communication_entity/entityfields/quickentrycommunications/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..428c1736ae46a399c033186d145b789fb6a5bd23
--- /dev/null
+++ b/entity/Communication_entity/entityfields/quickentrycommunications/documentation.adoc
@@ -0,0 +1 @@
+Provider specialized for the use in the QuickEntry_entity since the QuickEntry_entity needs some special handling of data.
\ No newline at end of file
diff --git a/entity/Communication_entity/recordcontainers/groupextension/query.js b/entity/Communication_entity/recordcontainers/groupextension/query.js
deleted file mode 100644
index 973ba257b30b0525570b1bf6835794f1decfc045..0000000000000000000000000000000000000000
--- a/entity/Communication_entity/recordcontainers/groupextension/query.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("Sql_lib");
-import("system.result");
-import("system.vars");
-import("system.db");
-
-var querySelect = newSelect('COMMUNICATION.COMMUNICATIONID, COMMUNICATION.COMMUNICATIONID as "_uid_", COMMUNICATION.ADDR')
- .from("COMMUNICATION")
- .orderBy("COMMUNICATION.COMMUNICATIONID");
-
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) {
- querySelect.where("COMMUNICATION.COMMUNICATIONID", vars.get("$local.idvalue"), SqlBuilder.IN());
-}
-
-result.string(querySelect.toString());
\ No newline at end of file
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index 467036825e4c47e455051a5af2a8a14dca967b7d..ac91f28ee4dbfaeaea563112aca8d9ae0bd288f3 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Competition_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Competition_entity/documentation.adoc</documentation>
@@ -290,6 +290,10 @@
</entityParameter>
</children>
</entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Competition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
deleted file mode 100644
index 0fda06efff26a459feed87a3433a92ff99b14171..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectPhase());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
deleted file mode 100644
index a76a727534152d479a8b4cbef548371ef4224dc0..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectPricePolitics());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
deleted file mode 100644
index 8c5b3ca3c9349b9437b2306dbb5708521e6045d4..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.competitionState());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
deleted file mode 100644
index cae1ead3876117be7f9a2c2be4fcc91f3f3b5964..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectStrenght());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
deleted file mode 100644
index 1f3ec844e7b00069d9f8bb49e3f1842402b71bdd..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWeakness(), "ORGANISATION.WEAKNESS");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js b/entity/Competition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
deleted file mode 100644
index 407c679050ac9ed59599f80b339bf2c64b9e1fb2..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.organisationType$competitor());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/user_edit/valueProcess.js b/entity/Competition_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 82c35b3c618ecc933e74b694daa96ad9f97cbfa4..53ca53c9dbbb6e2af03dbeca581fb0767c1c5069 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Contact_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
@@ -8,8 +8,8 @@
<grantUpdateProcess>%aditoprj%/entity/Contact_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/Contact_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Contact_entity/contentTitleProcess.js</contentTitleProcess>
- <onInit>%aditoprj%/entity/Contact_entity/onInit.js</onInit>
<onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
+ <initFilterProcess>%aditoprj%/entity/Contact_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:USERS</iconId>
<titlePlural>Contacts</titlePlural>
<recordContainer>db</recordContainer>
@@ -251,6 +251,10 @@
<name>Readonly_param</name>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js b/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
index 460b39849d5d34bac95e4b987d28a665b732e860..25f85ab3968071cfcfc4df692b11e5b3cc4f168b 100644
--- a/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
+++ b/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
@@ -3,7 +3,7 @@ import("system.db");
import("system.vars");
import("Contact_lib");
-var organisationId = vars.get("$field.ORGANISATION_ID");
-var res = OrganisationUtils.getNameByOrganisationId(organisationId);
+var organisationContactId = vars.get("$field.ORGANISATION_CONTACTID");
+var res = OrganisationUtils.getNameByContactId(organisationContactId);
result.string(res);
\ No newline at end of file
diff --git a/entity/Contact_entity/initFilterProcess.js b/entity/Contact_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c33a0cbce2a1e1a58e2c625c13dc34e40af3f62f
--- /dev/null
+++ b/entity/Contact_entity/initFilterProcess.js
@@ -0,0 +1,24 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
+{
+ var statusInactive = $KeywordRegistry.contactStatus$inactive();
+ var filter = {
+ type: "group",
+ operator: "AND",
+ childs: [{
+ type: "row",
+ name: "STATUS",
+ operator: "NOT_EQUAL",
+ contenttype: "TEXT",
+ key: statusInactive,
+ value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+ }]
+ };
+
+ result.string(JSON.stringify(filter));
+}
\ No newline at end of file
diff --git a/entity/Contact_entity/onInit.js b/entity/Contact_entity/onInit.js
deleted file mode 100644
index ad4324c7682881b8e9ca470e334269ae822ec522..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/onInit.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import("system.neon");
-import("Keyword_lib");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-var statusFilterElement = {
- "type":"row",
- "name":"STATUS",
- "operator":"NOT_EQUAL",
- "key":$KeywordRegistry.contactStatus$inactive(),
- "contenttype": vars.get("$property.STATUS.contentType")
-};
-
-statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
-
-var filter = {
- "type":"group",
- "operator":"AND",
- "childs": [statusFilterElement]
-};
-
-filter = JSON.stringify(filter);
-neon.setFilter("#ENTITY", filter);
\ No newline at end of file
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 9a34027e64533644ff0a36060f4c6c728b618079..c82aab16b52506b32800ef2f9635b260fffa3d6b 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Context_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
@@ -188,6 +188,10 @@
</entityParameter>
</children>
</entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Context_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js b/entity/Context_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
deleted file mode 100644
index 9e45ce3b6cda9f9cffa1f8c6046d4267f2eb0a61..0000000000000000000000000000000000000000
--- a/entity/Context_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object(["Person", "Organisation"]);
\ No newline at end of file
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 867da2214346c3543ad2601ffebd9fbfe42936f8..b3f109df9e129786beca3bfa1baedacb34f706e9 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Contract_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
@@ -8,7 +8,9 @@
<contentTitleProcess>%aditoprj%/entity/Contract_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Contract_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Contract_entity/onValidation.js</onValidation>
+ <useFavorites v="true" />
<iconId>VAADIN:FILE_TEXT</iconId>
+ <imageProcess>%aditoprj%/entity/Contract_entity/imageProcess.js</imageProcess>
<titlePlural>Contracts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -383,6 +385,10 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Contract_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>CONTRACT_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js</valueProcess>
+ </entityField>
<entityField>
<name>COUNT</name>
<title>Count</title>
@@ -392,6 +398,10 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -445,13 +455,13 @@
<name>CONTRACTDUE.value</name>
<recordfield>CONTRACT.CONTRACTDUE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTRACTEND.value</name>
<recordfield>CONTRACT.CONTRACTEND</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTRACTID.value</name>
@@ -461,31 +471,31 @@
<name>CONTRACTSTART.value</name>
<recordfield>CONTRACT.CONTRACTSTART</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTRACTSTATUS.value</name>
<recordfield>CONTRACT.CONTRACTSTATUS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTRACTTYPE.value</name>
<recordfield>CONTRACT.CONTRACTTYPE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PAYMENT.value</name>
<recordfield>CONTRACT.PAYMENT</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>REMARK.value</name>
<recordfield>CONTRACT.REMARK</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
@@ -529,10 +539,6 @@
<isFilterable v="true" />
<filtertype>EXTENDED</filtertype>
</consumerMapping>
- <dbRecordFieldMapping>
- <name>COUNT.value</name>
- <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
- </dbRecordFieldMapping>
<aggregateFieldDbMapping>
<name>COUNT_aggregate.value</name>
<recordfield>CONTRACT.CONTRACTID</recordfield>
@@ -559,9 +565,17 @@
</affectedTables>
<affectedIds>%aditoprj%/entity/Contract_entity/recordcontainers/index/affectedIds.js</affectedIds>
<indexFieldMappings>
+ <indexRecordSystemFieldMapping>
+ <name>#UID</name>
+ </indexRecordSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#TITLE</name>
+ </indexRecordMultilingualSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#DESCRIPTION</name>
+ </indexRecordMultilingualSystemFieldMapping>
<indexRecordFieldMapping>
- <name>CONTRACTCODE</name>
- <indexFieldType>TEXT_PLAIN</indexFieldType>
+ <name>CONTRACTCODE.value</name>
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>CONTACT_ORG_ID.value</name>
diff --git a/entity/Contract_entity/conditionProcess.js b/entity/Contract_entity/conditionProcess.js
deleted file mode 100644
index b40df37b5c21d8eb1dbf1f28efe0e857fc33f8a6..0000000000000000000000000000000000000000
--- a/entity/Contract_entity/conditionProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("Sql_lib");
-import("system.result");
-import("system.vars");
-
-var condition = newWhere();
-if (vars.exists("$param.ContactId_param"))
- condition.andIfSet("CONTRACT.CONTACT_ID", "$param.ContactId_param");
-
-result.string(condition.toString("1=1"));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js b/entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..69af3937a87119f464687ed81bcfa7b205a97633
--- /dev/null
+++ b/entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Contract");
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/date_new/valueProcess.js b/entity/Contract_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/Contract_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/user_edit/valueProcess.js b/entity/Contract_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Contract_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/user_new/valueProcess.js b/entity/Contract_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Contract_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Contract_entity/imageProcess.js b/entity/Contract_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a2de543489d834ea3457009159a8987cb50d961
--- /dev/null
+++ b/entity/Contract_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.#CONTENTTITLE"));
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/index/query.js b/entity/Contract_entity/recordcontainers/index/query.js
index 0b7612604a0518ed4437906473ea5f0caf38e248..e12356c93b0c2cefab1f3d847d91dfa563ffbbbe 100644
--- a/entity/Contract_entity/recordcontainers/index/query.js
+++ b/entity/Contract_entity/recordcontainers/index/query.js
@@ -8,20 +8,21 @@ import("Sql_lib");
import("KeywordRegistry_basic");
var sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("CONTRACTID " //as "_uid_"
- + ", " + sqlHelper.concat(["CONTRACTCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACTSTATUS")], " | ") //as "_title_"
- + ", " + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Type of contract") + ":'",
- KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]) //as "_description_"
- + ", CONTRACTCODE "
- + ", CONTACT.ORGANISATION_ID" //as CONTACT_ORG_ID
- + ", ORGANISATION.NAME" //as "CONTACT_ORG_ID.displayValue"
- + ", CONTRACT.CONTACT_ID")
- .from("CONTRACT")
- .join("CONTACT", "CONTRACT.CONTACT_ID = CONTACTID")
- .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
+var querySelect = newSelect([
+ "CONTRACTID", //#UID
+ sqlHelper.concat(["CONTRACTCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACTSTATUS")], " | "), //#TITLE
+ sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Type of contract") + ":'",
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]), //#DESCRIPTION
+ "CONTRACTCODE",
+ "CONTACT.ORGANISATION_ID", //CONTACT_ORG_ID
+ "ORGANISATION.NAME", //CONTACT_ORG_ID.displayValue
+ "CONTRACT.CONTACT_ID"
+ ])
+ .from("CONTRACT")
+ .join("CONTACT", "CONTRACT.CONTACT_ID = CONTACTID")
+ .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID");
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) {
- querySelect.where("CONTRACT.CONTRACTID", vars.get("$local.idvalue"), SqlBuilder.IN())
-}
+if (vars.exists("$local.idvalue"))
+ querySelect.whereIfSet("CONTRACT.CONTRACTID", "$local.idvalue", SqlBuilder.IN());
result.string(querySelect.toString());
\ No newline at end of file
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 41d1741997687b3daaf6b9d906903f215bdfd11f..9a4408cb03cc9d0d4de39895c93611b24df313da 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Countries_Entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Countries_Entity/documentation.adoc</documentation>
@@ -14,6 +14,8 @@
</entityProvider>
<entityProvider>
<name>ISO2Name</name>
+ <lookupIdfield>ISO2</lookupIdfield>
+ <documentation>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
@@ -91,6 +93,10 @@
<name>NAME_ORIGIN</name>
<title>Native Name</title>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -98,6 +104,8 @@
<alias>Data_alias</alias>
<isPageable v="false" />
<orderClauseProcess>%aditoprj%/entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <cacheType>GLOBAL</cacheType>
+ <cacheKeyProcess>%aditoprj%/entity/Countries_Entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
<linkInformation>
<linkInformation>
<name>cc219004-43fd-4a3f-bee0-be5e732c61f1</name>
diff --git a/entity/Countries_Entity/entityfields/iso2_name/children/key_param/valueProcess.js b/entity/Countries_Entity/entityfields/iso2_name/children/key_param/valueProcess.js
deleted file mode 100644
index ce35888708c4329a665a96045635891c38b79702..0000000000000000000000000000000000000000
--- a/entity/Countries_Entity/entityfields/iso2_name/children/key_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("ISO2");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_name/children/value_param/valueProcess.js b/entity/Countries_Entity/entityfields/iso2_name/children/value_param/valueProcess.js
deleted file mode 100644
index 02118b507989b951950aed5724eeb78479f546cc..0000000000000000000000000000000000000000
--- a/entity/Countries_Entity/entityfields/iso2_name/children/value_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("NAME");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_name2/children/key_param/code.js b/entity/Countries_Entity/entityfields/iso2_name2/children/key_param/code.js
deleted file mode 100644
index ce35888708c4329a665a96045635891c38b79702..0000000000000000000000000000000000000000
--- a/entity/Countries_Entity/entityfields/iso2_name2/children/key_param/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("ISO2");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_name2/children/value_param/code.js b/entity/Countries_Entity/entityfields/iso2_name2/children/value_param/code.js
deleted file mode 100644
index 02118b507989b951950aed5724eeb78479f546cc..0000000000000000000000000000000000000000
--- a/entity/Countries_Entity/entityfields/iso2_name2/children/value_param/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("NAME");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_names/children/key_param/code.js b/entity/Countries_Entity/entityfields/iso2_names/children/key_param/code.js
deleted file mode 100644
index ce35888708c4329a665a96045635891c38b79702..0000000000000000000000000000000000000000
--- a/entity/Countries_Entity/entityfields/iso2_names/children/key_param/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("ISO2");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_names/children/value_param/code.js b/entity/Countries_Entity/entityfields/iso2_names/children/value_param/code.js
deleted file mode 100644
index 02118b507989b951950aed5724eeb78479f546cc..0000000000000000000000000000000000000000
--- a/entity/Countries_Entity/entityfields/iso2_names/children/value_param/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("NAME");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2name/documentation.adoc b/entity/Countries_Entity/entityfields/iso2name/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4e2b19d84b1adaa686d02d2b63352907aaf28230
--- /dev/null
+++ b/entity/Countries_Entity/entityfields/iso2name/documentation.adoc
@@ -0,0 +1,4 @@
+Provides a list of countries, where the UID is the countires two character ISO-code
+ISO 3166-1 alpha-2; see: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+
+For example: `IT` for Italy, `DE` for Germany, `NO` for Norway, etc.
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2names/children/key_param/valueProcess.js b/entity/Countries_Entity/entityfields/iso2names/children/key_param/valueProcess.js
deleted file mode 100644
index ce35888708c4329a665a96045635891c38b79702..0000000000000000000000000000000000000000
--- a/entity/Countries_Entity/entityfields/iso2names/children/key_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("ISO2");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2names/children/value_param/valueProcess.js b/entity/Countries_Entity/entityfields/iso2names/children/value_param/valueProcess.js
deleted file mode 100644
index 02118b507989b951950aed5724eeb78479f546cc..0000000000000000000000000000000000000000
--- a/entity/Countries_Entity/entityfields/iso2names/children/value_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("NAME");
\ No newline at end of file
diff --git a/entity/Countries_Entity/recordcontainers/db/cacheKeyProcess.js b/entity/Countries_Entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a332cb19c88610c24c6e1fd7dc22f8b5f654d9b1
--- /dev/null
+++ b/entity/Countries_Entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,5 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey();
+result.string(res);
\ No newline at end of file
diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
index 1dfd409f9133b0587fc210804eea99d76a88b34d..dd8ae2f623b003b0541b515c36274467aae5be78 100644
--- a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
+++ b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
@@ -1,9 +1,10 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DSGVOInfo_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DSGVOInfo_entity/documentation.adoc</documentation>
<onValidation>%aditoprj%/entity/DSGVOInfo_entity/onValidation.js</onValidation>
+ <afterSave>%aditoprj%/entity/DSGVOInfo_entity/afterSave.js</afterSave>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -51,6 +52,7 @@
</entityParameter>
<entityParameter>
<name>ReportType_param</name>
+ <valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/reporttype_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
<entityProvider>
@@ -151,20 +153,21 @@
</entityParameter>
</children>
</entityConsumer>
- <entityActionField>
- <name>SafeAndOpenReport</name>
- <title>and open Report</title>
- <onActionProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/safeandopenreport/onActionProcess.js</onActionProcess>
- <isSaveAction v="true" />
- </entityActionField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityParameter>
+ <name>Recipient_param</name>
+ <valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/recipient_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/DSGVOInfo_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <onDBInsert>%aditoprj%/entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <onDBUpdate>%aditoprj%/entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
<name>23dd4eb2-0ac4-406e-92e3-031f1342bd05</name>
diff --git a/entity/DSGVOInfo_entity/entityfields/safeandopenreport/onActionProcess.js b/entity/DSGVOInfo_entity/afterSave.js
similarity index 83%
rename from entity/DSGVOInfo_entity/entityfields/safeandopenreport/onActionProcess.js
rename to entity/DSGVOInfo_entity/afterSave.js
index 9a6195801a21eb56a3224dd1f1ceabf02890e50e..fab6c5f77cb6da16dadf7532649461c6dee311d2 100644
--- a/entity/DSGVOInfo_entity/entityfields/safeandopenreport/onActionProcess.js
+++ b/entity/DSGVOInfo_entity/afterSave.js
@@ -1,3 +1,4 @@
+import("system.result");
import("system.vars");
import("DataPrivacy_lib");
@@ -17,4 +18,6 @@ var contactId = entityData["param.ContactId_param"];
var reportType = entityData["param.ReportType_param"];
if (reportType)
- DataPrivacyUtils.openReport(contactId, reportType, params);
\ No newline at end of file
+ DataPrivacyUtils.openReport(contactId, reportType, params);
+
+result.string(true);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js b/entity/DSGVOInfo_entity/entityfields/recipient_param/valueProcess.js
similarity index 52%
rename from entity/Classification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js
rename to entity/DSGVOInfo_entity/entityfields/recipient_param/valueProcess.js
index a5632992f1eb801942517498616c86a95f49b737..c9be9208d3f269740c4ed22b8ec8a1d05d6f7b53 100644
--- a/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js
+++ b/entity/DSGVOInfo_entity/entityfields/recipient_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.RECIPIENT"));
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js b/entity/DSGVOInfo_entity/entityfields/reporttype_param/valueProcess.js
similarity index 100%
rename from entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
rename to entity/DSGVOInfo_entity/entityfields/reporttype_param/valueProcess.js
diff --git a/entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js b/entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js b/entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/DSGVOReport_entity/DSGVOReport_entity.aod b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
index d4900177107a5df9d4c949858bd5bcc57c11d3b8..b96cb3a3dbc480499bb71e154509700ae34bb4f9 100644
--- a/entity/DSGVOReport_entity/DSGVOReport_entity.aod
+++ b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DSGVOReport_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DSGVOReport_entity/documentation.adoc</documentation>
@@ -9,7 +9,7 @@
<name>#PROVIDER</name>
</entityProvider>
<entityParameter>
- <name>ContactID_param</name>
+ <name>ContactId_param</name>
<expose v="true" />
<mandatory v="false" />
</entityParameter>
@@ -32,6 +32,22 @@
<entityField>
<name>UID</name>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityActionGroup>
+ <name>dsgvoReportDispatch</name>
+ <children>
+ <entityActionField>
+ <name>dispatchDSGVOReport</name>
+ <title>Dispatch as mail</title>
+ <onActionProcess>%aditoprj%/entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <iconId>VAADIN:AT</iconId>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js b/entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e7ffc71bedc55beb9053abc8da900f809680228c
--- /dev/null
+++ b/entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js
@@ -0,0 +1,28 @@
+import("system.logging");
+import("system.translate");
+import("system.vars");
+import("system.db");
+import("Contact_lib");
+import("MimeType_lib");
+import("Email_lib");
+import("Sql_lib");
+import("Entity_lib");
+
+var reportType = vars.get("$param.ReportName_param");
+var contactId = vars.get("$param.ContactId_param");
+var recipient = JSON.parse(vars.get("$param.DSGVOInfo_param"))["recipient"];
+
+var dsgvoReport = {};
+var attachmentArray = [];
+var reportData = vars.get("$field.REPORT_DATA");
+var emailFilename = translate.text(reportType == "DSGVO_Disclosure_report" ? "Disclosure Report" : "Information Report");
+var fullname = ContactUtils.getTitleByContactId(contactId);
+emailFilename = emailFilename + " " + fullname;
+
+dsgvoReport.content = reportData;
+dsgvoReport.mimeType = MimeTypes.PDF();
+dsgvoReport.filename = emailFilename + ".pdf";
+
+attachmentArray[0] = dsgvoReport;
+
+EmailWritingUtils.sendReportAsMail(recipient, attachmentArray, "DSGVOReport", null, emailFilename, null, null);
diff --git a/entity/DSGVOReport_entity/entityfields/report_data/valueProcess.js b/entity/DSGVOReport_entity/entityfields/report_data/valueProcess.js
index 2e61138143c9e5cf8decd5cda6bad318d7ce49e5..f32c42488423b505bfc4634adc12cef5b7256038 100644
--- a/entity/DSGVOReport_entity/entityfields/report_data/valueProcess.js
+++ b/entity/DSGVOReport_entity/entityfields/report_data/valueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
import("system.logging");
import("DataPrivacy_lib")
-result.string(DataPrivacyUtils.buildReport(vars.get("$param.ContactID_param"), vars.get("$param.ReportName_param"), JSON.parse(vars.get("$param.DSGVOInfo_param"))));
\ No newline at end of file
+result.string(DataPrivacyUtils.buildReport(vars.get("$param.ContactId_param"), vars.get("$param.ReportName_param"), JSON.parse(vars.get("$param.DSGVOInfo_param"))));
\ No newline at end of file
diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index c0bbf1f7433b9634ba4e1f2760bea82f448c6f25..6fd134a3a89d73e4185ec169dbd5efa7f0f7f34f 100644
--- a/entity/DSGVO_entity/DSGVO_entity.aod
+++ b/entity/DSGVO_entity/DSGVO_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DSGVO_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DSGVO_entity/documentation.adoc</documentation>
@@ -13,6 +13,7 @@
</siblings>
<grantCreate v="false" />
<grantDelete v="false" />
+ <afterSave>%aditoprj%/entity/DSGVO_entity/afterSave.js</afterSave>
<titlePlural></titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
@@ -202,6 +203,10 @@
<contentType>BOOLEAN</contentType>
<stateProcess>%aditoprj%/entity/DSGVO_entity/entityfields/apply_change_for_all_control/stateProcess.js</stateProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
index f4ba46a12241038fbc8b3f1978b2e071d4024cbb..a84b79d58a22aff0e293f7115c2f4fcdcede4b84 100644
--- a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
+++ b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DefaultAdminView_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DefaultAdminView_entity/documentation.adoc</documentation>
@@ -36,6 +36,10 @@
<expose v="true" />
<mandatory v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
index 497e675448c512e66e04d0605713f285ac30cbe9..83aa32b97318445d0891b35c2443d6452e929739 100644
--- a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
+++ b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DescriptionTranslation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DescriptionTranslation_entity/documentation.adoc</documentation>
@@ -73,6 +73,10 @@
</entityDependency>
</dependencies>
</entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..bffe4b62579551292476806217a2fc719a0d038d
--- /dev/null
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -0,0 +1,288 @@
+<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+ <name>DistrictResponsible_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/DistrictResponsible_entity/documentation.adoc</documentation>
+ <icon>VAADIN:GLOBE</icon>
+ <title>District Responsible</title>
+ <contentTitleProcess>%aditoprj%/entity/DistrictResponsible_entity/contentTitleProcess.js</contentTitleProcess>
+ <image>VAADIN:GLOBE</image>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DEPARTMENT_ATTRIBUTE_ID</name>
+ <title>Department</title>
+ <consumer>Departments</consumer>
+ <state>AUTO</state>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>EMPLOYEE_CONTACT_ID</name>
+ <title>{$DISTRICT_RESPONSIBLE}</title>
+ <consumer>Employees</consumer>
+ <linkedContext>Person</linkedContext>
+ <selectionMode>SINGLE</selectionMode>
+ </entityField>
+ <entityField>
+ <name>DISTRICT_ID</name>
+ <title>{$DISTRICT}</title>
+ <consumer>Districts</consumer>
+ <linkedContext>District</linkedContext>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Departments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ParentId_param</name>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js</valueProcess>
+ <description>parent id, this is used for filtering by the parent in the content process</description>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Employees</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Employees</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Districts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>District_entity</entityName>
+ <fieldName>ResponsibleDistricts</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityField>
+ <name>DISTRICTRESPONSIBLEID</name>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>DistrictResponsibles</name>
+ <lookupIdfield>DISTRICTRESPONSIBLEID</lookupIdfield>
+ <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc</documentation>
+ <titlePlural>Responsibles</titlePlural>
+ <dependencies>
+ <entityDependency>
+ <name>ef26fdb6-5fcf-416e-bcc8-380b5751b523</name>
+ <entityName>District_entity</entityName>
+ <fieldName>DistrictResponsibles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>DistrictId_param</name>
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrgUid_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>DistrictId_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ </entityParameter>
+ <entityConsumer>
+ <name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Documents</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>departmentAttributeName</name>
+ <title>Department</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>OrganisationResponsibles</name>
+ <targetContextField>targetContext</targetContextField>
+ <targetIdField>EMPLOYEE_CONTACT_ID</targetIdField>
+ <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>9c2fe0da-9456-44ef-ac6c-28ac234b35f7</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>DistrictResponsibles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>DistrictId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>OrgUid_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityParameter>
+ <name>CollectedDistrictIds_param</name>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js</valueProcess>
+ <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityField>
+ <name>MAIL</name>
+ <title>Email</title>
+ </entityField>
+ <entityField>
+ <name>PHONE</name>
+ <title>Phone</title>
+ </entityField>
+ <entityField>
+ <name>targetContext</name>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <isPageable v="false" />
+ <fromClauseProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <cacheType>GLOBAL</cacheType>
+ <cacheKeyProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>d24296ec-5040-4b40-ad5b-668d3e02b4aa</name>
+ <tableName>DISTRICTRESPONSIBLE</tableName>
+ <primaryKey>DISTRICTRESPONSIBLEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>86f9ab94-0d69-4a3a-9a04-615f61be2c23</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DEPARTMENT_ATTRIBUTE_ID.value</name>
+ <recordfield>DISTRICTRESPONSIBLE.DEPARTMENT_ATTRIBUTE_ID</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISTRICT_ID.value</name>
+ <recordfield>DISTRICTRESPONSIBLE.DISTRICT_ID</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>EMPLOYEE_CONTACT_ID.value</name>
+ <recordfield>DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISTRICTRESPONSIBLEID.value</name>
+ <recordfield>DISTRICTRESPONSIBLE.DISTRICTRESPONSIBLEID</recordfield>
+ <isFilterable v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>DISTRICTRESPONSIBLE.USER_EDIT</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>DISTRICTRESPONSIBLE.USER_NEW</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>DISTRICTRESPONSIBLE.DATE_EDIT</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>DISTRICTRESPONSIBLE.DATE_NEW</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>EMPLOYEE_CONTACT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DEPARTMENT_ATTRIBUTE_ID.displayValue</name>
+ <recordfield>DISTRICTRESPONSIBLE.DEPARTMENT_ATTRIBUTE_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>MAIL.value</name>
+ <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PHONE.value</name>
+ <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISTRICT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/DistrictResponsible_entity/contentTitleProcess.js b/entity/DistrictResponsible_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..67d21cf41ffa951498384284c6ebdd2490f0a84e
--- /dev/null
+++ b/entity/DistrictResponsible_entity/contentTitleProcess.js
@@ -0,0 +1,12 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("Employee_lib");
+
+var contactId = vars.get("$field.EMPLOYEE_CONTACT_ID");
+var res = "";
+
+if(contactId)
+ res = EmployeeUtils.getUsersDepartment(contactId, true);
+
+result.string(res)
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/documentation.adoc b/entity/DistrictResponsible_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4cc601b1d84e7540f351c476c436a4594452895e
--- /dev/null
+++ b/entity/DistrictResponsible_entity/documentation.adoc
@@ -0,0 +1,17 @@
+= DistrictResponsible_entity
+
+Overview:
+
+Definition: Entity, which is responsible for handling the district responsibles.
+Particularities: None known.
+
+Relations to other entities:
+ - District_entity
+ - Attribute_entity
+ - Document_entity
+ - Employee_entity
+ - LogHistory_entity
+
+Best practices: None known.
+
+FAQs: None known.
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..cad2d37316c24dd0897dc428e09f4953cf39bb92
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc
@@ -0,0 +1,15 @@
+Non exposed parameter that collects the districtIds for the given value of `OrgUid_param`.
+
+Advantages of encapsulation as a non exposed param:
+
+* one interface to other entities (e.g. the Organisation_entity)
+* logic for collecting districtIds is done within the `DistrictResponsible_entity` scope which means
+other entities don't have to collect the IDs themselfes. For example:
+The `Organisation_entity` doesn't have to collect the IDs because the `DistrictResponsible_entity`
+_knows_ how to collect them.
+* the value of this `CollectedDistrictIds_param` can be passed to the `cacheKeyProcess`
+(this enables us for example to cache district responsibles per Districtlist and not per Oranisation)
+* Calculation of the affected districtIds only when needed. For example:
+The DistrictIds are not loaded when an Organisation is opened but when the
+consumer data for the `DistrictResponsible_entity` is loaded
+(=when the user changes the into the district responsibles tab)
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d41b30698cdc7f111be42123d8b2eafb96d3f7c
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js
@@ -0,0 +1,52 @@
+import("system.entities");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var orgUid = vars.get("$param.OrgUid_param");
+
+if(orgUid)
+{
+ var orgDistrictIds = _getDistrictIdsByOrgUid(orgUid);
+ orgDistrictIds = JSON.stringify(orgDistrictIds);
+} else {
+ orgDistrictIds = JSON.stringify([]);
+}
+
+result.string(orgDistrictIds);
+
+function _getDistrictIdsByOrgUid(pOrgUid) {
+
+ var districtIds = [];
+ var nonMatchedId = [];
+ var loadingRowsConfig = entities.createConfigForLoadingRows()
+ .entity("District_entity")
+ .fields(["#UID", "appliedFilter", "DISTRICT_NAME", "PARENTDISTRICT_ID"]);
+ var districtRows = entities.getRows(loadingRowsConfig);
+
+ for (i = 0; i < districtRows.length; i++) {
+
+ if (districtRows[i]["PARENTDISTRICT_ID"] in nonMatchedId)
+ {
+ nonMatchedId.push(districtRows[i]["#UID"]);
+ continue;
+ } else {
+ var filter = JSON.stringify(JSON.parse(districtRows[i]["appliedFilter"]).filter);
+ var rowCountConfig = entities.createConfigForLoadingRows()
+ .entity("Organisation_entity")
+ .uid(pOrgUid)
+ //.provider()
+ .filter(filter);
+
+ var rowCount = entities.getRowCount(rowCountConfig);
+
+ if (rowCount > 0)
+ {
+ districtIds.push(districtRows[i]["#UID"]);
+ } else {
+ nonMatchedId.push(districtRows[i]["#UID"]);
+ }
+ }
+ }
+ return districtIds;
+}
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..054ad94ce22cb654da8b7caf533ffefc5219d21f
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ currentDate = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..032607ee56724f30881fec7bad289679ce944e4f
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+ currentDate = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3474c5398a8b48f35e4cd6f82297fecafb9e8928
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.result");
+import("system.tools");
+
+var employeesContactId = vars.get("$field.EMPLOYEE_CONTACT_ID");
+var departmentsAttrId = ""
+if (employeesContactId)
+{
+ departmentsAttrId = tools.getUsersByAttribute(tools.CONTACTID, [employeesContactId])[0][tools.PARAMS].department;
+}
+
+result.string(departmentsAttrId);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7fac5c4e3942f0e9442d679d78370ba7136b96d6
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
+
+var departmentAttrId = vars.get("$field.DEPARTMENT_ATTRIBUTE_ID");
+var departmentDisplayName = "";
+
+if (departmentAttrId)
+{
+ departmentDisplayName = AttributeUtil.getSimpleAttributeName(departmentAttrId, true);
+}
+
+result.string(departmentDisplayName);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..246beece1e0537e3649fa0eeda40218eaa852864
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("AttributeRegistry_basic");
+import("system.result");
+
+result.string($AttributeRegistry.departments());
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cc037e5096fd131d431504c70793f49767f701d
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$param.DistrictId_param"));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc b/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4f7a48b890e5dd28b4588e5339eb117cc590f4fb
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc
@@ -0,0 +1,3 @@
+= DistrictResponsible_entity - DistrictResponsibles
+
+Provider for the district entity, used to work with district responsibles from the district entity.
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..51e13bb7a66c51fe725941ddaad7f9b7e5ce884f
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.DISTRICTRESPONSIBLEID"));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b5a701f96e3402a647a7a6b8a1bd6e97c4a93769
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DISTRICTRESPONSIBLE");
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7e27434b585fb39f99361fb42945e1c97a68d173
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [{id: vars.get("$field.DISTRICTRESPONSIBLEID"), tableNames: ["DISTRICTRESPONSIBLE"]}];
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc b/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..f9d4c6b31cfaddff2e83e86f5735dde1fbee30bf
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc
@@ -0,0 +1,3 @@
+= District_entity - OrganisationResponsibles
+
+Provider for the organisation entity, used to display the corrensponding district responsibles in the organisation main view.
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/phonecommunication/children/commcategory_param/code.js b/entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js
similarity index 52%
rename from entity/Communication_entity/entityfields/phonecommunication/children/commcategory_param/code.js
rename to entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js
index a809f839e8fb3160394ffdda45a839dadf7cab1e..8ba819b0b1d3a291ac31d270ec48c009ccf047e0 100644
--- a/entity/Communication_entity/entityfields/phonecommunication/children/commcategory_param/code.js
+++ b/entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("PHONE")
\ No newline at end of file
+result.string("Person");
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a55cb327464d6def9b94735913c25ffb5e4328ef
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1411b9ac93e217a76a876371a2609ff9464f4997
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+ currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js b/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..37bf4d68be0ead0d1b35f9f14e70f7b867a2a5db
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,7 @@
+import("CachedRecordContainer_lib");
+import("system.result");
+
+
+var cacheKey = CachedRecordContainerUtils.getCommonKey("$param.DistrictId_param", "$param.CollectedDistrictIds_param");
+
+result.string(cacheKey);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js b/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1942674d0c7f077e9e993e0479b6aa6e94cfeaf6
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,23 @@
+import("system.entities");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var districtId = vars.get("$param.DistrictId_param");
+var orgUid = vars.get("$param.OrgUid_param");
+var cond = newWhere();
+
+if (districtId)
+{
+ cond.and("DISTRICTRESPONSIBLE.DISTRICT_ID", districtId);
+}
+else if(orgUid)
+{
+ var orgDistrictIds = vars.get("$param.CollectedDistrictIds_param");
+ if (orgDistrictIds){
+ orgDistrictIds = JSON.parse(orgDistrictIds);
+ cond.and("DISTRICTRESPONSIBLE.DISTRICT_ID", orgDistrictIds, SqlBuilder.IN());
+ }
+}
+
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js b/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..69390b79863ad21835d50b36269f255bbdacb62d
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+
+var res = "DISTRICTRESPONSIBLE \n\
+ left join CONTACT on (CONTACT.CONTACTID = DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID)";
+result.string(res);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..2bd6b5d01756719a2e951069a73268a5bb488d9f
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Sql_lib");
+
+result.string(newSelect("DISTRICT.DISTRICT_NAME")
+ .from("DISTRICT")
+ .where("DISTRICT.DISTRICTID = DISTRICTRESPONSIBLE.DISTRICT_ID")
+ .toString());
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..2dd8e6a8686055b27892337fab5ddaf48e405703
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js
@@ -0,0 +1,16 @@
+import("system.logging");
+import("system.result");
+import("Contact_lib");
+import("Sql_lib");
+
+
+var contact = Contact.createWithColumnPreset();
+var renderer = new ContactTitleRenderer(contact, ContactTitleRenderer.OPTIONS.NoOption);
+var selectExpression = renderer.asSql();
+
+result.string(newSelect(selectExpression)
+ .from("CONTACT")
+ .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+ .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ .where("CONTACT.CONTACTID = DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID")
+ .toString());
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..9ced6fa694a2e0d83946083b25efa1650fa9be24
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Communication_lib");
+
+result.string(CommUtil.getStandardSubSqlMail());
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce31b16dbba0412075b7f8f2d5376fe163ed868a
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Communication_lib");
+
+result.string(CommUtil.getStandardSubSqlPhone());
\ No newline at end of file
diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b42efad4e68bafa72d38edb18b943f212ed145da
--- /dev/null
+++ b/entity/District_entity/District_entity.aod
@@ -0,0 +1,360 @@
+<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+ <name>District_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/District_entity/documentation.adoc</documentation>
+ <icon>VAADIN:GLOBE</icon>
+ <title>District definition</title>
+ <contentTitleProcess>%aditoprj%/entity/District_entity/contentTitleProcess.js</contentTitleProcess>
+ <iconIdProcess>%aditoprj%/entity/District_entity/iconIdProcess.js</iconIdProcess>
+ <titlePlural></titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DISTRICT_NAME</name>
+ <title>Name</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>DISTRICT_NUMBER</name>
+ <title>{$DISTRICT_NUMBER}</title>
+ <contentType>TEXT</contentType>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_number/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/district_number/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/District_entity/entityfields/district_number/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>DISTRICT_INFO</name>
+ <title>Information</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>DISTRICTID</name>
+ </entityField>
+ <entityField>
+ <name>DISTRICT_STATUS</name>
+ <title>Status</title>
+ <contentType>BOOLEAN</contentType>
+ <mandatory v="true" />
+ <dropDownProcess>%aditoprj%/entity/District_entity/entityfields/district_status/dropDownProcess.js</dropDownProcess>
+ <selectionMode>SINGLE</selectionMode>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_status/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PARENTDISTRICT_DISTRICTID</name>
+ <title>{$DISTRICT_PARENT_DISTRICT}</title>
+ <consumer>ParentDistricts</consumer>
+ <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>DISTRICT_FILTER</name>
+ <title>District Filter</title>
+ <contentType>FILTER_TREE</contentType>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_filter/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>customerCounting</name>
+ <title>Customer counting</title>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/customercounting/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>totalTurnover</name>
+ <title>{$DISTRICT_TOTAL_TURNOVER}</title>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/totalturnover/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ISO3</name>
+ <title>Language</title>
+ <consumer>Languages</consumer>
+ <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/iso3/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityProvider>
+ <name>ResponsibleDistricts</name>
+ <lookupIdfield>DISTRICTID</lookupIdfield>
+ <documentation>%aditoprj%/entity/District_entity/entityfields/responsibledistricts/documentation.adoc</documentation>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>291c0ca4-5a68-45f5-80a7-745c7df56d7c</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>Districts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExcludedDistrictIds_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>DistrictsByContactId_param</name>
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>Languages</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3Name</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>DistrictResponsibles</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>DistrictResponsibles</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DistrictId_param</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Organisations</name>
+ <refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>FilterPreSet_param</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityFieldGroup>
+ <name>DISTRICT_NUMBER_fieldGroup</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js</valueProcess>
+ <title>{$DISTRICT_NO}</title>
+ <fields>
+ <element>DISTRICT_NUMBER</element>
+ </fields>
+ </entityFieldGroup>
+ <entityConsumer>
+ <name>Documents</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityField>
+ <name>parentFilter</name>
+ <title>Parent Filter</title>
+ <contentType>FILTER_TREE</contentType>
+ <state>READONLY</state>
+ <stateProcess>%aditoprj%/entity/District_entity/entityfields/parentfilter/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/parentfilter/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>DistrictsByContactId_param</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>appliedFilter</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/appliedfilter/valueProcess.js</valueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ <element>RECORD</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityConsumer>
+ <name>ParentDistricts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>#ENTITY</entityName>
+ <fieldName>ValidParentDistricts</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExcludedDistrictIds_param</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>ValidParentDistricts</name>
+ <documentation>%aditoprj%/entity/District_entity/entityfields/validparentdistricts/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>8b0738a4-e4cd-4f9e-8df1-f499046c81bf</name>
+ <entityName>District_entity</entityName>
+ <fieldName>ParentDistricts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>DistrictsByContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ExcludedDistrictIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <isPageable v="false" />
+ <conditionProcess>%aditoprj%/entity/District_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/District_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <cacheType>GLOBAL</cacheType>
+ <cacheKeyProcess>%aditoprj%/entity/District_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>b8398641-f97b-43e4-8f2c-beda8690ab2f</name>
+ <tableName>DISTRICT</tableName>
+ <primaryKey>DISTRICTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>DISTRICT.DATE_EDIT</recordfield>
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>DISTRICT.DATE_NEW</recordfield>
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISTRICT_FILTER.value</name>
+ <recordfield>DISTRICT.DISTRICT_FILTER</recordfield>
+ <isFilterable v="false" />
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISTRICT_INFO.value</name>
+ <recordfield>DISTRICT.DISTRICT_INFO</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISTRICT_NAME.value</name>
+ <recordfield>DISTRICT.DISTRICT_NAME</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISTRICT_NUMBER.value</name>
+ <recordfield>DISTRICT.DISTRICT_NUMBER</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISTRICT_STATUS.value</name>
+ <recordfield>DISTRICT.DISTRICT_STATUS</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISTRICTID.value</name>
+ <recordfield>DISTRICT.DISTRICTID</recordfield>
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISO3.value</name>
+ <recordfield>DISTRICT.ISO3</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PARENTDISTRICT_DISTRICTID.value</name>
+ <recordfield>DISTRICT.PARENTDISTRICT_DISTRICTID</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>DISTRICT.USER_EDIT</recordfield>
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>DISTRICT.USER_NEW</recordfield>
+ <isFilterable v="false" />
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>appliedFilter.value</name>
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>customerCounting.value</name>
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>parentFilter.value</name>
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>totalTurnover.value</name>
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/District_entity/contentTitleProcess.js b/entity/District_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..638819b3523dc19485ac772e4f6e5a539b4daf0c
--- /dev/null
+++ b/entity/District_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.DISTRICT_NAME"));
\ No newline at end of file
diff --git a/entity/District_entity/documentation.adoc b/entity/District_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a5a7cc1bf15dd756763350054e7a42d55cbcae59
--- /dev/null
+++ b/entity/District_entity/documentation.adoc
@@ -0,0 +1,23 @@
+= District_entity
+
+Overview:
+
+Definition: Entity, which is responsible for handling districts.
+Purpose: Creating the ability to create e.g. sales areas or logical areas.
+Particularities:
+ - Filters are used to implement the logic, to define a area/district. (District: Germany has the filter: Country = "Germany")
+ - The filters are separated into the corresponding district filter from the current tier, which is saved into the database
+ (e.g.: Country = Germany for the District: Germany) and the appliedFilter, which contains all the filter from the overlying
+ districts in a nested form (including the filter of the current tier) (e.g: District: Munich: Country: "Germany" -> State: "Bavaria"
+ -> City: "Munich").
+
+Relations to other entities:
+ - DistrictResponsible_entity
+ - Document_entity
+ - Language_entity
+ - LogHistory_entity
+ - Organisation_entity
+
+Best practices: None known.
+
+FAQs: None known.
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/appliedfilter/valueProcess.js b/entity/District_entity/entityfields/appliedfilter/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..253bd0712af0b47b35aaa72b8d027fc9d053526d
--- /dev/null
+++ b/entity/District_entity/entityfields/appliedfilter/valueProcess.js
@@ -0,0 +1,37 @@
+import("system.result");
+import("system.vars");
+
+var parentFilter = vars.get("$field.parentFilter");
+var districtFilter = vars.get("$field.DISTRICT_FILTER");
+
+var appliedFilter = {
+ entity: "Organisation_entity",
+ filter: {
+ type: "group",
+ operator: "AND",
+ childs: []
+}};
+
+if (parentFilter)
+{
+ appliedFilter.filter.childs.push(JSON.parse(parentFilter).filter);
+}
+if (districtFilter)
+{
+ //appliedFilter = _getApplicableFilter(appliedFilter, districtFilter);
+ appliedFilter.filter.childs.push(JSON.parse(districtFilter).filter);
+}
+
+result.string(JSON.stringify(appliedFilter));
+
+filterArray = [];
+
+function _getApplicableFilter(pFilter, pAppendFilter){
+
+ var applicableFilter = "";
+ var childFilter = JSON.parse(pFilter).filter;
+
+
+
+ return applicableFilter;
+}
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/customercounting/valueProcess.js b/entity/District_entity/entityfields/customercounting/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ccecd79603fe711a4705cd3fe0a6081a800986cc
--- /dev/null
+++ b/entity/District_entity/entityfields/customercounting/valueProcess.js
@@ -0,0 +1,24 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.entities");
+import("system.neon");
+
+var appliedFilter = vars.get("$field.appliedFilter");
+var conf, rowCount = 0;
+
+if (appliedFilter)
+{
+ appliedFilter = JSON.parse(appliedFilter).filter;
+ appliedFilter = JSON.stringify(appliedFilter);
+
+ conf = entities.createConfigForLoadingRows()
+ .entity("Organisation_entity")
+ .fields(["ORGANISATIONID"])
+ .filter(appliedFilter);
+
+ rowCount = entities.getRowCount(conf);
+}
+
+
+result.string(rowCount);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/date_edit/valueProcess.js b/entity/District_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..054ad94ce22cb654da8b7caf533ffefc5219d21f
--- /dev/null
+++ b/entity/District_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ currentDate = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/date_new/valueProcess.js b/entity/District_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..032607ee56724f30881fec7bad289679ce944e4f
--- /dev/null
+++ b/entity/District_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+ currentDate = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_filter/valueProcess.js b/entity/District_entity/entityfields/district_filter/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f184154fd9e40e1aef1e59d59efb97b7310f33ee
--- /dev/null
+++ b/entity/District_entity/entityfields/district_filter/valueProcess.js
@@ -0,0 +1,27 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+
+var currentFilter = vars.get("$this.value");
+var entity = "Organisation_entity";
+var emptyFilter = {
+ entity: entity,
+ filter: {
+ type: "group",
+ operator: "AND",
+ childs: []
+ }
+};
+
+
+if (currentFilter)
+ currentFilter = JSON.parse(currentFilter);
+
+//if the filter field is empty or if the entity was changed, reset the filter
+if (!currentFilter || currentFilter.entity != emptyFilter.entity)
+{
+ var condJson = JSON.stringify(emptyFilter);
+ result.string(condJson);
+}
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_number/displayValueProcess.js b/entity/District_entity/entityfields/district_number/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..95a9d9d10972827b4d89b9f4ad7aa68161204049
--- /dev/null
+++ b/entity/District_entity/entityfields/district_number/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.logging");
+import("system.result");
+import("system.neon");
+import("Sql_lib");
+
+
+var districtNo = vars.get("$field.DISTRICT_NUMBER");
+
+result.string(districtNo.padStart(4, '0'));
diff --git a/entity/District_entity/entityfields/district_number/onValidation.js b/entity/District_entity/entityfields/district_number/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..33392435cc69fabaa74c0d64eb48848b90674fc6
--- /dev/null
+++ b/entity/District_entity/entityfields/district_number/onValidation.js
@@ -0,0 +1,18 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+import("system.translate");
+import("Sql_lib");
+
+
+var localValue = vars.get("$local.value");
+var value = vars.get("$field.DISTRICT_NUMBER");
+var biggestDistrictNo = newSelect("MAX(DISTRICT_NUMBER)").from("DISTRICT").cell();
+
+if (localValue)
+{
+ if (Number(localValue) <= Number(biggestDistrictNo) && Number(localValue) != Number(value))
+ {
+ result.string(translate.withArguments("The district no has to be bigger than %0", [biggestDistrictNo]));
+ }
+}
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_number/valueProcess.js b/entity/District_entity/entityfields/district_number/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3e307b09a5f62a6e669170e08eb49aac6f036fee
--- /dev/null
+++ b/entity/District_entity/entityfields/district_number/valueProcess.js
@@ -0,0 +1,21 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+
+
+var returnableDistrictNo = null;
+var thisValue = vars.get("this.value");
+var previousDistrictNo = newSelect("COUNT(*)").from("DISTRICT").cell();
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+ if (previousDistrictNo != Number(previousDistrictNo)+1 && !thisValue)
+ {
+ returnableDistrictNo = Number(previousDistrictNo)+1;
+ } else{
+
+ }
+}
+
+result.string(returnableDistrictNo);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js b/entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..33857cd9988203551e8ec559931de007c78e462f
--- /dev/null
+++ b/entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+var districtNo = vars.get("$field.DISTRICT_NUMBER");
+
+result.string(translate.text("District No.:") + " " + districtNo.padStart(4, '0'));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_status/dropDownProcess.js b/entity/District_entity/entityfields/district_status/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..43063fe007d6d15d886c7cdd4bc624d7f2ddecf4
--- /dev/null
+++ b/entity/District_entity/entityfields/district_status/dropDownProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.translate");
+
+var selectableOptions = new Array();
+
+selectableOptions[0] = translate.text("Active");
+selectableOptions[1] = translate.text("Inactive");
+
+result.object(selectableOptions);
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/date_new/valueProcess.js b/entity/District_entity/entityfields/district_status/valueProcess.js
similarity index 78%
rename from entity/Orderitem_entity/entityfields/date_new/valueProcess.js
rename to entity/District_entity/entityfields/district_status/valueProcess.js
index f0ba30f6e144b316b4c1280648564aedeeb209ee..06be75dc391630efc92dffbff413d7b9fa2100ab 100644
--- a/entity/Orderitem_entity/entityfields/date_new/valueProcess.js
+++ b/entity/District_entity/entityfields/district_status/valueProcess.js
@@ -1,6 +1,7 @@
-import("system.vars");
+import("system.util");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+ result.string("0");
\ No newline at end of file
diff --git a/entity/CommRestriction_Entity/entityfields/commrestrictionmedium_param/valueProcess.js b/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js
similarity index 51%
rename from entity/CommRestriction_Entity/entityfields/commrestrictionmedium_param/valueProcess.js
rename to entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js
index 945de9c5f77d48811df0111ab4e7b296d799c128..d3d1d4b6cb94a84199fdc7783e0194a1a7255152 100644
--- a/entity/CommRestriction_Entity/entityfields/commrestrictionmedium_param/valueProcess.js
+++ b/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js
@@ -1,4 +1,5 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.MEDIUM"));
\ No newline at end of file
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.DISTRICTID"));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js b/entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..289f9107d46f3fabb9daf28ea42318b124ba98ea
--- /dev/null
+++ b/entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("$$$###ignore_param###$$$");//dummy value, for special treatment in the conditionProcess
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderitems/children/contactid_param/valueProcess.js b/entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
similarity index 52%
rename from entity/Order_entity/entityfields/orderitems/children/contactid_param/valueProcess.js
rename to entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
index ef0d5bcac51027b862291e5abd61c0c05773a8df..9e43ccb56de5d1eec96b494b8780ed76fee0a034 100644
--- a/entity/Order_entity/entityfields/orderitems/children/contactid_param/valueProcess.js
+++ b/entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
+result.string(vars.get("$field.DISTRICTID"));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8a6858d63bdfcd7a5877551916d5725825758863
--- /dev/null
+++ b/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DISTRICT");
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/iso3/displayValueProcess.js b/entity/District_entity/entityfields/iso3/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d951329b1376a125deb9c072c0d0f8f76a5cc328
--- /dev/null
+++ b/entity/District_entity/entityfields/iso3/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("Context_lib");
+import("system.vars");
+import("system.result");
+
+result.string(ContextUtils.loadContentTitle("Language_entity", vars.get("$field.ISO3")));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js b/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8ca4bf12840a2f9193816b3411c4f55bf41662fc
--- /dev/null
+++ b/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(JSON.stringify(JSON.parse(vars.get("$field.appliedFilter")).filter));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js b/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..07a7c92ba405f856fdf699a7dbfa94a512025ac7
--- /dev/null
+++ b/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("Context_lib");
+import("system.vars");
+import("system.result");
+
+var parentDistrictId = vars.get("$field.PARENTDISTRICT_DISTRICTID");
+var parentDistrictName = ContextUtils.loadContentTitle("District_entity", parentDistrictId);
+
+result.string(parentDistrictName);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js b/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bbd0a18395ba576ce8b33e4064dc211a92becd04
--- /dev/null
+++ b/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+
+var uid = vars.get("$field.DISTRICTID");
+var res = JSON.stringify([uid]);
+result.string(res);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentfilter/stateProcess.js b/entity/District_entity/entityfields/parentfilter/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a8368fb6d4da5006d6e2ab9045d62360c81497f6
--- /dev/null
+++ b/entity/District_entity/entityfields/parentfilter/stateProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (!vars.get("$field.parentFilter") || !vars.get("$field.PARENTDISTRICT_DISTRICTID"))
+ result.string(neon.COMPONENTSTATE_DISABLED);
+else
+ result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentfilter/valueProcess.js b/entity/District_entity/entityfields/parentfilter/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e1c0dfd89d6d147325bc77eb3fe1e1b452c6793e
--- /dev/null
+++ b/entity/District_entity/entityfields/parentfilter/valueProcess.js
@@ -0,0 +1,64 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("Sql_lib");
+
+var res = "";
+var parentDistrictId = vars.get("$field.PARENTDISTRICT_DISTRICTID");
+
+if (parentDistrictId)
+{
+ var completeParentFilter = _getParentFilter(parentDistrictId, null);
+ completeParentFilter.entity = "Organisation_entity";
+ res = completeParentFilter;
+}
+else
+{
+ var entity = "Organisation_entity";
+ var emptyFilter = {
+ entity: entity,
+ filter: {
+ type: "group",
+ operator: "AND",
+ childs: []
+ }
+ };
+
+ res = emptyFilter;
+}
+
+result.string(JSON.stringify(res));
+
+
+function _getParentFilter(pParentDistrictId, pPreviousFilter)
+{
+ var resFilter;
+
+ if (pPreviousFilter != null)
+ {
+ resFilter = pPreviousFilter;
+ }
+
+ if (pParentDistrictId)
+ {
+ var parentDistrictFilter, grandParentDistrict;
+ [parentDistrictFilter, grandParentDistrict] = newSelect(["DISTRICT.DISTRICT_FILTER", "DISTRICT.PARENTDISTRICT_DISTRICTID"])
+ .from("DISTRICT")
+ .where("DISTRICT.DISTRICTID", pParentDistrictId)
+ .arrayRow();
+
+ parentDistrictFilter = JSON.parse(parentDistrictFilter);
+
+ if (pPreviousFilter)
+ parentDistrictFilter.filter.childs.push(resFilter.filter);//todo: kommentar ergänzen was wir heir eigentlcih machen
+
+ resFilter = parentDistrictFilter;
+
+ if (grandParentDistrict.length > 0)
+ {
+ resFilter = _getParentFilter(grandParentDistrict, resFilter);
+ }
+ }
+
+ return resFilter;
+}
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/responsibledistricts/documentation.adoc b/entity/District_entity/entityfields/responsibledistricts/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..3ce26873409a61e01181493f161e5121ff15e78c
--- /dev/null
+++ b/entity/District_entity/entityfields/responsibledistricts/documentation.adoc
@@ -0,0 +1,3 @@
+= District_entity - ResponsibleDistricts
+
+Provider for the person entity, used to display the responsible districts in the person main view.
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/totalturnover/valueProcess.js b/entity/District_entity/entityfields/totalturnover/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..40d9732b34a8c3e73b89f860524abb9f55fd77ef
--- /dev/null
+++ b/entity/District_entity/entityfields/totalturnover/valueProcess.js
@@ -0,0 +1,35 @@
+import("system.text");
+import("Sql_lib");
+import("system.SQLTYPES");
+import("Date_lib");
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.entities");
+import("system.neon");
+import("system.db");
+
+var districtTurnover;
+var appliedFilter = vars.get("$field.DISTRICT_FILTER");
+if (appliedFilter)
+{
+ appliedFilter = JSON.parse(appliedFilter).filter;
+ appliedFilter = JSON.stringify(appliedFilter);
+
+ districtTurnover = newSelect("sum(NET)")
+ .from("SALESORDER")
+ .join("CONTACT", "CONTACT.CONTACTID = SALESORDER.CONTACT_ID")
+ .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
+ .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+ .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID")
+ .where(db.toFilterCondition(appliedFilter, "Organisation_entity"))
+ //.and("SALESORDER.SALESORDERDATE", DateUtils.getCurrentYear(), SqlBuilder.YEAR_EQUALS(), SQLTYPES.INTEGER)
+ .cell();
+}
+
+if (districtTurnover)
+ districtTurnover = text.formatDouble(districtTurnover, "#,##0.00", true);
+else
+ districtTurnover = "0";
+
+result.string(districtTurnover);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/user_edit/valueProcess.js b/entity/District_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a55cb327464d6def9b94735913c25ffb5e4328ef
--- /dev/null
+++ b/entity/District_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/user_new/valueProcess.js b/entity/District_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1411b9ac93e217a76a876371a2609ff9464f4997
--- /dev/null
+++ b/entity/District_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+ currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/validparentdistricts/documentation.adoc b/entity/District_entity/entityfields/validparentdistricts/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..6882425fd29087db57588d866d85d4d10963d838
--- /dev/null
+++ b/entity/District_entity/entityfields/validparentdistricts/documentation.adoc
@@ -0,0 +1 @@
+Provides a list of districts that can be set as parent district for one specific district entry.
\ No newline at end of file
diff --git a/entity/District_entity/iconIdProcess.js b/entity/District_entity/iconIdProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c0e2f3aee79df633566818ff042f326b00f4ecdd
--- /dev/null
+++ b/entity/District_entity/iconIdProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + (vars.getString("$field.DISTRICT_NAME")).trim());
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/cacheKeyProcess.js b/entity/District_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5c69b8e25a7c6b1288aa4eaad221a6621ed5860
--- /dev/null
+++ b/entity/District_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,5 @@
+import("CachedRecordContainer_lib");
+import("system.result");
+
+var cacheKey = CachedRecordContainerUtils.getCommonKey("$param.DistrictsByContactId_param", "$param.ExcludedDistrictIds_param");
+result.string(cacheKey);
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/conditionProcess.js b/entity/District_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8329757ab9cf0a152de9c68fc67fcb16ffcb921e
--- /dev/null
+++ b/entity/District_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,36 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var onlyResponsibleParam = vars.get("$param.DistrictsByContactId_param");
+var cond = newWhere();
+if (onlyResponsibleParam)
+{
+ //dummy value, if the dummy value is here, we can safely ignore that param, otherwise we need to filter the district list
+ if (onlyResponsibleParam != "$$$###ignore_param###$$$")
+ {
+ var responsibleDistricts = newSelect("DISTRICTRESPONSIBLE.DISTRICT_ID")
+ .from("DISTRICTRESPONSIBLE")
+ .where("DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID", onlyResponsibleParam)
+ .arrayColumn();
+
+ cond.and("DISTRICT.DISTRICTID", responsibleDistricts, SqlBuilder.IN());
+ }
+}
+else
+{
+ //this will happen if the param was specified but is empty. This happen when you use the consumer "ResponsibleDistricts" because the
+ //parameter "DistrictsByContactId_param" is mandatory in that case. If the value is empty we must not return any data because we would see all
+ //districts otherwise
+ cond.and("1 = 2");
+}
+
+
+var excludedDistrictIds = vars.get("$param.ExcludedDistrictIds_param");
+if (excludedDistrictIds)
+{
+ excludedDistrictIds = JSON.parse(excludedDistrictIds);
+ cond.andIfSet("DISTRICT.DISTRICTID", excludedDistrictIds, SqlBuilder.NOT_IN());
+}
+
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/orderClauseProcess.js b/entity/District_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8eecff7ca3cc3956505cd3d2e40b072c3af92f33
--- /dev/null
+++ b/entity/District_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.db");
+import("system.result");
+
+result.object({"DISTRICT_NUMBER" : db.ASCENDING});
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index b7b2802dbeddac3dfe5a548de3487b8b2a993fd1..e848d6cbed30ee763ef247d2b50de2b6a9fcd166 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DocumentTemplateLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DocumentTemplateLink_entity/documentation.adoc</documentation>
@@ -67,6 +67,7 @@
<entityProvider>
<name>Links</name>
<targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
+ <documentation>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -102,6 +103,10 @@
<contentType>TEXT</contentType>
<valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc b/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..7a84ce185cef34897e1edccd8a13474f484256e6
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplateLink_entity - Links
+
+needed instead of the #PROVIDER so the DocumentId_param and Type_param can be used
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
index 4dfe000072b3f3a5a57ccb17ea5c7a10eb5fe0af..3e77638a51c83f4a8c4826e1659f807b55198c97 100644
--- a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
+++ b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DocumentTemplatePlaceOfUse_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/documentation.adoc</documentation>
@@ -47,6 +47,7 @@
</entityConsumer>
<entityProvider>
<name>DocumentTemplatePlaceOfUse</name>
+ <documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>bc05b556-ecca-478c-9a92-b77e4d98d6f3</name>
@@ -59,6 +60,7 @@
<entityParameter>
<name>DocumentTemplatePlaceOfUse_param</name>
<valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/valueProcess.js</valueProcess>
+ <documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc</documentation>
</entityParameter>
</children>
</entityProvider>
@@ -67,6 +69,10 @@
<valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..01180d3457f67a1830bbbd0b35bfb3e6fa79fcf4
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplatePlaceOfUse_entity - DocumentTemplatePlaceOfUse
+
+needed instead of the #PROVIDER so the DocumentTemplatePlaceOfUse_param can be used to specify the place of use
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..fb626b8cd69b684823914118c7aa1513dbc40277
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplatePlaceOfUse_entity - DocumentTemplatePlaceOfUse
+
+needed instead of the #PROVIDER so DocumentTemplatePlaceOfUse_param can be used
\ No newline at end of file
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index 69654f30a92c95fd123461504f095c06628c7e67..bea4c1751d8494da143d1330f839615910e4cba6 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DocumentTemplateTypeCategory_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/documentation.adoc</documentation>
@@ -30,6 +30,7 @@
<entityProvider>
<name>ByCategory</name>
<lookupIdfield>KEYID</lookupIdfield>
+ <documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -46,6 +47,10 @@
</entityParameter>
</children>
</entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc b/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..3b14b668f8cb5c519c04fb13e0189cbcc1696ff2
--- /dev/null
+++ b/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplateTypeCategory_entity - ByCategory
+
+needed instead of the #PROVIDER so the usageFilter_param can be used
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 3e4bbba2abdc84a8a7f33554ef8178579318db16..3cace11c7a9bd178373d3c4adf2c1689fcc83376 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DocumentTemplate_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DocumentTemplate_entity/documentation.adoc</documentation>
@@ -8,7 +8,9 @@
<contentTitleProcess>%aditoprj%/entity/DocumentTemplate_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/DocumentTemplate_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/DocumentTemplate_entity/onValidation.js</onValidation>
+ <useFavorites v="true" />
<iconId>VAADIN:FILE_FONT</iconId>
+ <imageProcess>%aditoprj%/entity/DocumentTemplate_entity/imageProcess.js</imageProcess>
<titlePlural>Document templates</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -191,6 +193,7 @@
<name>Attachments</name>
<targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>DOCUMENTTEMPLATEID</targetIdField>
+ <documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc</documentation>
<titlePlural>Attachments</titlePlural>
<recordContainer>db</recordContainer>
<dependencies>
@@ -230,13 +233,8 @@
</entityParameter>
<entityProvider>
<name>DocumentTemplateProvider</name>
+ <documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc</documentation>
<dependencies>
- <entityDependency>
- <name>e1c555c3-9e53-4ccf-962c-4bdd3c14bb16</name>
- <entityName>Offer_entity</entityName>
- <fieldName>DocumentTemplateText</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>9c10883d-eb73-4587-b758-693a66367a4c</name>
<entityName>Offer_entity</entityName>
@@ -339,6 +337,14 @@
<name>ComingFrom_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>DOCUMENTTEMPLATE_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplate_objecttype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc b/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..fffc7bdb9141b4afad4836cebb0c2069dc0d3808
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplate_entity - Attachments
+
+needed instead of the #PROVIDER so the DocumentTemplateType_param can be used
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplate_objecttype/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/documenttemplate_objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1889e3e2e5f569d8d83c566b3d36f3dd7070c530
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplate_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DocumentTemplate");
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc b/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..6b0863e66ea80bb4e10cd56762dcbbf7bb3e93be
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplate_entity - DocumentTemplateProvider
+
+Provides the docTemplates to all the entities that need them using the comingFrom_param to specify which ones to display
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/imageProcess.js b/entity/DocumentTemplate_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a2de543489d834ea3457009159a8987cb50d961
--- /dev/null
+++ b/entity/DocumentTemplate_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.#CONTENTTITLE"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
index a6caa092b127b8be6153548a5be25be6507ba913..40ced6b7b961dd5616239ee3a8b8ff92f0f7932f 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
@@ -9,9 +9,10 @@ var cond = newWhere()
if(vars.get("$param.ComingFrom_param"))
{
- cond.and("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", newSelect("DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATE_ID")
- .from("DOCUMENTTEMPLATEPLACEOFUSE")
- .where("DOCUMENTTEMPLATEPLACEOFUSE.PLACEOFUSE", "$param.ComingFrom_param"),SqlBuilder.IN());
+ cond.and(null, newSelect("DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATEPLACEOFUSEID")
+ .from("DOCUMENTTEMPLATEPLACEOFUSE")
+ .where("DOCUMENTTEMPLATEPLACEOFUSE.PLACEOFUSE", "$param.ComingFrom_param")
+ .and("DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID"), SqlBuilder.EXISTS());
}
result.string(cond);
\ No newline at end of file
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index ece972eadd5328abb55c436e130971f9369bffa2..3f4cc4a2b3257e1b4f180528a09621179927cb06 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Document_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Document_entity/documentation.adoc</documentation>
@@ -95,6 +95,7 @@
</entityParameter>
<entityField>
<name>UID</name>
+ <title>Id</title>
</entityField>
<entityField>
<name>DESCRIPTION</name>
@@ -118,6 +119,7 @@
<name>IS_MAIN_DOCUMENT</name>
<title>Main document</title>
<contentType>BOOLEAN</contentType>
+ <placeholderProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/placeholderProcess.js</placeholderProcess>
<dropDownProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/dropDownProcess.js</dropDownProcess>
<valueProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Document_entity/entityfields/is_main_document/onValueChange.js</onValueChange>
@@ -219,6 +221,24 @@
<fieldName>LogDocuments</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>2e6fcf27-ee98-4f7d-a99d-7ce02774076b</name>
+ <entityName>UserhelpResources</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b7b14281-6e78-4005-ad5b-14dffc4091f5</name>
+ <entityName>District_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>e6553781-e306-4335-a929-2c2a8ad8270f</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -351,6 +371,10 @@
</entityParameter>
</children>
</entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
<entityActionGroup>
<name>MSTeam</name>
<title>MS Teams</title>
diff --git a/entity/Document_entity/contentProcess.js b/entity/Document_entity/contentProcess.js
deleted file mode 100644
index c676dbd27c0ad4530caf3072ad0e525cf1f6adc8..0000000000000000000000000000000000000000
--- a/entity/Document_entity/contentProcess.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.db");
-
-// Check if assignment parameters are present
-if(vars.exists("$param.AssignmentTable_param") &&
- vars.exists("$param.AssignmentName_param") &&
- vars.exists("$param.AssignmentRowId_param")) {
- var assignmentTable = vars.get("$param.AssignmentTable_param");
- var assignmentName = vars.get("$param.AssignmentName_param");
- var assignmentRowId = vars.get("$param.AssignmentRowId_param");
- var alias = db.getCurrentAlias();
- var documents = [];
-
- // Check if multiple Documents are selected
- if(vars.exists("$local.idvalues") && vars.get("$local.idvalues") != '')
- metadata = db.getBinaryMetadataForIds(vars.get("$local.idvalues"), true, alias)
- else
- metadata = db.getBinaryMetadata(assignmentTable, assignmentName, assignmentRowId, false, alias);
-
- // Iterate through found binary data and populate result array
- for( var i = 0; i < metadata.length; i++) {
- documents.push( [metadata[i].id, metadata[i].filename, metadata[i].size,
- metadata[i].edit, metadata[i].preview, metadata[i].mimetype,
- metadata[i].description, metadata[i].keyword]);
- }
-
- result.object(documents);
-}
diff --git a/entity/Document_entity/entityfields/downloadfilesaction/onActionProcess.js b/entity/Document_entity/entityfields/downloadfilesaction/onActionProcess.js
deleted file mode 100644
index cb680339a304a772903d66b521a97809f90288f2..0000000000000000000000000000000000000000
--- a/entity/Document_entity/entityfields/downloadfilesaction/onActionProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("Document_lib");
-DocumentUtil.downloadSelectedDocuments();
diff --git a/entity/Document_entity/entityfields/is_main_document/placeholderProcess.js b/entity/Document_entity/entityfields/is_main_document/placeholderProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b541d6a62aef80de1307ed68f9344719ec9febb
--- /dev/null
+++ b/entity/Document_entity/entityfields/is_main_document/placeholderProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Main document"));
\ No newline at end of file
diff --git a/entity/Document_entity/onDelete.js b/entity/Document_entity/onDelete.js
deleted file mode 100644
index 74fe70263290d64f3566a2806e4b2dd25bd81cf4..0000000000000000000000000000000000000000
--- a/entity/Document_entity/onDelete.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("Document_lib");
-DocumentUtil.deleteCurrentDocument();
diff --git a/entity/Document_entity/onInsert.js b/entity/Document_entity/onInsert.js
deleted file mode 100644
index 6ca4ff7fcd93fc451a6fedd32d9bd43d55d654af..0000000000000000000000000000000000000000
--- a/entity/Document_entity/onInsert.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import("system.db");
-import("system.vars");
-import("Document_lib");
-
-var assignmentTable = vars.get("$param.AssignmentTable_param");
-var assignmentName = vars.get("$param.AssignmentName_param");
-var assignmentRowId = vars.get("$param.AssignmentRowId_param");
-var bindata = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA_UPLOAD"));
-var filename = vars.get("$field.NAME");
-var description = vars.get("$field.DESCRIPTION");
-var alias = db.getCurrentAlias();
-var keyword = vars.get("$field.KEYWORD");
-
-if(bindata != '' && filename != ''){
- db.insertBinary(assignmentTable, assignmentName, assignmentRowId, "",
- bindata, filename, description, keyword, alias);
-}
diff --git a/entity/Document_entity/onUpdate.js b/entity/Document_entity/onUpdate.js
deleted file mode 100644
index 9a1c27e56d5a441a04cefa1c7fc1c338b507c7cd..0000000000000000000000000000000000000000
--- a/entity/Document_entity/onUpdate.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import("system.vars");
-import("system.db");
-import("Document_lib");
-
-var id = vars.get("$field.ID");
-var parentId = "";
-var fileName = vars.get("$field.NAME");
-var description = vars.get("$field.DESCRIPTION");
-var keyword = vars.get("$field.KEYWORD");
-var alias = db.getCurrentAlias();
-
-var bindata = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA_UPLOAD"));
-
-if (bindata == ''){
- bindata = vars.get("$field.BINDATA_UPLOAD")
-}
-
-// Check if bindata is present and execute the corresponding update method
-if(bindata != '')
- db.updateBinary(id, parentId, bindata, fileName, description, keyword, alias);
-else
- db.updateBinaryMetadata(id, parentId, fileName, description, keyword, alias);
\ No newline at end of file
diff --git a/entity/Document_entity/recordcontainers/jdito/contentProcess.js b/entity/Document_entity/recordcontainers/jdito/contentProcess.js
index ac587aa94de4b50020b99e39054ac3b3b29403ae..6481d977a0fecc1703609e78251cd1f35cafd397 100644
--- a/entity/Document_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Document_entity/recordcontainers/jdito/contentProcess.js
@@ -22,7 +22,7 @@ if(vars.exists("$param.AssignmentTable_param") &&
if(vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
metadata = db.getBinaryMetadataForIds(vars.get("$local.idvalues"), true, alias)
else
- metadata = db.getBinaryMetadata(assignmentTable, assignmentName || "", assignmentRowId, false, alias, keyword);
+ metadata = db.getBinaryMetadata(assignmentTable, assignmentName || "", assignmentRowId, true, alias, keyword);
// Iterate through found binary data and populate result array
for( var i = 0; i < metadata.length; i++) {
diff --git a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
index 27b1fa6d07324c0a715f96f69555cb2f4837e98a..b587b5faf51202eb06723ae25ddd47114b859384 100644
--- a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
+++ b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DuplicateScannerResultFieldConfig_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/documentation.adoc</documentation>
@@ -51,6 +51,10 @@
<name>DUPLICATESCANNER_ID</name>
<valueProcess>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/entityfields/duplicatescanner_id/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index b7116402fb566724a159f7c003fde69a19901b96..98691a749008df38df0e10ef2a4ee335dc6ef49b 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DuplicateScanner_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DuplicateScanner_entity/documentation.adoc</documentation>
@@ -14,6 +14,7 @@
<entityField>
<name>ENTITY_TO_SCAN_NAME</name>
<title>Target Entity</title>
+ <stateProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>UID</name>
@@ -64,7 +65,9 @@
<entityField>
<name>SCAN_PATTERN</name>
<title>Scan pattern</title>
- <contentType>LONG_TEXT</contentType>
+ <contentType>FILTER_TREE</contentType>
+ <state>AUTO</state>
+ <stateProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js</stateProcess>
</entityField>
<entityConsumer>
<name>ScannerResultFieldsConfig_Consumer</name>
@@ -95,11 +98,17 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>DBRecordContainer</name>
<alias>Data_alias</alias>
+ <onDBInsert>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js b/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js
similarity index 69%
rename from entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js
rename to entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js
index bcc88cc57c128d8971d6880133fb2584129a802e..07c220ad58c1df3eb5e3f6e8b387045763d9ad1e 100644
--- a/entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js
+++ b/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js
@@ -1,11 +1,9 @@
-import("system.result");
import("system.neon");
+import("system.result");
import("system.vars");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
result.string(neon.COMPONENTSTATE_EDITABLE);
-}
-else
-{
+} else {
result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js b/entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js
index 93506f3cf38b1cbfb21713bfa74fab61453f5d9b..185ff7e95eb7cb9c7433740c69e3db7fdaa6137a 100644
--- a/entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js
+++ b/entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js
@@ -6,7 +6,7 @@ let currentEntity = vars.get("$field.ENTITY_TO_SCAN_NAME");
var model = project.getEntityStructure(currentEntity);
let entityFields = [];
-for (fieldname in model.fields)
+for (let fieldname in model.fields)
{
let field = model.fields[fieldname];
if(field.fieldType == project.ENTITYFIELDTYPE_FIELD)
diff --git a/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js b/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..256afd274dae777fb192e66457b19415f215a693
--- /dev/null
+++ b/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+} else {
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..3c29c7e6c1790f6f53dd7fbb272a21d62f24667d
--- /dev/null
+++ b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
@@ -0,0 +1,8 @@
+import("Sql_lib");
+import("system.neon");
+import("system.vars");
+
+var rowdata = vars.get("$local.rowdata");
+
+newWhere("DUPLICATESCANNER.ID", rowdata["DUPLICATESCANNER.ID"])
+.updateFields({"DUPLICATESCANNER.SCAN_PATTERN" : JSON.stringify({entity: "" + rowdata["DUPLICATESCANNER.ENTITY_TO_SCAN_NAME"] + "", provider: "indexP", filter: {type: "group", operator: "AND", childs: []}})}, "DUPLICATESCANNER");
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..c8e53ac00d768ffab9c7f50553de8b2f3d327bed
--- /dev/null
+++ b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
@@ -0,0 +1,10 @@
+import("system.vars");
+
+var rowdata = vars.get("$local.rowdata");
+
+let scanPattern = JSON.parse(rowdata["DUPLICATESCANNER.SCAN_PATTERN"]);
+if (scanPattern.provider == undefined)
+{
+ scanPattern.provider = "indexP";
+ vars.set("$field.SCAN_PATTERN", JSON.stringify(scanPattern));
+}
\ No newline at end of file
diff --git a/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod b/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod
index 38cce034b41a30e64c9fd36aa732fc1b7d8d10a6..eb93c9ccc92f196b47836d66919105f669b6e984 100644
--- a/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod
+++ b/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DuplicatesUnrelated_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DuplicatesUnrelated_entity/documentation.adoc</documentation>
@@ -64,6 +64,10 @@
<expose v="true" />
<mandatory v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Duplicates_entity/Duplicates_entity.aod b/entity/Duplicates_entity/Duplicates_entity.aod
index 8b4c751722f526a33993a40e759fceb7a461a008..54ee932a3235f4e127feeb5112c9c11e3e7f2e47 100644
--- a/entity/Duplicates_entity/Duplicates_entity.aod
+++ b/entity/Duplicates_entity/Duplicates_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Duplicates_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Duplicates_entity/documentation.adoc</documentation>
@@ -30,8 +30,8 @@
</entityField>
<entityProvider>
<name>SelfPersonDuplicatesProvider</name>
- <titlePlural>Person duplicates</titlePlural>
<titlePluralProcess>%aditoprj%/entity/Duplicates_entity/entityfields/selfpersonduplicatesprovider/titlePluralProcess.js</titlePluralProcess>
+ <titlePlural>Person duplicates</titlePlural>
<children>
<entityParameter>
<name>TargetEntity</name>
@@ -112,7 +112,7 @@
<dependency>
<name>dependency</name>
<entityName>Person_entity</entityName>
- <fieldName>Contacts</fieldName>
+ <fieldName>NonselfDuplicates</fieldName>
</dependency>
<children>
<entityParameter>
@@ -189,7 +189,7 @@
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
+ <fieldName>NonselfDuplicates</fieldName>
</dependency>
<children>
<entityParameter>
@@ -202,6 +202,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 53fc0d062857cdc6c2a452f98967055dd6f2006c..a2aaff62e7faf22fc5a37085878823e7d2cda7bc 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Email_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Email_entity/documentation.adoc</documentation>
@@ -119,7 +119,7 @@
</entityParameter>
<entityActionField>
<name>sendMail</name>
- <title>send mail</title>
+ <title>{SEND_MAIL}</title>
<onActionProcess>%aditoprj%/entity/Email_entity/entityfields/sendmail/onActionProcess.js</onActionProcess>
<iconId>VAADIN:AT</iconId>
<stateProcess>%aditoprj%/entity/Email_entity/entityfields/sendmail/stateProcess.js</stateProcess>
@@ -128,6 +128,14 @@
<name>AdditionalPlaceholders_param</name>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>UpdateStatements_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Email_entity/entityfields/recipient/valueProcess.js b/entity/Email_entity/entityfields/recipient/valueProcess.js
index 28712f38d11117f0241a65aa12bac0cd0f7e89f9..e26a2de2a8118ee57c0e9c292eaae60f50885589 100644
--- a/entity/Email_entity/entityfields/recipient/valueProcess.js
+++ b/entity/Email_entity/entityfields/recipient/valueProcess.js
@@ -10,7 +10,7 @@ if (vars.get("$this.value") == null)
else if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
result.string(CommUtil.getStandardMail(vars.get("$param.ContactId_param")));
}
-else if (!vars.get("$field.RECIPIENT").includes("@"))
+else if (!vars.get("$field.RECIPIENT").includes("@") && vars.get("$field.RECIPIENT") != "")
result.string(newSelect("ADDR")
.from("COMMUNICATION")
.where("COMMUNICATION.COMMUNICATIONID", vars.get("$this.value")).cell());
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/sendmail/onActionProcess.js b/entity/Email_entity/entityfields/sendmail/onActionProcess.js
index a7bdf5af9030a2f9352c7f5ccd597d334995fd35..8d7f805dd0fb6e7dce5691bada2172ae0b11cd4f 100644
--- a/entity/Email_entity/entityfields/sendmail/onActionProcess.js
+++ b/entity/Email_entity/entityfields/sendmail/onActionProcess.js
@@ -1,12 +1,15 @@
-import("system.translate");
-import("ActivityTask_lib");
+import("system.db");
import("system.neon");
-import("Employee_lib");
import("system.vars");
+import("system.question");
+import("system.translate");
+import("Sql_lib");
import("Email_lib");
import("Contact_lib");
import("Document_lib");
-import("system.question");
+import("Employee_lib");
+import("ActivityTask_lib");
+import("KeywordRegistry_basic");
var attachments = JSON.parse(vars.get("$param.Attachments_param"));
var senderContactId = vars.get("$param.ContactId_param");
@@ -15,9 +18,10 @@ var emailFilename = vars.get("$param.EmailFilename");
var notificationMsg = vars.get("$param.NotificationMsg_param");
var notificationTitle = translate.text("Offer status changed");
var subject = vars.get("$field.subject");
-
+var updateStatements = JSON.parse(vars.get("$param.UpdateStatements_param"));
var additionalPlaceholders = null;
-if (vars.exists("$param.AdditionalPlaceholders_param") && vars.get("$param.AdditionalPlaceholders_param"))
+
+if (vars.exists("$param.AdditionalPlaceholders_param") && vars.get("$param.AdditionalPlaceholders_param") != "null")
{
additionalPlaceholders = JSON.parse(vars.get("$param.AdditionalPlaceholders_param")).map(function (placeholder)
{
@@ -38,6 +42,10 @@ var eml = EmailWritingUtils.openMailTemplate(
additionalPlaceholders
);
+if(updateStatements)
+{
+ db.updates(updateStatements);
+}
if (notificationMsg)
- question.showMessage(notificationMsg, question.INFORMATION, notificationTitle);
\ No newline at end of file
+ question.showMessage(notificationMsg, question.INFORMATION, notificationTitle);
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index 70d886c3bf2558effa335e84228a2a614dea579f..a25038afe35cf38b4a02c7766ef82f363cb07a0d 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>EmployeeRole_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/EmployeeRole_entity/documentation.adoc</documentation>
@@ -65,11 +65,16 @@
<entityField>
<name>TARGETCONTEXT</name>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <isSortable v="true" />
<contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
diff --git a/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js b/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js
index c31bba2928eacd13ecc63ab2b2196f18ff163015..bbf5094fbccb4af558c2c7bcecf8aab2d18f9034 100644
--- a/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js
+++ b/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js
@@ -6,13 +6,7 @@ import("system.result");
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
var excludeRolesArray = ["INTERNAL_EVERYONE", "INTERNAL_GROUPWARE", "INTERNAL_SNMP", "INTERNAL_DESIGNER", "INTERNAL_TECHNICAL"];
-if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
-{
- if (userTitle != "") {
- var userRoles = tools.getRoles(userTitle);
- for (i = 0; i < userRoles.length; i++) {
- excludeRolesArray.push(userRoles[i]);
- }
- }
-}
+if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW && userTitle)
+ excludeRolesArray = excludeRolesArray.concat(tools.getRoles(userTitle));
+
result.string(JSON.stringify(excludeRolesArray));
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
index a798b7a80f57f615439eab376b8db4b13a48fedd..4c099db5f38308fc0002a7da6d9a9722f7735092 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
@@ -1,9 +1,9 @@
+import("Util_lib");
import("system.result");
import("system.vars");
import("system.tools");
var roles = [];
-var singleRole = [];
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
var allRoles = tools.getAllRoles();
@@ -24,33 +24,20 @@ if (userTitle && tools.existUsers(userTitle))
}, existsObj);
}
-var ids = vars.get("$local.idvalues");
-if (ids != null)
+var idvalues = vars.get("$local.idvalues");
+if (!Utils.isNullOrEmpty(idvalues))
{
roles = roles.filter(function(role)
{
- for (let i = 0; i < ids.length; i++)
- {
- if (role[0] == ids[i])
- return true;
- }
- return ids[i];
+ return idvalues.includes(role[0]);
});
}
-if(roles == undefined || roles.length > 0)
- result.object(roles);
-else
+
+var sortOrder = vars.get("$local.order");
+if (sortOrder && "ROLE.displayValue" in sortOrder)
{
- var currentRole = vars.get("$field.ROLE")
- roles = roles.filter(function(role)
- {
- for (let i = 0; i < ids.length; i++)
- {
- if (role[0] == currentRole)
- return true;
- }
- return vars.get("$field.ROLE");
- });
- singleRole[0] = [currentRole.toUpperCase(), currentRole.toUpperCase(), allRoles[currentRole][0], "Role"];
- result.object(singleRole)
-}
\ No newline at end of file
+ ArrayUtils.sort2d(roles, 2, sortOrder["ROLE.displayValue"] === "UP");
+}
+
+
+result.object(roles);
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 36806cbf40d5502e38bbef7dd231635ea7496d10..60ea8401f68c771715b123bb20d125584e78a98f 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Employee_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Employee_entity/documentation.adoc</documentation>
@@ -8,6 +8,7 @@
<contentTitleProcess>%aditoprj%/entity/Employee_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Employee_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
+ <useFavorites v="false" />
<iconId>VAADIN:USER</iconId>
<titlePlural>Employees</titlePlural>
<recordContainer>jdito</recordContainer>
@@ -71,6 +72,7 @@
<contentType>PASSWORD</contentType>
<mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/password/mandatoryProcess.js</mandatoryProcess>
<stateProcess>%aditoprj%/entity/Employee_entity/entityfields/password/stateProcess.js</stateProcess>
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/password/onValidation.js</onValidation>
</entityField>
<entityField>
<name>CONFIRM_PASSWORD</name>
@@ -260,6 +262,12 @@
<fieldName>Leadimport_Empl</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>e9a775ab-e63d-493d-94dc-6b27dfb77173</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>Employees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -378,6 +386,14 @@
<element>MASK</element>
</onValueChangeTypes>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityParameter>
+ <name>DepartmentAttrIdByEmployeeContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Employee_entity/entityfields/contact_id/onValueChange.js b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
index d469435d5c78d77ed6371942df1cb330d36389d3..4a1dbe67e5fb2353cd24c297f9ca0c1eb08e9304 100644
--- a/entity/Employee_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
@@ -22,7 +22,7 @@ if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.r
neon.setFieldValues({
"$field.FIRSTNAME" : name[0] || "",
"$field.LASTNAME" : name[1] || "",
- "$field.EMAIL_ADDRESS" : name[2] || "",
+ "$field.EMAIL_ADDRESS" : name[2] || vars.get("$field.EMAIL_ADDRESS") || "",
"$field.TITLE" : username
});
}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/email_address/dropDownProcess.js b/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
index 99e97c2dddc0cae705cdc328a215b226a386f227..559a598b48b1f347bf21ee32e097eacc741b1083 100644
--- a/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
+++ b/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
@@ -6,7 +6,7 @@ import("system.result");
import("Sql_lib");
var contactId = vars.get("$field.CONTACT_ID");
-if (contactId && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW))
+if (contactId)
{
var addresses = newSelect("ADDR, ADDR")
.from("COMMUNICATION")
diff --git a/entity/Employee_entity/entityfields/password/onValidation.js b/entity/Employee_entity/entityfields/password/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..c633cac88f277ec6c4c16e0ab7711e93e8544112
--- /dev/null
+++ b/entity/Employee_entity/entityfields/password/onValidation.js
@@ -0,0 +1,22 @@
+import("system.neon");
+import("system.result");
+import("system.tools");
+import("system.vars");
+
+
+// Because employee password can only be set on new records
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+
+ let newPassword = vars.get("$local.value");
+ let policyMessages = tools.validatePasswordPolicies(newPassword, "");
+ let messages = [];
+
+ if(newPassword) {
+ if(policyMessages.length > 0) {
+ for(let msg in policyMessages) {
+ messages.push(policyMessages[msg]);
+ }
+ result.string(messages.join("\n", messages));
+ }
+ }
+}
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index b823dfd396e3f5ed32c3afb732c8effebe6e54c9..42ea78f8cac66461da9ad093bf976729358f76db 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -17,7 +17,7 @@ else
var values = ["true", "false"];
if (vars.exists("$param.OnlyActives_param") && vars.get("$param.OnlyActives_param") == "true")
values = ["true"];
- users = tools.getUsersByAttribute(tools.ISACTIVE, values, tools.PROFILE_FULL);
+ users = tools.getUsersByAttribute(tools.ISACTIVE, values, tools.PROFILE_DEFAULT);
}
users = users.map(function (user)
@@ -83,8 +83,6 @@ var filterFns = {
};
users = JditoFilterUtils.filterRecords(filterFields, users, filter.filter, filterFns);
-users.forEach(function (user) {user[12] = "";}); //clean up the ROLE_FILTER field, we don't need it after filtering
-
var order = vars.get("$local.order");
var columnOrder = {
"TITLE.value" : 1,
diff --git a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
index 8a781b6807e97a4ded80d80874109af4024f380e..e010ab9f6c122d2c7ece42f3c17cad5eb4ddae91 100644
--- a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
+++ b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ExportTemplateField_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ExportTemplateField_entity/documentation.adoc</documentation>
@@ -32,6 +32,7 @@
</entityField>
<entityProvider>
<name>ExportTemplateFields</name>
+ <documentation>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>b111615c-cde3-46b7-b229-46cc2db004fd</name>
@@ -60,6 +61,10 @@
<inputFormat>###</inputFormat>
<mandatory v="true" />
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc b/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..745d56fde373f290372fd75042424ade60202760
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc
@@ -0,0 +1,3 @@
+= ExoirtTemplateField_entity - ExportTemplateFields
+
+needed instead of the #PROVIDER so the ExportTemplateField_param can be used
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
index 90fdce90c45d94f3c24108835f5536e84121ac77..0dc5e1fc3a6ba07fa7a4b83bf0525011d9a81f57 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
+++ b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ExportTemplatePlaceOfUse_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc</documentation>
@@ -55,6 +55,7 @@
</entityParameter>
<entityProvider>
<name>ExportTemplatePlaceOfUser</name>
+ <documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>c60a238a-51f0-4538-8c53-6921481ddd4c</name>
@@ -71,6 +72,10 @@
</entityParameter>
</children>
</entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..9713220ef692ca2f93ca9047460db28270795e3c
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc
@@ -0,0 +1,3 @@
+= ExportTemplatePlaceOfUse_entity - ExportTemplatePlaceOfUser
+
+needed instead of the #PROVIDER so the ExportTemplatePlaceOfUse_param can be used
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
index ff6e122d10b80f80995f5afe78e4ab313d599b4a..1120b8578e2cf276e32f74dd05b7b8b67e69f011 100644
--- a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
+++ b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ExportTemplateSelection_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ExportTemplateSelection_entity/documentation.adoc</documentation>
@@ -71,11 +71,22 @@
</entityField>
<entityActionField>
<name>safeandexport</name>
- <title>export using the selected template</title>
+ <title>export using the selected template</title>
<onActionProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
<iconId>NEON:EXPORT</iconId>
<stateProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/safeandexport/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>exportCount</name>
+ <documentation>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc</documentation>
+ <titleProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
diff --git a/entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc b/entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..8d103628b9bb0d253324f37bd4e3423576a8359e
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc
@@ -0,0 +1,2 @@
+== exportCount;
+needed for the score card, to display extra information.
diff --git a/entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js b/entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d12a65747fe928abcad84aab3f87c98917e61ade
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js
@@ -0,0 +1,13 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+var comingFrom = vars.get("$field.comingfrom")
+var res
+
+if(comingFrom == "Organisation")
+ res = translate.text("Organisations will be exported");
+else if(comingFrom == "Person")
+ res = translate.text("Contacts will be exported");
+
+result.string(res)
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a650684a24f84809d4c90a99d7d0f48eeda908f9
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js
@@ -0,0 +1,10 @@
+import("FilterviewMenuAction_lib");
+import("system.vars");
+import("system.result");
+
+var selection = vars.getString("$field.selection");
+
+if(selection)
+ result.string(JSON.parse(selection).length);
+else
+ result.string(0);
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js b/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js
index c4237df19e543c334921e62da29247f955cbe61b..0eecb635d118154d8a947e791019c9a143823850 100644
--- a/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js
+++ b/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js
@@ -7,7 +7,8 @@ var templateId = vars.get("$field.EXPORTTEMPLATE_ID");
var selection = vars.get("$field.selection");
var comingFrom = vars.get("$field.comingfrom");
-if(templateId){
+if(templateId)
+{
var document = ExportTemplateUtils.buildExport(templateId, selection, comingFrom, filename);
neon.download(document.content, document.filename);
}
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js
index 6779bc32ba75e82ff16f072e56a8efeefb0ba329..3d860b7c277b9a22885f01c55d0f714161e7698b 100644
--- a/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js
+++ b/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js
@@ -1,5 +1,19 @@
+import("FilterviewMenuAction_lib");
import("system.vars");
import("system.result");
-if(vars.get("$param.selectedData_param"))
-result.string(vars.get("$param.selectedData_param"));
\ No newline at end of file
+var selection = JSON.parse(vars.getString("$param.selectedData_param"));
+var comingfrom = vars.getString("$param.comingFrom_param");
+var contactIds;
+
+
+if(!Array.isArray(selection)) //if selection is an array, data has been selected
+{
+ var condition = selection.condition;
+ if(comingfrom == "Organisation")
+ contactIds = FilterviewMenuActionUtils.organisationIdsFilter(condition);
+ else if (comingfrom == "Person")
+ contactIds = FilterviewMenuActionUtils.contactIdsFilter(condition);
+}
+result.string(JSON.stringify(contactIds));
+
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index becc0bf70eb7448cfedfb3b682ecdb0269a2b6dd..fa020ece7853b12581a8e40dd5b8328808dc987a 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
@@ -1,13 +1,17 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ExportTemplate_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ExportTemplate_entity/documentation.adoc</documentation>
+ <icon>NEON:EXPORT</icon>
<title>Export Template</title>
<grantCreate v="true" />
<grantUpdate v="true" />
<grantDelete v="true" />
+ <contentTitleProcess>%aditoprj%/entity/ExportTemplate_entity/contentTitleProcess.js</contentTitleProcess>
+ <useFavorites v="true" />
<iconId>NEON:EXPORT</iconId>
+ <imageProcess>%aditoprj%/entity/ExportTemplate_entity/imageProcess.js</imageProcess>
<titlePlural>Export Templates</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -105,6 +109,7 @@
</entityConsumer>
<entityProvider>
<name>ExportTemplateIDs</name>
+ <documentation>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -140,6 +145,14 @@
<dropDownProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/fielddelimiter/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
</entityField>
+ <entityField>
+ <name>EXPORTTEMPLATE_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Contract_entity/entityfields/contact_id/fieldIdProcess.js b/entity/ExportTemplate_entity/contentTitleProcess.js
similarity index 54%
rename from entity/Contract_entity/entityfields/contact_id/fieldIdProcess.js
rename to entity/ExportTemplate_entity/contentTitleProcess.js
index 6cd3c4544e56fa57ad04b119be620aa650f4a849..8c4a6496bfcf03b92b386a4a655a0e44634c47e2 100644
--- a/entity/Contract_entity/entityfields/contact_id/fieldIdProcess.js
+++ b/entity/ExportTemplate_entity/contentTitleProcess.js
@@ -1,4 +1,5 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$this.value"));
\ No newline at end of file
+
+result.string(vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1421e6130d566bd65a2666337d439c0a3ed4aee2
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("ExportTemplate");
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc b/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..2d3b77143cac4fd108022449985661a5ec655fe5
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc
@@ -0,0 +1,3 @@
+= ExportTemplate_entity - ExportTemplateIDs
+
+needed instead of the #PROVIDER so the comingFrom_param and ExportTemplateID_param can be used
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/imageProcess.js b/entity/ExportTemplate_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..994135211b3d2414c8c38e1682d969154db2e154
--- /dev/null
+++ b/entity/ExportTemplate_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:"+vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1ad0dce01d4ff015c4d431b334acbae56f804871
--- /dev/null
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -0,0 +1,126 @@
+<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+ <name>Favorite_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Favorite_entity/documentation.adoc</documentation>
+ <icon>VAADIN:STAR</icon>
+ <title>Favorite</title>
+ <siblings>
+ <element>Organisation_entity</element>
+ </siblings>
+ <grantCreate v="true" />
+ <grantUpdate v="true" />
+ <grantDelete v="true" />
+ <usePermissions v="false" />
+ <titlePlural>Favorites</titlePlural>
+ <recordContainer>jDitoRecordContainer</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <targetContextField>OBJECT_TYPE</targetContextField>
+ <targetIdField>ROW_ID</targetIdField>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>GROUP_ID</name>
+ </entityField>
+ <entityField>
+ <name>ROW_ID</name>
+ </entityField>
+ <entityField>
+ <name>OBJECT_TYPE</name>
+ <title>Object type</title>
+ <groupable v="true" />
+ <displayValueProcess>%aditoprj%/entity/Favorite_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_ID</name>
+ </entityField>
+ <entityField>
+ <name>GROUP_TITLE</name>
+ <title>Group name</title>
+ <groupable v="true" />
+ <displayValueProcess>%aditoprj%/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>GROUP_TYPE</name>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ <title></title>
+ <titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/title/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>PICTURE</name>
+ <contentType>IMAGE</contentType>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jDitoRecordContainer</name>
+ <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+ <isFilterable v="true" />
+ <isGroupable v="true" />
+ <isSortable v="true" />
+ <contentProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js</contentProcess>
+ <onDelete>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js</onDelete>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>GROUP_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>GROUP_TITLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>GROUP_TYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OBJECT_TYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PICTURE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ROW_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TITLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>USER_ID.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ <filterExtensions>
+ <filterExtension>
+ <name>groupGroupNameExtension</name>
+ <title>Gruppenname</title>
+ <contentType>TEXT</contentType>
+ <filterValuesProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js</filterValuesProcess>
+ <filtertype>BASIC</filtertype>
+ </filterExtension>
+ <filterExtension>
+ <name>groupTitleExtension</name>
+ <title>Titel</title>
+ <contentType>TEXT</contentType>
+ <filtertype>BASIC</filtertype>
+ </filterExtension>
+ <filterExtension>
+ <name>groupTypeExtension</name>
+ <title>Typ</title>
+ <contentType>TEXT</contentType>
+ <filterValuesProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptypeextension/filterValuesProcess.js</filterValuesProcess>
+ <filtertype>BASIC</filtertype>
+ </filterExtension>
+ </filterExtensions>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Favorite_entity/documentation.adoc b/entity/Favorite_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..0fd73ab7e92da44b2c8222bf7c484b8556d3feba
--- /dev/null
+++ b/entity/Favorite_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= Favorite_entity
+
+Entity for managing a users dataset-favorites
\ No newline at end of file
diff --git a/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js b/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7aed37bfce2003f01165e55ef0c28acec7b33c9a
--- /dev/null
+++ b/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+
+result.string(translate.text(vars.get("$field.GROUP_TITLE")));
\ No newline at end of file
diff --git a/entity/Favorite_entity/entityfields/object_type/displayValueProcess.js b/entity/Favorite_entity/entityfields/object_type/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2658ccbeb36a636a708de9bfd5a73df126c3afff
--- /dev/null
+++ b/entity/Favorite_entity/entityfields/object_type/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text(vars.get("$field.OBJECT_TYPE")));
\ No newline at end of file
diff --git a/entity/Favorite_entity/entityfields/title/titleProcess.js b/entity/Favorite_entity/entityfields/title/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a8ab89ba02ed4a1bc6c1aa76c544ab71edff02c
--- /dev/null
+++ b/entity/Favorite_entity/entityfields/title/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.text("Title"));
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e9c4ffa902d44d946666223002c3eaeaa035c21a
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -0,0 +1,211 @@
+import("system.translate");
+import("system.project");
+import("system.logging");
+import("system.vars");
+import("Context_lib");
+import("system.result");
+import("system.favorite");
+import("system.tools");
+import("system.entities");
+
+if(vars.get("$local.idvalues") && vars.get("$local.idvalues").length != 0)
+{
+ var selected = vars.get("$local.idvalues");
+ var selectedFavos = [];
+
+ for(h = 0; h < selected.length; h++)
+ selectedFavos.push(buildFavoriteForDeletion(favorite.getFavoriteById(selected[h])));
+
+ result.object(selectedFavos);
+}
+else
+{
+
+ var filters = vars.get("$local.filter");
+ var activeFilters = [];
+ if(filters["filter"] != null)
+ for(g = 0; g < filters["filter"]["childs"].length; g++)
+ activeFilters.push(filters["filter"]["childs"][g])
+
+
+ var finishedFavoritesForDisplay = [];
+
+ var allContexts = getAllFavoriteEnabledContexts();
+ for(i = 0; i < allContexts.length; i++)
+ {
+ var allFavorites = favorite.getAllFavorites(tools.getCurrentUser()["name"], allContexts[i]);
+ var builtFavos = buildFavorites(allFavorites, allContexts[i]);
+
+ for(let x = 0; x < builtFavos.length; x++)
+ {
+ var favo = builtFavos[x];
+ if(isFiltered(activeFilters, favo))
+ finishedFavoritesForDisplay.push(favo);
+ }
+ }
+
+ result.object(finishedFavoritesForDisplay);
+}
+
+function isFiltered(filters, fav)
+{
+ var favoObjectType = fav[3];
+ var favoGroupName = fav[1];
+ var favoRowId = fav[5];
+ var favoTitle = fav[6];
+
+ var isFiltered = true;
+
+ for(let i = 0; i < filters.length; i++)
+ {
+ if(filters[i]["name"].includes("groupTypeExtension"))
+ {
+ if(!isValid(favoObjectType, filters[i]))
+ {
+ isFiltered = false;
+ break;
+ }
+ }
+ if(filters[i]["name"].includes("groupTitleExtension"))
+ {
+ if(!isValid(favoTitle, filters[i]))
+ {
+ isFiltered = false;
+ break;
+ }
+ }
+ if(filters[i]["name"].includes("groupGroupNameExtension"))
+ {
+ if(!isValid(favoGroupName, filters[i]))
+ {
+ isFiltered = false;
+ break;
+ }
+ }
+ }
+
+ return isFiltered;
+}
+
+function isValid(value, filter)
+{
+ var operator = filter["operator"];
+ var filterValue = filter["key"];
+
+ switch(operator)
+ {
+ case "EQUAL":
+ return value.equals(filterValue);
+ case "NOT_EQUAL":
+ return !value.equals(filterValue);
+ case "CONTAINS":
+ return value.includes(filterValue);
+ case "NOT_CONTAINS":
+ return !value.includes(filterValue);
+ case "ISNULL":
+ return value == null || value === "";
+ case "ISNOTNULL":
+ return value != null && value !== "";
+ }
+
+ return false;
+}
+
+function buildFavorites(favos, objecttype)
+{
+ var builtFavos = []
+
+ var ids = [];
+ for(y = 0; y < favos.length; y++)
+ ids.push(favos[y]["rowid"]);
+
+ var loadConfig = entities.createConfigForLoadingRows();
+ loadConfig.entity(ContextUtils.getEntity(objecttype));
+ loadConfig.uids(ids);
+ loadConfig.count(200);
+ loadConfig.fields(["#CONTENTTITLE", "#IMAGE", "#UID"]);
+ var loadedRows = entities.getRows(loadConfig);
+
+ for(z = 0; z < loadedRows.length; z++)
+ getFavoriteWith(loadedRows[z], builtFavos, favos, loadedRows[z]["#UID"], objecttype);
+
+ return builtFavos;
+}
+
+function getFavoriteWith(loadedRow, builtFavos, favoriten, pRowid, objecttype)
+{
+ for(b = 0; b < favoriten.length; b++)
+ {
+ if(favoriten[b]["rowid"].equals(pRowid))
+ {
+
+ var groupid = favoriten[b]["group"]["groupid"];
+ var grouptitle = favoriten[b]["group"]["grouptitle"];
+ var grouptype = favoriten[b]["group"]["grouptype"];
+ var image = loadedRow["#IMAGE"];
+ var rowid = favoriten[b]["rowid"];
+ var title = loadedRow["#CONTENTTITLE"];
+ var id = favoriten[b]["id"];
+ var user = favoriten[b]["group"]["groupuser"];
+
+ builtFavos.push([
+ groupid,
+ grouptitle,
+ grouptype,
+ objecttype,
+ image,
+ rowid,
+ title,
+ id,
+ user
+ ]);
+ }
+ }
+}
+
+function getAllFavoriteEnabledContexts()
+{
+ var allContexts = project.getDataModels(project.DATAMODEL_KIND_CONTEXT);
+ var permittedContexts = [];
+
+ for(k = 0; k < allContexts.length; k++)
+ {
+ var isFavoEnabled = false;
+ var entityname = ContextUtils.getEntity(allContexts[k][0]);
+ var entity = null;
+ if(entityname)
+ entity = project.getDataModel(project.DATAMODEL_KIND_ENTITY,entityname);
+
+ if(entity && entity[7].equals("true")) //favoritesEnabled
+ permittedContexts.push(allContexts[k][0]);
+ }
+
+ return permittedContexts;
+}
+
+function buildFavoriteForDeletion(favo)
+{
+ var groupid = favo["group"]["groupid"];
+ var grouptitle = favo["group"]["grouptitle"];
+ var grouptype = favo["group"]["grouptype"];
+ var objecttype = favo["objecttype"];
+ var image = "";
+ var rowid = favo["rowid"];
+ var title = "";
+ var id = favo["id"];
+ var user = favo["group"]["groupuser"];
+
+ return [
+ groupid,
+ grouptitle,
+ grouptype,
+ objecttype,
+ image,
+ rowid,
+ title,
+ id,
+ user
+ ];
+}
+
+
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f8a6e1919db15f11b8913cd741da51ba6a20c580
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
@@ -0,0 +1,23 @@
+import("system.favorite");
+import("system.tools");
+import("system.result");
+import("Sql_lib");
+
+var allTypes = [];
+
+var filterCond = newWhere("ASYS_RECORDGROUP.USER_ID", tools.getCurrentUser()["name"]);
+var groupNames = (new SqlBuilder()).selectDistinct("ASYS_RECORDGROUP.TITLE")
+ .from("ASYS_RECORDGROUP")
+ .where(filterCond)
+ .arrayColumn();
+
+groupNames.forEach(element => {
+ if(element.equals("Default"))
+ allTypes.push([element, translate.text(element)]);
+ else
+ allTypes.push([element, element]);
+});
+
+result.object(Array.from(allTypes));
+
+
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptypeextension/filterValuesProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptypeextension/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a93adae2048428cee77945a75b5f452008ebee20
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptypeextension/filterValuesProcess.js
@@ -0,0 +1,24 @@
+import("system.translate");
+import("system.result");
+import("system.project");
+import("system.tools");
+import("system.logging");
+import("Context_lib");
+
+
+var allContexts = project.getDataModels(project.DATAMODEL_KIND_CONTEXT);
+var permittedContexts = [];
+
+for(i = 0; i < allContexts.length; i++)
+{
+ var isFavoEnabled = false;
+ var entityname = ContextUtils.getEntity(allContexts[i][0]);
+ var entity = null;
+ if(entityname)
+ entity = project.getDataModel(project.DATAMODEL_KIND_ENTITY,entityname);
+
+ if(entity && entity[7].equals("true")) //favoritesEnabled
+ permittedContexts.push([allContexts[i][0], translate.text(allContexts[i][0])]);
+}
+
+result.object(permittedContexts);
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..fc4c8d8f0b7757575883cd6dc57fc66a6520db1f
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.favorite");
+
+favorite.removeFavoriteById(vars.get("$local.uid"));
\ No newline at end of file
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index ddbbc5bc0918b30506c6eeb149e695d904e12a09..f553dde8f46895a3f1a215e1bcf33825610c8009 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Forecast_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Forecast_entity/documentation.adoc</documentation>
@@ -119,6 +119,10 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Forecast_entity/conditionProcess.js b/entity/Forecast_entity/conditionProcess.js
deleted file mode 100644
index 3f88d5b798124f2191f5b0a39e28dc5d484e580e..0000000000000000000000000000000000000000
--- a/entity/Forecast_entity/conditionProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = newWhereIfSet("FORECAST.OBJECT_ROWID", "$param.ForecastId_param");
-
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/date_edit/valueProcess.js b/entity/Forecast_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Forecast_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/date_new/valueProcess.js b/entity/Forecast_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/Forecast_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/salesprojectforecastdatestart/code.js b/entity/Forecast_entity/entityfields/salesprojectforecastdatestart/code.js
deleted file mode 100644
index 66ce3a4676a6c0a9b212a2ac2126c03f3c3a912b..0000000000000000000000000000000000000000
--- a/entity/Forecast_entity/entityfields/salesprojectforecastdatestart/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result")
-result.string("DATE_START");
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/user_edit/valueProcess.js b/entity/Forecast_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Forecast_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/user_new/valueProcess.js b/entity/Forecast_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Forecast_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 85e1ffb23e5b1ab7b0fa2eecd2e438acdb6c5078..6c4c35a17b128754630433e0f0ab1aaec04cc865 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Gender_keyword</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Gender_keyword/documentation.adoc</documentation>
@@ -23,6 +23,10 @@
</entityDependency>
</dependencies>
</entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Gender_keyword/contentProcess.js b/entity/Gender_keyword/contentProcess.js
deleted file mode 100644
index b744f12ef03a41bd12055222ce68812e3564aba6..0000000000000000000000000000000000000000
--- a/entity/Gender_keyword/contentProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.translate");
-import("system.result");
-
-result.object([
- ['f', translate.text("Female")],
- ['m', translate.text("Male")]
-]);
\ No newline at end of file
diff --git a/entity/ImportField_Entity/ImportField_Entity.aod b/entity/ImportField_Entity/ImportField_Entity.aod
index 683f3503f8b4db2db47441ea370e9190e298fde5..cb5bb3fb6434c7a789b8d105cc18d40891bfd3f5 100644
--- a/entity/ImportField_Entity/ImportField_Entity.aod
+++ b/entity/ImportField_Entity/ImportField_Entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ImportField_Entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ImportField_Entity/documentation.adoc</documentation>
@@ -55,6 +55,7 @@
</entityConsumer>
<entityProvider>
<name>LeadImportIds</name>
+ <documentation>%aditoprj%/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc</documentation>
<titlePlural>Import Fields</titlePlural>
<dependencies>
<entityDependency>
@@ -83,6 +84,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc b/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..c3e81f687ccd1016a902170d69baddf5b0917d61
--- /dev/null
+++ b/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc
@@ -0,0 +1 @@
+Provides configured ImportFields for one specific lead import.
\ No newline at end of file
diff --git a/entity/IndexSearchEntity/IndexSearchEntity.aod b/entity/IndexSearchEntity/IndexSearchEntity.aod
index 4a49661a055be7f869bd4f22330640fb20631fb7..d1274e4307d0d28a5c12f16f123d4ff145671ed4 100644
--- a/entity/IndexSearchEntity/IndexSearchEntity.aod
+++ b/entity/IndexSearchEntity/IndexSearchEntity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>IndexSearchEntity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/IndexSearchEntity/documentation.adoc</documentation>
@@ -10,5 +10,9 @@
<entityField>
<name>INDEXSEARCHFIELD</name>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
</entity>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index 0b5f45af64d886efbcae4863f6c4277336e25b77..e4f1112d7f054bbbabda17db37f3cd4c7efdcc8f 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>KeywordAttributeRelation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
@@ -117,6 +117,10 @@
<name>LONG_CHAR_VALUE</name>
<state>INVISIBLE</state>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index 3c1336f58bb89beb5882d3d227165b7145289271..660467e301eb5004b4aca71e1aa786ba5d0df3cc 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -1,9 +1,10 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>KeywordAttribute_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttribute_entity/documentation.adoc</documentation>
<title>Keyword Attribute</title>
+ <grantDeleteProcess>%aditoprj%/entity/KeywordAttribute_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/KeywordAttribute_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:KEY_O</iconId>
<iconIdProcess>%aditoprj%/entity/KeywordAttribute_entity/iconIdProcess.js</iconIdProcess>
@@ -81,6 +82,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/KeywordAttribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js b/entity/KeywordAttribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
deleted file mode 100644
index 286c720daa7ca679bc489aa75306c9e697210b12..0000000000000000000000000000000000000000
--- a/entity/KeywordAttribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.keywordAttributeType());
diff --git a/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/valueProcess.js b/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/valueProcess.js
deleted file mode 100644
index e52675c31d5faf2c260c05bd11438d29755121ca..0000000000000000000000000000000000000000
--- a/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.keywordAttributeType());
\ No newline at end of file
diff --git a/entity/KeywordAttribute_entity/grantDeleteProcess.js b/entity/KeywordAttribute_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d7194ae0db833587f4d58bfd766d04995394af74
--- /dev/null
+++ b/entity/KeywordAttribute_entity/grantDeleteProcess.js
@@ -0,0 +1,18 @@
+import("system.result");
+import("Attribute_lib");
+import("system.vars");
+import("Sql_lib");
+import("Entity_lib");
+
+var id = vars.get("$field.AB_KEYWORD_ATTRIBUTEID");
+
+var countSql = newSelect("count(*)")
+ .from("AB_KEYWORD_ATTRIBUTERELATION")
+ .where("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID", id)
+
+var canDelete = new HasLinkedObjectTester()
+ .andSqlYieldsZero(countSql)
+ .andNoEntityRows("KeywordAttributeRelation_entity", "AttributesForKeywordEntry", {KeywordEntryId_param: id})
+ .validate();
+
+result.string(canDelete);
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 2d0edd64d5ba7e6d9b3e6463f32144b574509094..ad9c6c66275b74b098addef8c4d4ed2ca621cb5c 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>KeywordEntry_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
@@ -385,12 +385,6 @@
<fieldName>KeywordCampaignManagementCostCategory</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>63bd7284-e9a0-4576-afe8-299d412e8def</name>
- <entityName>ClassificationAdmin_entity</entityName>
- <fieldName>KeywordClassificationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>3a81e886-0d83-47f0-9ec7-c864ffc57cda</name>
<entityName>Classification_entity</entityName>
@@ -583,6 +577,18 @@
<fieldName>CategoryKeyword</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>d1769b5e-db2a-445b-bb79-c72ac757038b</name>
+ <entityName>LeadimportMappingAssistant_entity</entityName>
+ <fieldName>KeywordImportFields</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>2823f5a0-2b1d-41f4-abf1-3e7b332fa176</name>
+ <entityName>VisitRecommendation_entity</entityName>
+ <fieldName>KeywordVisitRecommendationSource</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -644,6 +650,10 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -653,6 +663,8 @@
<conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <cacheType>GLOBAL</cacheType>
+ <cacheKeyProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
<linkInformation>
<linkInformation>
<name>52acbfe0-57f4-4614-83af-9882e168f431</name>
diff --git a/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js b/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js
index dcb435b5f5508a654ce8c39f81aa6dd9c74fb323..c2ad10b5f03f2c193bf611ba705dbf9c081f29eb 100644
--- a/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js
+++ b/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.object(false);
\ No newline at end of file
+result.object(true);
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js b/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bd9e8c01354097c564fcb6fd65e3e5390fbb9f10
--- /dev/null
+++ b/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,6 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey("$param.ContainerName_param", "$param.ExcludedKeyIdsSubquery_param", "$param.OnlyActives_param"
+ , "$param.WhitelistIds_param");
+result.string(res);
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js b/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
index 68666406b4705e7e463034ccbce8d35400bae35f..6fcb81de353b15da6987c4a057a54535f2d1fcbb 100644
--- a/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
@@ -20,7 +20,7 @@ if (vars.getString("$param.WhitelistIds_param"))
if (whitelist.length > 0)
cond.and("AB_KEYWORD_ENTRY.KEYID", JSON.parse(vars.getString("$param.WhitelistIds_param")), SqlBuilder.IN());
else
- cond.and("1=2"); // force empty result if whitelist is empty
+ cond.noResult(); // force empty result if whitelist is empty
}
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 4511f71a29b7613767ddba5aeddac2e16e5dfb8e..2afefb3f30bcad00355211100c7b648e58118ddf 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Language_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Language_entity/documentation.adoc</documentation>
@@ -31,6 +31,7 @@
<entityProvider>
<name>ISO3Name</name>
<lookupIdfield>ISO3</lookupIdfield>
+ <documentation>%aditoprj%/entity/Language_entity/entityfields/iso3name/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -87,6 +88,12 @@
<fieldName>Languages</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>9ee48241-5d40-46e9-83ec-a1dc55fdb7d5</name>
+ <entityName>District_entity</entityName>
+ <fieldName>Languages</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -97,6 +104,8 @@
</entityProvider>
<entityProvider>
<name>ISO3NameFiltered</name>
+ <lookupIdfield>ISO3</lookupIdfield>
+ <documentation>%aditoprj%/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>2df9d0ed-c26b-4166-9667-786a55146e05</name>
@@ -116,12 +125,19 @@
<name>ExcludedIds_param</name>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <isPageable v="false" />
<conditionProcess>%aditoprj%/entity/Language_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <cacheType>GLOBAL</cacheType>
+ <cacheKeyProcess>%aditoprj%/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
<linkInformation>
<linkInformation>
<name>3cd06d7c-16c3-49e5-87cd-672a7222e613</name>
@@ -143,16 +159,20 @@
<dbRecordFieldMapping>
<name>ISO3.value</name>
<recordfield>AB_LANGUAGE.ISO3</recordfield>
- <isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isFilterable v="false" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NAME_LATIN.value</name>
<recordfield>AB_LANGUAGE.NAME_LATIN</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NAME_NATIVE.value</name>
<recordfield>AB_LANGUAGE.NAME_NATIVE</recordfield>
+ <isFilterable v="false" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/Language_entity/entityfields/iso3name/documentation.adoc b/entity/Language_entity/entityfields/iso3name/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..ee01db23ea4a5c6e95611ab17a81ebf465438ee0
--- /dev/null
+++ b/entity/Language_entity/entityfields/iso3name/documentation.adoc
@@ -0,0 +1,6 @@
+Provides a list of languages, where the UID is the three character ISO-code
+ISO 639-2; see: https://de.wikipedia.org/wiki/ISO_639#ISO_639-2
+
+For example: `deu` for _German_
+
+No filter apply.
\ No newline at end of file
diff --git a/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc b/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..da968d688544a606d6130b49b57137c497a37de5
--- /dev/null
+++ b/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc
@@ -0,0 +1,6 @@
+Provides a list of languages, where the UID is the three character ISO-code
+ISO 639-2; see: https://de.wikipedia.org/wiki/ISO_639#ISO_639-2
+
+For example: `deu` for _German_
+
+A filter for excluding languages by paramvalues is applied.
\ No newline at end of file
diff --git a/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js b/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..050f117ec1c89c3fbb29fe28161d61092b6a04b2
--- /dev/null
+++ b/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,6 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+//no locale in the key because the locale does not modify the result of the recordcontainer
+var res = CachedRecordContainerUtils.getKeyWithPreset(CachedRecordContainerFieldPresets.STANDARD(), "$param.ExcludedIds_param");
+result.string(res);
\ No newline at end of file
diff --git a/entity/LeadLog_entity/LeadLog_entity.aod b/entity/LeadLog_entity/LeadLog_entity.aod
index 3134413b01e52ecae02e9349820f5609dbc12a6b..ca424a627c7dd8b54e6c90a2383f372981e6c5d3 100644
--- a/entity/LeadLog_entity/LeadLog_entity.aod
+++ b/entity/LeadLog_entity/LeadLog_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>LeadLog_entity</name>
<description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -81,6 +81,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/LeadTemp_entity/LeadTemp_entity.aod b/entity/LeadTemp_entity/LeadTemp_entity.aod
index d0b7ccb5424f71bbac8530bb391fb18115c15899..51582fefafa728a3a3296b4e8b9de55ce4c74062 100644
--- a/entity/LeadTemp_entity/LeadTemp_entity.aod
+++ b/entity/LeadTemp_entity/LeadTemp_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>LeadTemp_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/LeadTemp_entity/documentation.adoc</documentation>
@@ -164,6 +164,10 @@
<name>LeadImportId</name>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Lead_entity/Lead_entity.aod b/entity/Lead_entity/Lead_entity.aod
index 61d94589feeca8af63e63c70830f59c5713b16fb..6a8a9fed94965be2a51c7c27cef30ed371dc7631 100644
--- a/entity/Lead_entity/Lead_entity.aod
+++ b/entity/Lead_entity/Lead_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Lead_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Lead_entity/documentation.adoc</documentation>
@@ -121,6 +121,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Lead_entity/entityfields/leaddup_status/displayValueProcess.js b/entity/Lead_entity/entityfields/leaddup_status/displayValueProcess.js
index ef4e1160139f7440c70a1a835871d674459eefc1..031fb565efa4fbd77e87424854b0214283530618 100644
--- a/entity/Lead_entity/entityfields/leaddup_status/displayValueProcess.js
+++ b/entity/Lead_entity/entityfields/leaddup_status/displayValueProcess.js
@@ -6,7 +6,7 @@ import("Keyword_lib");
var dupStatus = vars.getString("$field.LEADDUP_STATUS");
var values = KeywordUtils.getEntryNamesAndIdsByContainer($KeywordRegistry.dupStatus());
-for (i = 0; i < values.length; i++)
+for (let i = 0; i < values.length; i++)
{
if(dupStatus.trim() == values[i][0].trim())
{
diff --git a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0cbf79b0ddbfcc88bc73e391734bffd8e0b04a8e
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
@@ -0,0 +1,142 @@
+<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+ <name>LeadimportMappingAssistant_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/LeadimportMappingAssistant_entity/documentation.adoc</documentation>
+ <title>Mapping</title>
+ <titlePlural>Mappings</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>FIELDNAME</name>
+ <title>Fieldname</title>
+ <consumer>KeywordImportFields</consumer>
+ <displayValueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>LEADIMPORTMAPPINGASSISTANTID</name>
+ </entityField>
+ <entityField>
+ <name>LEADIMPORT_ID</name>
+ <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>INPUTVALUE</name>
+ <title>Input value</title>
+ </entityField>
+ <entityField>
+ <name>OUTPUTVALUE</name>
+ <title>Output value</title>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>LeadimportMapping</name>
+ <dependencies>
+ <entityDependency>
+ <name>89a94a8b-9447-47a6-94c7-240e25aff7a8</name>
+ <entityName>Leadimport_entity</entityName>
+ <fieldName>LeadimportMappings</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>Leadimport_ID_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>KeywordImportFields</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>61a456d3-b7b5-4042-ae4c-6245d420da3b</name>
+ <tableName>LEADIMPORTMAPPINGASSISTANT</tableName>
+ <primaryKey>LEADIMPORTMAPPINGASSISTANTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>LEADIMPORTMAPPINGASSISTANT.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>LEADIMPORTMAPPINGASSISTANT.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>FIELDNAME.value</name>
+ <recordfield>LEADIMPORTMAPPINGASSISTANT.FIELDNAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INPUTVALUE.value</name>
+ <recordfield>LEADIMPORTMAPPINGASSISTANT.INPUTVALUE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LEADIMPORT_ID.value</name>
+ <recordfield>LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LEADIMPORTMAPPINGASSISTANTID.value</name>
+ <recordfield>LEADIMPORTMAPPINGASSISTANT.LEADIMPORTMAPPINGASSISTANTID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OUTPUTVALUE.value</name>
+ <recordfield>LEADIMPORTMAPPINGASSISTANT.OUTPUTVALUE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>LEADIMPORTMAPPINGASSISTANT.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>LEADIMPORTMAPPINGASSISTANT.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/LeadimportMappingAssistant_entity/documentation.adoc b/entity/LeadimportMappingAssistant_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..56f2b18264225ae874cb63fbc5bb66ee32cafda3
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/documentation.adoc
@@ -0,0 +1,16 @@
+= LeadimportMappingAssistant_entity
+
+This Entity is for the mapping of Values of the Leadimport and the actual value, which will be imported into the System.
+
+== Example
+
+The Gender would be imported as a numbered System:
+
+- 0 = female
+- 1 = male
+- 2 = various
+
+But in ADITO would save only f, m and v. So you can map each other and it would save right.
+
+== Relational entities
+Leadimport_entity
diff --git a/entity/Competition_entity/entityfields/date_edit/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js
similarity index 73%
rename from entity/Competition_entity/entityfields/date_edit/valueProcess.js
rename to entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..8d41a64d6993f71d00e0879f5eb4aed0aa0b866d 100644
--- a/entity/Competition_entity/entityfields/date_edit/valueProcess.js
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/date_new/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js
similarity index 73%
rename from entity/Competition_entity/entityfields/date_new/valueProcess.js
rename to entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..8ee28e84edb9930de54975f81e8cb5a13c9aa02f 100644
--- a/entity/Competition_entity/entityfields/date_new/valueProcess.js
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js
similarity index 50%
rename from entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js
rename to entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js
index 62451165d8d832fb9359a2696e3f32d16a585149..eef0406796fdc99af1bab6091bef0f1b3d1bb08a 100644
--- a/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js
@@ -1,6 +1,6 @@
import("system.result");
import("system.vars");
-import("Keyword_lib");
import("KeywordRegistry_basic");
+import("Keyword_lib");
-result.string(KeywordUtils.getViewValue($KeywordRegistry.classificationType(), vars.get("$field.UID")))
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.importFields(), vars.get("$field.FIELDNAME")));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js
similarity index 62%
rename from entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js
rename to entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js
index 8a4cee16039670b6963ac6920a03a81bf1a8ad43..44130c6f89157637aa362ec88a044f93545d46d7 100644
--- a/entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js
@@ -1,5 +1,4 @@
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.taskPriority());
\ No newline at end of file
+result.string($KeywordRegistry.importFields());
\ No newline at end of file
diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f143363605bba5d83aa0fed87b15f0c1b9b0e57
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+if (vars.get("$this.value") == null)
+{
+ result.string(vars.get("$param.Leadimport_ID_param"));
+}
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/date_edit/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js
similarity index 73%
rename from entity/Contract_entity/entityfields/date_edit/valueProcess.js
rename to entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..90383c071316dc55fe51d43a93dd7db75551842e 100644
--- a/entity/Contract_entity/entityfields/date_edit/valueProcess.js
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/user_new/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js
similarity index 73%
rename from entity/Competition_entity/entityfields/user_new/valueProcess.js
rename to entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js
index 7c566863b493d778b72dea7d8822f6a59333e77d..dda83cfd00e13df5c6da64151f5d1e6d932a681e 100644
--- a/entity/Competition_entity/entityfields/user_new/valueProcess.js
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js b/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1856100040a7d080cd6f46c0ee6dab0a374b0217
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Sql_lib");
+
+result.string(newWhere("LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID", "$param.Leadimport_ID_param").toString());
\ No newline at end of file
diff --git a/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js b/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b1cf90519bef6ae973e2d43e31bc4c62e14abcb
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.db");
+
+result.object({"LEADIMPORTMAPPINGASSISTANT.FIELDNAME": db.ASCENDING});
\ No newline at end of file
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index b794f161e46182f88b34adf15eb7670350f3b11a..e5241d647c840387bb8afa77a68ae3282a8532b1 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Leadimport_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Leadimport_entity/documentation.adoc</documentation>
@@ -17,14 +17,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>9433bb88-2330-4487-9e3a-fd864da9b8a9</name>
- <entityName>Object_entity</entityName>
- <fieldName>Leadimports</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>NAME</name>
@@ -313,6 +305,28 @@
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportreset/stateProcess.js</stateProcess>
</entityActionField>
+ <entityConsumer>
+ <name>LeadimportMappings</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LeadimportMappingAssistant_entity</entityName>
+ <fieldName>LeadimportMapping</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Leadimport_ID_param</name>
+ <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>LEADIMPORT_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimport_objecttype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -339,7 +353,7 @@
<name>LEADIMPORT_DATE.value</name>
<recordfield>LEADIMPORT.IMPORT_DATE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NAME.value</name>
@@ -351,25 +365,25 @@
<name>STATUS.value</name>
<recordfield>LEADIMPORT.STATUS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LEADIMPORT_EMPLOYEE.value</name>
<recordfield>LEADIMPORT.IMPORTEMPLOYEE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>FIELDDELIMITERS.value</name>
<recordfield>LEADIMPORT.FIELD_DELIMITER</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>IMPORTSOURCE.value</name>
<recordfield>LEADIMPORT.IMPORTSOURCE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
@@ -391,13 +405,13 @@
<name>FIELDSEPARATOR.value</name>
<recordfield>LEADIMPORT.FIELD_SEPARATOR</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SENTENCESEPARATOR.value</name>
<recordfield>LEADIMPORT.RECORD_SEPARATOR</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/Leadimport_entity/documentation.adoc b/entity/Leadimport_entity/documentation.adoc
index 3e934155d2a48e6ee939893bf779b3ab1f9f50ef..8628a2be9c43e87d57950a61f16dc0f7a2185230 100644
--- a/entity/Leadimport_entity/documentation.adoc
+++ b/entity/Leadimport_entity/documentation.adoc
@@ -4,4 +4,5 @@ Is for the Import of Data from a CSV-Format File. Important of this is, that the
== Relational entities
ImportField_entity
+LeadimportMappingAssistant_entity
Lead_entity
diff --git a/entity/Leadimport_entity/entityfields/leadimport_objecttype/valueProcess.js b/entity/Leadimport_entity/entityfields/leadimport_objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a6c90ee2e77f92cbf5562fa60d79829b6c05da81
--- /dev/null
+++ b/entity/Leadimport_entity/entityfields/leadimport_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Leadimport");
\ No newline at end of file
diff --git a/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js b/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..11eb7d9117891654d3122080243e30de654f98a6
--- /dev/null
+++ b/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.LEADIMPORTID"));
\ No newline at end of file
diff --git a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
index c7b4f0fdf7661d9430c260c73320cac09a35dec8..e3ab27e0a12c8b09990f1739ec1e11464248d700 100644
--- a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
+++ b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
@@ -46,7 +46,7 @@ function _deleteData (pTableName, pleadimportId, pdateADayBefor)
{
let uTableName = pTableName.charAt(0);
newWhere(pTableName + "." + pTableName + "ID",
- newSelect(pTableName + "." + pTableName + "ID")
+ newSelect(uTableName + "." + pTableName + "ID")
.from(pTableName, uTableName)
.join("LEADLOG", "LEADLOG.DATE_NEW = " + uTableName + ".DATE_NEW")
.where(uTableName + ".USER_NEW = LEADLOG.USER_NEW")
diff --git a/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js b/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
index b5d208a6e86d2d4ae9a17889a9cde267e1a8ad28..14460a42e7048be82537f9b978c8d9f966637f71 100644
--- a/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
+++ b/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
@@ -34,17 +34,16 @@ if (binMetadatas.length > 0)
var insertTable = "LEADTEMP";
var insertCols = LeadImportUtils.leadTempColumns();
- var insertTypes = db.getColumnTypes(insertTable, insertCols);
var insertVals = [];
var toInsert = [];
db.deleteData(insertTable, newWhere([insertTable, "ROW_ID"], assignmentRowId).build());//delete existing
- for (i = 0; i < table.length; i++)//and load new
+ for (let i = 0; i < table.length; i++)//and load new
{
insertVals = [];
- for (j = 0; j < 30; j++) //fill the 30 data-columns of the table
+ for (let j = 0; j < 30; j++) //fill the 30 data-columns of the table
{
if(table[i][j] == undefined)
table[i][j] = "";
@@ -53,7 +52,7 @@ if (binMetadatas.length > 0)
}
insertVals.push(importDate, util.getNewUUID(), importName, i.toString(), assignmentRowId);//push other necessary data for the insert
- toInsert.push([insertTable, insertCols, insertTypes, insertVals]);
+ toInsert.push([insertTable, insertCols, null, insertVals]);
}
db.inserts(toInsert);
@@ -62,9 +61,8 @@ if (binMetadatas.length > 0)
var updTable = "LEADIMPORT";
var updCols = ["STATUS"];
- var updTypes = db.getColumnTypes(updTable, updCols);
- db.updateData(updTable, updCols, updTypes, [$KeywordRegistry.importStatus$loaded()], newWhere([updTable, "LEADIMPORTID"], assignmentRowId).build());
+ db.updateData(updTable, updCols, null, [$KeywordRegistry.importStatus$loaded()], newWhere([updTable, "LEADIMPORTID"], assignmentRowId).build());
neon.refreshAll();
diff --git a/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js b/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js
index 7fc0b527fdceab78d1a224caf8c8229fcb5e03a4..76cb3729e7370c9c2435b1fa433f64dcbec4bd4a 100644
--- a/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js
@@ -22,12 +22,13 @@ newSelect("LEADLOGID")
binMetadata = binMetadata.concat(db.getBinaryMetadata("LEADLOG", "ERRORLOG", leadLogId, false, SqlUtils.getBinariesAlias(), ""));
});
-if(leadImportId != "")//delete the connected importfields
+if(leadImportId != "")//delete the connected importfields und der Mappings
{
newWhere("IMPORTFIELD.LEADIMPORT_ID", leadImportId).deleteData();
newWhere("LEADTEMP.ROW_ID", leadImportId).deleteData();
newWhere("LEAD.LEADIMPORT_ID", leadImportId).deleteData();
newWhere("LEADLOG.LEADIMPORT_ID", leadImportId).deleteData();
+ newWhere("LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID", leadImportId).deleteData();
}
binMetadata.forEach(function(pMeta)
diff --git a/entity/LetterRecipient_entity/LetterRecipient_entity.aod b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
index 0aada1984fce3a5887916b8bfc573e627eaa03f9..63ec8c14576769c9f89e4cedc7152fb2fc92b02c 100644
--- a/entity/LetterRecipient_entity/LetterRecipient_entity.aod
+++ b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>LetterRecipient_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/LetterRecipient_entity/documentation.adoc</documentation>
@@ -97,6 +97,10 @@
<state>READONLY</state>
<displayValueProcess>%aditoprj%/entity/LetterRecipient_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index 217b0267c07dc5b5b2cd2049abf1136154822cba..d82878bd13c5a624daa7b9283086a158467a67e8 100644
--- a/entity/Letter_entity/Letter_entity.aod
+++ b/entity/Letter_entity/Letter_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Letter_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Letter_entity/documentation.adoc</documentation>
@@ -76,6 +76,10 @@
<name>AdditionalPlaceholders_param</name>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index d1aaa4cf38d3da28a1e8bf92045fe6cd05434dbe..6499fc00e002942363effcb7f67696ae5849e409 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>LogHistory_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/LogHistory_entity/documentation.adoc</documentation>
@@ -38,6 +38,7 @@
</entityField>
<entityProvider>
<name>LogHistoryProvider</name>
+ <documentation>%aditoprj%/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
@@ -111,12 +112,25 @@
<fieldName>LogHistories</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>fd46379e-f1be-4a9e-9914-4f3f81d96ad5</name>
+ <entityName>District_entity</entityName>
+ <fieldName>LogHistories</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>e97b5f2d-d2e0-4539-96e9-e3f96107ffaa</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>LogHistories</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
<name>tablenames_param</name>
<expose v="true" />
<mandatory v="true" />
+ <documentation>%aditoprj%/entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc</documentation>
<description>PARAMETER</description>
</entityParameter>
<entityField>
@@ -140,6 +154,10 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/LogHistory_entity/documentation.adoc b/entity/LogHistory_entity/documentation.adoc
index 4aa8b0704c0d06778a21425ce2f5258dfde88977..20fa16faa475bdb8b0cd35d7ddb11fe847f73e0e 100644
--- a/entity/LogHistory_entity/documentation.adoc
+++ b/entity/LogHistory_entity/documentation.adoc
@@ -1,3 +1,6 @@
= LogHistory_entity
-Entity for the log entries in the individual modules
\ No newline at end of file
+Entity for the log entries in the individual modules.
+
+This entity is based on the `AB_LOGHISTORY`-table. Note that this database table has no primary key associated to it.
+This is because it is only a pit of log-record and not necessary.
\ No newline at end of file
diff --git a/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc b/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..2712d5d5c6d4ad5349fc4f6539190503d2efa92d
--- /dev/null
+++ b/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc
@@ -0,0 +1,3 @@
+Generic provider for log history entries.
+
+A filter for given _tablenames_ is applied, see the documentation of the parameters for an example.
\ No newline at end of file
diff --git a/entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc b/entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d0168dcdaf0b296ec9082b3d0cfbf39dfeaf5cc3
--- /dev/null
+++ b/entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc
@@ -0,0 +1,10 @@
+Tablenames have to be given as stringified object-arrays, see the following example:
+
+[source,javascript]
+----
+var res = [];
+res.push({id: vars.get("$field.CONTACTID"), tableNames: ["CONTACT", "COMMUNICATION", "ADDRESS", "AB_ATTRIBUTERELATION"]});
+res.push({id: vars.get("$field.ORGANISATIONID"), tableNames: ["ORGANISATION"]});
+//stringify because currently only strings can be passed as parameter
+res = JSON.stringify(res);//this is an example for the parameter-value
+----
\ No newline at end of file
diff --git a/entity/MemberRoles_entity/MemberRoles_entity.aod b/entity/MemberRoles_entity/MemberRoles_entity.aod
index 0438f69501fce7318bdcdfacbd0829f396e3db9b..2871a36c5d9a4d53641f4e2a6788e31f3a2ca46f 100644
--- a/entity/MemberRoles_entity/MemberRoles_entity.aod
+++ b/entity/MemberRoles_entity/MemberRoles_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>MemberRoles_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MemberRoles_entity/documentation.adoc</documentation>
@@ -35,6 +35,10 @@
<expose v="true" />
<mandatory v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index b79d4cca1bc3f55efced701ab10e613f66ae436b..fea67a119b74cb8d248dd15319a6bba1787fd3a0 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Member_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Member_entity/documentation.adoc</documentation>
@@ -176,12 +176,6 @@
<targetIdField>CONTACT_ID</targetIdField>
<recordContainer>db</recordContainer>
<dependencies>
- <entityDependency>
- <name>df6a9a25-f787-41f6-877b-c8e3cbbdc6be</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Members</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>efeb191c-dd03-46e1-b176-c4e0c2f75fc5</name>
<entityName>Campaign_entity</entityName>
@@ -201,6 +195,26 @@
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/Member_entity/entityfields/image/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityProvider>
+ <name>WithDistrictResponsibles</name>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>6f90b6c6-118c-485e-9a41-365bdc325f9b</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Members</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ <documentation>%aditoprj%/entity/Member_entity/entityfields/uid/documentation.adoc</documentation>
+ </entityField>
<entityActionGroup>
<name>MSTeamsActionGroup</name>
<title>MS Teams</title>
@@ -422,5 +436,72 @@
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Member_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OBJECTMEMBERID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CONTACT_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CONTACTROLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DEPARTMENT.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ICON.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>IMAGE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>MEMBERROLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OBJECT_ROWID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OBJECT_TYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ORG_ORGID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ORGANISATION_NAME.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PERSON_FIRSTNAME.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PERSON_FULL_NAME.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PERSON_LASTNAME.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PERSON_PERSID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PERSON_SALUTATION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PERSON_TITLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>POSITION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TARGETCONTEXT.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Member_entity/entityfields/date_edit/valueProcess.js b/entity/Member_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Member_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/date_new/valueProcess.js b/entity/Member_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/Member_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/pers_full_name/fieldIdProcess.js b/entity/Member_entity/entityfields/pers_full_name/fieldIdProcess.js
deleted file mode 100644
index d8ff22328f581fd0a82cd486cb8a8985b44968e8..0000000000000000000000000000000000000000
--- a/entity/Member_entity/entityfields/pers_full_name/fieldIdProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.getString("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/uid/documentation.adoc b/entity/Member_entity/entityfields/uid/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4db4f5e24216d619048062e493f79e2bb919aa77
--- /dev/null
+++ b/entity/Member_entity/entityfields/uid/documentation.adoc
@@ -0,0 +1 @@
+Is only used by the jdito record container.
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/user_edit/valueProcess.js b/entity/Member_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Member_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/user_new/valueProcess.js b/entity/Member_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Member_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Member_entity/recordcontainers/jdito/contentProcess.js b/entity/Member_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b678a96f2fa95f38313aa434a2b5895f899a228a
--- /dev/null
+++ b/entity/Member_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,114 @@
+import("system.result");
+import("system.vars");
+import("system.entities");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+
+var idValues = vars.get("$local.idvalues");
+var filter = vars.get("$local.filter");
+var memberLoadingConfig = entities.createConfigForLoadingRows()
+ .entity("Member_entity")
+ .provider("Links")
+ .addParameter("ObjectRowId_param", vars.get("$param.ObjectRowId_param"))
+ .addParameter("ObjectType_param", vars.get("$param.ObjectType_param"))
+ .fields(["#UID", "CONTACT_ID", "CONTACTROLE", "DEPARTMENT", "ICON", "IMAGE", "MEMBERROLE", "OBJECT_ROWID", "OBJECT_TYPE",
+ "OBJECTMEMBERID", "ORG_ORGID", "ORGANISATION_NAME", "PERSON_FIRSTNAME", "PERSON_FULL_NAME",
+ "PERSON_LASTNAME", "PERSON_PERSID", "PERSON_SALUTATION", "PERSON_TITLE", "POSITION", "TARGETCONTEXT"]);
+
+if (idValues)
+{
+ memberLoadingConfig.uids(idValues);
+}
+
+if (filter && filter.filter != null)
+{
+ memberLoadingConfig.filter(JSON.stringify(filter.filter));
+}
+
+var memberRows = entities.getRows(memberLoadingConfig);
+
+if (vars.get("$param.ObjectType_param") == "Salesproject" && vars.get("$param.ObjectRowId_param") != null)
+{
+ var orgContactId = newSelect("SALESPROJECT.CONTACT_ID")
+ .from("SALESPROJECT")
+ .where("SALESPROJECT.SALESPROJECTID", "$param.ObjectRowId_param")
+ .cell();
+
+ var districtLoadingConfig = entities.createConfigForLoadingRows()
+ .entity("DistrictResponsible_entity")
+ .provider("OrganisationResponsibles")
+ .addParameter("OrgUid_param", orgContactId)
+ .fields(["#UID","DISTRICTRESPONSIBLEID", "DISTRICT_ID", "EMPLOYEE_CONTACT_ID",
+ "EMPLOYEE_CONTACT_ID.displayValue", "USER_EDIT", "USER_NEW",
+ "departmentAttributeName", "DATE_EDIT", "DATE_NEW"]);
+
+ var districtRows = entities.getRows(districtLoadingConfig);
+
+
+ districtRows = districtRows.map(function(row)
+ {
+ return [row["#UID"], row["DISTRICTRESPONSIBLEID"], row["DISTRICT_ID"], row["EMPLOYEE_CONTACT_ID"], row["EMPLOYEE_CONTACT_ID.displayValue"],
+ row["USER_EDIT"], row["USER_NEW"], row["departmentAttributeName"], row["DATE_EDIT"], row["DATE_NEW"]];
+ });
+}
+
+
+memberRows = memberRows.map(function(row)
+{
+ return [row["#UID"], row["OBJECTMEMBERID"], row["CONTACT_ID"], row["CONTACTROLE"], row["DEPARTMENT"], row["ICON"], row["IMAGE"], row["MEMBERROLE"], row["OBJECT_ROWID"],
+ row["OBJECT_TYPE"], row["ORG_ORGID"], row["ORGANISATION_NAME"], row["PERSON_FIRSTNAME"],
+ row["PERSON_FULL_NAME"], row["PERSON_LASTNAME"], row["PERSON_PERSID"], row["PERSON_SALUTATION"], row["PERSON_TITLE"],
+ row["POSITION"], row["TARGETCONTEXT"]];
+});
+
+var responsibleUids = [];
+
+districtRows.forEach(function(row){
+ responsibleUids.push(row[3]);
+});
+
+var loadingConfPers = entities.createConfigForLoadingRows()
+ .entity("Person_entity")
+ .uids(responsibleUids)
+ .fields(["ORGANISATION_ID", "ORGANISATION_NAME", "CONTACTROLE", "POSITION",
+ "FIRSTNAME", "LASTNAME", "SALUTATION", "TITLE"]);
+
+var persRows = entities.getRows(loadingConfPers);
+var counter = 0;
+
+persRows = persRows.map(function(row){
+ return [row["SALUTATION"], row["TITLE"], row["FIRSTNAME"], row["LASTNAME"],
+ row["ORGANISATION_NAME"], row["ORGANISATION_ID"], row["CONTACTROLE"],
+ row["POSITION"], row["PERSONID"]];
+});
+
+
+districtRows.forEach(function(row){
+
+ memberRows.push(
+ [row[0],
+ null,
+ row[3],
+ persRows[counter][6],
+ row[7],
+ "VAADIN:GLOBE",
+ "TEXT:" + row[4].substring(row[4].indexOf(" ", 0)+1, row[4].length),
+ "MEMBERROLEDISTRICTRESPONSIBLE",
+ vars.get("$param.ObjectRowId_param"),
+ vars.get("$param.ObjectType_param"),
+ persRows[counter][5],
+ persRows[counter][4],
+ persRows[counter][2],
+ row[4],
+ persRows[counter][3],
+ persRows[counter][8],
+ persRows[counter][0],
+ persRows[counter][1],
+ persRows[counter][7],
+ null
+ ]);
+
+ counter++;
+});
+
+result.object(memberRows);
\ No newline at end of file
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 33f8210372ed63dd7340622968c34f31eb2d34a5..8bc4b0587027cb71947f5ade5bcede18bdb01ebb 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -1,9 +1,10 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ModuleTree_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ModuleTree_entity/documentation.adoc</documentation>
<title>History</title>
+ <recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
@@ -79,6 +80,10 @@
<mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 05ab81cea74020a8b9ef2aa3bfa4266073bcda10..ee2693457f7249abe5c03b444283d1093ddb90c7 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Notification_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Notification_entity/documentation.adoc</documentation>
@@ -27,6 +27,7 @@
<name>STATE</name>
<title>State</title>
<consumer>StateKeywords</consumer>
+ <groupable v="true" />
<displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
@@ -34,7 +35,7 @@
</entityField>
<entityField>
<name>CAPTION</name>
- <title>title</title>
+ <title>Title</title>
</entityField>
<entityField>
<name>CREATEDATE</name>
@@ -45,7 +46,7 @@
</entityField>
<entityField>
<name>DESCRIPTION</name>
- <title>description</title>
+ <title>Description</title>
</entityField>
<entityField>
<name>FORCEDPRIORITY</name>
@@ -70,7 +71,7 @@
<name>TYPECODE</name>
<title>Type</title>
<groupable v="true" />
- <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/displayValueProcess.js</displayValueProcess>
+ <dropDownProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/dropDownProcess.js</dropDownProcess>
</entityField>
<entityField>
<name>VERSION</name>
@@ -104,7 +105,7 @@
<title>set Read</title>
<description></description>
<onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <isSelectionAction v="false" />
<iconId>VAADIN:OPEN_BOOK</iconId>
<tooltip></tooltip>
<tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js</tooltipProcess>
@@ -123,8 +124,9 @@
</entityActionGroup>
<entityField>
<name>RESOLVEDPRIORITY</name>
- <title>priority</title>
+ <title>Priority</title>
<consumer>PrioKeywords</consumer>
+ <groupable v="true" />
<textInputAllowed v="false" />
</entityField>
<entityConsumer>
@@ -155,25 +157,24 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>_____SYSTEMALIAS</alias>
+ <maximumDbRows v="200" />
+ <isPageable v="false" />
<fromClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBDelete>%aditoprj%/entity/Notification_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
- <name>c4e34b96-6081-4d04-8377-040a8ed3e14c</name>
- <tableName>ASYS_NOTIFICATIONS</tableName>
- <primaryKey>ID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>38bfb16c-bfe9-45dd-8ce7-692ebba030a9</name>
+ <name>3061f3b4-a5d1-4436-9c4d-28415363a056</name>
<tableName>ASYS_NOTIFICATIONCONTENTS</tableName>
<primaryKey>CONTENTID</primaryKey>
<isUIDTable v="false" />
@@ -195,11 +196,6 @@
<name>CONTENTID.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.CONTENTID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CREATIONDATE.value</name>
- <isFilterable v="true" />
- <isLookupFilter v="true" />
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DESCRIPTION.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.DESCRIPTION</recordfield>
@@ -259,6 +255,8 @@
<dbRecordFieldMapping>
<name>CREATEDATE.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.CREATEDATE</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DELETEDATE.value</name>
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js
index d90098a01f6be9f474f4608d3fcd62454ce20c2f..a11db05fbf8b23cf18b4826418d8318a040260ba 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js
@@ -9,4 +9,4 @@ var selectedNotifications = vars.get("$sys.selection");
for(var i = 0; i < selectedNotifications.length; i++)
notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_ARCHIVE);
-neon.refresh();
\ No newline at end of file
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js
index 9769ec5519b73d33625204f7d7c935bc64a233a1..3010398e4cb612bcd1a8300a878eecb52fad86db 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js
@@ -9,4 +9,4 @@ var selectedNotifications = vars.get("$sys.selection");
for(var i = 0; i < selectedNotifications.length; i++)
notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_UNSEEN);
-neon.refresh();
\ No newline at end of file
+neon.refreshAll();
\ 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 608c454e87cb33460b61a4999fb77372ccaab864..f28870eaa227a906700250efe1924529d0e49417 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
@@ -1,12 +1,25 @@
+import("Sql_lib");
import("system.vars");
import("system.tools");
import("system.notification");
import("system.neon");
+import("KeywordRegistry_basic");
var user = tools.getCurrentUser();
var selectedNotifications = vars.get("$sys.selection");
+if (selectedNotifications.length == 0)
+{
+ let userid = tools.getCurrentUser()["name"];
+
+ selectedNotifications = newSelect("ASYS_NOTIFICATIONS.ID")
+ .from("ASYS_NOTIFICATIONS")
+ .where("ASYS_NOTIFICATIONS.STATE", [notification.STATE_SEEN.toString(), notification.STATE_UNSEEN.toString()], SqlBuilder.IN())
+ .and("ASYS_NOTIFICATIONS.USERID", userid, SqlBuilder.EQUAL())
+ .arrayColumn();
+}
+
for(var i = 0; i < selectedNotifications.length; i++)
notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
-//neon.refreshAll();
\ No newline at end of file
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/state/displayValueProcess.js b/entity/Notification_entity/entityfields/state/displayValueProcess.js
index fcd088324b80387634096e3d62a49a2e82974495..277c05aab18dbce9a8a0a5f7bc078c8ada84c94d 100644
--- a/entity/Notification_entity/entityfields/state/displayValueProcess.js
+++ b/entity/Notification_entity/entityfields/state/displayValueProcess.js
@@ -1,24 +1,6 @@
-import("system.translate");
+import("Keyword_lib");
import("system.result");
import("system.vars");
+import("KeywordRegistry_basic");
-var value = vars.get("$field.STATE");
-
-switch(value)
-{
- case "SEEN":
- result.string(translate.text("Seen"));
- break;
- case "CONFIRMED":
- result.string(translate.text("Confirmed"));
- break;
- case "TODELETE":
- result.string(translate.text("To Delete"));
- break;
- case "ARCHIVE":
- result.string(translate.text("Archive"));
- break;
- default:
- result.string(translate.text("Unseen"));
- break;
-}
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.notificationState(), vars.get("$field.STATE")));
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js b/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js
index a5407effb79841e7d2492e6f27f3ce81bfa33a51..f39ea4075a7d01b5ebcd3b54a316ce20694c3e79 100644
--- a/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js
+++ b/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js
@@ -1,4 +1,5 @@
import("system.result");
+import("KeywordRegistry_basic");
-result.string("NotificationState");
\ No newline at end of file
+result.string($KeywordRegistry.notificationState());
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/typecode/displayValueProcess.js b/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
deleted file mode 100644
index 76e8d769dc2a82a791668c8df8783f1bfee95141..0000000000000000000000000000000000000000
--- a/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
+++ /dev/null
@@ -1,28 +0,0 @@
-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/entityfields/typecode/dropDownProcess.js b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7b41babad8257e8b81cfe60d7d5166e2d222c172
--- /dev/null
+++ b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.logging");
+import("system.notification");
+
+var types = []
+
+var props = notification.getAllTypes();
+for (i = 0; i < props.length; i++)
+{
+ types.push([props[i]["typecode"], props[i]["title"]]);
+}
+
+result.object(types);
\ No newline at end of file
diff --git a/entity/Notification_entity/recordcontainers/db/onDBDelete.js b/entity/Notification_entity/recordcontainers/db/onDBDelete.js
index 05d1a30c0a4efc49d64aab055ed9b58109aba6f6..54618e0f77334d441107ac955591986a7540f4d0 100644
--- a/entity/Notification_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Notification_entity/recordcontainers/db/onDBDelete.js
@@ -1,5 +1,7 @@
import("system.vars");
import("system.notification");
-// Deletes notificationContents from its table, if there are no
-notification.deleteContentIfOrphan(vars.get("$field.ID"), vars.get("$field.CONTENTID"));
\ No newline at end of file
+// Deletes notificationContents from its table, if there are no user notification left
+// Only AppointmentContents need to stay, because they would appear again after every deletion.
+if(vars.get("$field.TYPECODE") != "_____SYSTEM_NOTIFICATION_APPOINTMENT")
+ notification.deleteContentIfOrphan(vars.get("$field.ID"), vars.get("$field.CONTENTID"));
\ No newline at end of file
diff --git a/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js b/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
index 86103719abde99edd46ff3be4155f6acc4e3219a..72450da3054601b74ab35a77ebb66ce6172a35e0 100644
--- a/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
@@ -2,6 +2,6 @@ import("system.result");
import("system.db");
result.object({
- "ASYS_NOTIFICATIONS.STATE": db.DESCENDING,
- "ASYS_NOTIFICATIONCONTENTS.CREATEDATE": db.DESCENDING
+ "ASYS_NOTIFICATIONCONTENTS.CREATEDATE": db.DESCENDING,
+ "ASYS_NOTIFICATIONS.STATE": db.DESCENDING
});
\ No newline at end of file
diff --git a/entity/ObjectProxy_entity/ObjectProxy_entity.aod b/entity/ObjectProxy_entity/ObjectProxy_entity.aod
index 079478f4ff9eb6109c42acb3fe2ffa2ad2663ca2..ade8076995cdf19ebddb1dc97d0ed3626fb4ea9e 100644
--- a/entity/ObjectProxy_entity/ObjectProxy_entity.aod
+++ b/entity/ObjectProxy_entity/ObjectProxy_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ObjectProxy_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ObjectProxy_entity/documentation.adoc</documentation>
@@ -197,6 +197,10 @@
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 8172bd7ae2f1e98cb00ad6b74d4276d9b18df43a..a2a47eb12c23e662e6c4e789dd4f4b5ae4d032a0 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ObjectRelationType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ObjectRelationType_entity/documentation.adoc</documentation>
@@ -141,6 +141,10 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index b9254898273fcc9245e72a06b185d4e4c732c190..4266919a6b46eca1ea8ba194b849935a8c606e23 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>ObjectTree_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ObjectTree_entity/documentation.adoc</documentation>
@@ -167,6 +167,10 @@
<entityField>
<name>OBJECTRELATIONID</name>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 55ac5773b3cb1302c26846d766e066c70d64222f..4ea71164c3cd8f2f93b39be55a3555cbf9b8090a 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -234,7 +234,7 @@ function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pP
if (pRelationType1 == undefined || pRelationType2 == undefined)
return [];
- var [myNum, otherNum] = pDirection == "normal" ? [2, 1] : [1, 2];
+ var [myNum, otherNum] = pDirection == "normal" ? [1, 2] : [2, 1];
onConditionForRelationTypeJoin = newWhere("AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum)
.and("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", pRelationType1)
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 2d1e2ff409dd15ec5a3c863503159b69ae385721..7fe6b0ab3b64924d4aa6a0a3aa184c1dfcec34f7 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Object_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
@@ -271,6 +271,10 @@
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 0b3a54a7db2a33381db46e8d4d83547f52c16d7d..90825b31062b88f9c34214de9678d02d17f9ea3d 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Offer_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
@@ -11,8 +11,9 @@
<grantDeleteProcess>%aditoprj%/entity/Offer_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Offer_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
- <afterOperatingState>%aditoprj%/entity/Offer_entity/afterOperatingState.js</afterOperatingState>
+ <useFavorites v="true" />
<iconId>VAADIN:CART</iconId>
+ <imageProcess>%aditoprj%/entity/Offer_entity/imageProcess.js</imageProcess>
<titlePlural>Offers</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -133,7 +134,7 @@
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/ContactId_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js</valueProcess>
<expose v="true" />
<mandatory v="true" />
</entityParameter>
@@ -826,7 +827,6 @@
</entityParameter>
<entityField>
<name>chooseTEXHeader</name>
- <consumer>DocumentTemplateTex</consumer>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/choosetexheader/stateProcess.js</stateProcess>
</entityField>
<entityConsumer>
@@ -1022,7 +1022,12 @@
<entityAggregateField>
<name>NET_aggregate</name>
<parentField>NET</parentField>
+ <title>Sum</title>
</entityAggregateField>
+ <entityField>
+ <name>OFFER_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js</valueProcess>
+ </entityField>
<entityField>
<name>COUNT</name>
<title>Count</title>
@@ -1033,6 +1038,19 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
+ <entityAggregateField>
+ <name>PROBABILITY_aggregate</name>
+ <parentField>PROBABILITY</parentField>
+ <title>Ø Probability</title>
+ </entityAggregateField>
+ <entityProvider>
+ <name>OfferAggregates</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1087,19 +1105,19 @@
<name>CURRENCY.value</name>
<recordfield>OFFER.CURRENCY</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>HEADER.value</name>
<recordfield>OFFER.HEADER</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NET.value</name>
<recordfield>OFFER.NET</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OFFERCODE.value</name>
@@ -1111,7 +1129,7 @@
<name>OFFERDATE.value</name>
<recordfield>OFFER.OFFERDATE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OFFERID.value</name>
@@ -1125,19 +1143,19 @@
<name>STATUS.value</name>
<recordfield>OFFER.STATUS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>VAT.value</name>
<recordfield>OFFER.VAT</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>VERSNR.value</name>
<recordfield>OFFER.VERSNR</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ORG_ID.value</name>
@@ -1155,7 +1173,7 @@
<name>ADDRESS.value</name>
<recordfield>OFFER.ADDRESS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CURRENCY.displayValue</name>
@@ -1178,7 +1196,7 @@
<name>DELIVERYTERMS.value</name>
<recordfield>OFFER.DELIVERYTERMS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DELIVERYTERMS.displayValue</name>
@@ -1192,7 +1210,7 @@
<name>INFO.value</name>
<recordfield>OFFER.INFO</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
@@ -1218,7 +1236,7 @@
<name>FOOTER.value</name>
<recordfield>OFFER.FOOTER</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_TYPE.value</name>
@@ -1232,7 +1250,7 @@
<name>CONTACT_ID.value</name>
<recordfield>OFFER.CONTACT_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LETTERSALUTATION.value</name>
@@ -1241,6 +1259,7 @@
<dbRecordFieldMapping>
<name>CONTACT_ORG_ID.displayValue</name>
<recordfield>ORGANISATION.NAME</recordfield>
+ <isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_PERSON_ID.displayValue</name>
@@ -1260,7 +1279,7 @@
<name>ISOLANGUAGE.value</name>
<recordfield>OFFER.ISOLANGUAGE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ISOLANGUAGE.displayValue</name>
@@ -1271,15 +1290,15 @@
<recordfield>OFFER.NET</recordfield>
<aggregateType>SUM</aggregateType>
</aggregateFieldDbMapping>
- <dbRecordFieldMapping>
- <name>COUNT.value</name>
- <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
- </dbRecordFieldMapping>
<aggregateFieldDbMapping>
<name>COUNT_aggregate.value</name>
<recordfield>OFFER.OFFER_ID</recordfield>
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
+ <aggregateFieldDbMapping>
+ <name>PROBABILITY_aggregate.value</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js</expression>
+ </aggregateFieldDbMapping>
</recordFieldMappings>
<filterExtensions>
<filterExtensionSet>
@@ -1301,6 +1320,15 @@
</affectedTables>
<affectedIds>%aditoprj%/entity/Offer_entity/recordcontainers/index/affectedIds.js</affectedIds>
<indexFieldMappings>
+ <indexRecordSystemFieldMapping>
+ <name>#UID</name>
+ </indexRecordSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#TITLE</name>
+ </indexRecordMultilingualSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#DESCRIPTION</name>
+ </indexRecordMultilingualSystemFieldMapping>
<indexRecordFieldMapping>
<name>OFFERCODE.value</name>
<indexFieldType>STRING</indexFieldType>
diff --git a/entity/Offer_entity/afterOperatingState.js b/entity/Offer_entity/afterOperatingState.js
deleted file mode 100644
index d80259f9b7e089caef078d2f29f78d30e9979734..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/afterOperatingState.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("Workflow_lib");
-
-if (vars.exists("$context.workflowQueue") && vars.get("$context.workflowQueue"))
-{
- WorkflowStarter.inserted(vars.get("$context.workflowQueue"));
- vars.set("$context.workflowQueue", null);
-}
\ No newline at end of file
diff --git a/entity/Offer_entity/conditionProcess.js b/entity/Offer_entity/conditionProcess.js
deleted file mode 100644
index 1fb5c50e9a6eacdb22c14b5d5f1be4a70f87e686..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/conditionProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = newWhereIfSet("OFFER.OBJECT_ROWID", "$param.ObjectRowId_param");
-
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetype_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetype_param/valueProcess.js
deleted file mode 100644
index 361c9a219045f0f73c9d32749357157e8501d650..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetype_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("TEX");
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/valueProcess.js b/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/valueProcess.js
deleted file mode 100644
index b5612781a16cf17e988af9ad4c1f375ea2abd119..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.offerProbability());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/moduletrees/children/contextname/valueProcess.js b/entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js
similarity index 53%
rename from entity/Task_entity/entityfields/moduletrees/children/contextname/valueProcess.js
rename to entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js
index 86bf9bdfc95f2757f6ee947b7549edad4ce0b154..cbe3420c9866c88162b709500cd75929acb0e4e3 100644
--- a/entity/Task_entity/entityfields/moduletrees/children/contextname/valueProcess.js
+++ b/entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("Task");
\ No newline at end of file
+result.string("Offer");
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
index a5b761ab29d8a43dfb5e9f3aa4a2b19a79bf057c..0f003f4454eb7dc65386ea75080398e1070aef56 100644
--- a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
@@ -1,35 +1,32 @@
+import("system.db");
+import("system.vars");
import("system.question");
import("system.translate");
-import("system.vars");
import("KeywordRegistry_basic");
-import("system.translate");
+import("Placeholder_lib");
import("Offer_lib");
import("Email_lib");
import("Sql_lib");
import("MimeType_lib");
-import("Placeholder_lib");
-var offerReport = {};
+var offerReport = {}
var attachmentArray = [];
-var notificationMsg = translate.text("The status of the offer was changed to \"Sent\".");
+var updateStatements = [["OFFER", ["STATUS"], db.getColumnTypes("OFFER", ["STATUS"]), [$KeywordRegistry.offerStatus$sent()], newWhere("OFFER.OFFERID", vars.get("$field.OFFERID")).build()]];
+var notificationMsg = translate.text("The status of the offer was changed to \"sent\".");
var contactId = vars.get("$field.CONTACT_ID");
var arrayReport = OfferUtils.buildOfferReport(vars.get("$field.OFFERID"));
var emailFilename = translate.text("Offerrequest");
+var offerId = vars.get("$field.OFFERID")
+var additionalPlaceholders = [
+ new Placeholder("offerCode", Placeholder.types.FIXEDVALUE, vars.get("$field.FullOfferCode"))
+];
if (vars.get("$field.CONTACT_ID") == null || "") contactId = vars.get("$field.CONTACT_ORG_ID");
offerReport.content = arrayReport[1];
-offerReport.contentType = MimeTypes.PDF();
+offerReport.mimeType = MimeTypes.PDF();
offerReport.filename = translate.text("Offer No.") + vars.get("$field.#CONTENTTITLE") + ".pdf";
attachmentArray[0] = offerReport;
-var additionalPlaceholders = [
- new Placeholder("offerCode", Placeholder.types.FIXEDVALUE, vars.get("$field.FullOfferCode"))
-];
-
-EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders);
-
-newWhere("OFFER.OFFERID", "$field.OFFERID")
- .updateData(true, "OFFER", ["STATUS"], null, [$KeywordRegistry.offerStatus$sent()]);
-
+EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, updateStatements);
diff --git a/entity/Offer_entity/entityfields/status/onValueChange.js b/entity/Offer_entity/entityfields/status/onValueChange.js
deleted file mode 100644
index d06a9e01b5af62f0a0637d6db848cb7a76f626da..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/status/onValueChange.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("Offer_lib");
-
-var offerId = vars.getString("$field.OFFERID");
-if (offerId && vars.get("local.value") == 2 || vars.get("local.value") == 3 || vars.get("local.value") == 4)
-{
- OfferUtils.setSent(offerId);
-}
\ No newline at end of file
diff --git a/entity/Offer_entity/imageProcess.js b/entity/Offer_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6cdd3b6896a70daa1c53e6d4d25a6d8dfb716338
--- /dev/null
+++ b/entity/Offer_entity/imageProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + translate.text("Offer"));
\ No newline at end of file
diff --git a/entity/Offer_entity/onDBDelete.js b/entity/Offer_entity/onDBDelete.js
deleted file mode 100644
index 0090a9df8b3a850fc7300a48b310361444786883..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/onDBDelete.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("Sql_lib");
-
-newWhere("OFFERITEM.OFFER_ID", "$field.OFFERID").deleteData();
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/onDBDelete.js b/entity/Offer_entity/recordcontainers/db/onDBDelete.js
index 1e1ad63fd5ccb8c6fa1a56dc2c313247474d34fb..d304685d8ce5a02f8d000448a17276115ec869ae 100644
--- a/entity/Offer_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Offer_entity/recordcontainers/db/onDBDelete.js
@@ -10,5 +10,4 @@ newWhere("OFFERITEM.OFFER_ID", "$field.OFFERID")
new AttributeRelationQuery(vars.get("$field.OFFERID"), null, ContextUtils.getCurrentContextId())
.deleteAllAttributes();
-WorkflowStarter.deleted({sum : Number(vars.get("$field.TotalGross")), status : vars.get("$field.STATUS")});
WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/onDBInsert.js b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
index abaadff6901261c70eb884a3be78ef0ddc075721..086ca1c55981c155c21009f26992a12a4a701fac 100644
--- a/entity/Offer_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
@@ -21,6 +21,4 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
}
}
-//start the execution in afterOperatingState, because here the dataset is not yet inserted
-vars.set("$context.workflowQueue", {sum : Number(vars.get("$field.TotalGross")), status : vars.get("$field.STATUS")});
WorkflowSignalSender.inserted();
diff --git a/entity/Offer_entity/recordcontainers/db/onDBUpdate.js b/entity/Offer_entity/recordcontainers/db/onDBUpdate.js
index d278b4ce871a65e42c5226a367bd94c970101c30..2e53f3cad9a9edf21cc5bbc6fdecc00c5001dfee 100644
--- a/entity/Offer_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Offer_entity/recordcontainers/db/onDBUpdate.js
@@ -1,10 +1,3 @@
-import("system.workflow");
-import("KeywordRegistry_basic");
-import("system.vars");
import("Workflow_lib");
-var status = vars.get("$local.rowdata")["OFFER.STATUS"];
-if (vars.get("$local.changed").indexOf("OFFER.STATUS") !== -1 && status == $KeywordRegistry.offerStatus$toCheck())
- WorkflowStarter.updated({sum : Number(vars.get("$field.TotalGross")), status : status});
-
WorkflowSignalSender.updated();
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..25f76f180180bfc8602cee9566751078ba280678
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js
@@ -0,0 +1,6 @@
+import("system.SQLTYPES");
+import("system.result");
+import("Sql_lib");
+
+var helper = new SqlMaskingUtils();
+result.string("AVG("+ helper.cast("OFFER.PROBABILITY", SQLTYPES.INTEGER) + ")");
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/index/query.js b/entity/Offer_entity/recordcontainers/index/query.js
index 6026dd62b0e7e82195b1597e9907f011545ce07f..32864cdd4aa7c56b613c6d4d984718c1d2e897b5 100644
--- a/entity/Offer_entity/recordcontainers/index/query.js
+++ b/entity/Offer_entity/recordcontainers/index/query.js
@@ -2,28 +2,26 @@ import("system.SQLTYPES");
import("system.translate");
import("system.result");
import("system.vars");
-import("system.calendars");
-import("system.db");
import("Keyword_lib");
import("Sql_lib");
import("KeywordRegistry_basic");
var sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("OFFER.OFFERID " // as "_uid_",
- + ", " + sqlHelper.concat([sqlHelper.cast("OFFER.OFFERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ") //as "_title_"
- + ", " + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Description") + ":'", sqlHelper.castLob("OFFER.INFO", 250)]) // as "_description_"
- + ", OFFER.OFFERCODE"
- + ", OFFER.CONTACT_ID "
- + ", CONTACT.ORGANISATION_ID " // as CONTACT_ORG_ID
- + ", ORGANISATION.NAME") // as "CONTACT_ORG_ID.displayValue"
- .from("OFFER")
- .join("CONTACT", "OFFER.CONTACT_ID = CONTACTID")
- .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
- .orderBy("OFFER.OFFERCODE");
+var querySelect = newSelect([
+ "OFFER.OFFERID", //#UID
+ sqlHelper.concat([sqlHelper.cast("OFFER.OFFERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | "), //#TITLE
+ sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Description") + ":'", sqlHelper.castLob("OFFER.INFO", 250)]), //#DESCRIPTION
+ "OFFER.OFFERCODE",
+ "OFFER.CONTACT_ID",
+ "CONTACT.ORGANISATION_ID", //CONTACT_ORG_ID
+ "ORGANISATION.NAME" //CONTACT_ORG_ID.displayValue
+ ])
+ .from("OFFER")
+ .join("CONTACT", "OFFER.CONTACT_ID = CONTACTID")
+ .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ .orderBy("OFFER.OFFERCODE");
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0)
-{
- querySelect.where("OFFER.OFFERID", vars.get("$local.idvalue"), SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue"))
+ querySelect.whereIfSet("OFFER.OFFERID", "$local.idvalue", SqlBuilder.IN());
result.string(querySelect.toString());
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 30cf07a3915710b23a81030fa7a3d18df73c1cfa..a900e6473e8d7ded55a0ca946aa0798296bf657e 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Offeritem_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
@@ -244,6 +244,10 @@
<name>Language_param</name>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -274,13 +278,13 @@
<name>DISCOUNT.value</name>
<recordfield>OFFERITEM.DISCOUNT</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>GROUPCODEID.value</name>
<recordfield>OFFERITEM.GROUPCODEID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ITEMNAME.value</name>
@@ -292,7 +296,7 @@
<name>ITEMPOSITION.value</name>
<recordfield>OFFERITEM.ITEMPOSITION</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ITEMSORT.value</name>
@@ -310,43 +314,43 @@
<name>OPTIONAL.value</name>
<recordfield>OFFERITEM.OPTIONAL</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PRICE.value</name>
<recordfield>OFFERITEM.PRICE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PRODUCT_ID.value</name>
<recordfield>OFFERITEM.PRODUCT_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>QUANTITY.value</name>
<recordfield>OFFERITEM.QUANTITY</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>UNIT.value</name>
<recordfield>OFFERITEM.UNIT</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>VAT.value</name>
<recordfield>OFFERITEM.VAT</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>INFO.value</name>
<recordfield>OFFERITEM.INFO</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>GROUPCODEID.displayValue</name>
diff --git a/entity/Offeritem_entity/entityfields/date_edit/valueProcess.js b/entity/Offeritem_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Offeritem_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/date_new/valueProcess.js b/entity/Offeritem_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/Offeritem_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/user_edit/valueProcess.js b/entity/Offeritem_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Offeritem_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/user_new/valueProcess.js b/entity/Offeritem_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Offeritem_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/price_aggregate.value/expression.js b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/price_aggregate.value/expression.js
deleted file mode 100644
index 6a3e3167e6a5d3a3ec8b30eefd928c665c58dc4a..0000000000000000000000000000000000000000
--- a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/price_aggregate.value/expression.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("OFFERITEM.PRICE * OFFERITEM.QUANTITY * ((100 - OFFERITEM.DISCOUNT) / 100)");
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 7610aac58abe7df79a112280b6807f2f1cb5399b..cb7b3dcde53402ce412d44c3c4564956d79bbd2a 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Order_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
@@ -7,7 +7,9 @@
<grantDeleteProcess>%aditoprj%/entity/Order_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Order_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Order_entity/afterUiInit.js</afterUiInit>
+ <useFavorites v="true" />
<iconId>VAADIN:DOLLAR</iconId>
+ <imageProcess>%aditoprj%/entity/Order_entity/imageProcess.js</imageProcess>
<titlePlural>Receipts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -32,6 +34,7 @@
<name>CURRENCY</name>
<title>Currency</title>
<consumer>KeywordCurrencies</consumer>
+ <groupable v="true" />
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/currency/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
</entityField>
@@ -66,7 +69,6 @@
<consumer>AnyContacts</consumer>
<linkedContextProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
<onValueChangeTypes>
<element>MASK</element>
@@ -119,7 +121,6 @@
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/ContactId_param/valueProcess.js</valueProcess>
<expose v="true" />
<mandatory v="true" />
</entityParameter>
@@ -153,33 +154,15 @@
<name>ISOLANGUAGE</name>
<title>Language</title>
<consumer>Languages</consumer>
+ <groupable v="true" />
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/isolanguage/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess>
</entityField>
- <entityField>
- <name>VERSNR</name>
- <documentation>%aditoprj%/entity/Order_entity/entityfields/versnr/documentation.adoc</documentation>
- <title>Vers. no.</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/versnr/valueProcess.js</valueProcess>
- </entityField>
<entityField>
<name>SALESORDER_ID</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/salesorder_id/documentation.adoc</documentation>
<title>SALESORDER_ID</title>
</entityField>
- <entityFieldGroup>
- <name>OrderCode_VersNr_fieldgroup</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js</valueProcess>
- <title>Receipt number</title>
- <description>Ordercode + VersNr</description>
- <state>READONLY</state>
- <fields>
- <element>SALESORDERCODE</element>
- <element>VERSNR</element>
- </fields>
- </entityFieldGroup>
<entityParameter>
<name>ContactId_param</name>
<expose v="true" />
@@ -293,25 +276,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityParameter>
- <name>OrderCurrency_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OrderLanguage_param</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OrderHeader_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
<entityConsumer>
<name>Languages</name>
<dependency>
@@ -356,7 +320,6 @@
<groupable v="true" />
<linkedContext>Offer</linkedContext>
<state>AUTO</state>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/offer_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/offer_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
@@ -463,10 +426,6 @@
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/paid/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/paid/displayValueProcess.js</displayValueProcess>
</entityField>
- <entityField>
- <name>Unpaid</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/unpaid/valueProcess.js</valueProcess>
- </entityField>
<entityField>
<name>CANCELLATION</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/cancellation/documentation.adoc</documentation>
@@ -483,6 +442,7 @@
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/dunningdate/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/dunningdate/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DUNNINGLEVEL</name>
@@ -499,6 +459,7 @@
<resolution>DAY</resolution>
<groupable v="true" />
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/paydate/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/paydate/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PAYDUEDATE</name>
@@ -546,7 +507,6 @@
<mandatory v="true" />
<mandatoryProcess>%aditoprj%/entity/Order_entity/entityfields/object_rowid/mandatoryProcess.js</mandatoryProcess>
<titleProcess>%aditoprj%/entity/Order_entity/entityfields/object_rowid/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
<onValueChangeTypes>
<element>MASK</element>
@@ -641,14 +601,12 @@
<title>Delivery address</title>
<contentType>LONG_TEXT</contentType>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PAYMENTADDRESS</name>
<title>Payment address</title>
<contentType>LONG_TEXT</contentType>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/paymentaddress/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>KeywordPaymentTerms</name>
@@ -706,16 +664,6 @@
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/dunningtext/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/dunningtext/valueProcess.js</valueProcess>
</entityField>
- <entityParameter>
- <name>OrderPaymentTerm_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OrderDeliveryTerm_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
<entityConsumer>
<name>Offers</name>
<dependency>
@@ -776,31 +724,6 @@
<title>Choose Footer</title>
<consumer>DocumentTemplateTexFooter</consumer>
</entityField>
- <entityParameter>
- <name>OrderFooter_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OrderDunningDate_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OrderDunningLevel_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OrderType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OrderCancellation_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
<entityField>
<name>ChosenPaymentAddress</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/chosenpaymentaddress/documentation.adoc</documentation>
@@ -829,46 +752,49 @@
<element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
- <entityParameter>
- <name>OrderCode_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OrderStatus_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OrderVersnr_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
<entityField>
- <name>FullOrderCode</name>
- <title>Order number</title>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/fullordercode/valueProcess.js</valueProcess>
+ <name>REMINDER_REPORT_DATA</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>ORDER_REPORT_DATA</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_report_data/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Organisations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Persons</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Contacts</fieldName>
+ </dependency>
+ </entityConsumer>
<entityParameter>
- <name>OrderPaymentAddress_param</name>
- <expose v="true" />
- <documentation>%aditoprj%/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc</documentation>
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OrderDeliveryAddress_param</name>
+ <name>Copy_param</name>
<expose v="true" />
- <documentation>%aditoprj%/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc</documentation>
- <description>PARAMETER</description>
+ <documentation>%aditoprj%/entity/Order_entity/entityfields/copy_param/documentation.adoc</documentation>
</entityParameter>
- <entityActionField>
- <name>newOrderVersion</name>
- <documentation>%aditoprj%/entity/Order_entity/entityfields/neworderversion/documentation.adoc</documentation>
- <title>New receipt version</title>
- <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/neworderversion/onActionProcess.js</onActionProcess>
- <isObjectAction v="true" />
- <iconId>VAADIN:DOLLAR</iconId>
- </entityActionField>
+ <entityField>
+ <name>ORDER_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_objecttype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>COUNT</name>
+ <title>Count</title>
+ <contentType>NUMBER</contentType>
+ </entityField>
+ <entityAggregateField>
+ <name>COUNT_aggregate</name>
+ <parentField>COUNT</parentField>
+ <title>Count</title>
+ </entityAggregateField>
<entityActionField>
<name>newOrder</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/neworder/documentation.adoc</documentation>
@@ -963,40 +889,36 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
- <entityField>
- <name>REMINDER_REPORT_DATA</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ORDER_REPORT_DATA</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_report_data/valueProcess.js</valueProcess>
- </entityField>
- <entityConsumer>
- <name>Organisations</name>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Persons</name>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>Contacts</fieldName>
- </dependency>
- </entityConsumer>
- <entityField>
- <name>COUNT</name>
- <title>Count</title>
- <contentType>NUMBER</contentType>
- </entityField>
- <entityAggregateField>
- <name>COUNT_aggregate</name>
- <parentField>COUNT</parentField>
- <title>Count</title>
- </entityAggregateField>
+ <entityActionGroup>
+ <name>orderReportDispatch</name>
+ <children>
+ <entityActionField>
+ <name>dispatchOrderReport</name>
+ <title>Dispatch as mail</title>
+ <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <iconId>VAADIN:AT</iconId>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js</stateProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityActionGroup>
+ <name>reminderReportDispatch</name>
+ <children>
+ <entityActionField>
+ <name>dispatchReminderReport</name>
+ <title>Dispatch as mail</title>
+ <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <iconId>VAADIN:AT</iconId>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js</stateProcess>
+ </entityActionField>
+ </children>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+</entityActionGroup>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1044,7 +966,7 @@
<name>CURRENCY.value</name>
<recordfield>SALESORDER.CURRENCY</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>FOOTER.value</name>
@@ -1061,6 +983,8 @@
<dbRecordFieldMapping>
<name>SALESORDERCODE.value</name>
<recordfield>SALESORDER.SALESORDERCODE</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALESORDERDATE.value</name>
@@ -1074,10 +998,6 @@
<name>VAT.value</name>
<recordfield>SALESORDER.VAT</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VERSNR.value</name>
- <recordfield>SALESORDER.VERSNR</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
<recordfield>SALESORDER.CONTACT_ID</recordfield>
@@ -1086,13 +1006,13 @@
<name>CONTACT_ORG_ID.value</name>
<recordfield>CONTACT.ORGANISATION_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_PERSON_ID.value</name>
<recordfield>CONTACT.PERSON_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CURRENCY.displayValue</name>
@@ -1102,11 +1022,12 @@
<name>OFFER_ID.value</name>
<recordfield>SALESORDER.OFFER_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ORG_ID.displayValue</name>
<recordfield>ORGANISATION.NAME</recordfield>
+ <isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_PERSON_ID.displayValue</name>
@@ -1133,7 +1054,7 @@
<name>ORDERTYPE.value</name>
<recordfield>SALESORDER.ORDERTYPE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PAID.value</name>
@@ -1143,7 +1064,7 @@
<name>PAYDATE.value</name>
<recordfield>SALESORDER.PAYDATE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PAYDUEDATE.value</name>
@@ -1169,13 +1090,13 @@
<name>PAYMENTTERMS.value</name>
<recordfield>SALESORDER.PAYMENTTERMS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DELIVERYTERMS.value</name>
<recordfield>SALESORDER.DELIVERYTERMS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DELIVERYADDRESS.value</name>
@@ -1212,8 +1133,8 @@
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/isolanguage.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>COUNT.value</name>
- <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
+ <name>ORDERTYPE.displayValue</name>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<aggregateFieldDbMapping>
<name>COUNT_aggregate.value</name>
@@ -1232,6 +1153,15 @@
</affectedTables>
<affectedIds>%aditoprj%/entity/Order_entity/recordcontainers/index/affectedIds.js</affectedIds>
<indexFieldMappings>
+ <indexRecordSystemFieldMapping>
+ <name>#UID</name>
+ </indexRecordSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#TITLE</name>
+ </indexRecordMultilingualSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#DESCRIPTION</name>
+ </indexRecordMultilingualSystemFieldMapping>
<indexRecordFieldMapping>
<name>SALESORDERCODE.value</name>
<indexFieldType>STRING</indexFieldType>
diff --git a/entity/Order_entity/afterUiInit.js b/entity/Order_entity/afterUiInit.js
index e30b0b283b229b405cc9ac5bcedcecbfd38128d9..fb24b7ec60ecd148bd0781d70563249786539bc0 100644
--- a/entity/Order_entity/afterUiInit.js
+++ b/entity/Order_entity/afterUiInit.js
@@ -6,4 +6,8 @@ import("Attribute_lib");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
+
+ if(vars.get("$param.Copy_param"))
+ neon.setFieldValues(JSON.parse(vars.get("$param.Copy_param")));
}
+
diff --git a/entity/Order_entity/contentTitleProcess.js b/entity/Order_entity/contentTitleProcess.js
index 68e68c1f458568bb982e4e4ca205ede596738785..efca7174f4eba418870382ab3a958d1428e7d247 100644
--- a/entity/Order_entity/contentTitleProcess.js
+++ b/entity/Order_entity/contentTitleProcess.js
@@ -1,5 +1,7 @@
+import("KeywordRegistry_basic");
+import("Keyword_lib");
import("system.translate");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.OrderCode_VersNr_fieldgroup"));
+result.string(KeywordUtils.getViewValue($KeywordRegistry.orderType(), vars.get("$field.ORDERTYPE")) +" - "+ vars.get("$field.SALESORDERCODE"));
diff --git a/entity/Order_entity/entityfields/attributes/stateProcess.js b/entity/Order_entity/entityfields/attributes/stateProcess.js
deleted file mode 100644
index 9cffc2b80461245d94a17604f60cc531e2d63a6d..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/attributes/stateProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.neon");
-import("system.result");
-import("Context_lib");
-import("Attribute_lib");
-
-if (AttributeUtil.hasAttributes(ContextUtils.getCurrentContextId()))
- result.string(neon.COMPONENTSTATE_EDITABLE);
-else
- result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/cancellation/valueProcess.js b/entity/Order_entity/entityfields/cancellation/valueProcess.js
index 396d93a9c1ca3a7ed699ff8502147ec1159efaaa..2baa7fdbc7834cef70e01813ec5daf6fb13ca5f4 100644
--- a/entity/Order_entity/entityfields/cancellation/valueProcess.js
+++ b/entity/Order_entity/entityfields/cancellation/valueProcess.js
@@ -3,14 +3,6 @@ import("system.vars");
import("system.result");
-if (vars.get("$this.value") == null) {
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null){
- if (vars.exists("$param.OrderCancellation_param") && vars.get("$param.OrderCancellation_param"))
- {
- result.string(vars.get("$param.OrderCancellation_param"));
- }
- else
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
result.string("0");
-}
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/contact_id/valueProcess.js b/entity/Order_entity/entityfields/contact_id/valueProcess.js
deleted file mode 100644
index 1127220726ee436e1f878c4467fa29d976d6af80..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/contact_id/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.ContactId_param"))
-{
- result.string(vars.get("$param.ContactId_param"));
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/copy_param/documentation.adoc b/entity/Order_entity/entityfields/copy_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..5ec36081ee1fbd4fee417e0ac3cce5a2ba999624
--- /dev/null
+++ b/entity/Order_entity/entityfields/copy_param/documentation.adoc
@@ -0,0 +1,2 @@
+This Param is filled after the action "new Order" is activated. It fills close to all fields with values from the order before.
+Therefor it uses a stringified JSON-Object, look up "OrderUtils.copyOrder()" for more details
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/currency/valueProcess.js b/entity/Order_entity/entityfields/currency/valueProcess.js
index 428b8d7716316722c89d40e18f3eb0593361b745..317b5ce1ed9b68979dbf953ee5b7abe78329d317 100644
--- a/entity/Order_entity/entityfields/currency/valueProcess.js
+++ b/entity/Order_entity/entityfields/currency/valueProcess.js
@@ -3,11 +3,5 @@ import("system.result");
import("system.vars");
import("KeywordRegistry_basic");
-if (vars.exists("$param.OrderCurrency_param") && vars.get("$param.OrderCurrency_param"))
-{
- result.string(vars.get("$param.OrderCurrency_param"));
-}
-else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
-{
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string($KeywordRegistry.currency$eur());
-}
diff --git a/entity/Order_entity/entityfields/date_edit/valueProcess.js b/entity/Order_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/date_new/valueProcess.js b/entity/Order_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js b/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js
deleted file mode 100644
index 10da985c56a171302f7837c593e9e4cf7f21b80a..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if (((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.get("$this.value") == null)){
-if (vars.get("$param.OrderDeliveryAddress_param"))
-{
- result.string(vars.get("$param.OrderDeliveryAddress_param"));
-}
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/deliveryterms/valueProcess.js b/entity/Order_entity/entityfields/deliveryterms/valueProcess.js
index 99fd7d0b2246eec03bd23438043c005ae5bc16c7..8e6fb1be5bc999ff98be26570bbd8ff5d5233ff1 100644
--- a/entity/Order_entity/entityfields/deliveryterms/valueProcess.js
+++ b/entity/Order_entity/entityfields/deliveryterms/valueProcess.js
@@ -9,14 +9,10 @@ import("Contact_lib");
-if (vars.get("$param.OrderDeliveryTerm_param"))
-{
- result.string(vars.get("$param.OrderDeliveryTerm_param"));
-}
-else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
{
var presetValue = "";
- var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))
+ var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));
if (contactIds.length >= 3 && contactIds[2])
{
var orgContactId = ContactUtils.getOrgContactId(contactIds[2]);
diff --git a/entity/Order_entity/entityfields/dunningdate/valueProcess.js b/entity/Order_entity/entityfields/dunningdate/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5ae1be32b21e27a07049d1388af7d1feab5f678
--- /dev/null
+++ b/entity/Order_entity/entityfields/dunningdate/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == "")
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/dunningtext/valueProcess.js b/entity/Order_entity/entityfields/dunningtext/valueProcess.js
index 6ceea69e5f317f4fc7552b6dfc10011b0510adc7..4751e50c64571d78c42b21c5afe4a1e19f179834 100644
--- a/entity/Order_entity/entityfields/dunningtext/valueProcess.js
+++ b/entity/Order_entity/entityfields/dunningtext/valueProcess.js
@@ -4,12 +4,5 @@ import("system.result");
import("system.neon");
import("Date_lib");
-
-if (vars.get("$this.value") == null){
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value")|| neon.OPERATINGSTATE_NEW ){
-
+if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || neon.OPERATINGSTATE_NEW) && vars.get("$this.value") == null)
result.string(translate.text("Please pay the outstanding amount,this is you first/second reminder."))
-}
-
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/footer/valueProcess.js b/entity/Order_entity/entityfields/footer/valueProcess.js
index 7eebbf85ccc8c260b08ab22ce6ac784275920a03..2351de155efc20f214326b6f0462709076c21edc 100644
--- a/entity/Order_entity/entityfields/footer/valueProcess.js
+++ b/entity/Order_entity/entityfields/footer/valueProcess.js
@@ -7,12 +7,7 @@ import("system.util");
if (vars.get("$this.value") == null)
{
- if (vars.exists("$param.OrderFooter_param"))
- {
- result.string(vars.get("$param.OrderFooter_param"));
- }
-
- else if(vars.get("$this.value"))
+ if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
@@ -21,9 +16,9 @@ if (vars.get("$this.value") == null)
if (vars.get("$field.ChosenTexFooter") != "")
{
var binaryId = newSelect("ID", SqlUtils.getBinariesAlias())
- .from("ASYS_BINARIES")
- .whereIfSet("ASYS_BINARIES.ROW_ID", "$field.ChosenTexFooter")
- .cell(true);
+ .from("ASYS_BINARIES")
+ .whereIfSet("ASYS_BINARIES.ROW_ID", "$field.ChosenTexFooter")
+ .cell(true);
if (binaryId)
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
diff --git a/entity/Order_entity/entityfields/fullordercode/valueProcess.js b/entity/Order_entity/entityfields/fullordercode/valueProcess.js
deleted file mode 100644
index 5a188eb0a4498a62bf5f10cb2991eb148579ea1f..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/fullordercode/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-//a fieldGroup cannot be placed in a table (filter-view) at the moment and therefore a separate field is needed:
-if(!vars.get("$field.SALESORDERCODE") && !vars.get("$field.VERSNR"))
- result.string(translate.text("Order"));
-else
- result.string(vars.get("$field.SALESORDERCODE") + "-" + vars.get("$field.VERSNR"));
diff --git a/entity/Order_entity/entityfields/header/valueProcess.js b/entity/Order_entity/entityfields/header/valueProcess.js
index 0adc1563dd309d78e547dd920956cfd87d85061d..6b045a0397ae09744e85eb23b00ce6369114ce55 100644
--- a/entity/Order_entity/entityfields/header/valueProcess.js
+++ b/entity/Order_entity/entityfields/header/valueProcess.js
@@ -7,10 +7,7 @@ import("system.util");
if (vars.get("$this.value") == null)
{
- if(vars.exists("$param.OrderHeader_param") && vars.get("$param.OrderHeader_param"))
- result.string(vars.get("$param.OrderHeader_param"));
-
- else if(vars.get("$this.value"))
+ if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
@@ -19,9 +16,9 @@ if (vars.get("$this.value") == null)
if (vars.get("$field.ChosenTexHeader") != "")
{
var binaryId = newSelect("ID", SqlUtils.getBinariesAlias())
- .from("ASYS_BINARIES")
- .whereIfSet("ASYS_BINARIES.ROW_ID", "$field.ChosenTexHeader")
- .cell(true);
+ .from("ASYS_BINARIES")
+ .whereIfSet("ASYS_BINARIES.ROW_ID", "$field.ChosenTexHeader")
+ .cell(true);
if (binaryId)
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
diff --git a/entity/Order_entity/entityfields/isolanguage/valueProcess.js b/entity/Order_entity/entityfields/isolanguage/valueProcess.js
deleted file mode 100644
index 9ce0bbebd61d58530b880b1a513baa32edd4c963..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/isolanguage/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if ((vars.get("$this.value") == null || vars.get("$this.value") == undefined)
- && vars.exists("$param.OrderLanguage_param") && vars.get("$param.OrderLanguage_param"))
-{
- result.string(vars.get("$param.OrderLanguage_param"));
-}
diff --git a/entity/Order_entity/entityfields/neworderversion/documentation.adoc b/entity/Order_entity/entityfields/neworderversion/documentation.adoc
deleted file mode 100644
index 6bbf8c93b4fab59181e46a92743a1eddd3ac0ab7..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/neworderversion/documentation.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-== NEW ORDER VERSION
-* _New order version_: All values, orderitems included, are copied and inserted in a **new order version** (versnr. + _1_).
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/neworderversion/onActionProcess.js b/entity/Order_entity/entityfields/neworderversion/onActionProcess.js
deleted file mode 100644
index 7c40ce8cdba15306b3d8fcee7d73dc1aa11ae3b9..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/neworderversion/onActionProcess.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import("system.vars");
-import("system.neon");
-import("Order_lib");
-
-var params = {
- "ContactId_param" : vars.get("$field.CONTACT_ID"),
- "ObjectType_param" : vars.get("$field.OBJECT_TYPE"),
- "ObjectRowId_param" : vars.get("$field.OBJECT_ROWID"),
- "OrderLanguage_param" : vars.get("$field.ISOLANGUAGE"),
- "OfferId_param" : vars.get("$field.OFFER_ID"),
- "OrderCode_param" : vars.get("$field.SALESORDERCODE"),
- "OrderVersnr_param" : OrderUtils.getNextOrderVersionNumber(vars.get("$field.SALESORDERCODE")),
- "OrderCurrency_param" : vars.get("$field.CURRENCY"),
- "OrderPaymentAddress_param" : vars.get("$field.PAYMENTADDRESS"),
- "OrderDeliveryAddress_param" : vars.get("$field.DELIVERYADDRESS"),
- "OrderHeader_param" : vars.get("$field.HEADER"),
- "OrderFooter_param" : vars.get("$field.FOOTER"),
- "OrderDeliveryTerm_param" : vars.get("$field.DELIVERYTERMS"),
- "OrderPaymentTerm_param" : vars.get("$field.PAYMENTTERMS"),
- "OrderDunningDate_param" : vars.get("$field.DUNNINGDATE"),
- "OrderDunningLevel_param" : vars.get("$field.DUNNINGLEVEL"),
- "OrderType_param" : vars.get("$field.ORDERTYPE"),
- "OrderCancellation_param" : vars.get("$field.CANCELLATION"),
- "OrderStatus_param" : vars.get("$field.ORDERSTATUS")
-}
-neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/object_rowid/valueProcess.js b/entity/Order_entity/entityfields/object_rowid/valueProcess.js
deleted file mode 100644
index 4be89e30a9df56a10e2e57f0ec3da1a813c5b165..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/object_rowid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
- result.string(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/object_type/valueProcess.js b/entity/Order_entity/entityfields/object_type/valueProcess.js
index 55bd8cc69a8e1aaf581a117bfa22becd8581c312..f8de4e0dc851411d870fe1bbabfd7b3247e5500c 100644
--- a/entity/Order_entity/entityfields/object_type/valueProcess.js
+++ b/entity/Order_entity/entityfields/object_type/valueProcess.js
@@ -5,11 +5,7 @@ import("Context_lib")
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
{
- if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
- {
- result.string(vars.get("$param.ObjectType_param"));
- }
- else if (vars.exists("$param.PossibleConnectionTypes") && vars.get("$param.PossibleConnectionTypes"))
+ if (vars.exists("$param.PossibleConnectionTypes") && vars.get("$param.PossibleConnectionTypes"))
{
var possible = JSON.parse(vars.getString("$param.PossibleConnectionTypes"));
if (possible.length > 0)
diff --git a/entity/Order_entity/entityfields/objects/children/contactid_param/valueProcess.js b/entity/Order_entity/entityfields/objects/children/contactid_param/valueProcess.js
index 0d0a95eccca8e1e727a25fe04a1099d583af6471..2829b047ba35ddd7cc76bfe3e1b04677ae6420b2 100644
--- a/entity/Order_entity/entityfields/objects/children/contactid_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/objects/children/contactid_param/valueProcess.js
@@ -1,14 +1,6 @@
-import("system.db");
import("system.result");
import("system.vars");
import("Contact_lib");
if (vars.get("$field.CONTACT_ID"))
-{
- var ids = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));
- if (ids.length >= 3 && ids[2]){
- result.string(db.cell("select CONTACTID from CONTACT"
-+ " join ORGANISATION on ORGANISATIONID = ORGANISATION_ID"
-+ " where ORGANISATION_ID = '" + ids[2] + "'"
-+ " and PERSON_ID is null"))}
-}
\ No newline at end of file
+ result.string(ContactUtils.getOrganisationContactId(vars.get("field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/offer_id/valueProcess.js b/entity/Order_entity/entityfields/offer_id/valueProcess.js
deleted file mode 100644
index aed6796329941efdf70888e87e642c9bfffb0154..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/offer_id/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OfferId_param"))
-{
- result.string(vars.get("$param.OfferId_param"));
-}
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/emailcommunication/children/commcategory_param/code.js b/entity/Order_entity/entityfields/order_objecttype/valueProcess.js
similarity index 53%
rename from entity/Communication_entity/entityfields/emailcommunication/children/commcategory_param/code.js
rename to entity/Order_entity/entityfields/order_objecttype/valueProcess.js
index 3612519c44ffa2f329945d4411777c6b5c22d92d..b7ce74bb791286990dc819334f15deff900c55bf 100644
--- a/entity/Communication_entity/entityfields/emailcommunication/children/commcategory_param/code.js
+++ b/entity/Order_entity/entityfields/order_objecttype/valueProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("EMAIL")
\ No newline at end of file
+result.string("Order");
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js b/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js
deleted file mode 100644
index 7e065cc1c9e17fbfa7155cf31690ea680577f12d..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-if(!vars.get("$field.SALESORDERCODE") && !vars.get("$field.VERSNR"))
- result.string(translate.text("Receipt"));
-else
- result.string(vars.getString("$field.ORDERTYPE.displayValue") + " " + vars.get("$field.SALESORDERCODE") + "-" + vars.get("$field.VERSNR"));
diff --git a/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc b/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc
deleted file mode 100644
index b50a32de3db59790cfb871c49c908778c8b43081..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc
+++ /dev/null
@@ -1 +0,0 @@
-Carries the delivery address of the receipt. Can also be set from the offer if a receipt is to be created from a specified offer.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js b/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
deleted file mode 100644
index 28676a75cab4da50168d2e44d2142abf7d8044e2..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.logging");
-import("system.vars");
-import("system.db");
-import("system.result");
-
-var salesorderid = vars.get("$field.SALESORDERID")
-if(salesorderid)
-result.string(db.cell("select ISOLANGUAGE from SALESORDER where SALESORDERID = '" + salesorderid + "'"))
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc b/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc
deleted file mode 100644
index 43cd09315c3da6da4918fff7eac2d6c0108320db..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc
+++ /dev/null
@@ -1 +0,0 @@
-Carries the main address of the receipt. Can also be set from the offer if a receipt is to be created from a specified offer.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js b/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..44cf00055adb79b0f8a573e12ded26e954c36f73
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js
@@ -0,0 +1,30 @@
+import("system.question");
+import("system.translate");
+import("system.vars");
+import("system.db");
+import("MimeType_lib");
+import("Email_lib");
+import("Sql_lib");
+
+var orderReport = {};
+var attachmentArray = [];
+var updateStatements = [["SALESORDER", ["ORDERSTATUS"], db.getColumnTypes("SALESORDER", ["ORDERSTATUS"]), ["1"], newWhere("SALESORDER.SALESORDERID", vars.get("$field.SALESORDERID")).build()]];
+var notificationMsg = translate.text("The status of the order was changed to \"sent\".");
+var contactId = vars.get("$field.CONTACT_ID");
+var orgContactId = vars.get("$field.CONTACT_ORG_ID");
+var reportData = vars.get("$field.ORDER_REPORT_DATA");
+var emailFilename = vars.get("$field.#CONTENTTITLE");
+var orderNo = emailFilename.substring(emailFilename.indexOf(" ", 0)+1, emailFilename.length);
+emailFilename = emailFilename.substring(0, emailFilename.indexOf(" ", 0));
+emailFilename = emailFilename + " " + orderNo;
+
+if (contactId == null || "")
+ contactId = orgContactId;
+
+orderReport.content = reportData;
+orderReport.mimeType = MimeTypes.PDF();
+orderReport.filename = emailFilename + ".pdf";
+
+attachmentArray[0] = orderReport;
+
+EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Order", notificationMsg, emailFilename, null, updateStatements);
diff --git a/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js b/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3411dae9c83f152623887db6ecc7ef26d12ae281
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+
+var orderStatus = vars.get("$field.ORDERSTATUS");
+var isOfferCancelled = vars.get("$field.CANCELLATION");
+
+if (orderStatus == 1 || isOfferCancelled == 1)
+ result.string(neon.COMPONENTSTATE_DISABLED);
diff --git a/entity/Order_entity/entityfields/orderstatus/valueProcess.js b/entity/Order_entity/entityfields/orderstatus/valueProcess.js
index f5ecd3b2f061a50dc0f1dd155c269806ad5b6d90..b9588e051171fbbc28133b0f78fb9a2c0f8a8a25 100644
--- a/entity/Order_entity/entityfields/orderstatus/valueProcess.js
+++ b/entity/Order_entity/entityfields/orderstatus/valueProcess.js
@@ -3,14 +3,5 @@ import("system.vars");
import("system.result");
-if (vars.get("$this.value") == null) {
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null){
- if (vars.exists("$param.OrderStatus_param") && vars.get("$param.OrderStatus_param"))
- {
- result.string(vars.get("$param.OrderStatus_param"));
- }
- else
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
result.string("0");
-}
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/ordertype/valueProcess.js b/entity/Order_entity/entityfields/ordertype/valueProcess.js
index 1a8c788d8297f9560d2707bd9795989748352d18..76d59f30bbacd605d84816370a167c6c9ce16533 100644
--- a/entity/Order_entity/entityfields/ordertype/valueProcess.js
+++ b/entity/Order_entity/entityfields/ordertype/valueProcess.js
@@ -1,23 +1,10 @@
-import("Keyword_lib");
import("KeywordRegistry_basic");
-import("AttributeRegistry_basic");
-import("system.neon");
+import("Keyword_lib");
import("system.result");
+import("system.neon");
import("system.vars");
-import("Attribute_lib");
-import("Contact_lib");
-
-if (vars.get("$this.value") == null) {
- if (vars.exists("$param.OrderType_param") && vars.get("$param.OrderType_param"))
- {
- result.string(vars.get("$param.OrderType_param"));
- }
-
- else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
- {
- result.string(KeywordUtils.getFirst($KeywordRegistry.orderType()));
- }
-}
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+ result.string(KeywordUtils.getFirst($KeywordRegistry.orderType()));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paydate/valueProcess.js b/entity/Order_entity/entityfields/paydate/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5ae1be32b21e27a07049d1388af7d1feab5f678
--- /dev/null
+++ b/entity/Order_entity/entityfields/paydate/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == "")
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paymentaddress/valueProcess.js b/entity/Order_entity/entityfields/paymentaddress/valueProcess.js
deleted file mode 100644
index 8bdbd2e1e87d26be0e3ae0eacfa0585c0fef0018..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/paymentaddress/valueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if (((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.get("$this.value") == null)){
-if (vars.get("$param.OrderPaymentAddress_param"))
-{
- result.string(vars.get("$param.OrderPaymentAddress_param"));
-}
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paymentterms/valueProcess.js b/entity/Order_entity/entityfields/paymentterms/valueProcess.js
index 7f0d5a1cab9400e5de82cdb30f175dbab3f4ed59..7501b966d14bf76fa1fc2ded5b655a8f0e3e9129 100644
--- a/entity/Order_entity/entityfields/paymentterms/valueProcess.js
+++ b/entity/Order_entity/entityfields/paymentterms/valueProcess.js
@@ -8,14 +8,10 @@ import("system.vars");
import("Attribute_lib");
if (vars.get("$this.value") == null) {
- if (vars.get("$param.OrderPaymentTerm_param"))
- {
- result.string(vars.get("$param.OrderPaymentTerm_param"));
- }
- else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
{
var presetValue = "";
- var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))
+ var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));
if (contactIds.length >= 3 && contactIds[2])
{
var orgContactId = ContactUtils.getOrgContactId(contactIds[2]);
diff --git a/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js b/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7538162cacd9d49220e1ded198b3293f6dc46564
--- /dev/null
+++ b/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js
@@ -0,0 +1,28 @@
+import("system.question");
+import("system.translate");
+import("system.vars");
+import("system.db");
+import("MimeType_lib");
+import("Email_lib");
+import("Order_lib");
+import("Sql_lib");
+
+var orderReport = {};
+var attachmentArray = [];
+var contactId = vars.get("$field.CONTACT_ID");
+var orgContactId = vars.get("$field.CONTACT_ORG_ID");
+var reportData = OrderUtils.buildReminderReport(vars.get("$field.SALESORDERID"));
+var emailFilename = vars.get("$field.#CONTENTTITLE");
+var orderNo = emailFilename.substring(emailFilename.indexOf(" ", 0)+1, emailFilename.length);
+emailFilename = translate.text("Reminder") + " " + orderNo;
+
+if (contactId == null || "")
+ contactId = orgContactId;
+
+orderReport.content = reportData;
+orderReport.mimeType = MimeTypes.PDF();
+orderReport.filename = emailFilename + ".pdf";
+
+attachmentArray[0] = orderReport;
+
+EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Order", null, emailFilename, null, null);
diff --git a/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js b/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..211643d5aad46d3202a811668c8b5ad6bd7a0771
--- /dev/null
+++ b/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+
+var isOfferCancelled = vars.get("$field.CANCELLATION");
+
+if (isOfferCancelled == 1)
+ result.string(neon.COMPONENTSTATE_DISABLED);
diff --git a/entity/Order_entity/entityfields/salesordercode/valueProcess.js b/entity/Order_entity/entityfields/salesordercode/valueProcess.js
index ccfc41b24a693aa2c8f66d86a17c544d9ff15b86..1282b4c9159166206fd88d040640e87e1e393d63 100644
--- a/entity/Order_entity/entityfields/salesordercode/valueProcess.js
+++ b/entity/Order_entity/entityfields/salesordercode/valueProcess.js
@@ -4,9 +4,4 @@ import("system.neon");
import("Order_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- if (vars.exists("$param.OrderCode_param") && vars.get("$param.OrderCode_param"))
- result.string(vars.get("$param.OrderCode_param"));
- else
- result.string(OrderUtils.getNextOrderNumber());
-}
\ No newline at end of file
+ result.string(OrderUtils.getNextOrderNumber());
diff --git a/entity/Order_entity/entityfields/unpaid/valueProcess.js b/entity/Order_entity/entityfields/unpaid/valueProcess.js
deleted file mode 100644
index 1439939a0c2a0926465ff2792b803ac15eadfb3b..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/unpaid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.eMath");
-
-result.string(eMath.subDec(
- vars.get("$field.TotalGross"),
- vars.get("$field.PAID")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/user_edit/valueProcess.js b/entity/Order_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/user_new/valueProcess.js b/entity/Order_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/versnr/documentation.adoc b/entity/Order_entity/entityfields/versnr/documentation.adoc
deleted file mode 100644
index 9a71d9a905a2007a61a64e0d7160ee6b2bb4899e..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/versnr/documentation.adoc
+++ /dev/null
@@ -1,8 +0,0 @@
-= VERSNR
-:hardbreaks:
-
-Additional to the ordercode there's a version number.
-By default it contains the value _1_.
-
-A new order version can be created over the action _newOrderVersion_.
-Then the new value is the old one incremented by _1_.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/versnr/valueProcess.js b/entity/Order_entity/entityfields/versnr/valueProcess.js
deleted file mode 100644
index 6c5f491570d2a8e1a2541beb711d11b1d6753d95..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/versnr/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-import("Offer_lib");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- if (vars.exists("$param.OrderVersnr_param") && vars.get("$param.OrderVersnr_param"))
- result.string(vars.get("$param.OrderVersnr_param"));
- else
- result.string( "1" );
-}
\ No newline at end of file
diff --git a/entity/Order_entity/imageProcess.js b/entity/Order_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ba6b878beb20872e3b49add111855229674a15c
--- /dev/null
+++ b/entity/Order_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:"+vars.get("$field.SALESORDERCODE"));
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js b/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js
deleted file mode 100644
index 65d6b67c6e0affc794a04043f264fa103f4c2ba0..0000000000000000000000000000000000000000
--- a/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("AttributeFilter_lib");
-
-var sqlCond = AttributeFilterExtensionMaker.makeFilterConditionSql();
-result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterFieldsProcess.js b/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterFieldsProcess.js
deleted file mode 100644
index 209ddd39ef4a15b1190ef2bd4955ccdc78f5808b..0000000000000000000000000000000000000000
--- a/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterFieldsProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("AttributeFilter_lib");
-
-var fields = AttributeFilterExtensionMaker.makeFilterFields();
-result.string(fields);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterValuesProcess.js b/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterValuesProcess.js
deleted file mode 100644
index 942b0a0495a179f9c25d19330bb8cd59c5563ec0..0000000000000000000000000000000000000000
--- a/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterValuesProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("AttributeFilter_lib");
-
-var values = AttributeFilterExtensionMaker.makeFilterValues();
-result.object(values);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/orderClauseProcess.js b/entity/Order_entity/recordcontainers/db/orderClauseProcess.js
index e214b63f100778e2e4761ca1a8a5a25c20e13e53..f33113e0e33a700848349964ec93665e6828f937 100644
--- a/entity/Order_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/Order_entity/recordcontainers/db/orderClauseProcess.js
@@ -2,6 +2,5 @@ import("system.result");
import("system.db");
result.object({
- "SALESORDER.SALESORDERCODE": db.DESCENDING,
- "SALESORDER.VERSNR": db.DESCENDING
+ "SALESORDER.SALESORDERCODE": db.DESCENDING
});
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/activities/filterConditionProcess.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/activities/filterConditionProcess.js
deleted file mode 100644
index 33c36a352b21b0f4dfc9c54c1a490ea4826a610a..0000000000000000000000000000000000000000
--- a/entity/Order_entity/recordcontainers/db/recordfieldmappings/activities/filterConditionProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-
-var from = "ACTIVITYLINK join ACTIVITY on ACTIVITY.ACTIVITYID = ACTIVITYLINK.ACTIVITY_ID and ACTIVITYLINK.OBJECT_TYPE = 'Order'";
-
-result.string("SALESORDERID in (select ACTIVITYLINK.OBJECT_ROWID from " + from + " where " + vars.get("$local.condition")+ ")");
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..c4de4de9387832709bf9998b04dd987da1e8d4fe
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.orderType(), "SALESORDER.ORDERTYPE"));
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/index/query.js b/entity/Order_entity/recordcontainers/index/query.js
index f0f600b464a18cfbe610b23dbd3889337d28dc15..e8aa2e80361037d578289ebf58e7c20672d08731 100644
--- a/entity/Order_entity/recordcontainers/index/query.js
+++ b/entity/Order_entity/recordcontainers/index/query.js
@@ -1,28 +1,26 @@
import("system.SQLTYPES");
import("system.result");
import("system.vars");
-import("system.calendars");
-import("system.db");
import("Sql_lib");
import("Keyword_lib");
import("KeywordRegistry_basic");
var sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("SALESORDERID " // as "_uid_"
- + ", " + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10)], " | ") // as "_title_"
- + ", " + sqlHelper.concat(["ORGANISATION.NAME"], " | ") // as "_description_"
- + ", SALESORDERCODE"
- + ", SALESORDER.CONTACT_ID"
- + ", CONTACT.ORGANISATION_ID " //as CONTACT_ORG_ID
- + ", ORGANISATION.NAME ") //as "CONTACT_ORG_ID.displayValue"
- .from("SALESORDER")
- .join("CONTACT", "SALESORDER.CONTACT_ID = CONTACTID")
- .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
- .orderBy("SALESORDERCODE");
+var querySelect = newSelect([
+ "SALESORDERID", //#UID
+ sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10)], " | "), //#TITLE
+ sqlHelper.concat(["ORGANISATION.NAME"], " | "), //#DESCRIPTION
+ "SALESORDERCODE",
+ "SALESORDER.CONTACT_ID",
+ "CONTACT.ORGANISATION_ID", //as CONTACT_ORG_ID
+ "ORGANISATION.NAME" //as "CONTACT_ORG_ID.displayValue"
+ ])
+ .from("SALESORDER")
+ .join("CONTACT", "SALESORDER.CONTACT_ID = CONTACTID")
+ .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ .orderBy("SALESORDERCODE");
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0)
-{
- querySelect.where("SALESORDER.SALESORDERID", vars.get("$local.idvalue"), SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue"))
+ querySelect.whereIfSet("SALESORDER.SALESORDERID", "$local.idvalue", SqlBuilder.IN());
result.string(querySelect.toString());
\ No newline at end of file
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 930a2fe071ad5fd57dfee877db8c8080da78ad51..888a453225876d3097dfbf65f250e8a3576e83b5 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Orderitem_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
@@ -239,6 +239,10 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Orderitem_entity/entityfields/date_edit/valueProcess.js b/entity/Orderitem_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Orderitem_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/user_edit/valueProcess.js b/entity/Orderitem_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Orderitem_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 26fe1fdb3d81b895c3116377537320ae54a77d70..d877dda51ec1f42a4f92a62a6fbd7d47d61c5d39 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Organisation_entity</name>
<description>former Org</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -7,8 +7,9 @@
<title>Company</title>
<grantDeleteProcess>%aditoprj%/entity/Organisation_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Organisation_entity/contentTitleProcess.js</contentTitleProcess>
- <onInit>%aditoprj%/entity/Organisation_entity/onInit.js</onInit>
- <afterOperatingState>%aditoprj%/entity/Organisation_entity/afterOperatingState.js</afterOperatingState>
+ <afterUiInit>%aditoprj%/entity/Organisation_entity/afterUiInit.js</afterUiInit>
+ <initFilterProcess>%aditoprj%/entity/Organisation_entity/initFilterProcess.js</initFilterProcess>
+ <useFavorites v="true" />
<iconId>VAADIN:BUILDING</iconId>
<imageProcess>%aditoprj%/entity/Organisation_entity/imageProcess.js</imageProcess>
<titlePlural>Companies</titlePlural>
@@ -111,6 +112,7 @@
</entityFieldGroup>
<entityProvider>
<name>Organisations</name>
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisations/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -143,6 +145,12 @@
<fieldName>OrganisationConsumer</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>36d6824f-8f2f-4207-9dde-60f0b8f08815</name>
+ <entityName>District_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -165,6 +173,14 @@
<name>AttributeId_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>DuplicateActionsControl_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>DuplicateCurrentContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityConsumer>
@@ -247,6 +263,7 @@
</entityConsumer>
<entityProvider>
<name>#PROVIDER</name>
+ <sortingField>NAME</sortingField>
<dependencies>
<entityDependency>
<name>1a472ca0-4d27-453c-8de5-a046b86f22fb</name>
@@ -272,6 +289,12 @@
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>271c43f9-8807-4439-9ab4-906fbf019475</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>OrganisationConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityConsumer>
@@ -607,6 +630,14 @@
<name>ExcludedContactIds_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>DuplicateActionsControl_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>DuplicateCurrentContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityParameter>
@@ -621,6 +652,7 @@
</entityParameter>
<entityProvider>
<name>WithAttribute</name>
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/withattribute/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>10480df2-f0b6-4cb6-8bfb-4a468b994996</name>
@@ -657,6 +689,14 @@
<name>ExcludedContactIds_param</name>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>DuplicateActionsControl_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>DuplicateCurrentContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityParameter>
@@ -818,11 +858,6 @@
<colorProcess>%aditoprj%/entity/Organisation_entity/entityfields/lastactivity/colorProcess.js</colorProcess>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/lastactivity/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>OpenTasks</name>
- <title>Open tasks</title>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/opentasks/valueProcess.js</valueProcess>
- </entityField>
<entityActionField>
<name>openEditDefaultsView</name>
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/documentation.adoc</documentation>
@@ -895,8 +930,8 @@
<title>Add to Bulkmail</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
<iconId>VAADIN:AT</iconId>
+ <state>EDITABLE</state>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js</stateProcess>
<tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js</tooltipProcess>
</entityActionField>
@@ -905,7 +940,6 @@
<title>Add to serial letter</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
<iconId>VAADIN:ENVELOPES</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js</stateProcess>
<tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js</tooltipProcess>
@@ -917,6 +951,7 @@
<isMenuAction v="true" />
<isObjectAction v="false" />
<iconId>NEON:EXPORT</iconId>
+ <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js</stateProcess>
<tooltip>Export fields of this table</tooltip>
<tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js</tooltipProcess>
</entityActionField>
@@ -952,8 +987,39 @@
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
<entityProvider>
- <name>SelfDuplicatesProvider</name>
+ <name>SelfDuplicates</name>
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc</documentation>
<titlePlural>Duplicates</titlePlural>
+ <children>
+ <entityParameter>
+ <name>AttributeId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeKeyId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>FilterPreSet_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrganisationType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>WithPrivate_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyOwnSupervised_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludeOrganisationsByPersonId</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>OnlyShowContactIds_param</name>
@@ -1019,7 +1085,7 @@
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
- <fieldName>SelfDuplicatesProvider</fieldName>
+ <fieldName>SelfDuplicates</fieldName>
</dependency>
<children>
<entityParameter>
@@ -1103,6 +1169,32 @@
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openlocation/onActionProcess.js</onActionProcess>
<iconId>NEON:TACKED</iconId>
</entityActionField>
+ <entityConsumer>
+ <name>Classifications</name>
+ <refreshParent v="false" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>Classification_entity</entityName>
+ <fieldName>Classifications</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ClassificationType_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowid_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/classifications/children/objecttype_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
<entityField>
<name>COUNT</name>
<title>Count</title>
@@ -1113,6 +1205,198 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
+ <entityField>
+ <name>CLASSIFICATIONSTORAGE_ID</name>
+ <title>Classification</title>
+ <groupable v="true" />
+ </entityField>
+ <entityProvider>
+ <name>OrganisationsViaIndex</name>
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisationsviaindex/documentation.adoc</documentation>
+ <recordContainer>index</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>e60b8983-166d-4280-a1a5-f990ad77eeb9</name>
+ <entityName>AroundLocation_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExcludeOrganisationsByPersonId</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeKeyId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>DuplicateActionsControl_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>DuplicateCurrentContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyOwnSupervised_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyShowContactIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrganisationType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>WithPrivate_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityActionField>
+ <name>openAroundLocation</name>
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/openaroundlocation/documentation.adoc</documentation>
+ <title>Radius Search</title>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:LOCATION_ARROW_CIRCLE_O</iconId>
+ <state>DISABLED</state>
+ <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityField>
+ <name>STANDARD_LAT</name>
+ </entityField>
+ <entityField>
+ <name>STANDARD_LON</name>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityField>
+ <name>ORGANISATION_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>indexP</name>
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/indexp/documentation.adoc</documentation>
+ <recordContainer>index</recordContainer>
+ <children>
+ <entityParameter>
+ <name>AttributeId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyShowContactIds_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>DuplicateCurrentContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludeOrganisationsByPersonId</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>FilterPreSet_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyOwnSupervised_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>WithPrivate_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrganisationType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>DistrictResponsibles</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>OrganisationResponsibles</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>OrgUid_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>FilterPreSet_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>NonselfDuplicates</name>
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>2e410b9e-5ebc-48ea-9562-da386202d7e8</name>
+ <entityName>Duplicates_entity</entityName>
+ <fieldName>DuplicateOrganisationsConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>AttributeKeyId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>DuplicateCurrentContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyShowContactIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyOwnSupervised_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityActionGroup>
+ <name>orgReportDispatch</name>
+ <children>
+ <entityActionField>
+ <name>dispatchOrgReport</name>
+ <title>Dispatch as mail</title>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <iconId>VAADIN:AT</iconId>
+ <iconIdProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js</iconIdProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1126,26 +1410,33 @@
<onDBDelete>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
- <name>5808a4a3-f2c1-4ccd-bad1-4e8a834ec7a4</name>
+ <name>f63d7d1a-118a-4cc1-9963-495f57468f8d</name>
<tableName>ORGANISATION</tableName>
<primaryKey>ORGANISATIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>5cd93c60-47e5-4eaa-90a4-69990f6a7d00</name>
+ <name>3cca93ac-fb3b-4dae-933e-0ee1e8c84260</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>23fa4717-b401-48db-92ed-285aeab71f08</name>
+ <name>c0bcece8-306a-47ac-a406-7e42014fa4d7</name>
<tableName>ADDRESS</tableName>
<primaryKey>ADDRESSID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
+ <linkInformation>
+ <name>c00213e6-4f5d-41df-a5f3-fd751a46e94b</name>
+ <tableName>CLASSIFICATIONSTORAGE</tableName>
+ <primaryKey>CLASSIFICATIONSTORAGEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
@@ -1162,13 +1453,13 @@
<name>INFO.value</name>
<recordfield>ORGANISATION.INFO</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LANGUAGE.value</name>
<recordfield>CONTACT.ISOLANGUAGE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NAME.value</name>
@@ -1192,25 +1483,25 @@
<name>STATUS.value</name>
<recordfield>CONTACT.STATUS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TYPE.value</name>
<recordfield>ORGANISATION.KIND</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_EMAIL_COMMUNICATION.displayValue</name>
<expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_PHONE_COMMUNICATION.displayValue</name>
<expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js</expression>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.displayValue</name>
@@ -1259,12 +1550,12 @@
<dbRecordFieldMapping>
<name>STANDARD_EMAIL_COMMUNICATION.value</name>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_PHONE_COMMUNICATION.value</name>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<consumerMapping>
<name>Activities</name>
@@ -1276,7 +1567,7 @@
<name>Addresses</name>
<filterConditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/addresses/filterConditionProcess.js</filterConditionProcess>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
<filtertype>BASIC</filtertype>
</consumerMapping>
<consumerMapping>
@@ -1300,7 +1591,7 @@
<name>ObjectTrees</name>
<filterConditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js</filterConditionProcess>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
<filtertype>BASIC</filtertype>
</consumerMapping>
<dbRecordFieldMapping>
@@ -1314,6 +1605,7 @@
<dbRecordFieldMapping>
<name>STANDARD_CITY.value</name>
<recordfield>ADDRESS.CITY</recordfield>
+ <isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_ZIP.value</name>
@@ -1325,8 +1617,18 @@
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
<dbRecordFieldMapping>
- <name>COUNT.value</name>
- <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
+ <name>CLASSIFICATIONSTORAGE_ID.value</name>
+ <recordfield>CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STANDARD_LAT.value</name>
+ <recordfield>ADDRESS.LAT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STANDARD_LON.value</name>
+ <recordfield>ADDRESS.LON</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
<filterExtensions>
@@ -1337,11 +1639,30 @@
<filterConditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
<filtertype>BASIC</filtertype>
</filterExtensionSet>
+ <filterExtensionSet>
+ <name>ClassificationType_filter</name>
+ <filterFieldsProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js</filterFieldsProcess>
+ <filterValuesProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js</filterValuesProcess>
+ <filterConditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js</filterConditionProcess>
+ <isGroupable v="true" />
+ <groupQueryProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js</groupQueryProcess>
+ <filtertype>BASIC</filtertype>
+ </filterExtensionSet>
+ <filterExtensionSet>
+ <name>ClassificationGroup_filter</name>
+ <filterFieldsProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js</filterFieldsProcess>
+ <filterValuesProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js</filterValuesProcess>
+ <filterConditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js</filterConditionProcess>
+ <isGroupable v="true" />
+ <groupQueryProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js</groupQueryProcess>
+ <filtertype>BASIC</filtertype>
+ </filterExtensionSet>
</filterExtensions>
</dbRecordContainer>
<indexRecordContainer>
<name>index</name>
<configMode>INDEXGROUP_DEFINITION</configMode>
+ <patternExtensionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js</patternExtensionProcess>
<indexRecordAlias>Data_alias</indexRecordAlias>
<query>%aditoprj%/entity/Organisation_entity/recordcontainers/index/query.js</query>
<affectedTables>
@@ -1352,6 +1673,18 @@
</affectedTables>
<affectedIds>%aditoprj%/entity/Organisation_entity/recordcontainers/index/affectedIds.js</affectedIds>
<indexFieldMappings>
+ <indexRecordSystemFieldMapping>
+ <name>#UID</name>
+ </indexRecordSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#TITLE</name>
+ </indexRecordMultilingualSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#DESCRIPTION</name>
+ </indexRecordMultilingualSystemFieldMapping>
+ <indexRecordSystemFieldMapping>
+ <name>#LOCATION</name>
+ </indexRecordSystemFieldMapping>
<indexRecordFieldMapping>
<name>NAME.value</name>
<indexFieldType>PROPER_NAME</indexFieldType>
@@ -1410,7 +1743,7 @@
<additionalFieldNameAliases>
<element>email</element>
</additionalFieldNameAliases>
- <isMultiValued v="true" />
+ <isMultiValued v="false" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>STANDARD_PHONE_COMMUNICATION.value</name>
@@ -1418,7 +1751,12 @@
<additionalFieldNameAliases>
<element>phone</element>
</additionalFieldNameAliases>
- <isMultiValued v="true" />
+ <isMultiValued v="false" />
+ </indexRecordFieldMapping>
+ <indexRecordFieldMapping>
+ <name>ADDRESS_ID.displayValue</name>
+ <indexFieldType>ADDRESS</indexFieldType>
+ <isGlobalSearchField v="false" />
</indexRecordFieldMapping>
</indexFieldMappings>
</indexRecordContainer>
diff --git a/entity/Organisation_entity/afterOperatingState.js b/entity/Organisation_entity/afterOperatingState.js
deleted file mode 100644
index 95c27335097d5a484f25b37e679dbc332eb8302a..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/afterOperatingState.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("Workflow_lib");
-
-if (vars.exists("$context.workflowQueue") && vars.get("$context.workflowQueue"))
-{
- WorkflowStarter.inserted(vars.get("$context.workflowQueue"));
- vars.set("$context.workflowQueue", null);
-}
\ No newline at end of file
diff --git a/entity/Organisation_entity/afterUiInit.js b/entity/Organisation_entity/afterUiInit.js
new file mode 100644
index 0000000000000000000000000000000000000000..02fda64bc9192b6709fae947090a87c36dc6c139
--- /dev/null
+++ b/entity/Organisation_entity/afterUiInit.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+import("Attribute_lib");
+
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
+}
diff --git a/entity/Organisation_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js b/entity/Organisation_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..051bc0a8272ab51e6ed2062791876bbf88fb349d
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.classificationType$organisation());
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/contract/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/contract/children/contactid_param/valueProcess.js
rename to entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
index 70a1c0fcc1293fa4bf37109294829055704eeaea..7b6137b4d105e9ba592cf8ef6e796fb838a32b09 100644
--- a/entity/Person_entity/entityfields/contract/children/contactid_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
import("system.vars");
+import("system.result");
result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js b/entity/Organisation_entity/entityfields/classifications/children/objecttype_param/valueProcess.js
similarity index 97%
rename from entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
rename to entity/Organisation_entity/entityfields/classifications/children/objecttype_param/valueProcess.js
index 5996e99db232db8df50f155732110608e5abff4e..008915f61deac19ccdd40fff81701de63eb3b6a2 100644
--- a/entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/classifications/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
-import("Context_lib");
-
+import("system.result");
+import("Context_lib");
+
result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/contacts/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/contacts/children/contactid_param/valueProcess.js
deleted file mode 100644
index 0519ecba6ea913e21689ec692e81e9e4973fbf73..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/contacts/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/contract/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/contract/children/contactid_param/valueProcess.js
rename to entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
index d723a8841f561e91a346e6eea8e86054aabaeaa1..9a2a483e4cc5785a6bf242a7494ee30c3ab9b554 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
@@ -1,6 +1,14 @@
import("Bulkmail_lib");
import("system.vars");
-import("system.neon");
-if (vars.exists("$sys.selection"))
- BulkMailUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
+var sysSelection = vars.get("$sys.selection");
+
+if(sysSelection.length > 0) //if data selected -> use selected data
+{
+ BulkMailUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
+}
+else //else -> use Filtercondition
+{
+ let sysFilter = vars.get("$sys.filter");
+ BulkMailUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
+}
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
index 1a24bf4924a99876b3bec1f9bec24fe7bed7743d..81097eaaf9c8078380bb8851862b38e18fb1abf1 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
@@ -1,9 +1,7 @@
-import("system.neon");
-import("system.neon");
-import("system.result");
-import("KeywordRegistry_basic");
+import("FilterviewMenuAction_lib");
import("system.vars");
+import("system.result");
+var contactCount = vars.get("$sys.datarowcount");
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
- result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+result.string(FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
index c9b89f86a88ad0145a75d7a744938b719fca4c3e..d2b26e842b85f3da742191e8163d45b5078e3317 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
@@ -4,18 +4,12 @@ import("Campaign_lib");
var sysSelection = vars.get("$sys.selection");
-/*
- * If there's a selection only those are ought to be added.
- * Otherwise the filter gets checked, if a filter has beed set, the condition
- * is used to determine the objects to be added.
- * If no selection has been set, all objects will be added.
- */
-if(sysSelection.length > 0) //selektierte IDs als Array
+if(sysSelection.length > 0) //if data selected -> use selected data
{
- CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), "ORGANISATION");
+ CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
}
-else
+else //else -> use Filtercondition
{
- let sysFilter = vars.get("$sys.filter");//todo change name
- CampaignUtils.addParticipantsByCondition(JSON.stringify(sysFilter), "ORGANISATION");
+ let sysFilter = vars.get("$sys.filter");
+ CampaignUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
}
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
index a4f62ede0a6fc0d8c841610e69fcace9a4213f30..98d07ed94330546f78f2e51c304d9e0faf664903 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
@@ -1,19 +1,7 @@
-import("KeywordRegistry_basic");
-import("system.db");
+import("FilterviewMenuAction_lib");
import("system.vars");
-import("system.neon");
import("system.result");
var contactCount = vars.get("$sys.datarowcount");
-if(contactCount > 0)
-{
- result.string(neon.COMPONENTSTATE_EDITABLE);
-}
-else
-{
- result.string(neon.COMPONENTSTATE_DISABLED);
-}
-
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
- result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
index 3bbd8231ed11dd2906547f569e1463e72561c9bd..dc03abb3d725bdf059ac78f6079a3c3214debd2e 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
@@ -1,6 +1,14 @@
import("Bulkmail_lib");
import("system.vars");
-import("system.neon");
-if (vars.exists("$sys.selection"))
- SerialLetterUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
+var sysSelection = vars.get("$sys.selection");
+
+if(sysSelection.length > 0) //if data selected -> use selected data
+{
+ SerialLetterUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
+}
+else //else -> use Filtercondition
+{
+ let sysFilter = vars.get("$sys.filter");
+ SerialLetterUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
index daa09139c5a6115f0f8dea868089b1293977fe97..81097eaaf9c8078380bb8851862b38e18fb1abf1 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
@@ -1,8 +1,7 @@
-import("system.neon");
-import("system.result");
-import("KeywordRegistry_basic");
+import("FilterviewMenuAction_lib");
import("system.vars");
+import("system.result");
+var contactCount = vars.get("$sys.datarowcount");
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
- result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+result.string(FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
index d33e137213bc04c9d971f030d68840ab0e9c46b4..ecad88623a921908ff07c1929560d806ff8c440d 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
@@ -1,21 +1,14 @@
-import("system.neon");
+import("ExportTemplate_lib");
import("system.vars");
var sysSelection = vars.get("$sys.selection");
-var params;
+
if(sysSelection.length > 0) //if data selected -> use selected data
{
- params = {
- "selectedData_param" : JSON.stringify(sysSelection),
- "comingFrom_param" : vars.get("$sys.currentcontextname")}
- neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+ ExportTemplateUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
}
else //else -> use Filtercondition
{
let sysFilter = vars.get("$sys.filter");
- params = {
- "selectedData_param" : JSON.stringify(sysFilter),
- "comingFrom_param" : vars.get("$sys.currentcontextname")}
- neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
-}
-
+ ExportTemplateUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..669533224153cb9af9dad27f4f82ef833db79d13
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("FilterviewMenuAction_lib");
+import("system.vars");
+
+var contactCount = vars.get("$sys.datarowcount");
+
+result.string(FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/indexp/documentation.adoc b/entity/Organisation_entity/entityfields/indexp/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..7922ff204b1664828fd0e5422eb564f5b13e32a4
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/indexp/documentation.adoc
@@ -0,0 +1,2 @@
+Indexprovider used for duplicate-pattern-config.
+//this provider is named poorly, but it's if it is changed a process is needed to update exisiting duplicate-pattern-configs.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
deleted file mode 100644
index a76a727534152d479a8b4cbef548371ef4224dc0..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectPricePolitics());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
deleted file mode 100644
index cae1ead3876117be7f9a2c2be4fcc91f3f3b5964..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectStrenght());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
deleted file mode 100644
index 9973fed72b013f63d5400a1bd09de489911df93c..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectWeakness());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc b/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..dc35980c12405163da2417e0472197dd9e3c7285
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc
@@ -0,0 +1,3 @@
+Provides organisation duplicate-records without the `Organisation_entity` scope, for example for the `Duplicates_entity`.
+
+The provider is named `NonselfDuplicates` to differentiate this provider and the `SelfDuplicates`-provider.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/openaroundlocation/documentation.adoc b/entity/Organisation_entity/entityfields/openaroundlocation/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..71a6bebdaa6896721a55e63b1489e51a555660d2
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/openaroundlocation/documentation.adoc
@@ -0,0 +1 @@
+Only available if location-data is present.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js b/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ede9b6084a4906f84887a8929adbf91028a3ad3
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js
@@ -0,0 +1,21 @@
+import("system.entities");
+import("system.vars");
+import("system.neon");
+
+var rowConfig = entities.createConfigForLoadingRows()
+ .fields(["STANDARD_LAT", "STANDARD_LON"])
+ .entity("Organisation_entity")
+ .uid(vars.get("$sys.uid"));
+var row = entities.getRow(rowConfig);
+
+//todo: use read entity and comment why (data is not loaded)
+var lat = row["STANDARD_LAT"];
+var lon = row["STANDARD_LON"];
+
+var params = {
+ OriginUid_param: vars.get("$sys.uid"),
+ LocationLat_param: lat,
+ LocationLon_param: lon
+}
+
+neon.openContext("AroundLocation", "AroundOrganisationLocation_view", null, null, params, null);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js b/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b9adad9dcc6f3d6bd52266d65651298cbada6a5b
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
@@ -0,0 +1,26 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("system.entities");
+
+var recordState = vars.get("$sys.operatingstate");
+var res = neon.COMPONENTSTATE_DISABLED;
+var uid = vars.get("$sys.uid");
+if (recordState != neon.OPERATINGSTATE_NEW && recordState != neon.OPERATINGSTATE_EDIT && uid)
+{
+ //use read entity since the lat and lon fields are not loaded by default since they are not needed otherwise
+ var rowConfig = entities.createConfigForLoadingRows()
+ .fields(["STANDARD_LAT", "STANDARD_LON"])
+ .entity(vars.get("$sys.currententityname"))
+ .uid(uid);
+ var row = entities.getRow(rowConfig);
+
+ var lat = row["STANDARD_LAT"];
+ var lon = row["STANDARD_LON"];
+
+ if (lat && lon)
+ res = neon.COMPONENTSTATE_AUTO;
+}
+
+result.string(res);
+
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/opentasks/valueProcess.js b/entity/Organisation_entity/entityfields/opentasks/valueProcess.js
deleted file mode 100644
index 496146a7378b47fc4c6dd676665f5bc8c4ee8e83..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/opentasks/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("Context_lib");
-import("ActivityTask_lib");
-import("system.result");
-
-result.string(TaskUtils.getOpenTaskCount(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/org_date_edit/valueProcess.js b/entity/Organisation_entity/entityfields/org_date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/org_date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/org_date_new/valueProcess.js b/entity/Organisation_entity/entityfields/org_date_new/valueProcess.js
deleted file mode 100644
index 408c498a4c90f59cd95eafbf74a8ea2683bab068..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/org_date_new/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
-
diff --git a/entity/Organisation_entity/entityfields/org_user_edit/valueProcess.js b/entity/Organisation_entity/entityfields/org_user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/org_user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/org_user_new/valueProcess.js b/entity/Organisation_entity/entityfields/org_user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/org_user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e359dfbd05a73d0010c8e90a0a645160e0087e4
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Organisation");
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js
index 873ef5f79898a892ef47424dc859ec922077b583..0088b85da116da628f85d01f042d4ecdf0092d62 100644
--- a/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js
@@ -1,13 +1,13 @@
-import("system.logging");
import("system.vars");
import("system.result");
import("system.neon");
import("Organisation_lib");
var presentationMode = vars.get("$sys.presentationmode");
-if (presentationMode != neon.CONTEXT_PRESENTATIONMODE_EDIT) {
- var reportData = OrgUtils.buildOrgReport(vars.get("$field.ORGANISATIONID"), vars.get("$field.CONTACTID"))
-
+var opState = vars.get("$sys.operatingstate");
+if (opState == neon.OPERATINGSTATE_VIEW && presentationMode == neon.CONTEXT_PRESENTATIONMODE_FULL )
+{
+ var reportData = OrgUtils.buildOrgReport(vars.get("$field.ORGANISATIONID"), vars.get("$field.CONTACTID"));
if (reportData != null) {
result.string(reportData[1]);
}
diff --git a/entity/Organisation_entity/entityfields/organisations/documentation.adoc b/entity/Organisation_entity/entityfields/organisations/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..69b5814ae97b11439a61bf8cff2886154f0db896
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/organisations/documentation.adoc
@@ -0,0 +1 @@
+Provides several organisation contacts for basic use cases.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisationsviaindex/documentation.adoc b/entity/Organisation_entity/entityfields/organisationsviaindex/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..3230ced75ea5dbac74798ad11d5f8474ffc3094b
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/organisationsviaindex/documentation.adoc
@@ -0,0 +1,5 @@
+Provides organisations via the index recordContainer and not the default (database) recorcContainer.
+
+WARNING: Not all Parameters are supported in the index recordContainer.
+Especially the parameters that are used for filtering.
+If these parameters are necessary they need to be implemented in the `patternExtensionProcess` of the IndexRecordContainer.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js b/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0d420de9957b538e4cf051771601c318fac5702
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+import("KeywordRegistry_basic");
+
+var orgStatus = vars.get("$field.STATUS");
+
+if (orgStatus == $KeywordRegistry.contactStatus$inactive())
+ result.string(COMPONENTSTATE_DISABLED);
diff --git a/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js b/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca54b8d0ce3503663165304eea9856fae5ff423c
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js
@@ -0,0 +1,24 @@
+import("system.logging");
+import("Organisation_lib");
+import("system.translate");
+import("system.vars");
+import("system.db");
+import("MimeType_lib");
+import("Email_lib");
+import("Order_lib");
+import("Sql_lib");
+
+var orgReport = {};
+var attachmentArray = [];
+var reportData = vars.get("$field.ORGANISATION_REPORT_DATA");
+var orgContactId = vars.get("$field.CONTACTID");
+var emailFilename = vars.get("$field.#CONTENTTITLE");
+emailFilename = translate.text("Customer Base Sheet") + " " + emailFilename;
+
+orgReport.content = reportData;
+orgReport.mimeType = MimeTypes.PDF();
+orgReport.filename = emailFilename + ".pdf";
+
+attachmentArray[0] = orgReport;
+
+EmailWritingUtils.sendReportAsMail(orgContactId, attachmentArray, "Organisation", null, emailFilename, null, null);
diff --git a/entity/Organisation_entity/entityfields/rel_date_edit/valueProcess.js b/entity/Organisation_entity/entityfields/rel_date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/rel_date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/rel_date_new/valueProcess.js b/entity/Organisation_entity/entityfields/rel_date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/rel_date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/rel_user_edit/valueProcess.js b/entity/Organisation_entity/entityfields/rel_user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/rel_user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/rel_user_new/valueProcess.js b/entity/Organisation_entity/entityfields/rel_user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/rel_user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc b/entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..396162acb9e2db72c8c1090f4fdda9eb84a95738
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc
@@ -0,0 +1 @@
+Provides organisation duplicate-records within the `Organisation_entity` scope itself.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/withattribute/documentation.adoc b/entity/Organisation_entity/entityfields/withattribute/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4b77444176abf29b2f460c1798d04e459b079dee
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/withattribute/documentation.adoc
@@ -0,0 +1,3 @@
+Provides organisation contacts where one attribute has a specific, given value.
+
+Use case: "give me all organizations where loyalty has the value high".
\ No newline at end of file
diff --git a/entity/Organisation_entity/fromClauseProcess.js b/entity/Organisation_entity/fromClauseProcess.js
deleted file mode 100644
index 866a616c6ae9a7c4b96b7afbe773a266009fbe59..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/fromClauseProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-result.string("ORGANISATION \n\
- join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)");
\ No newline at end of file
diff --git a/entity/Organisation_entity/initFilterProcess.js b/entity/Organisation_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4ceb24fc0886eb4cba97f9320889469a96558fd1
--- /dev/null
+++ b/entity/Organisation_entity/initFilterProcess.js
@@ -0,0 +1,29 @@
+import("system.neon");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("system.result");
+
+var filter = vars.get("$param.FilterPreSet_param");
+
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER && (!filter && filter != null))
+{
+ var statusInactive = $KeywordRegistry.contactStatus$inactive();
+
+ filter = {
+ type: "group",
+ operator: "AND",
+ childs: [{
+ type: "row",
+ name: "STATUS",
+ operator: "NOT_EQUAL",
+ contenttype: "TEXT",
+ key: statusInactive,
+ value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+ }]
+ };
+
+ result.string(JSON.stringify(filter));
+}
+
+result.string(filter);
\ No newline at end of file
diff --git a/entity/Organisation_entity/onInit.js b/entity/Organisation_entity/onInit.js
deleted file mode 100644
index b9717583554415c62b48c4ad8304aceb87245938..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/onInit.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-import("system.neon");
-import("system.vars");
-import("Context_lib");
-import("Attribute_lib");
-
-var statusFilterElement = {
- "type":"row",
- "name":"STATUS",
- "operator":"NOT_EQUAL",
- "key":$KeywordRegistry.contactStatus$inactive(),
- "contenttype": "TEXT"
-};
-
-statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
-
-var filter = {
- "type":"group",
- "operator":"AND",
- "childs": [statusFilterElement]
-};
-
-filter = JSON.stringify(filter);
-neon.setFilter("#ENTITY", filter);
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
-}
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef0d44ef34942a6219d4ae0f3c5cb66f34847555
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var sqlCond = ClassificationGroupFilterUtils.makeFilterConditionSql();
+
+result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f4082997e0ffed652aa150ae87c52a258d0b481c
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+//this filterExtensionSet is for the Classifications (ClassificationGroups, e.g. 1. Target Group, Customer Value...)
+var fields = ClassificationGroupFilterUtils.makeFilterFields();
+
+result.string(fields);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..447f4c037255ee7dcbeb6eb0a39007733806d71c
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var values = ClassificationGroupFilterUtils.makeFilterValues();
+result.object(values);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..768e6ca7501cdd94caba44242bd5d9f1b3c76859
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
@@ -0,0 +1,30 @@
+import("system.translate");
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+
+var isCount = vars.get("$local.count"); // TRUE if the count of the records is needed
+var columns = vars.get("$local.columnlist"); // The column, expected from the querry, see also AttributeFilter_lib
+var condition = vars.get("$local.condition"); // The Condition that's beeing used, includes the grouphirachy
+var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
+var order = vars.get("$local.order"); // The order of the result
+var name = vars.get("$local.name");
+
+var stmt = newSelect(isCount ? groupedColumns : columns)
+ .from("ORGANISATION")
+ .join("CONTACT", "ORGANISATIONID = ORGANISATION_ID and PERSON_ID is null")
+ .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID and OBJECT_TYPE = 'Organisation'")
+
+if (condition)
+{
+ condition = condition.trim();
+ if (condition)
+ stmt.where(condition);
+}
+
+if (order)
+ stmt.orderBy(order);
+
+stmt.groupBy(groupedColumns);
+stmt = stmt.toString();
+result.string(stmt);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5875efb7699dfc5aaa3b567c912990895b03eded
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var sqlCond = ClassificationTypeFilterUtils.makeFilterConditionSql();
+
+result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..eebe4d838230a9702e630d919349e7c5aceefb9f
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("ClassificationFilter_lib");
+
+//this filterExtensionSet is for the Indicators (ClassificationTypes, e.g. Industry, Loyality, Number of employees...)
+var fields = ClassificationTypeFilterUtils.getFilterFields(vars.get("$sys.currentcontextname"));
+
+result.string(fields);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..488499064a9bdd69b939b834b9a8c642bae09484
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var values = ClassificationTypeFilterUtils.makeFilterFields();
+result.object(values);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ccf8f498ce2171f22150fbf2c26e89f495ba169b
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js
@@ -0,0 +1,25 @@
+import("system.translate");
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+import("system.logging");
+
+var isCount = vars.get("$local.count"); // TRUE if the count of the records is needed
+var columns = vars.get("$local.columnlist"); // The column, expected from the querry, see also AttributeFilter_lib
+var condition = vars.get("$local.condition"); // The Condition that's beeing used, includes the grouphirachy
+var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
+var order = vars.get("$local.order"); // The order of the result
+var classificationId = vars.get("$local.name");
+classificationId = classificationId.slice(classificationId.lastIndexOf(".") + 1, classificationId.length);
+var valuefield = "''"
+var stmt = "";
+
+stmt = newSelect(isCount ? "1" : columns)
+ .from("ORGANISATION")
+ .join("CONTACT", "ORGANISATIONID = ORGANISATION_ID and PERSON_ID is null")
+ .leftJoin("CLASSIFICATION", "CLASSIFICATION.OBJECT_ROWID = CONTACT.CONTACTID and OBJECT_TYPE = 'Organisation' and CLASSIFICATION.CLASSIFICATIONTYPE_ID = '" + classificationId + "' ")
+ .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCOREID = CLASSIFICATION.CLASSIFICATIONSCORE_ID " + (condition != " " ? " WHERE " + condition : ""))
+ .groupBy(groupedColumns + (order != null && !isCount ? " ORDER BY " + order : ""))
+ .toString();
+
+result.string(stmt);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js b/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
index 81779a42ee9e845df049275fd8bdf352063e1d4a..f743fde17b2c783b6afdd3f016d19e3cef97d592 100644
--- a/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,6 +1,8 @@
import("system.result");
//ADDRESS is necessary to display standard address fast within organisation lists
+//CLASSIFICATIONSTORAGE is necessaray to make it possible to get the classifications of the organisations and making it possible to group by them
result.string("ORGANISATION \n\
join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)\n\
- left join ADDRESS on (ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID)");
\ No newline at end of file
+ left join ADDRESS on (ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID)\n\
+ left join CLASSIFICATIONSTORAGE on (CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID)");
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
index 3171f7e09c222691270b6385f8a21a03cd69fd5d..4286e03eb2abd75c156c4b4c45eda9f16f8e084e 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
@@ -15,6 +15,6 @@ new AttributeRelationQuery(contactId, null, ContextUtils.getCurrentContextId())
newWhere("COMMUNICATION.CONTACT_ID", contactId).deleteData();
newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
newWhere("COMMRESTRICTION.CONTACT_ID", contactId).deleteData();
+newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID", vars.get("$field.CONTACTID")).deleteData();
-//WorkflowStarter.deleted();
WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBInsert.js b/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
index e0e913086009646224810132ee12c3f3d0c3a3c6..434601a60b8df854ee2910909a9c22d187266dd9 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
@@ -1,5 +1,12 @@
-import("Workflow_lib");
import("system.vars");
+import("Classification_lib");
+import("Workflow_lib");
+
+
+var uid = vars.get("$sys.uid");
+var contextname = vars.get("$sys.currentcontextname");
+
+ClassificationUtils.insertEmptyClassification(uid, contextname);
//start the execution in afterOperatingState, because here the dataset is not yet inserted
vars.set("$context.workflowQueue", {});
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
index 5b073c2fbe076a21151cd89d334c914f51d8e32b..1f1a45acc4ec6c3e34db3bdba54fdfab62ad32ca 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
@@ -1,12 +1,16 @@
+import("Sql_lib");
import("system.vars");
import("Organisation_lib");
import("Communication_lib");
import("Entity_lib");
import("Workflow_lib");
+import("KeywordRegistry_basic");
// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
var rowdata = vars.get("$local.rowdata");
+var changedRows = vars.get("$local.changed");
var uid = rowdata["CONTACT.CONTACTID"];
+
FieldChanges.assimilateChangeAndDispose("$field.STANDARD_EMAIL_COMMUNICATION", function(state, value){
CommUtil.setStandardMail(uid, value);
});
@@ -15,5 +19,14 @@ FieldChanges.assimilateChangeAndDispose("$field.STANDARD_PHONE_COMMUNICATION", f
CommUtil.setStandardPhone(uid, value);
});
-WorkflowStarter.updated();
+if (changedRows.indexOf("CONTACT.STATUS") > -1
+ && rowdata["CONTACT.STATUS"] && rowdata["CONTACT.STATUS"] == $KeywordRegistry.contactStatus$inactive())
+{
+ var orgId = rowdata["ORGANISATION.ORGANISATIONID"];
+
+ newWhere("CONTACT.ORGANISATION_ID", orgId)
+ .and("CONTACT.PERSON_ID is not null")
+ .updateFields({"STATUS" : $KeywordRegistry.contactStatus$inactive()}, "CONTACT");
+}
+
WorkflowSignalSender.updated();
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js
index f20cd5000331d5b73514378d9389d8ea3c0ca9b4..0f8a38ee79cd0f0b93ce8e8a75bd1dbcb54c353d 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
import("Context_lib");
import("system.result");
import("ObjectRelation_lib");
@@ -7,4 +8,4 @@ import("ObjectRelation_lib");
var mapping = {};
mapping[ContextUtils.getCurrentContextId()] = "CONTACT.CONTACTID";
-result.string(ObjectRelationUtils.getFilterCondition(mapping).toString("1=2"));
\ No newline at end of file
+result.string(ObjectRelationUtils.getFilterCondition(mapping).toString(SqlBuilder.NORESULT_CONDITION()));
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js b/entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a8964d11609060d4990dc463b161fc0f799451e3
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js
@@ -0,0 +1,27 @@
+import("Entity_lib");
+import("system.result");
+import("system.vars");
+import("system.indexsearch");
+import("system.logging");
+
+var patternConfig = indexsearch.createPatternConfig();
+
+// filter privat company if it is not needed
+if (vars.exists("$param.WithPrivate_param") && vars.getString("$param.WithPrivate_param") != "true")
+{
+ patternConfig.not(indexsearch.createTerm("0").setIndexField("organisationid_value"));
+}
+
+ParameterUtils.handleNotEmptyEntityParam("$param.OnlyShowContactIds_param", function(pContactIds){
+ var contactIdsToFilter = JSON.parse(pContactIds);
+ var filterGroup = indexsearch.createGroupTerm();
+
+ contactIdsToFilter.forEach(function (contactId){
+ filterGroup.or(indexsearch.createTerm(contactId).setIndexField(indexsearch.FIELD_ID));
+ });
+ patternConfig.and(filterGroup);
+});
+
+var pattern = indexsearch.buildPattern(patternConfig);
+logging.log("Pattern:" + pattern);
+result.string(pattern);
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index eeb55badd15ac127cc5f9a7c8ea8b64d3d374a65..0bc707c216716ac660c5975697b5747f6622bd42 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -1,3 +1,4 @@
+import("KeywordRegistry_basic");
import("system.translate");
import("system.result");
import("system.vars");
@@ -5,6 +6,7 @@ import("system.calendars");
import("system.db");
import("Sql_lib");
import("Communication_lib");
+import("system.SQLTYPES");
/*
Before changing the results that are returned here:
@@ -12,40 +14,52 @@ Please keep in mind that some of the indexfields are used in other modules (like
You may want to check out if your change affects other modules. However adding more fields should not be a problem therefor.
*/
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-var CommMediumPhoneIds = db.array( db.COLUMN, "select KEYID from AB_KEYWORD_ENTRY join ab_keyword_attributerelation on AB_KEYWORD_ENTRYID = AB_KEYWORD_ENTRY_ID "
- + " join ab_keyword_attribute on AB_KEYWORD_ATTRIBUTEID = AB_KEYWORD_ATTRIBUTE_ID and CHAR_VALUE = 'TELEPHONE' and AB_KEYWORD_ATTRIBUTE.CONTAINER = 'CommunicationMedium'");
-sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("CONTACT.CONTACTID "
- + ", " + sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"])
- + ", " + sqlHelper.concat([
- sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
- ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
- ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
- ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
- ], " | ")
- //additional indexed fields
- + ", ORGANISATION.NAME"
- + ", ORGANISATION.ORGANISATIONID"
- + ", CONTACT.CONTACTID"
- + ", ORGANISATION.CUSTOMERCODE"
- + ", ADDRESS.ADDRESS "
- + ", ADDRESS.COUNTRY "
- + ", ADDRESS.ZIP "
- + ", ADDRESS.CITY "
- + ", COMMUNICATION.ADDR "
- + ", PHONE.ADDR "
- )
- .from("ORGANISATION")
- .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
- .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
- .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
- .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
- .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "')", "PHONE")//TODO: refactor to new SqlBuilder
+var commMediumPhoneIds = CommUtil.getMediumIdsByCategory("PHONE");
+var commMediumMailIds = CommUtil.getMediumIdsByCategory("EMAIL");
+var sqlHelper = new SqlMaskingUtils();
+var querySelect = newSelect([
+ "CONTACT.CONTACTID",
+ sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"]),
+ sqlHelper.concat([
+ sqlHelper.concat(["standardAddress.ADDRESS", "standardAddress.BUILDINGNO", "'-'"
+ ,"standardAddress.COUNTRY", "standardAddress.ZIP", "standardAddress.CITY"]),
+ sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
+ sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
+ ], " | "),
+ sqlHelper.concat([sqlHelper.cast("standardAddress.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("standardAddress.LON", SQLTYPES.VARCHAR, 16)], ","),
+ //additional indexed fields
+ "ORGANISATION.NAME",
+ sqlHelper.trim("ORGANISATION.ORGANISATIONID"),//trim to enable filter patterns like: >> -organisationid_value:0<<
+ "CONTACT.CONTACTID",
+ "ORGANISATION.CUSTOMERCODE",
+ "ADDRESS.ADDRESS",
+ "ADDRESS.COUNTRY",
+ "ADDRESS.ZIP",
+ "ADDRESS.CITY",
+ "standardEmail.ADDR",
+ "standardPhone.ADDR",
+ sqlHelper.concat([sqlHelper.concat(["standardAddress.ADDRESS", "standardAddress.BUILDINGNO"])
+ ,sqlHelper.concat(["standardAddress.COUNTRY", "standardAddress.ZIP", "standardAddress.CITY"])
+ ], " - ")
+ ])
+ .from("ORGANISATION")
+ .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
+ .leftJoin("ADDRESS", "standardAddress.ADDRESSID = CONTACT.ADDRESS_ID", "standardAddress")
+ .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
+ .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
+ //standardMail is not multi valued and can only old one value (the standard email address)
+ .leftJoin("COMMUNICATION", newWhere("standardEmail.CONTACT_ID = CONTACT.CONTACTID")
+ .and(["COMMUNICATION", "MEDIUM_ID", "standardEmail"], commMediumMailIds, SqlBuilder.IN())
+ .and(["COMMUNICATION", "ISSTANDARD", "standardEmail"], "1")
+ , "standardEmail")
+ //standardPhone is not multi valued and can only old one value (the standard phone number)
+ .leftJoin("COMMUNICATION", newWhere("standardPhone.CONTACT_ID = CONTACT.CONTACTID")
+ .and(["COMMUNICATION", "MEDIUM_ID", "standardPhone"], commMediumPhoneIds, SqlBuilder.IN())
+ .and(["COMMUNICATION", "ISSTANDARD", "standardPhone"], "1")
+ , "standardPhone")
+ .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL());
if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0)
-{
- querySelect.where("CONTACT.CONTACTID", vars.get("$local.idvalue"), SqlBuilder.IN());
-}
+ querySelect.and("CONTACT.CONTACTID", "$local.idvalue");
result.string(querySelect.toString());
diff --git a/entity/PermissionAction_entity/PermissionAction_entity.aod b/entity/PermissionAction_entity/PermissionAction_entity.aod
index 1822c16fc82e4291bce32c4651426c21de7f43c5..ff1497fcaa30b1b0ccc00ddf5a03bffa290d137f 100644
--- a/entity/PermissionAction_entity/PermissionAction_entity.aod
+++ b/entity/PermissionAction_entity/PermissionAction_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>PermissionAction_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PermissionAction_entity/documentation.adoc</documentation>
@@ -58,6 +58,10 @@
<name>FullPermissions_param</name>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
index a238832f1d236913854ff9ffa634281c3081d5ec..6fd9cfebf50492e7de30e44e050a9e60450778b5 100644
--- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+++ b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>PermissionCalendar_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PermissionCalendar_entity/documentation.adoc</documentation>
@@ -96,6 +96,7 @@
<isMenuAction v="true" />
<isObjectAction v="false" />
<isSelectionAction v="false" />
+ <iconId>VAADIN:USER</iconId>
<state>AUTO</state>
<tooltip></tooltip>
</entityActionField>
@@ -104,6 +105,7 @@
<title>Receive new Department Permission</title>
<onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactions/children/receivenewdepartmentpermissiondealteraction/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
+ <iconId>VAADIN:GROUP</iconId>
<state>AUTO</state>
</entityActionField>
</children>
@@ -172,6 +174,7 @@
<entityField>
<name>permissionDealer_rowId</name>
<title>Permission Dealer</title>
+ <valueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_rowid/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_rowid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
@@ -197,6 +200,49 @@
<name>PermissionDealer_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>permissionProcurer_User_RowId</name>
+ <title>Permission Procurer User</title>
+ <consumer>User</consumer>
+ <mandatoryProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js</onValueChange>
+ </entityField>
+ <entityActionGroup>
+ <name>AddActionsReverse</name>
+ <children>
+ <entityActionField>
+ <name>addNewUserPermissionProcurerAction</name>
+ <title>Grant new User Permission</title>
+ <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:USER</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>addNewDepartmentPermissionProcurerAction</name>
+ <title>Grant new Department Permission</title>
+ <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewdepartmentpermissionprocureraction/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:GROUP</iconId>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityField>
+ <name>permissionProcurer_Department_RowId</name>
+ <title>Permission Procurer Department</title>
+ <consumer>Departments</consumer>
+ <mandatoryProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js</onValueChange>
+ </entityField>
+ <entityParameter>
+ <name>PermissionProcurerType_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/PermissionCalendar_entity/documentation.adoc b/entity/PermissionCalendar_entity/documentation.adoc
index 74fe5d0df0a48d7408b5f9124f70fd94f5ef438d..1c79842cd4a0d40d8bb415ae413ed6eeb80f71ce 100644
--- a/entity/PermissionCalendar_entity/documentation.adoc
+++ b/entity/PermissionCalendar_entity/documentation.adoc
@@ -1,5 +1,21 @@
=PermissionCalendar_entity
-This Entity is to set Permissions for a Employee of another Employee or Department. Important is that in the `PermissionCalendarEdit_view` the `PERMISSIONPROCURER` gets Rights from the chosen `PERMISSIONDEALER`.
+This Entity is to set Permissions for a Employee or a Department of another Employee or Department.
+Important is that in the `PermissionCalendarEdit_view` the `PERMISSIONPROCURER` gets Rights from the chosen `PERMISSIONDEALER`.
-If you execute a add-Action over the own Filter-View, the current registered User is chosen as `PERMISSIONPROCURER`.
\ No newline at end of file
+If you execute a add-Action over the own of the Filter-Views, you can add a new Permission.
+
+== Consumer of the Provider
+
+if you want to integrate one of the Filter-Views, you have to set the right parameter:
+
+- If you want to show the `PermissionCalendarFilter_view`, you have to set the `PermissionDeler_param`
+- If you want to show the `PermissionCalendarFilterReverse_view`, you have to set the `PermissionProcurer_param`
+
+
+Note: Always set the whole and not the short UID of the Employee. This is need for determining the type.
+
+
+== Relational entities
+
+Employee_entity
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewdepartmentpermissionprocureraction/onActionProcess.js b/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewdepartmentpermissionprocureraction/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1d2df49b6706814050016064d6cdcc63a551f945
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewdepartmentpermissionprocureraction/onActionProcess.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("PermissionCalendar_lib");
+import("system.vars");
+import("system.neon");
+
+var params = {};
+params["PermissionProcurerType_param"] = $KeywordRegistry.permissionCalendarType$department();
+params["PermissionDealer_param"] = vars.get("$param.PermissionDealer_param");
+neon.openContext("PermissionCalendar", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js b/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f2036f9dd03482fbcad1be27e33aa8ea0b39c2ae
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("PermissionCalendar_lib");
+import("system.vars");
+import("system.neon");
+
+var params = {};
+params["PermissionProcurerType_param"] = $KeywordRegistry.permissionCalendarType$user();
+params["PermissionDealer_param"] = vars.get("$param.PermissionDealer_param");
+neon.openContext("PermissionCalendar", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/mandatoryProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/mandatoryProcess.js
index b0dd49473c7bcc91b7780c8cbf92b2c7543e27a9..ce5b287666060686b801c0c9f3f1784f16a2e9ec 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/mandatoryProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/mandatoryProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
import("system.result");
import("PermissionCalendar_lib");
-if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$department())
+if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$department()&& vars.getString("$param.PermissionProcurer_param"))
result.string(true);
else
result.string(false);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/stateProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/stateProcess.js
index 9d47dab7c47ceadfac3e9b602cd8156ef6232290..3d2ee67a3de6457a6e676e324fc9241f20059b12 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/stateProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/stateProcess.js
@@ -4,10 +4,10 @@ import("system.result");
import("PermissionCalendar_lib");
import("system.neon");
-if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$department())
+if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$department()&& vars.getString("$param.PermissionProcurer_param"))
if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string("READONLY")
+ result.string(neon.COMPONENTSTATE_READONLY)
else
- result.string("EDITABLE");
+ result.string(neon.COMPONENTSTATE_EDITABLE);
else
- result.string("INVISIBLE");
\ No newline at end of file
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_rowid/valueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_rowid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a742ec0c4cbd30eac2f6d5111aa8221db7cb1278
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_rowid/valueProcess.js
@@ -0,0 +1,8 @@
+import("Employee_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.PermissionDealer_param"))
+ result.string(EmployeeUtils.sliceUserId(vars.get("$param.PermissionDealer_param")));
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js
index c02d458db6ede7ee066f364a67745996fee3166d..1138eceb8719e0a176c8706b64a0260d43247272 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js
@@ -1,8 +1,17 @@
+import("system.neon");
+import("PermissionCalendar_lib");
import("system.result");
import("system.vars");
-let permissionDealerType = vars.get("$param.PermissionDealerType_param");
+let permissionDealerType = vars.get("$param.PermissionDealerType_param");
-if (vars.get("$this.value") == null && permissionDealerType)
- result.string(permissionDealerType);
\ No newline at end of file
+if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ if (permissionDealerType)
+ // if there would add a new Permission Dealer the Dealer Type will be handed over by the Action
+ result.string(permissionDealerType);
+ else
+ // if there would add a new Permission Procurer the Deler Type has to get
+ result.string(PermissionCalendar.getObjectType(vars.get("$param.PermissionDealer_param")));
+}
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/mandatoryProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/mandatoryProcess.js
index 20c989da57b7e91f711995280a680e661d35c514..e21c5a274d5116118bf7c8eac19ba628b466d3e3 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/mandatoryProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/mandatoryProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
import("system.result");
import("PermissionCalendar_lib");
-if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user())
+if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user() && vars.getString("$param.PermissionProcurer_param"))
result.string(true);
else
result.string(false);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js
index 6176f62e416f788ea0d62b28dfcc28c1f14759d9..e17b225d175d6dcd6978e2b416fae4b519f94f7f 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js
@@ -4,10 +4,10 @@ import("system.result");
import("PermissionCalendar_lib");
import("system.neon");
-if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user())
+if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user() && vars.getString("$param.PermissionProcurer_param"))
if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string("READONLY")
+ result.string(neon.COMPONENTSTATE_READONLY)
else
- result.string("EDITABLE");
+ result.string(neon.COMPONENTSTATE_EDITABLE);
else
- result.string("INVISIBLE");
\ No newline at end of file
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/displayValueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5a26f0a31fbf7854ef8c2fd22f90655b93bfa4b
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+
+let display = vars.get("$field.PERMISSIONPROCURER_ROWID.displayValue");
+if(display != "undefined")
+ result.string(vars.get("$field.PERMISSIONPROCURER_ROWID.displayValue"));
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/mandatoryProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6736c4a5eca0adf47347adb7db0951392aff3f6c
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/mandatoryProcess.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("PermissionCalendar_lib");
+
+if(vars.getString("$field.PERMISSIONPROCURER_TYPE") == $KeywordRegistry.permissionCalendarType$department() && vars.getString("$param.PermissionDealer_param"))
+ result.string(true);
+else
+ result.string(false);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..a10a281ce5afe63ce87eef4c182927d89f050e80
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$this.value") != null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ vars.set("$field.PERMISSIONPROCURER_ROWID", vars.get("$this.value"));
+ vars.set("$field.PERMISSIONPROCURER_TYPE", $KeywordRegistry.permissionCalendarType$department());
+}
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/stateProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..69ad9d69c792575595fb64fed74b3b0ce1bd9c2b
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/stateProcess.js
@@ -0,0 +1,13 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("PermissionCalendar_lib");
+import("system.neon");
+
+if(vars.getString("$field.PERMISSIONPROCURER_TYPE") == $KeywordRegistry.permissionCalendarType$department() && vars.getString("$param.PermissionDealer_param"))
+ if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(neon.COMPONENTSTATE_READONLY)
+ else
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_rowid/valueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_rowid/valueProcess.js
index a8593c85365db38defb230673ce11e7eebfaf361..0990ee82108b6b3f87601a2cc3e3fe8c9c2704f6 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_rowid/valueProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_rowid/valueProcess.js
@@ -4,5 +4,5 @@ import("system.neon");
import("system.vars");
-if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.PermissionProcurer_param"))
result.string(EmployeeUtils.sliceUserId(vars.get("$param.PermissionProcurer_param")));
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js
index 61f70f8df4ea2d6125cf20c9c10ef2c05fe51eb5..7d609bbc471ec12848fde99610e0f112f180d3f0 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js
@@ -1,8 +1,15 @@
+import("system.neon");
import("PermissionCalendar_lib");
-import("Employee_lib");
import("system.result");
-import("system.neon");
import("system.vars");
-if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(PermissionCalendar.getObjectType(vars.get("$param.PermissionProcurer_param")));
\ No newline at end of file
+
+let permissionProcurerType = vars.get("$param.PermissionProcurerType_param");
+
+if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ if (permissionProcurerType)
+ result.string(permissionProcurerType);
+ else
+ result.string(PermissionCalendar.getObjectType(vars.get("$param.PermissionProcurer_param")));
+}
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5a26f0a31fbf7854ef8c2fd22f90655b93bfa4b
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+
+let display = vars.get("$field.PERMISSIONPROCURER_ROWID.displayValue");
+if(display != "undefined")
+ result.string(vars.get("$field.PERMISSIONPROCURER_ROWID.displayValue"));
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/mandatoryProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c958afbcaa9dafcd96f380798f8bddd02729bef4
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/mandatoryProcess.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("PermissionCalendar_lib");
+
+if(vars.getString("$field.PERMISSIONPROCURER_TYPE") == $KeywordRegistry.permissionCalendarType$user() && vars.getString("$param.PermissionDealer_param"))
+ result.string(true);
+else
+ result.string(false);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..03e9dfdfd7c8d982cc7dbb1234319342be9e439b
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$this.value") != null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ vars.set("$field.PERMISSIONPROCURER_ROWID", vars.get("$this.value"));
+ vars.set("$field.PERMISSIONPROCURER_TYPE", $KeywordRegistry.permissionCalendarType$user());
+}
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/stateProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1af2036a8c6ed62380e7674dd32a71bc9c5bc4f7
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/stateProcess.js
@@ -0,0 +1,13 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("PermissionCalendar_lib");
+import("system.neon");
+
+if(vars.getString("$field.PERMISSIONPROCURER_TYPE") == $KeywordRegistry.permissionCalendarType$user() && vars.getString("$param.PermissionDealer_param"))
+ if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(neon.COMPONENTSTATE_READONLY)
+ else
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/recordcontainers/permissioncalendardb/conditionProcess.js b/entity/PermissionCalendar_entity/recordcontainers/permissioncalendardb/conditionProcess.js
index 80d6ae15b8e5c9b21a8d215cdce17445cb48b090..82af1af206386982e03c55e531947e9da0ff227b 100644
--- a/entity/PermissionCalendar_entity/recordcontainers/permissioncalendardb/conditionProcess.js
+++ b/entity/PermissionCalendar_entity/recordcontainers/permissioncalendardb/conditionProcess.js
@@ -9,7 +9,8 @@ let permissionDealer = vars.getString("$param.PermissionDealer_param");
var cond = new SqlBuilder();
if (permissionProcurer)
{
- cond.whereIfSet("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", EmployeeUtils.sliceUserId(permissionProcurer));
+ cond.whereIfSet("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", EmployeeUtils.sliceUserId(permissionProcurer))
+ .orIfSet("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", PermissionCalendar.getAllParents(permissionProcurer) , SqlBuilder.IN());
}
else if (permissionDealer)
{
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index 8b2a82d1248e5a526244505511c3a5150ea748fe..e18801ffb9cab3450e4dc8c5dbe77069c76add1b 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>PermissionDetail_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PermissionDetail_entity/documentation.adoc</documentation>
@@ -92,7 +92,7 @@
<entityDependency>
<name>b1a6483c-e7b1-4eb7-aa22-d0e9d0ef0b49</name>
<entityName>Role_entity</entityName>
- <fieldName>Permissions</fieldName>
+ <fieldName>TheirPermissions</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -131,11 +131,6 @@
<entityName>PermissionMetaData_entity</entityName>
<fieldName>MetaData</fieldName>
</dependency>
- <children>
- <entityParameter>
- <name>EntityName_param</name>
- </entityParameter>
- </children>
</entityConsumer>
<entityParameter>
<name>EntityTitle_param</name>
@@ -207,6 +202,10 @@
<contentType>BOOLEAN</contentType>
<stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/fullpermissions/stateProcess.js</stateProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/PermissionDetail_entity/entityfields/field/stateProcess.js b/entity/PermissionDetail_entity/entityfields/field/stateProcess.js
index d32cd4fbebf1eb7d206da2179868048a2eb4951b..fb566e889230d93c21336c8c5a5ce9305e254d9c 100644
--- a/entity/PermissionDetail_entity/entityfields/field/stateProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/field/stateProcess.js
@@ -9,14 +9,17 @@ var entity = vars.get("$field.ENTITY");
rootPermSet = PermissionUtil.getSetRoot(role, entity);
-if (rootPermSet == "") {
+if (rootPermSet == "")
+{
result.string(neon.COMPONENTSTATE_DISABLED);
-} else {
+}
+else
+{
entityStructure = project.getEntityStructure(entity);
- for (fieldname in entityStructure.fields) {
+ for (let fieldname in entityStructure.fields)
+ {
var field = entityStructure.fields[fieldname];
- if (field.usePermissions == true) {
- result.string(neon.COMPONENTSTATE_EDITABLE)
- }
+ if (field.usePermissions == true)
+ result.string(neon.COMPONENTSTATE_EDITABLE);
}
}
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
index 5d999c34f3383e588ad65a929ad035ddfde69468..af8f904bf6b375b2f4ffd304214a0879a3f6d5cf 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
@@ -22,15 +22,17 @@ var entitiesUsePermFlagSet = [];
var fieldsUsePermFlagSet = [];
// gets all names of entites and fields which have the 'usePermission'-flag set (positive list)
-for each (let entityMetaData in entitiesMetaData) {
+for (let entityMetaDataId in entitiesMetaData)
+{
+ let entityMetaData = entitiesMetaData[entityMetaDataId];
if (entityMetaData[6] == "true") {
entitiesUsePermFlagSet.push(entityMetaData[0])
entityStructure = project.getEntityStructure(entityMetaData[0]);
- for (fieldname in entityStructure.fields) {
+ for (let fieldname in entityStructure.fields)
+ {
field = entityStructure.fields[fieldname];
- if (field.usePermissions == true) {
+ if (field.usePermissions == true)
fieldsUsePermFlagSet.push(field.name);
- }
}
}
}
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index 1d94b71a3d9c35ce547075ad403745dd00dc9483..b2006b9d74a349c0fd3b27a7ceca370802b5c8d6 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>PermissionMetaData_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PermissionMetaData_entity/documentation.adoc</documentation>
@@ -85,6 +85,10 @@
<entityField>
<name>USEPERMISSION</name>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index e3dcca0f8a1a4fdda1e02d81142d3d14da009db8..70dfee92a9a3555047c7503b3f829a8ff6be0df7 100644
--- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod
+++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>PermissionOverview_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PermissionOverview_entity/documentation.adoc</documentation>
@@ -85,6 +85,10 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index cbabea32766c97f2a7d1faa4fcc2ede5fd2a3048..2cc3bad53c18a04bc9c309a28b3e2aa98ad384d7 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Person_entity</name>
<description>former Pers</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -10,9 +10,10 @@
</siblings>
<grantDeleteProcess>%aditoprj%/entity/Person_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Person_entity/contentTitleProcess.js</contentTitleProcess>
- <onInit>%aditoprj%/entity/Person_entity/onInit.js</onInit>
+ <afterUiInit>%aditoprj%/entity/Person_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Person_entity/onValidation.js</onValidation>
- <afterOperatingState>%aditoprj%/entity/Person_entity/afterOperatingState.js</afterOperatingState>
+ <initFilterProcess>%aditoprj%/entity/Person_entity/initFilterProcess.js</initFilterProcess>
+ <useFavorites v="true" />
<iconId>VAADIN:USERS</iconId>
<imageProcess>%aditoprj%/entity/Person_entity/imageProcess.js</imageProcess>
<usePermissions v="false" />
@@ -115,6 +116,7 @@
</entityField>
<entityProvider>
<name>OrganisationRelated</name>
+ <documentation>%aditoprj%/entity/Person_entity/entityfields/organisationrelated/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -137,6 +139,10 @@
<name>OnlyActive_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>DuplicateCurrentContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityField>
@@ -283,6 +289,12 @@
<fieldName>PersonConsumer</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>befbfd87-c065-4a4b-9d1e-8de8fba87302</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>PersonConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityField>
@@ -338,6 +350,7 @@
</entityFieldGroup>
<entityProvider>
<name>Contact</name>
+ <documentation>%aditoprj%/entity/Person_entity/entityfields/contact/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -365,6 +378,14 @@
<name>OnlyActive_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>DuplicateCurrentContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>DuplicateActionsControl_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityConsumer>
@@ -680,19 +701,8 @@
</entityParameter>
<entityProvider>
<name>Contacts</name>
+ <documentation>%aditoprj%/entity/Person_entity/entityfields/contacts/documentation.adoc</documentation>
<dependencies>
- <entityDependency>
- <name>e46dcd73-64a8-4b3e-b976-1b4643c54ebb</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>ContactsConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0b7a3dc8-854f-4a0b-9e1c-e6f7cd12d8f1</name>
- <entityName>DuplicatesDetails_entity</entityName>
- <fieldName>PersonsConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>c98da62f-d6b2-4ddb-9101-92e9a60abdfb</name>
<entityName>VisitPlanEmployeeWeek_entity</entityName>
@@ -727,6 +737,10 @@
<name>OnlyActive_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>DuplicateCurrentContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityConsumer>
@@ -906,7 +920,7 @@
<dependency>
<name>dependency</name>
<entityName>Person_entity</entityName>
- <fieldName>SelfDuplicatesProvider</fieldName>
+ <fieldName>SelfDuplicates</fieldName>
</dependency>
<children>
<entityParameter>
@@ -954,6 +968,7 @@
</entityField>
<entityProvider>
<name>QuickEntryContacts</name>
+ <documentation>%aditoprj%/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc</documentation>
<titlePlural>Additional Contacts</titlePlural>
<dependencies>
<entityDependency>
@@ -976,6 +991,14 @@
<name>OnlyActive_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>DuplicateActionsControl_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>DuplicateCurrentContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityActionField>
@@ -1038,7 +1061,6 @@
<title>Add to Bulkmail</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
<iconId>VAADIN:AT</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js</stateProcess>
<tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js</tooltipProcess>
@@ -1047,8 +1069,8 @@
<name>addToSerialLetter</name>
<title>Add to serial letter</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
<isObjectAction v="false" />
- <isSelectionAction v="true" />
<iconId>VAADIN:ENVELOPES</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js</stateProcess>
<tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js</tooltipProcess>
@@ -1059,6 +1081,7 @@
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<iconId>NEON:EXPORT</iconId>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js</stateProcess>
<tooltip>Export fields of this table</tooltip>
<tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js</tooltipProcess>
</entityActionField>
@@ -1133,11 +1156,6 @@
<iconId>VAADIN:ENVELOPE</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/newletter/stateProcess.js</stateProcess>
</entityActionField>
- <entityActionField>
- <name>openTaskView</name>
- <isMenuAction v="false" />
- <isObjectAction v="false" />
- </entityActionField>
<entityActionField>
<name>startWorkflow</name>
<title>Start workflow</title>
@@ -1156,25 +1174,10 @@
<name>OnlyShowContactIds_param</name>
<expose v="true" />
</entityParameter>
- <entityConsumer>
- <name>SelfDuplicates</name>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>SelfDuplicatesProvider</fieldName>
- </dependency>
- </entityConsumer>
<entityProvider>
- <name>SelfDuplicatesProvider</name>
+ <name>SelfDuplicates</name>
+ <documentation>%aditoprj%/entity/Person_entity/entityfields/selfduplicates/documentation.adoc</documentation>
<titlePlural>Duplicates</titlePlural>
- <dependencies>
- <entityDependency>
- <name>f6d16008-1764-4920-8ea5-c95c6a67f508</name>
- <entityName>Person_entity</entityName>
- <fieldName>SelfDuplicates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>OnlyShowContactIds_param</name>
@@ -1184,6 +1187,18 @@
<name>OnlyActive_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>OrgId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyOwnSupervised_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityField>
@@ -1223,6 +1238,7 @@
</entityActionField>
<entityProvider>
<name>IdFilteredActiveContacts</name>
+ <documentation>%aditoprj%/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>511f3e4c-7493-4a31-a136-0ba80ba2ec85</name>
@@ -1276,6 +1292,73 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
+ <entityProvider>
+ <name>indexP</name>
+ <documentation>%aditoprj%/entity/Person_entity/entityfields/indexp/documentation.adoc</documentation>
+ <recordContainer>index</recordContainer>
+ <children>
+ <entityParameter>
+ <name>DuplicateActionsControl_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>PERSON_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/person_objecttype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityConsumer>
+ <name>Districts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>District_entity</entityName>
+ <fieldName>ResponsibleDistricts</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DistrictsByContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>NonselfDuplicates</name>
+ <documentation>%aditoprj%/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>3a4352e2-9686-4c52-9d01-dbfad8c68ea7</name>
+ <entityName>Duplicates_entity</entityName>
+ <fieldName>DuplicatePersonsConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>DuplicateCurrentContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyShowContactIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrgId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyOwnSupervised_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1326,7 +1409,7 @@
<name>DATEOFBIRTH.value</name>
<recordfield>PERSON.DATEOFBIRTH</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>FIRSTNAME.value</name>
@@ -1338,13 +1421,13 @@
<name>GENDER.value</name>
<recordfield>PERSON.GENDER</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LANGUAGE.value</name>
<recordfield>CONTACT.ISOLANGUAGE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_ID.value</name>
@@ -1360,7 +1443,7 @@
<name>MIDDLENAME.value</name>
<recordfield>PERSON.MIDDLENAME</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACTID.value</name>
@@ -1370,13 +1453,13 @@
<name>SALUTATION.value</name>
<recordfield>PERSON.SALUTATION</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TITLE.value</name>
<recordfield>PERSON.TITLE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TITLESUFFIX.value</name>
@@ -1420,25 +1503,25 @@
<name>STATUS.value</name>
<recordfield>CONTACT.STATUS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>POSITION.value</name>
<recordfield>CONTACT.CONTACTPOSITION</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DEPARTMENT.value</name>
<recordfield>CONTACT.DEPARTMENT</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACTROLE.value</name>
<recordfield>CONTACT.CONTACTROLE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORGANISATION_NAME.value</name>
@@ -1480,18 +1563,18 @@
<dbRecordFieldMapping>
<name>STANDARD_EMAIL_COMMUNICATION.value</name>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_PHONE_COMMUNICATION.value</name>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<consumerMapping>
<name>Organisations</name>
<filterConditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js</filterConditionProcess>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
<filtertype>BASIC</filtertype>
</consumerMapping>
<consumerMapping>
@@ -1508,14 +1591,14 @@
<name>PersAddresses</name>
<filterConditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/persaddresses/filterConditionProcess.js</filterConditionProcess>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
<filtertype>BASIC</filtertype>
</consumerMapping>
<consumerMapping>
<name>Communications</name>
<filterConditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/communications/filterConditionProcess.js</filterConditionProcess>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
<filtertype>BASIC</filtertype>
</consumerMapping>
<dbRecordFieldMapping>
@@ -1526,7 +1609,7 @@
<name>ObjectTrees</name>
<filterConditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js</filterConditionProcess>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
<filtertype>BASIC</filtertype>
</consumerMapping>
<dbRecordFieldMapping>
@@ -1566,10 +1649,6 @@
<recordfield>PERSON.PERSONID</recordfield>
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
- <dbRecordFieldMapping>
- <name>COUNT.value</name>
- <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
- </dbRecordFieldMapping>
</recordFieldMappings>
<filterExtensions>
<filterExtensionSet>
@@ -1595,6 +1674,15 @@
</affectedTables>
<affectedIds>%aditoprj%/entity/Person_entity/recordcontainers/index/affectedIds.js</affectedIds>
<indexFieldMappings>
+ <indexRecordSystemFieldMapping>
+ <name>#UID</name>
+ </indexRecordSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#TITLE</name>
+ </indexRecordMultilingualSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#DESCRIPTION</name>
+ </indexRecordMultilingualSystemFieldMapping>
<indexRecordFieldMapping>
<name>CONTACTID.value</name>
<indexFieldType>STRING</indexFieldType>
diff --git a/entity/Person_entity/afterOperatingState.js b/entity/Person_entity/afterOperatingState.js
deleted file mode 100644
index 95c27335097d5a484f25b37e679dbc332eb8302a..0000000000000000000000000000000000000000
--- a/entity/Person_entity/afterOperatingState.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("Workflow_lib");
-
-if (vars.exists("$context.workflowQueue") && vars.get("$context.workflowQueue"))
-{
- WorkflowStarter.inserted(vars.get("$context.workflowQueue"));
- vars.set("$context.workflowQueue", null);
-}
\ No newline at end of file
diff --git a/entity/Person_entity/afterUiInit.js b/entity/Person_entity/afterUiInit.js
new file mode 100644
index 0000000000000000000000000000000000000000..8ef43c0a2e8d5c5b74624b60e1024210c4794092
--- /dev/null
+++ b/entity/Person_entity/afterUiInit.js
@@ -0,0 +1,9 @@
+import("Context_lib");
+import("Attribute_lib");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
+}
diff --git a/entity/Person_entity/conditionProcess.js b/entity/Person_entity/conditionProcess.js
deleted file mode 100644
index 788e9d568184651faaeafd86739f620cb5e7d224..0000000000000000000000000000000000000000
--- a/entity/Person_entity/conditionProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.result");
-import("Sql_lib");
-
-var cond = newWhere()
- .andIfSet("CONTACT.ORGANISATION_ID", "$param.OrgId_param")
- .andIfSet("PERSON.CONTACT_ID", "$param.ContactId_param");
-
-//TODO; add OBJECT_ID (probably another param)
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/stateProcess.js b/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/stateProcess.js
deleted file mode 100644
index 97f11bcc36325116cb384cd7ffd6e3fc8b537061..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/stateProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-var isInactive = vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive() ? true : false;
-
-if (isInactive)
- result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js b/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js
deleted file mode 100644
index de48bf8c672f09224d17ea648e12c3c8c656ca70..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("system.db");
-import("system.vars");
-import("system.neon");
-import("system.result");
-import("KeywordRegistry_basic");
-
-
-var contactCount = vars.get("$sys.datarowcount")
-var isInactive = vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive() ? true : false;
-
-if (contactCount <= 0 || isInactive)
- result.string(neon.COMPONENTSTATE_DISABLED);
-else
- result.string(neon.COMPONENTSTATE_EDITABLE);
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/stateProcess.js b/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/stateProcess.js
deleted file mode 100644
index 97f11bcc36325116cb384cd7ffd6e3fc8b537061..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/stateProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-var isInactive = vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive() ? true : false;
-
-if (isInactive)
- result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/contact/documentation.adoc b/entity/Person_entity/entityfields/contact/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e289ce718031c5d07bee51e625d4e1d1102b5a99
--- /dev/null
+++ b/entity/Person_entity/entityfields/contact/documentation.adoc
@@ -0,0 +1 @@
+Provides excactly one or none person contact.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/contacts/documentation.adoc b/entity/Person_entity/entityfields/contacts/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..ee825691906f33196684266c31015c9e11d7bee3
--- /dev/null
+++ b/entity/Person_entity/entityfields/contacts/documentation.adoc
@@ -0,0 +1 @@
+Provides several person contacts.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js b/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e32550b2a4545aad0e9ae8c08bcc5ee36bbda80a
--- /dev/null
+++ b/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("Employee_lib");
+
+var contactId = vars.get("$field.CONTACTID");
+if (EmployeeUtils.isUser(contactId))
+{
+ result.string(contactId);
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
index d723a8841f561e91a346e6eea8e86054aabaeaa1..ead03187df10951374645e8b1c8a7515b27f1a76 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
@@ -1,6 +1,14 @@
import("Bulkmail_lib");
import("system.vars");
-import("system.neon");
-if (vars.exists("$sys.selection"))
- BulkMailUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
+var sysSelection = vars.get("$sys.selection");
+
+if(sysSelection.length > 0) //if data selected -> use selected data
+{
+ BulkMailUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
+}
+else //else -> use Filtercondition
+{
+ let sysFilter = vars.get("$sys.filter");
+ BulkMailUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
index 92f584818ad1fcff6775adf3c9ef1acd2e807151..98d07ed94330546f78f2e51c304d9e0faf664903 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
@@ -1,8 +1,7 @@
+import("FilterviewMenuAction_lib");
import("system.vars");
-import("system.neon");
import("system.result");
-import("system.result");
-import("KeywordRegistry_basic");
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
- result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+var contactCount = vars.get("$sys.datarowcount");
+
+FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
index 5306ab46adf627dedf15b3c578162ed6720f8fed..dec741db1e10a5a36746e87da2b3496c02665940 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
@@ -2,20 +2,14 @@ import("system.vars");
import("system.neon");
import("Campaign_lib");
-/*
- * If there's a selection only those are ought to be added.
- * Otherwise the filter gets checked, if a filter has beed set, the condition
- * is used to determine the objects to be added.
- * If no selection has been set, all objects will be added.
- */
var sysSelection = vars.get("$sys.selection");
-if(sysSelection.length > 0) //selektierte IDs als Array
+if(sysSelection.length > 0) //if data selected -> use selected data
{
- CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), "PERSON");
+ CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
}
-else
+else //else -> use Filtercondition
{
let sysFilter = vars.get("$sys.filter");//todo change name
- CampaignUtils.addParticipantsByCondition(JSON.stringify(sysFilter), "PERSON");
+ CampaignUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
index 1692669f6caf7db43e9f24decb3fcbfeb3c62993..98d07ed94330546f78f2e51c304d9e0faf664903 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
@@ -1,19 +1,7 @@
-import("KeywordRegistry_basic");
-import("system.db");
+import("FilterviewMenuAction_lib");
import("system.vars");
-import("system.neon");
import("system.result");
-var contactCount = vars.get("$sys.datarowcount")
+var contactCount = vars.get("$sys.datarowcount");
-if(contactCount > 0)
-{
- result.string(neon.COMPONENTSTATE_EDITABLE);
-}
-else
-{
- result.string(neon.COMPONENTSTATE_DISABLED);
-}
-
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
- result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
index 3bbd8231ed11dd2906547f569e1463e72561c9bd..dc03abb3d725bdf059ac78f6079a3c3214debd2e 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
@@ -1,6 +1,14 @@
import("Bulkmail_lib");
import("system.vars");
-import("system.neon");
-if (vars.exists("$sys.selection"))
- SerialLetterUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
+var sysSelection = vars.get("$sys.selection");
+
+if(sysSelection.length > 0) //if data selected -> use selected data
+{
+ SerialLetterUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
+}
+else //else -> use Filtercondition
+{
+ let sysFilter = vars.get("$sys.filter");
+ SerialLetterUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
index 0712af69970fdab78181f33195515067e0003949..98d07ed94330546f78f2e51c304d9e0faf664903 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
@@ -1,7 +1,7 @@
-import("system.neon");
+import("FilterviewMenuAction_lib");
import("system.vars");
import("system.result");
-import("KeywordRegistry_basic");
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
- result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+var contactCount = vars.get("$sys.datarowcount");
+
+FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
index 2ad35007ff37100b2d33ffa1443d026442cb976e..ecad88623a921908ff07c1929560d806ff8c440d 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
@@ -1,20 +1,14 @@
-import("system.neon");
+import("ExportTemplate_lib");
import("system.vars");
var sysSelection = vars.get("$sys.selection");
-var params;
+
if(sysSelection.length > 0) //if data selected -> use selected data
{
- params = {
- "selectedData_param" : JSON.stringify(sysSelection),
- "comingFrom_param" : vars.get("$sys.currentcontextname")}
- neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+ ExportTemplateUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
}
else //else -> use Filtercondition
{
- var sysFilter = vars.get("$sys.filter");
- params = {
- "selectedData_param" : JSON.stringify(sysFilter),
- "comingFrom_param" : vars.get("$sys.currentcontextname")}
- neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+ let sysFilter = vars.get("$sys.filter");
+ ExportTemplateUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..98d07ed94330546f78f2e51c304d9e0faf664903
--- /dev/null
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
@@ -0,0 +1,7 @@
+import("FilterviewMenuAction_lib");
+import("system.vars");
+import("system.result");
+
+var contactCount = vars.get("$sys.datarowcount");
+
+FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc b/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d9bacf98343c207f38487a774be4c8361470bd3f
--- /dev/null
+++ b/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc
@@ -0,0 +1,3 @@
+Provides person contacts that are active (default) and excludes contacts with given IDs.
+
+This is useful for lists where person contacts can be chosen only once.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/indexp/documentation.adoc b/entity/Person_entity/entityfields/indexp/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..7922ff204b1664828fd0e5422eb564f5b13e32a4
--- /dev/null
+++ b/entity/Person_entity/entityfields/indexp/documentation.adoc
@@ -0,0 +1,2 @@
+Indexprovider used for duplicate-pattern-config.
+//this provider is named poorly, but it's if it is changed a process is needed to update exisiting duplicate-pattern-configs.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/newtask/stateProcess.js b/entity/Person_entity/entityfields/newtask/stateProcess.js
deleted file mode 100644
index aefbc6e8f76f99c4281890f3461553c49562d5b9..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/newtask/stateProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
- result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc b/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d7964dadc0c8a8c7d5ea6856c3b82d07ccbcc361
--- /dev/null
+++ b/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc
@@ -0,0 +1,3 @@
+Provides contact duplicate-records without the `Person_entity` scope, for example for the `Duplicates_entity`.
+
+The provider is named `NonselfDuplicates` to differentiate this provider and the `SelfDuplicates`-provider.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/organisationrelated/documentation.adoc b/entity/Person_entity/entityfields/organisationrelated/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d3ad0acc86fc948d76e1983846d1e3cbdfc93899
--- /dev/null
+++ b/entity/Person_entity/entityfields/organisationrelated/documentation.adoc
@@ -0,0 +1 @@
+Provides person contacts for one specific (given) organisation.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/person_objecttype/valueProcess.js b/entity/Person_entity/entityfields/person_objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2117b3614a5aeaca466ac6119e4ec979d928d4c5
--- /dev/null
+++ b/entity/Person_entity/entityfields/person_objecttype/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+
+result.string("Person");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc b/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e512d6ef8e14a2e1fbeec41e4ff9b53bf3051f61
--- /dev/null
+++ b/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc
@@ -0,0 +1,3 @@
+Provides the `Person_entity` for the Quickinsert-use-case:
+
+The `Quickinsert_entity` is only used to create new records, not to update, delete or show them.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/selfduplicates/documentation.adoc b/entity/Person_entity/entityfields/selfduplicates/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4f02d8b1a256bb4d0a791bab46cf0cda23790c84
--- /dev/null
+++ b/entity/Person_entity/entityfields/selfduplicates/documentation.adoc
@@ -0,0 +1 @@
+Provides contact duplicate-records within the `Person_entity` scope itself.
\ No newline at end of file
diff --git a/entity/Person_entity/fromClauseProcess.js b/entity/Person_entity/fromClauseProcess.js
deleted file mode 100644
index bea9bd3897f01eb07fe79bc7d953770d17b0a88e..0000000000000000000000000000000000000000
--- a/entity/Person_entity/fromClauseProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string("PERSON \n\
- join CONTACT on (CONTACT.PERSON_ID = PERSON.PERSONID) \n\
- join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID) ");
\ No newline at end of file
diff --git a/entity/Person_entity/grantDeleteProcess.js b/entity/Person_entity/grantDeleteProcess.js
index 7b130d228f43287df7b16ee2f16acc9f7f43c009..88573c89e81ef582b5950cb216a6449152212166 100644
--- a/entity/Person_entity/grantDeleteProcess.js
+++ b/entity/Person_entity/grantDeleteProcess.js
@@ -1,20 +1,36 @@
+import("Sql_lib");
import("Entity_lib");
import("Employee_lib");
import("Context_lib");
import("system.vars");
import("system.result");
-var contactId = vars.get("$field.CONTACTID");
-var currentContext = ContextUtils.getCurrentContextId();
+var canDelete = false;
+var personId = vars.get("$field.PERSONID");
+var personCount = newSelect("count(*)")
+ .from("CONTACT")
+ .join("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+ .where("PERSON.PERSONID", personId)
+ .cell();
+//only delete when the contact doesnt have any functions, because that would currently lead to the person and all his functions being deleted,
+// since there is only one person contact behind all the contacts.
+//ToDo: come back to this and implement the solution for deleting a function (#1059167) once it'S decided how that's being implemented
+if(personCount == 1)
+{
+ var contactId = vars.get("$field.CONTACTID");
+ var currentContext = ContextUtils.getCurrentContextId();
-var canDelete = new HasLinkedObjectTester()
- .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : contactId}) //Activities
- .andNoEntityRows("Task_entity", "Tasks", {ObjectId_param : currentContext, RowId_param : contactId}) //Tasks
- .andNoEntityRows("Document_entity", "Documents", {AssignmentTable_param : "CONTACT", AssignmentRowId_param : contactId}) //Documents
- .and(function () {return !EmployeeUtils.isUser(contactId);})
- .andNoEntityRows("Offer_entity", "ContactOffers", {ContactId_param : contactId}) //Offers
- .andNoEntityRows("Contract_entity", "Contracts", {ContactId_param : contactId}) //Contracts
- .andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : JSON.stringify([contactId, vars.get("$field.PERSON_ID")]), ObjectTypes_param : JSON.stringify([currentContext, "PrivatePerson"])})
- .validate();
+ canDelete = new HasLinkedObjectTester()
+ .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : contactId}) //Activities
+ .andNoEntityRows("Task_entity", "Tasks", {ObjectId_param : currentContext, RowId_param : contactId}) //Tasks
+ .andNoEntityRows("Document_entity", "Documents", {AssignmentTable_param : "CONTACT", AssignmentRowId_param : contactId}) //Documents
+ .and(function () {return !EmployeeUtils.isUser(contactId);})
+ .andNoEntityRows("Offer_entity", "ContactOffers", {ContactId_param : contactId}) //Offers
+ .andNoEntityRows("Contract_entity", "Contracts", {ContactId_param : contactId}) //Contracts
+ .andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : JSON.stringify([contactId, vars.get("$field.PERSON_ID")]), ObjectTypes_param : JSON.stringify([currentContext, "PrivatePerson"])})
+ .validate();
+}
+else if (personCount == 0) //special case in QuickEntry where it should be possible to remove a new Person that is not saved in the db yet
+ canDelete = true;
result.string(canDelete);
diff --git a/entity/Person_entity/initFilterProcess.js b/entity/Person_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c30d06ea24f7a12f1a5dfdec27fcf47948a78dc9
--- /dev/null
+++ b/entity/Person_entity/initFilterProcess.js
@@ -0,0 +1,24 @@
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
+{
+ var statusInactive = $KeywordRegistry.contactStatus$inactive();
+ var filter = {
+ type: "group",
+ operator: "AND",
+ childs: [{
+ type: "row",
+ name: "STATUS",
+ operator: "NOT_EQUAL",
+ contenttype: "TEXT",
+ key: statusInactive,
+ value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+ }]
+ };
+
+ result.string(JSON.stringify(filter));
+}
\ No newline at end of file
diff --git a/entity/Person_entity/onInit.js b/entity/Person_entity/onInit.js
deleted file mode 100644
index 1958e327f289481afe51088aa62d5d57af3a782f..0000000000000000000000000000000000000000
--- a/entity/Person_entity/onInit.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-import("system.neon");
-import("system.vars");
-import("Context_lib");
-import("Attribute_lib");
-
-var statusFilterElement = {
- "type":"row",
- "name":"STATUS",
- "operator":"NOT_EQUAL",
- "key":$KeywordRegistry.contactStatus$inactive(),
- "contenttype": "TEXT"
-};
-
-statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
-
-var filter = {
- "type":"group",
- "operator":"AND",
- "childs": [statusFilterElement]
-};
-
-filter = JSON.stringify(filter);
-neon.setFilter("#ENTITY", filter);
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
-}
diff --git a/entity/Person_entity/recordcontainers/db/conditionProcess.js b/entity/Person_entity/recordcontainers/db/conditionProcess.js
index 96a93d2ddef53d2c42ac1e41124aeeb5987e0531..105cede4033ebdd5e3892b002dc5e2545ea28f7f 100644
--- a/entity/Person_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/conditionProcess.js
@@ -24,15 +24,9 @@ if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedC
var onlyShowContactIds = JSON.parse(vars.get("$param.OnlyShowContactIds_param"));
-if(onlyShowContactIds != null && onlyShowContactIds.length > 0)
+if (onlyShowContactIds != null && onlyShowContactIds.length > 0)
{
- let additionalCondition = newWhere();
- onlyShowContactIds.forEach(function(pContactId)
- {
- additionalCondition.or("CONTACT.CONTACTID", pContactId);
- });
- cond.and(additionalCondition);
- alternativeCondition = "1 = 2";
+ cond.and("CONTACT.CONTACTID", onlyShowContactIds, SqlBuilder.IN());
}
if (vars.exists("$param.OnlyOwnSupervised_param") && vars.get("$param.OnlyOwnSupervised_param") == "true")
diff --git a/entity/Person_entity/recordcontainers/db/onDBDelete.js b/entity/Person_entity/recordcontainers/db/onDBDelete.js
index 62d6a3e6da2cfc9c3e4f1db29b01d5c9ce9b0d15..c6f452b97cadd9aa9ab20a4f13e1c2ec9319546b 100644
--- a/entity/Person_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Person_entity/recordcontainers/db/onDBDelete.js
@@ -15,5 +15,4 @@ newWhere("COMMUNICATION.CONTACT_ID", contactId).deleteData();
newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
newWhere("COMMRESTRICTION.CONTACT_ID", contactId).deleteData();
-//WorkflowStarter.deleted();
WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/onDBInsert.js b/entity/Person_entity/recordcontainers/db/onDBInsert.js
index 650231513d93c21ad7db06a68f49f091e941af48..b0ba83b53273ba878317b0ee3c0982d6623eff36 100644
--- a/entity/Person_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Person_entity/recordcontainers/db/onDBInsert.js
@@ -9,8 +9,6 @@ import("system.vars");
let contactId = vars.get("$local.uid");
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(contactId);
-//start the execution in afterOperatingState, because here the dataset is not yet inserted
-vars.set("$context.workflowQueue", {});
WorkflowSignalSender.inserted();
//let valuesToCheck = {};
diff --git a/entity/Person_entity/recordcontainers/db/onDBUpdate.js b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
index 4268b8a01770b2026a28ea01d6606fb743b1e64b..b6e1ccbb97bd3d8336823449a8e445865f78114c 100644
--- a/entity/Person_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
@@ -1,12 +1,52 @@
+import("Sql_lib");
import("Workflow_lib");
import("DataPrivacy_lib");
import("system.tools");
+import("system.neon");
import("system.vars");
import("Person_lib");
import("Communication_lib");
import("Entity_lib");
import("StandardObject_lib");
+var localChanged = vars.get("$local.changed");
+var orgChanged = false;
+for (var i = 0; i < localChanged.length; i++) {
+ if(localChanged[i] == "CONTACT.ORGANISATION_ID")
+ {
+ orgChanged = true;
+ break;
+ }
+}
+
+if(orgChanged)
+{
+ var orgAddressId = newSelect("CONTACT.ADDRESS_ID")
+ .from("CONTACT")
+ .where("CONTACT.ORGANISATION_ID", vars.get("$field.ORGANISATION_ID"))
+ .and("CONTACT.PERSON_ID is null")
+ .cell();
+
+ var addressId = vars.get("$field.ADDRESS_ID");
+
+ if(addressId != orgAddressId) //update standard address if the the organisation changed
+ {
+ var persAddress = newSelect("ADDRESS.ADDRESSID")
+ .from("ADDRESS")
+ .where("ADDRESS.CONTACT_ID", vars.get("$field.CONTACTID"))
+ .and("ADDRESS.ADDRESSID", addressId)
+ .cell();
+
+ if(!persAddress) // only when the standard address is from the organisation
+ {
+ var standardAddressId = new StandardObject("Address", null, "Person", vars.get("$field.PERSONID"))
+ .onPersonValueChange(vars.get("$field.ORGANISATION_ID"));
+
+ neon.setFieldValue("$field.ADDRESS_ID", standardAddressId);
+ }
+ }
+}
+
var rowdata = vars.get("$local.rowdata");
// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
var uid = rowdata["CONTACT.CONTACTID"];
@@ -24,7 +64,7 @@ new StandardObject("Address", rowdata["CONTACT.ADDRESS_ID"], "Person", uid)
var updates = [];
// update user object if name changed
-vars.get("$local.changed").forEach(function(fieldName)
+localChanged.forEach(function(fieldName)
{
var nameProp = tools.LASTNAME;
switch (fieldName) {
@@ -43,5 +83,4 @@ vars.get("$local.changed").forEach(function(fieldName)
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(uid);
-WorkflowStarter.updated();
WorkflowSignalSender.updated();
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js
index 60242965b3b74a56854008a2ed0973bc8a6428e7..4516eb7b9b3f6d4413c3f214a644245db68fafbf 100644
--- a/entity/Person_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
import("Context_lib");
import("system.result");
import("ObjectRelation_lib");
@@ -8,4 +9,4 @@ var mapping = {};
mapping[ContextUtils.getCurrentContextId()] = "CONTACT.CONTACTID";
mapping["PrivatePerson"] = "CONTACT.PERSON_ID";
-result.string(ObjectRelationUtils.getFilterCondition(mapping).toString("1=2"));
\ No newline at end of file
+result.string(ObjectRelationUtils.getFilterCondition(mapping).toString(SqlBuilder.NORESULT_CONDITION()));
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/index/query.js b/entity/Person_entity/recordcontainers/index/query.js
index c1983f7ee8be7bdf52619e4c14cb9cfd6f7826b3..efd61cfbef8e6e6e7da311c7d575e415f52f9f77 100644
--- a/entity/Person_entity/recordcontainers/index/query.js
+++ b/entity/Person_entity/recordcontainers/index/query.js
@@ -5,6 +5,7 @@ import("system.calendars");
import("system.db");
import("Sql_lib");
import("Communication_lib");
+import("KeywordRegistry_basic");
/*
Before changing the results that are returned here:
@@ -13,46 +14,44 @@ You may want to check out if your change affects other modules. However adding m
*/
var sqlQuery, sqlHelper, queryCondition, affectedIds;
-var CommMediumPhoneIds = db.array( db.COLUMN, "select KEYID from AB_KEYWORD_ENTRY join ab_keyword_attributerelation on AB_KEYWORD_ENTRYID = AB_KEYWORD_ENTRY_ID "
- + " join ab_keyword_attribute on AB_KEYWORD_ATTRIBUTEID = AB_KEYWORD_ATTRIBUTE_ID and CHAR_VALUE = 'TELEPHONE' and AB_KEYWORD_ATTRIBUTE.CONTAINER = 'CommunicationMedium'");
+var commMediumPhoneIds = CommUtil.getMediumIdsByCategory("PHONE");
sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("CONTACT.CONTACTID "
- + "," + sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"])
- + "," + sqlHelper.concat([
- sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
- ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
- ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
- ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
- ], " | ")
- //additional indexed fields
- + ", CONTACT.CONTACTID "
- + ", PERSON.PERSONID "
- + ", PERSON.FIRSTNAME "
- + ", PERSON.LASTNAME "
- + ", TRIM(PERSON.GENDER) "
- + ", CONTACT.ORGANISATION_ID "
- + ", ORGANISATION.NAME "
- + ", ADDRESS.ADDRESS "
- + ", ADDRESS.COUNTRY "
- + ", ADDRESS.ZIP "
- + ", ADDRESS.CITY "
- + ", COMMUNICATION.ADDR "
- + ", PHONE.ADDR "
- )
- .from("PERSON")
- .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")
+var querySelect = newSelect([
+ "CONTACT.CONTACTID", //#UID
+ sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"]), //#TITLE
+ sqlHelper.concat([
+ sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'",
+ "defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"]),
+ sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
+ sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
+ ], " | "), //#DESCRIPTION
+ //additional indexed fields
+ "CONTACT.CONTACTID",
+ "PERSON.PERSONID",
+ "PERSON.FIRSTNAME",
+ "PERSON.LASTNAME",
+ sqlHelper.trim("PERSON.GENDER"),
+ "CONTACT.ORGANISATION_ID",
+ "ORGANISATION.NAME",
+ "ADDRESS.ADDRESS",
+ "ADDRESS.COUNTRY",
+ "ADDRESS.ZIP",
+ "ADDRESS.CITY",
+ "COMMUNICATION.ADDR",
+ "PHONE.ADDR"
+ ])
+ .from("PERSON")
+ .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")
.join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
- .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
- .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
- .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
- .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "')", "PHONE") //TODO: refactor to new SqlBuilder
+ .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
+ .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
+ .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
+ .leftJoin("COMMUNICATION", newWhere("phone.CONTACT_ID = CONTACT.CONTACTID")
+ .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone")
+ .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
.orderBy("CONTACT.CONTACTID");
-if (vars.exists("$local.idvalue"))
-{
- affectedIds = vars.get("$local.idvalue");
- querySelect.whereIfSet("CONTACT.CONTACTID", affectedIds, SqlBuilder.IN());
-}
-
+if (vars.exists("$local.idvalue"))
+ querySelect.whereIfSet("CONTACT.CONTACTID", "$local.idvalue");
result.string(querySelect);
\ No newline at end of file
diff --git a/entity/PrivatePerson_entity/PrivatePerson_entity.aod b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
index 4d351a6db3e6ec41c4b812037158f2292c3247ba..e3cc784be65ee3ec69e37b8921bdc7fa2076e089 100644
--- a/entity/PrivatePerson_entity/PrivatePerson_entity.aod
+++ b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>PrivatePerson_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PrivatePerson_entity/documentation.adoc</documentation>
@@ -76,6 +76,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -104,10 +108,12 @@
<dbRecordFieldMapping>
<name>FIRSTNAME.value</name>
<recordfield>PERSON.FIRSTNAME</recordfield>
+ <isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LASTNAME.value</name>
<recordfield>PERSON.LASTNAME</recordfield>
+ <isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>MIDDLENAME.value</name>
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index c8e776243320bbffdfd21ade60436bc2c42cd68c..09e2fcde10da3e7bff836acfcb834abe1f740b0f 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Prod2prod_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
@@ -125,6 +125,10 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Prod2prod_entity/contentProcess.js b/entity/Prod2prod_entity/contentProcess.js
deleted file mode 100644
index 912ab1f560dfdc682fc116a76e7c9a87bd0dc1d6..0000000000000000000000000000000000000000
--- a/entity/Prod2prod_entity/contentProcess.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.db");
-import("system.util");
-import("Product_lib");
-
-var prodid = vars.exists("$param.ProductId_param")
- && vars.get("$param.ProductId_param") != null ? vars.get("$param.ProductId_param") : "";
-
-if(prodid != "")
-{
- var p2pUtils = new Prod2ProdUtils(prodid);
- result.object(p2pUtils.getPartsListForRecordContainer());
-}
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/entityfields/date_edit/valueProcess.js b/entity/Prod2prod_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Prod2prod_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/entityfields/date_new/valueProcess.js b/entity/Prod2prod_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 408c498a4c90f59cd95eafbf74a8ea2683bab068..0000000000000000000000000000000000000000
--- a/entity/Prod2prod_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
-
diff --git a/entity/Prod2prod_entity/entityfields/user_edit/valueProcess.js b/entity/Prod2prod_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Prod2prod_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/entityfields/user_new/valueProcess.js b/entity/Prod2prod_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Prod2prod_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/externalOpenAction.js b/entity/Prod2prod_entity/externalOpenAction.js
deleted file mode 100644
index ebe4247e954a0ae05655cb6cd40c9b8a30e2e791..0000000000000000000000000000000000000000
--- a/entity/Prod2prod_entity/externalOpenAction.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.neon");
-
-neon.openContext("Product", null, [vars.get("$field.SOURCE_ID")], neon.OPERATINGSTATE_VIEW, null);
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/onDelete.js b/entity/Prod2prod_entity/onDelete.js
deleted file mode 100644
index 0ad9fcce719c3c90c3d608bdaf3265c96ed939c0..0000000000000000000000000000000000000000
--- a/entity/Prod2prod_entity/onDelete.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("Sql_lib");
-
-newWhere("PROD2PROD.PROD2PRODID", "$field.UID").deleteData();
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/onInsert.js b/entity/Prod2prod_entity/onInsert.js
deleted file mode 100644
index af42dcad8f1805fec826a4dfb7d84ec57b217643..0000000000000000000000000000000000000000
--- a/entity/Prod2prod_entity/onInsert.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import("system.datetime");
-import("system.vars");
-import("system.db");
-
-var cols = [ "PROD2PRODID"
- , "DEST_ID"
- , "SOURCE_ID"
- , "QUANTITY"
- , "OPTIONAL"
- , "TAKEPRICE" ];
-
-var vals = [ vars.get("$field.UID")
- , vars.get("$field.DEST_ID")
- , vars.get("$field.SOURCE_ID")
- , vars.get("$field.QUANTITY")
- , vars.get("$field.OPTIONAL")
- , vars.get("$field.TAKEPRICE") ];
-
-var colTypes = db.getColumnTypes("PROD2PROD", cols);
-
-db.insertData("PROD2PROD", cols, colTypes, vals);
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/onUpdate.js b/entity/Prod2prod_entity/onUpdate.js
deleted file mode 100644
index a2834dd3ef42b887903d8b4de5ed989f4f2fa16d..0000000000000000000000000000000000000000
--- a/entity/Prod2prod_entity/onUpdate.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import("Sql_lib");
-import("system.vars");
-
-var cols = [ "DEST_ID"
- , "SOURCE_ID"
- , "QUANTITY"
- , "OPTIONAL"
- , "TAKEPRICE" ];
-
-var vals = [ vars.get("$field.DEST_ID")
- , vars.get("$field.SOURCE_ID")
- , vars.get("$field.QUANTITY")
- , vars.get("$field.OPTIONAL")
- , vars.get("$field.TAKEPRICE") ];
-
-newWhere("PROD2PROD.PROD2PRODID", "$field.UID")
- .updateData(true, "PROD2PROD", cols, null, vals);
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index aab2dfcb21f200605c77c10973ff927b18217abb..01c9b42d47200f35bc2900eee2e91a39e3ffd178 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Product_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Product_entity/documentation.adoc</documentation>
@@ -10,6 +10,7 @@
<grantDeleteProcess>%aditoprj%/entity/Product_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Product_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Product_entity/afterUiInit.js</afterUiInit>
+ <useFavorites v="true" />
<iconId>VAADIN:HAMMER</iconId>
<imageProcess>%aditoprj%/entity/Product_entity/imageProcess.js</imageProcess>
<titlePlural>Products</titlePlural>
@@ -457,6 +458,10 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>PRODUCT_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/product_objecttype/valueProcess.js</valueProcess>
+ </entityField>
<entityField>
<name>COUNT</name>
<title>Count</title>
@@ -467,6 +472,10 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -507,19 +516,19 @@
<name>ADVERTISING.value</name>
<recordfield>PRODUCT.ADVERTISING</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>GROUPCODEID.value</name>
<recordfield>PRODUCT.GROUPCODEID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>MINSTOCK.value</name>
<recordfield>PRODUCT.MINSTOCK</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PRODUCTCODE.value</name>
@@ -539,19 +548,19 @@
<name>STATUS.value</name>
<recordfield>PRODUCT.STATUS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>UNIT.value</name>
<recordfield>PRODUCT.UNIT</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
<recordfield>PRODUCT.CONTACT_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>GROUPCODEID.displayValue</name>
@@ -591,10 +600,6 @@
<isFilterable v="true" />
<filtertype>EXTENDED</filtertype>
</consumerMapping>
- <dbRecordFieldMapping>
- <name>COUNT.value</name>
- <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
- </dbRecordFieldMapping>
<aggregateFieldDbMapping>
<name>COUNT_aggregate.value</name>
<recordfield>PRODUCT.PRODUCTID</recordfield>
@@ -621,6 +626,15 @@
</affectedTables>
<affectedIds>%aditoprj%/entity/Product_entity/recordcontainers/index/affectedIds.js</affectedIds>
<indexFieldMappings>
+ <indexRecordSystemFieldMapping>
+ <name>#UID</name>
+ </indexRecordSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#TITLE</name>
+ </indexRecordMultilingualSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#DESCRIPTION</name>
+ </indexRecordMultilingualSystemFieldMapping>
<indexRecordFieldMapping>
<name>PRODUCTCODE.value</name>
<indexFieldType>TEXT_PLAIN</indexFieldType>
diff --git a/entity/Product_entity/entityfields/product_objecttype/valueProcess.js b/entity/Product_entity/entityfields/product_objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..879615539dc8ebee637190f9381107d47e080649
--- /dev/null
+++ b/entity/Product_entity/entityfields/product_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Product");
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/stock/children/productid_param/valueProcess.js b/entity/Product_entity/entityfields/stock/children/productid_param/valueProcess.js
deleted file mode 100644
index 24f19f37786781bff6661183f3fcd8ae8d1efb45..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/stock/children/productid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.PRODUCTID"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/stockcount/children/productid_param/valueProcess.js b/entity/Product_entity/entityfields/stockcount/children/productid_param/valueProcess.js
deleted file mode 100644
index 24f19f37786781bff6661183f3fcd8ae8d1efb45..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/stockcount/children/productid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.PRODUCTID"));
\ No newline at end of file
diff --git a/entity/Product_entity/onDBDelete.js b/entity/Product_entity/onDBDelete.js
deleted file mode 100644
index 9fe9dbd2473b9f99b08619e247c6f4ab22acabaa..0000000000000000000000000000000000000000
--- a/entity/Product_entity/onDBDelete.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("Sql_lib");
-
-newWhereIfSet("PROD2PROD.DEST_ID", "$field.PRODUCTID")
- .deleteData();
-
-newWhereIfSet("PROD2PROD.SOURCE_ID", "$field.PRODUCTID")
- .deleteData();
-
-newWhereIfSet("PRODUCTPRICE.PRODUCT_ID", "$field.PRODUCTID")
- .deleteData();
-
-newWhereIfSet("STOCK.PRODUCT_ID", "$field.PRODUCTID")
- .deleteData();
\ No newline at end of file
diff --git a/entity/Product_entity/recordcontainers/index/query.js b/entity/Product_entity/recordcontainers/index/query.js
index 5d811e52c4fc3435b9c17aedd36efd979eef4c0b..ad3ce1ae86df57d36ab7bcde323b417ddc646241 100644
--- a/entity/Product_entity/recordcontainers/index/query.js
+++ b/entity/Product_entity/recordcontainers/index/query.js
@@ -1,22 +1,20 @@
import("system.result");
import("system.vars");
-import("system.calendars");
-import("system.db");
import("Keyword_lib");
import("Sql_lib");
import("KeywordRegistry_basic");
var sqlHelper = new SqlMaskingUtils();
-var sqlQuery = newSelect("PRODUCTID as \"_uid_\""
- + ", " + sqlHelper.concat(["PRODUCTCODE", "PRODUCTNAME"], " | ") // as "_title_"
- + ", " + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODEID") // as "_description_"
- + ", PRODUCTCODE ")
- .from("PRODUCT")
- .orderBy("PRODUCTCODE");
+var sqlQuery = newSelect([
+ "PRODUCTID", //#UID
+ sqlHelper.concat(["PRODUCTCODE", "PRODUCTNAME"], " | "), //#TITLE
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODEID"), //#DESCRIPTION
+ "PRODUCTCODE"
+ ])
+ .from("PRODUCT")
+ .orderBy("PRODUCTCODE");
-if (vars.exists("$local.idvalue")) {
- var affectedIds = vars.get("$local.idvalue");
- sqlQuery.whereIfSet("PRODUCT.PRODUCTID", affectedIds, SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue"))
+ sqlQuery.whereIfSet("PRODUCT.PRODUCTID", "$local.idvalue", SqlBuilder.IN());
result.string(sqlQuery.toString());
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index a6d245878b3cac5cd80f3ed42f8d1888cb3000ee..88bf091386f6c700f3730d959eb07137ce3fdc38 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Productprice_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
@@ -9,6 +9,7 @@
<element>Product_entity</element>
</siblings>
<onValidation>%aditoprj%/entity/Productprice_entity/onValidation.js</onValidation>
+ <useFavorites v="false" />
<titlePlural>Prices</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -229,6 +230,10 @@
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -251,31 +256,31 @@
<name>BUYSELL.value</name>
<recordfield>PRODUCTPRICE.BUYSELL</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CURRENCY.value</name>
<recordfield>PRODUCTPRICE.CURRENCY</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>FROMQUANTITY.value</name>
<recordfield>PRODUCTPRICE.FROMQUANTITY</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PRICE.value</name>
<recordfield>PRODUCTPRICE.PRICE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PRICELIST.value</name>
<recordfield>PRODUCTPRICE.PRICELIST</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PRODUCTPRICEID.value</name>
@@ -285,7 +290,7 @@
<name>PRODUCT_ID.value</name>
<recordfield>PRODUCTPRICE.PRODUCT_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
@@ -303,13 +308,13 @@
<name>VALID_TO.value</name>
<recordfield>PRODUCTPRICE.VALID_TO</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>VAT.value</name>
<recordfield>PRODUCTPRICE.VAT</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CURRENCY.displayValue</name>
diff --git a/entity/Productprice_entity/conditionProcess.js b/entity/Productprice_entity/conditionProcess.js
deleted file mode 100644
index 90e180d441b9bfc5481528e78d074a2659d54f31..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/conditionProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("Sql_lib");
-import("system.result");
-import("system.vars");
-
-
-if(vars.get("$param.ProductId_param") != "")
- result.string(newWhere("PRODUCTPRICE.PRODUCT_ID", "$param.ProductId_param").toString());
-else if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != "")
- result.string(newWhere("PRODUCTPRICE.CONTACT_ID", "$param.ContactId_param").toString());
-else
- result.string("1 = 2");
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js b/entity/Productprice_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
deleted file mode 100644
index ed8bbd10820acb37aeb4928a20dd218f42a9f6e0..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string(1);
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js b/entity/Productprice_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
deleted file mode 100644
index 69acbaabdeb26f9d1b05f34290073efec5aa8d76..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.db");
-import("system.result");
-result.object(db.array(db.ROW, "select AB_ATTRIBUTEID from AB_ATTRIBUTE where ATTRIBUTE_PARENT_ID = 'ab545654-1fce-4993-b763-0ec469781302'"));
diff --git a/entity/Productprice_entity/entityfields/date_edit/valueProcess.js b/entity/Productprice_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/date_new/valueProcess.js b/entity/Productprice_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/product_id/fieldIdProcess.js b/entity/Productprice_entity/entityfields/product_id/fieldIdProcess.js
deleted file mode 100644
index 6cd3c4544e56fa57ad04b119be620aa650f4a849..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/product_id/fieldIdProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$this.value"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/user_edit/valueProcess.js b/entity/Productprice_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/user_new/valueProcess.js b/entity/Productprice_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/orderClauseProcess.js b/entity/Productprice_entity/orderClauseProcess.js
deleted file mode 100644
index 9fd0aad5a4bce2f8f7f5ca713d35f79bc1b9a7ec..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/orderClauseProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object({"PRODUCTPRICE.VALID_FROM": "down"});
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
deleted file mode 100644
index e83ab1dfc880532cf6bcd1dcbaa3e8a0e49affa3..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productPricelist(), "PRODUCTPRICE.PRICELIST");
-result.string(sql);
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index ac7e1e7e1bcc4d93f1c0e8270c9386530dfeae40..fe83641faf97bfc9c0ccc2d595d9105d5ff1b3d2 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>QuickEntry_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/QuickEntry_entity/documentation.adoc</documentation>
@@ -67,13 +67,11 @@
<entityField>
<name>FIRSTNAME</name>
<title>Firstname</title>
- <mandatoryProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/firstname/mandatoryProcess.js</mandatoryProcess>
</entityField>
<entityField>
<name>LASTNAME</name>
<title>Lastname</title>
<mandatoryProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/lastname/mandatoryProcess.js</mandatoryProcess>
- <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/lastname/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PERSON_TITLE</name>
@@ -246,6 +244,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js b/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
index e0891f1fe607eda473e4993d2e8b8cf1d9e5a513..aa0f51c76fd12f0f2b68af5357d04ea7f1303952 100644
--- a/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
@@ -1,91 +1,62 @@
import("Sql_lib");
-import("system.db");
-import("system.vars");
import("KeywordRegistry_basic");
+import("system.entities");
+import("system.vars");
-//TODO: use writeEntity when available
//TODO: duplicate check
var rowdata = vars.get("$local.rowdata");
-var organisationId = rowdata["ORGANISATION_ID.value"];
+var organisationId = "0";
var userNew = rowdata["USER_NEW.value"];
var dateNew = rowdata["DATE_NEW.value"];
-var contactCols = [
- "CONTACTID",
- "ORGANISATION_ID",
- "PERSON_ID",
- "STATUS",
- "ISOLANGUAGE",
- "ADDRESS_ID",
- "USER_NEW",
- "DATE_NEW"
-];
-var contactVals = [
- rowdata["UID.value"],
- organisationId,
- "",
- $KeywordRegistry.contactStatus$active(),
- rowdata["ISOLANGUAGE.value"],
- "",
- userNew,
- dateNew
-];
-
if (rowdata["ORGANISATION_NAME.value"])
{
- var orgCols = [
- "ORGANISATIONID",
- "NAME",
- "USER_NEW",
- "DATE_NEW"
- ];
- var orgVals = [
- organisationId,
- rowdata["ORGANISATION_NAME.value"],
- userNew,
- dateNew
- ];
- db.insertData("ORGANISATION", orgCols, null, orgVals);
-
- db.insertData("CONTACT", contactCols, null, contactVals);
-}
-else
-{
- contactVals[1] = "0"; //"private" if no company is given
+ let configOrg = entities.createConfigForAddingRows();
+ organisationId = rowdata["ORGANISATION_ID.value"];
+ configOrg.entity("Organisation_entity");
+ configOrg.fieldValues({
+ "ORGANISATIONID": organisationId,
+ "ORGANISATION_ID": organisationId,
+ "CONTACTID" : rowdata["UID.value"],
+ "NAME": rowdata["ORGANISATION_NAME.value"],
+ "USER_NEW": userNew,
+ "DATE_NEW": dateNew,
+ "USER_NEW_CONTACT": userNew,
+ "DATE_NEW_CONTACT" : dateNew,
+ "STATUS" : $KeywordRegistry.contactStatus$active(),
+ "ISOLANGUAGE" : rowdata["ISOLANGUAGE.value"]
+ });
+
+ entities.createRow(configOrg);
}
if (rowdata["LASTNAME.value"])
{
- var personCols = [
- "PERSONID",
- "FIRSTNAME",
- "LASTNAME",
- "SALUTATION",
- "TITLE",
- "GENDER",
- "USER_NEW",
- "DATE_NEW"
- ];
- var gender = newSelect("SEX")
- .from("SALUTATION")
- .whereIfSet("SALUTATION.SALUTATION", rowdata["PERSON_SALUTATION.value"])
- .cell(true);
-
- var personVals = [
- rowdata["PERSON_ID.value"],
- rowdata["FIRSTNAME.value"] || "",
- rowdata["LASTNAME.value"],
- rowdata["PERSON_SALUTATION.value"] || "",
- rowdata["PERSON_TITLE.value"] || "",
- gender,
- userNew,
- dateNew
- ];
- db.insertData("PERSON", personCols, null, personVals);
-
- contactVals[0] = rowdata["PERSON_CONTACT_ID.value"];
- contactVals[2] = rowdata["PERSON_ID.value"];
-
- db.insertData("CONTACT", contactCols, null, contactVals);
+ let gender = newSelect("SEX")
+ .from("SALUTATION")
+ .whereIfSet("SALUTATION.SALUTATION", rowdata["PERSON_SALUTATION.value"])
+ .cell(true);
+
+ let configPer = entities.createConfigForAddingRows();
+ configPer.entity("Person_entity");
+ configPer.fieldValues({
+ "PERSON_ID" : rowdata["PERSON_ID.value"],
+ "PERSONID": rowdata["PERSON_ID.value"],
+ "FIRSTNAME": rowdata["FIRSTNAME.value"] || "",
+ "LASTNAME" : rowdata["LASTNAME.value"],
+ "SALUTATION": rowdata["PERSON_SALUTATION.value"] || "",
+ "TITLE": rowdata["PERSON_TITLE.value"] || "",
+ "GENDER": gender,
+ "USER_NEW": userNew,
+ "DATE_NEW": dateNew,
+ "USER_NEW_CONTACT": userNew,
+ "DATE_NEW_CONTACT" : dateNew,
+ "CONTACTID": rowdata["PERSON_CONTACT_ID.value"],
+ "ORGANISATION_ID": organisationId,
+ "STATUS" : $KeywordRegistry.contactStatus$active(),
+ "ISOLANGUAGE": rowdata["ISOLANGUAGE.value"]
+ });
+
+ entities.createRow(configPer);
}
\ No newline at end of file
diff --git a/entity/RoleChildren_entity/RoleChildren_entity.aod b/entity/RoleChildren_entity/RoleChildren_entity.aod
index 2bcb0f99e0f70067d257ffb297c1db4e40ca05a7..89c17291b48f25526ea7a47de2b33a46a6a09bed 100644
--- a/entity/RoleChildren_entity/RoleChildren_entity.aod
+++ b/entity/RoleChildren_entity/RoleChildren_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>RoleChildren_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/RoleChildren_entity/documentation.adoc</documentation>
@@ -50,6 +50,10 @@
<name>RoleType_param</name>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/RoleChildren_entity/recordcontainers/jdito/onDelete.js b/entity/RoleChildren_entity/recordcontainers/jdito/onDelete.js
index 778e62eb9820cecef3e378e97114d53f78cea22f..3135d2cddf197831f1547b797d50ad006ee0d387 100644
--- a/entity/RoleChildren_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/RoleChildren_entity/recordcontainers/jdito/onDelete.js
@@ -1,7 +1,5 @@
import("Sql_lib");
-import("system.db");
-import("system.vars");
-var uid = vars.get("$field.UID");
-var alias = SqlUtils.getSystemAlias();
-db.deleteData("ASYS_ROLES_CHILDREN", "ID = '" + uid + "'", alias)
\ No newline at end of file
+new SqlBuilder(SqlUtils.getSystemAlias())
+ .where("ASYS_ROLES_CHILDREN.ID", "$field.UID")
+ .deleteData();
\ No newline at end of file
diff --git a/entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js b/entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js
index ef5e24b81d4997315d826c016dfd7e5ab07725f8..a1bc13a234a647ca0ffedb456a9c0c7f70386772 100644
--- a/entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js
@@ -7,10 +7,11 @@ import("system.vars");
var selectedRoleName = vars.exists("$param.RoleId_param") && vars.get("$param.RoleId_param");
var selectedRoleType = vars.exists("$param.RoleType_param") && vars.get("$param.RoleType_param");
-if (selectedRoleName && selectedRoleType == "CUSTOM") {
- var alias = SqlUtils.getSystemAlias();
+if (selectedRoleName && selectedRoleType == "CUSTOM")
+{
var childRole = vars.get("$local.rowdata")["CHILD_ROLE.value"];
- var uid = vars.get("$field.UID");
- db.updateData("ASYS_ROLES_CHILDREN", ["CHILD_ROLE"], null, [childRole], "ID = '" + uid + "'", alias);
+ new SqlBuilder(SqlUtils.getSystemAlias())
+ .where("ASYS_ROLES_CHILDREN.ID", "$field.UID")
+ .updateFields({"CHILD_ROLE" : childRole});
}
\ No newline at end of file
diff --git a/entity/RoleParent_entity/RoleParent_entity.aod b/entity/RoleParent_entity/RoleParent_entity.aod
index 0ba6053919ab0291af8718524598853a77e888db..a48ffa5d0dcbad43da264927c486add10341c1fa 100644
--- a/entity/RoleParent_entity/RoleParent_entity.aod
+++ b/entity/RoleParent_entity/RoleParent_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>RoleParent_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/RoleParent_entity/documentation.adoc</documentation>
@@ -43,6 +43,10 @@
<name>RoleId_param</name>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index a591a19e522f52f8049e312d316e5c378f65abea..b1e75e67c1de2cb4e7b72f7307b74a81a6e6f0cf 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Role_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Role_entity/documentation.adoc</documentation>
@@ -49,7 +49,6 @@
<children>
<entityParameter>
<name>RoleTitle_param</name>
- <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -170,6 +169,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js b/entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js
deleted file mode 100644
index c4fc6bffb984a2312dbe938d59b5770b9703ce50..0000000000000000000000000000000000000000
--- a/entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.ROLENAME"));
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index 69760cd6ee0eae82d8bee97db47f050319e1cc2e..5b2898641b5f0cf0d33f29c1dd3c81bd07806201 100644
--- a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
+++ b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>SalesprojectAnalyses_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
@@ -83,6 +83,10 @@
<titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/my_turnover/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/my_turnover/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js b/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
index afcd4eaacbf83cd6a1329d9678895224751c2193..eee423852dcd66baeefb18745cc79f82ad09109e 100644
--- a/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
@@ -20,19 +20,10 @@ var phases = newSelect("KEYID, AB_KEYWORD_ENTRY.TITLE, count(PHASE), AB_KEYWORD_
.orderBy("SORTING")
.table();
-for(i = 0; i < phases.length; i++){
- if(phases[i][1] == "${SALESPROJECT_OFFER}"){
+for(let i = 0; i < phases.length; i++)
+{
+ if(phases[i][1] == "${SALESPROJECT_OFFER}")
phases[i][1] = "Offer";
- }
}
-result.object(phases);
-
-
-
-
-
-
-
-
-
+result.object(phases);
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
index ab8b7b82dbcefbd4ae406239e4059735790e0922..c420a5c09b4db9bebb7ad575435fa090ea80b552 100644
--- a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
+++ b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>SalesprojectMilestone_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalesprojectMilestone_entity/documentation.adoc</documentation>
@@ -147,6 +147,10 @@
<name>valueLongName</name>
<valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/valuelongname/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/SalesprojectMilestone_entity/conditionProcess.js b/entity/SalesprojectMilestone_entity/conditionProcess.js
deleted file mode 100644
index 300b91638bc8b36ce14988109c1826b68a3054de..0000000000000000000000000000000000000000
--- a/entity/SalesprojectMilestone_entity/conditionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Sql_lib");
-
-var cond = newWhereIfSet("SALESPROJECT_MILESTONE.SALESPROJECT_ID", "$param.SalesprojectId_param")
-
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/entityfields/date_edit/valueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/SalesprojectMilestone_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/entityfields/date_new/valueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/SalesprojectMilestone_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/entityfields/user_edit/valueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/SalesprojectMilestone_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/entityfields/user_new/valueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/SalesprojectMilestone_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
index 91d7ec56743324bdefc9c5c75666d3b73577aa64..fe5610bd1313ceb3c056d46f83d887e6f38e752f 100644
--- a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
+++ b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>SalesprojectPhase_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalesprojectPhase_entity/documentation.adoc</documentation>
@@ -48,6 +48,10 @@
</entityDependency>
</dependencies>
</entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 1684133b262935505179a0d22c785d6ba54cded7..7e2e4769fec4c4ac972fa7e08bde182d1b3ddf92 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>SalesprojectSource_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalesprojectSource_entity/documentation.adoc</documentation>
@@ -84,6 +84,10 @@
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/SalesprojectSource_entity/conditionProcess.js b/entity/SalesprojectSource_entity/conditionProcess.js
deleted file mode 100644
index 679d08965b06a59685ccaa6341679110f8f953b7..0000000000000000000000000000000000000000
--- a/entity/SalesprojectSource_entity/conditionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Sql_lib");
-
-var cond = newWhereIfSet("SALESPROJECT_TOUCHPOINT.SALESPROJECT_ID", "$param.SalesprojectId_param");
-
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/date_edit/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/SalesprojectSource_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/date_new/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/SalesprojectSource_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/user_edit/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/SalesprojectSource_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/user_new/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/SalesprojectSource_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index c26b030570763df9f467a4803dfa17234a64873a..84c89c142bda6b79953012f9256478c3e94ea877 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Salesproject_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Salesproject_entity/documentation.adoc</documentation>
@@ -12,9 +12,10 @@
<contentTitleProcess>%aditoprj%/entity/Salesproject_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Salesproject_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Salesproject_entity/onValidation.js</onValidation>
- <afterOperatingState>%aditoprj%/entity/Salesproject_entity/afterOperatingState.js</afterOperatingState>
+ <useFavorites v="true" />
<iconId>VAADIN:BOOK_DOLLAR</iconId>
- <titlePlural>Sales Projects</titlePlural>
+ <imageProcess>%aditoprj%/entity/Salesproject_entity/imageProcess.js</imageProcess>
+ <titlePlural>Salesprojects</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -257,7 +258,7 @@
<dependency>
<name>dependency</name>
<entityName>Member_entity</entityName>
- <fieldName>Links</fieldName>
+ <fieldName>WithDistrictResponsibles</fieldName>
</dependency>
<children>
<entityParameter>
@@ -607,6 +608,7 @@
</entityConsumer>
<entityConsumer>
<name>Classifications</name>
+ <refreshParent v="true" />
<dependency>
<name>dependency</name>
<entityName>Classification_entity</entityName>
@@ -637,13 +639,6 @@
<title>Days running</title>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/runtime/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>ClassificationResult</name>
- <title>Classification</title>
- <groupable v="false" />
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js</valueProcess>
- </entityField>
<entityConsumer>
<name>SalesprojectForecastCharts</name>
<dependency>
@@ -684,28 +679,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityConsumer>
- <name>ClassificationGroups</name>
- <dependency>
- <name>dependency</name>
- <entityName>ClassificationGroupAnalyses_entity</entityName>
- <fieldName>GroupAnalyses</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ClassificationType_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectRowid_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
<entityField>
<name>PHASEINFO</name>
<title>phase information</title>
@@ -724,7 +697,6 @@
<title>Project type</title>
<description>own field for setting the project type attribute in the new mode, required for creating Salesprojects in QuickEntry</description>
<consumer>ProjectTypeAttribute</consumer>
- <groupable v="true" />
</entityField>
<entityConsumer>
<name>ProjectTypeAttribute</name>
@@ -762,6 +734,17 @@
<iconId>VAADIN:PLAY</iconId>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>PROBABILITY_AI</name>
+ <title>Probability AI</title>
+ <state>READONLY</state>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability_ai/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SALESPROJECT_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js</valueProcess>
+ </entityField>
<entityField>
<name>MST_TEAM_ID</name>
<title>Teams group</title>
@@ -780,6 +763,14 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONSTORAGE_ID</name>
+ <title>Classification</title>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -793,19 +784,26 @@
<onDBDelete>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
- <name>8431afcb-b0f3-4498-9e2c-d343bc6b4dd3</name>
+ <name>c8b6f1e0-630c-45d1-bdfb-d1eb3f6d6bef</name>
<tableName>SALESPROJECT</tableName>
<primaryKey>SALESPROJECTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>cf76b9a8-55fc-41e9-918c-f06ce3c86e3c</name>
+ <name>5f687ee0-15eb-4e19-aa5a-461c446e7d91</name>
<tableName>ORGANISATION</tableName>
<primaryKey>ORGANISATIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
+ <linkInformation>
+ <name>1c73b0de-0e70-421e-a8aa-660dbd177f81</name>
+ <tableName>CLASSIFICATIONSTORAGE</tableName>
+ <primaryKey>CLASSIFICATIONSTORAGEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation
<linkInformation>
<name>44fba381-e477-4a92-ba82-fc22c3d98c23</name>
<tableName>MST_TEAM</tableName>
@@ -819,25 +817,25 @@
<name>ENDDATE.value</name>
<recordfield>SALESPROJECT.ENDDATE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>INFO.value</name>
<recordfield>SALESPROJECT.INFO</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PHASE.value</name>
<recordfield>SALESPROJECT.PHASE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PROBABILITY.value</name>
<recordfield>SALESPROJECT.PROBABILITY</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PROJECTCODE.value</name>
@@ -859,19 +857,19 @@
<name>STARTDATE.value</name>
<recordfield>SALESPROJECT.STARTDATE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>VOLUME.value</name>
<recordfield>SALESPROJECT.VOLUME</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
<recordfield>SALESPROJECT.CONTACT_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.displayValue</name>
@@ -889,13 +887,13 @@
<name>REASONS.value</name>
<recordfield>SALESPROJECT.REASONS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<consumerMapping>
<name>Organisations</name>
<filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js</filterConditionProcess>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
<filtertype>BASIC</filtertype>
</consumerMapping>
<consumerMapping>
@@ -912,21 +910,23 @@
<name>STATUS.value</name>
<recordfield>SALESPROJECT.STATUS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>MST_TEAM_ID.value</name>
<recordfield>MST_TEAM.MST_TEAMID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>COUNT.value</name>
- <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
- </dbRecordFieldMapping>
<aggregateFieldDbMapping>
<name>COUNT_aggregate.value</name>
<recordfield>SALESPROJECT.SALESPROJECTID</recordfield>
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONSTORAGE_ID.value</name>
+ <recordfield>CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="false" />
+ </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>MST_TEAM_ID.displayValue</name>
<recordfield>MST_TEAM.TEAMNAME</recordfield>
@@ -941,17 +941,21 @@
<filtertype>BASIC</filtertype>
</filterExtensionSet>
<filterExtensionSet>
- <name>ClassificationSummary_filter</name>
- <filterFieldsProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js</filterFieldsProcess>
- <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js</filterValuesProcess>
- <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js</filterConditionProcess>
+ <name>ClassificationType_filter</name>
+ <filterFieldsProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js</filterFieldsProcess>
+ <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js</filterValuesProcess>
+ <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js</filterConditionProcess>
+ <isGroupable v="true" />
+ <groupQueryProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js</groupQueryProcess>
<filtertype>BASIC</filtertype>
</filterExtensionSet>
<filterExtensionSet>
- <name>ClassificationScore_filter</name>
- <filterFieldsProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterFieldsProcess.js</filterFieldsProcess>
- <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterValuesProcess.js</filterValuesProcess>
- <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterConditionProcess.js</filterConditionProcess>
+ <name>ClassificationGroup_filter</name>
+ <filterFieldsProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js</filterFieldsProcess>
+ <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js</filterValuesProcess>
+ <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js</filterConditionProcess>
+ <isGroupable v="true" />
+ <groupQueryProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js</groupQueryProcess>
<filtertype>BASIC</filtertype>
</filterExtensionSet>
</filterExtensions>
@@ -967,6 +971,15 @@
</affectedTables>
<affectedIds>%aditoprj%/entity/Salesproject_entity/recordcontainers/index/affectedIds.js</affectedIds>
<indexFieldMappings>
+ <indexRecordSystemFieldMapping>
+ <name>#UID</name>
+ </indexRecordSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#TITLE</name>
+ </indexRecordMultilingualSystemFieldMapping>
+ <indexRecordMultilingualSystemFieldMapping>
+ <name>#DESCRIPTION</name>
+ </indexRecordMultilingualSystemFieldMapping>
<indexRecordFieldMapping>
<name>PROJECTCODE.value</name>
<indexFieldType>STRING</indexFieldType>
diff --git a/entity/Salesproject_entity/afterOperatingState.js b/entity/Salesproject_entity/afterOperatingState.js
deleted file mode 100644
index 30dc6947ef78065a5d4341a489a633733684d27a..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/afterOperatingState.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("system.vars");
-import("Workflow_lib");
-
-if (vars.exists("$context.workflowQueue") && vars.get("$context.workflowQueue"))
-{
- WorkflowStarter.inserted(vars.get("$context.workflowQueue"));
- vars.set("$context.workflowQueue", null);
-}
-
-//TODO: error on save, why should be a refresh necessary
-//if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
-//{
-// neon.refresh();
-//}
diff --git a/entity/Salesproject_entity/entityfields/2pensalesprojects/children/state_param/valueProcess.js b/entity/Salesproject_entity/entityfields/2pensalesprojects/children/state_param/valueProcess.js
deleted file mode 100644
index 2a82320164b8a1ee9cce3001fdbe18a385a7c77c..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/2pensalesprojects/children/state_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectState$open());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
deleted file mode 100644
index 6dd2e4417403f7f224f0889aa787a11b2e516dc9..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("KeywordRegistry_basic");
-import("system.result");
-
-result.string($KeywordRegistry.classificationType$salesproject());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js b/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js
deleted file mode 100644
index ec7e306ee9580b62b61f879c1acac71f7c0872ad..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("KeywordRegistry_basic");
-import("system.vars");
-import("system.result");
-import("Classification_lib")
-import("Context_lib")
-
-var classes = ClassificationUtils.getClass($KeywordRegistry.classificationType$salesproject(), ContextUtils.getCurrentContextId(), vars.get("$sys.uid"))
-result.string(classes);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/date_edit/valueProcess.js b/entity/Salesproject_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/date_new/valueProcess.js b/entity/Salesproject_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/valueProcess.js b/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
deleted file mode 100644
index 0fda06efff26a459feed87a3433a92ff99b14171..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectPhase());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/valueProcess.js b/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
deleted file mode 100644
index 9604353462b5f896fe861ef98813706bc705a3e7..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectState());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordwonlost/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordwonlost/children/containername_param/code.js
deleted file mode 100644
index cbd1c681941578fe0b1e5234bd3c80837eaaae0a..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/keywordwonlost/children/containername_param/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectWonLost());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/probability_ai/stateProcess.js b/entity/Salesproject_entity/entityfields/probability_ai/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fd3f09b8d62446c4e3946a0ece4b428e7f8ca48b
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/probability_ai/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.project");
+
+if(!JSON.parse(project.getPreferenceValue("custom.ai.salesprojectProbability", "false")))
+{
+ result.string("INVISIBLE");
+}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js b/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..844f60472a79f7551370dc0bf2ad0c3607eeed43
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js
@@ -0,0 +1,16 @@
+import("system.vars");
+import("system.logging");
+import("system.result");
+import("AISalesproject_lib");
+import("system.project");
+
+if(JSON.parse(project.getPreferenceValue("custom.ai.salesprojectProbability", "false")))
+{
+ result.string(AISalesprojectUtil.classify(vars.getString("$field.SALESPROJECTID"),
+ vars.getString("$field.CONTACT_ID"),
+ vars.getString("$field.PHASE"),
+ vars.getString("$field.STATUS"),
+ vars.getString("$field.VOLUME"),
+ vars.getString("$field.PROBABILITY")));
+
+}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js b/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..32bdd9f268d88e47e27565b3aa1b814760ebc161
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Salesproject");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/forecastid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/forecastid_param/valueProcess.js
deleted file mode 100644
index b9a94c51a19da02962159545a287ddc773e7320d..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/forecastid_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/salesprojectsopen/children/state_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js
deleted file mode 100644
index 52a7642475b873a3e9afb4e686aa447f07ec64d5..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-
-
-//KeywordId for CompetitionState OPEN
-result.string("25b0ac77-ef92-4809-802e-bb9d8782f865")
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/user_edit/valueProcess.js b/entity/Salesproject_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/user_new/valueProcess.js b/entity/Salesproject_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volume/onValidation.js b/entity/Salesproject_entity/entityfields/volume/onValidation.js
deleted file mode 100644
index 410b72014ab2ce31519900fc218a7e064e0a2b05..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/volume/onValidation.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("PostalAddress_lib");
-import("Entity_lib");
-
-// TODO: displayValue + contentType number crashes so we use TEXT and validate ourselve
-// Workaround for 1035861
-
-var volume = vars.get("local.value");
-var message = "";
-if (!/^\d+\.?\d*$/.test(volume))
- message = translate.text("Only numbers are allowed.");
-
-result.string(message);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/imageProcess.js b/entity/Salesproject_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a2de543489d834ea3457009159a8987cb50d961
--- /dev/null
+++ b/entity/Salesproject_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.#CONTENTTITLE"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/onValidation.js b/entity/Salesproject_entity/onValidation.js
index e0b1e589a7543108c938f3dbb1d9c75b58908753..c9618796815b4f0e83c28c43a12320cd981a3ed9 100644
--- a/entity/Salesproject_entity/onValidation.js
+++ b/entity/Salesproject_entity/onValidation.js
@@ -1,3 +1,4 @@
+import("system.translate");
import("system.result");
import("Date_lib");
import("system.vars");
@@ -6,4 +7,6 @@ var startDate = vars.get("$field.STARTDATE");
var endDate = vars.get("$field.ENDDATE");
if (!DateUtils.validateBeginnBeforeEnd(startDate, endDate))
- result.string(DateUtils.getValidationFailString());
\ No newline at end of file
+ result.string(DateUtils.getValidationFailString());
+else if(!vars.get("$field.PROJECTTITLE") && vars.get("$field.PROJECTTYPE") && vars.exists("$param.PresetTitle_param"))
+ result.string(translate.text("The Sales Project can only be filled when a company has been specified"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef0d44ef34942a6219d4ae0f3c5cb66f34847555
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var sqlCond = ClassificationGroupFilterUtils.makeFilterConditionSql();
+
+result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f4082997e0ffed652aa150ae87c52a258d0b481c
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+//this filterExtensionSet is for the Classifications (ClassificationGroups, e.g. 1. Target Group, Customer Value...)
+var fields = ClassificationGroupFilterUtils.makeFilterFields();
+
+result.string(fields);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..447f4c037255ee7dcbeb6eb0a39007733806d71c
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var values = ClassificationGroupFilterUtils.makeFilterValues();
+result.object(values);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1f7be0b8bd8fa6f889a7402ac9457d1ba15cbe67
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
@@ -0,0 +1,5 @@
+import("ClassificationFilter_lib");
+import("system.result");
+
+var res = ClassificationGroupFilterUtils.makeDefaultGroupQuery().toString();
+result.string(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterConditionProcess.js
deleted file mode 100644
index a9a81e734d1d5832c87848fa6b12650b9af03993..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterConditionProcess.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import("Sql_lib");
-import("system.logging");
-import("AttributeFilter_lib");
-import("Entity_lib");
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-
-var operator = vars.get("$local.operator");
-var rawvalue = vars.get("$local.rawvalue");
-var columnPlaceholder = vars.get("$local.columnPlaceholder");
-var filterCond = vars.get("$local.condition");
-var classificationtypeid = AttributeSearchNameCoder.decode(vars.getString("$local.name")).id;
-var sqlCond;
-
-
-var subsqlclosed = newSelect("OBJECT_ROWID").from("CLASSIFICATION").where("CLASSIFICATION.OBJECT_TYPE", "Salesproject");
-var subsqlExtra2 = subsqlclosed.andIfSet("CLASSIFICATION.CLASSIFICATIONTYPE_ID", classificationtypeid);
-var subsqlExtra = subsqlclosed.andIfSet("CLASSIFICATION.CLASSIFICATIONSCORE_ID", rawvalue);
-
-if (operator == "1")//equal
- sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subsqlExtra, SqlBuilder.IN()).toString();
-else if (operator == "2")//not equal
- sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subsqlExtra, SqlBuilder.NOT_IN()).toString();
-else if (operator == "11")//is not empty
- sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subsqlExtra2, SqlBuilder.IN()).toString();
-else if (operator == "12")//is empty
- sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subsqlExtra2, SqlBuilder.NOT_IN()).toString();
-else sqlCond = "1=1";
-
-
-result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterFieldsProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterFieldsProcess.js
deleted file mode 100644
index a2733262042f5986d7d3cae681ed536f454fffbd..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterFieldsProcess.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import("Sql_lib");
-import("system.translate");
-import("system.logging");
-import("system.util");
-import("KeywordRegistry_basic");
-import("system.entities");
-import("Attribute_lib");
-import("AttributeFilter_lib");
-import("system.result");
-
-var res = [];
-
-var data = newSelect("CLASSIFICATIONTYPEID, CLASSIFICATIONGROUP, SCORETYPE")
- .from("classificationtype")
- .orderBy("CLASSIFICATIONGROUP").table();
-
-data.forEach(function(row){
- var name = AttributeSearchNameCoder.encode(row[0], row[2]);
- res.push({
- name: name,
- title: translate.text(row[1]) + " / " + translate.text(row[2]),
- contentType: "TEXT",
- hasDropDownValues: true
- });
-})
-
-res = JSON.stringify(res);
-result.string(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterValuesProcess.js
deleted file mode 100644
index 6750d045ccbf390d579bac8c82f19e61027d3b13..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterValuesProcess.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import("IndexSearch_lib");
-import("system.logging");
-import("system.vars");
-import("Sql_lib");
-import("AttributeFilter_lib");
-import("Attribute_lib");
-import("system.result");
-import("system.translate");
-
-var filter = JSON.parse(vars.get("$local.filter"));
-var nameObject = AttributeSearchNameCoder.decode(filter.name);
-var classID = nameObject.id;
-
-
-var res = newSelect("CLASSIFICATIONSCOREID , TITLE")
- .from("CLASSIFICATIONSCORE")
- .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", classID)
- .table();
-
-for(var i = 0; i < res.length; i++)
-{
- res[i][1] = translate.text(res[i][1])
-}
-
-if (res == null)
- res = [];
-result.object(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js
deleted file mode 100644
index ffad1bd95e4772a70895b5d53923ec4fd4ef2789..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import("Sql_lib");
-import("Classification_lib");
-import("system.logging");
-import("AttributeFilter_lib");
-import("Entity_lib");
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-
-var operator = vars.get("$local.operator");
-var rawvalue = vars.get("$local.rawvalue");
-var columnPlaceholder = vars.get("$local.columnPlaceholder");
-var filterCond = vars.get("$local.condition");
-var classificationTypeID = AttributeSearchNameCoder.decode(vars.getString("$local.name")).id;
-var sqlCond;
-
-//[["A","A"],["B","B"],["C","C"],["D","D"]]
-var scoreValue = ClassificationUtils.mapClassLetter(rawvalue);
-var havingCase;
-if(scoreValue[0] == 0)
- havingCase = "sum(SCORE) >= " + scoreValue[0];
-else
- havingCase = "sum(SCORE) > " + scoreValue[0];
-
-var having = havingCase + " and sum(SCORE) <= " + scoreValue[1];
-
-
-var subSqlCond = newSelect("OBJECT_ROWID").from("classification").join("classificationscore", "classiFICATIONSCOREID = CLASSIFICATIONSCORE_ID")
- .where("classificationscore.CLASSIFICATIONTYPE_ID", newSelect("classificationtypeId").from("classificationtype")
- .where("classificationtype.CLASSIFICATIONGROUP", classificationTypeID), SqlBuilder.IN()).groupBy("classification.OBJECT_ROWID");
-
-if (operator == "1")//equal
- sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond.having(having), SqlBuilder.IN()).toString();
-else if (operator == "2")//not equal
- sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond.having(having), SqlBuilder.NOT_IN()).toString();
-else if (operator == "11")//is not empty
- sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond, SqlBuilder.IN()).toString();
-else if (operator == "12")//is empty
- sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond, SqlBuilder.NOT_IN()).or("SALESPROJECT.SALESPROJECTID", newSelect("OBJECT_ROWID").from("classification"), SqlBuilder.NOT_IN()).toString();
-else sqlCond = "1=1";
-
-result.string(sqlCond);
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js
deleted file mode 100644
index 9121b18d618730e329ce439e3d72cb6eb11e91d3..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import("Sql_lib");
-import("system.translate");
-import("system.logging");
-import("system.util");
-import("KeywordRegistry_basic");
-import("system.entities");
-import("Attribute_lib");
-import("AttributeFilter_lib");
-import("system.result");
-
-var res = [];
-
-var data = newSelect("distinct CLASSIFICATIONGROUP, CLASSIFICATIONGROUP")
- .from("classificationtype")
- .orderBy("CLASSIFICATIONGROUP").table();
-
-
-data.forEach(function(row){
- var name = AttributeSearchNameCoder.encode(row[0], row[1]);
- res.push({
- name: name,
- title: translate.text(row[1]),
- contentType: "TEXT",
- hasDropDownValues: true
- });
-})
-
-res = JSON.stringify(res);
-result.string(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js
deleted file mode 100644
index 8a572bd1090952e3ff3ef6d731c18a18b1c218fe..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.object([["A","A"],["B","B"],["C","C"],["D","D"]]);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5875efb7699dfc5aaa3b567c912990895b03eded
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var sqlCond = ClassificationTypeFilterUtils.makeFilterConditionSql();
+
+result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b2cf16be606711221d28048b4af26922e946c004
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("ClassificationFilter_lib");
+
+var fields = ClassificationTypeFilterUtils.getFilterFields(vars.get("$sys.currentcontextname"));
+
+result.string(fields);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..541cc6c67ce6e4dc53ccc16714b3b7746eb0f097
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var values = ClassificationTypeFilterUtils.makeFilterFields();
+result.object(values);
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..524e35692ad0f51d4bebd9dce80d82ebfc6efc80
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js
@@ -0,0 +1,22 @@
+import("system.translate");
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+
+var isCount = vars.get("$local.count"); // TRUE if the count of the records is needed
+var columns = vars.get("$local.columnlist"); // The column, expected from the querry, see also AttributeFilter_lib
+var condition = vars.get("$local.condition"); // The Condition that's beeing used, includes the grouphirachy
+var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
+var order = vars.get("$local.order"); // The order of the result
+var classificationId = vars.get("$local.name");
+classificationId = classificationId.slice(classificationId.lastIndexOf(".") + 1, classificationId.length);
+var valuefield = "''"
+var stmt = "";
+
+stmt = newSelect(isCount ? "1" : columns)
+ .from("SALESPROJECT")
+ .leftJoin("CLASSIFICATION", "CLASSIFICATION.OBJECT_ROWID = SALESPROJECT.SALESPROJECTID and CLASSIFICATION.OBJECT_TYPE = 'Salesproject' and CLASSIFICATION.CLASSIFICATIONTYPE_ID = '" + classificationId + "' ")
+ .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID = CLASSIFICATION.CLASSIFICATIONSCORE_ID" + (condition != " " ? " WHERE " + condition : ""))
+ .groupBy(groupedColumns + (order != null && !isCount ? " ORDER BY " + order : ""))
+ .toString();
+result.string(stmt);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js b/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
index 4291674d8278dfaf237ed2b20e684ed6e8c3dcc9..038770929b6fab8622e35b5275cc62fd31e8b446 100644
--- a/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,8 +1,10 @@
import("system.vars");
import("system.result");
+//CLASSIFICATIONSTORAGE is necessaray to make it possible to get the classifications of the organisations and making it possible to group by them
result.string("SALESPROJECT \n\
left join CONTACT on (SALESPROJECT.CONTACT_ID = CONTACT.CONTACTID) \n\
left join ORGANISATION on (CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID)\n\
+ left join CLASSIFICATIONSTORAGE on (CLASSIFICATIONSTORAGE.OBJECT_ROWID = SALESPROJECT.SALESPROJECTID)\n\
left join MST_TEAMLINK on (SALESPROJECT.SALESPROJECTID = MST_TEAMLINK.OBJECT_ROWID and MST_TEAMLINK.OBJECT_TYPE = 'Salesproject')\n\
left join MST_TEAM on (MST_TEAM.MST_TEAMID = MST_TEAMLINK.MST_TEAM_ID)");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
index aa9041d3bdf7a1351d23fd9d0768ee2b547006e4..169c88c898085262157c370ee06c9d55a132086c 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
@@ -11,12 +11,18 @@ if (currentId)
{
var toDelete = [
"SALESPROJECT_MILESTONE",
- "SALESPROJECT_TOUCHPOINT"
+ "SALESPROJECT_TOUCHPOINT",
+ "CLASSIFICATIONSTORAGE"
];
toDelete = toDelete.map(function(pTable)
{
- var cond = newWhere(pTable + ".SALESPROJECT_ID", currentId)
+ var cond;
+ if(pTable != "CLASSIFICATIONSTORAGE")
+ cond = newWhere(pTable + ".SALESPROJECT_ID", currentId)
+ else
+ cond = newWhere(pTable + ".OBJECT_ROWID", currentId)
+
return [pTable, cond.build()];
});
@@ -44,5 +50,4 @@ if (currentId)
new AttributeRelationQuery(currentId, null, ContextUtils.getCurrentContextId())
.deleteAllAttributes();
-WorkflowStarter.deleted();
WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js b/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js
index ac292d8633e479eb892884d9d62652463b34c980..38fe9698031dd654c3a8a1e3a37aa506cbb72a8e 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js
@@ -1,3 +1,4 @@
+import("Classification_lib");
import("Workflow_lib");
import("Context_lib");
import("Attribute_lib");
@@ -16,6 +17,11 @@ if (vars.get("$field.PROJECTTYPE"))
.insertAttribute(vars.get("$field.PROJECTTYPE"), true);
}
+var salesprojectId = vars.get("$field.SALESPROJECTID");
+var contextname = vars.get("$sys.currentcontextname");
+
+ClassificationUtils.insertEmptyClassification(salesprojectId, contextname);
+
//start the execution in afterOperatingState, because here the dataset is not yet inserted
vars.set("$context.workflowQueue", {});
WorkflowSignalSender.inserted();
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
index ccbc8268c326f3903e95e1cbc3d1071138b84cc7..73086a2fdfb50dbea04b9e7c6c56461cc22c269b 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
@@ -116,7 +116,6 @@ var serviceUrl = newSelect("SERVICE_URL")
if (needToUpdateForecast)
Salesproject.notifyToUpdateForecast();
-WorkflowStarter.updated();
WorkflowSignalSender.updated();
neon.refreshAll();
diff --git a/entity/Salesproject_entity/recordcontainers/index/query.js b/entity/Salesproject_entity/recordcontainers/index/query.js
index 1b84bf3549d756af8c7672952d3a159ffaef8708..b39c8d68ffd1e7e13b652a1bac2008d5a0ed8fec 100644
--- a/entity/Salesproject_entity/recordcontainers/index/query.js
+++ b/entity/Salesproject_entity/recordcontainers/index/query.js
@@ -7,24 +7,24 @@ import("KeywordRegistry_basic");
var sqlHelper = new SqlMaskingUtils();
-var sqlQuery = newSelect("SALESPROJECTID " // as "_uid_"
- + ", PROJECTTITLE " //as "_title_"
- + ", " + sqlHelper.concat([
- "'" + translate.text("Status") + ":'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS"),
- "'| " + translate.text("Phase") + ":'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "PHASE")
- ]) //as "_description_"
- + ", PROJECTCODE"
- + ", PROJECTTITLE"
- + ", STATUS"
- + ", " + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS") // as "STATUS.displayValue"
- + ", PHASE"
- + ", " + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "PHASE")) // as "PHASE.displayValue")
- .from("SALESPROJECT")
- .orderBy("PROJECTCODE");
+var sqlQuery = newSelect([
+ "SALESPROJECTID", //#UID
+ "PROJECTTITLE", //#TITLE
+ sqlHelper.concat([
+ "'" + translate.text("Status") + ":'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS"),
+ "'| " + translate.text("Phase") + ":'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "PHASE")
+ ]), //#DESCRIPTION
+ "PROJECTCODE",
+ "PROJECTTITLE",
+ "STATUS",
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS"), //STATUS.displayValue
+ "PHASE",
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "PHASE") //PHASE.displayValue
+ ])
+ .from("SALESPROJECT")
+ .orderBy("PROJECTCODE");
-if (vars.exists("$local.idvalue")) {
- var affectedIds = vars.get("$local.idvalue");
- sqlQuery.whereIfSet("SALESPROJECT.SALESPROJECTID", affectedIds, SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue"))
+ sqlQuery.whereIfSet("SALESPROJECT.SALESPROJECTID", "$local.idvalue", SqlBuilder.IN());
result.string(sqlQuery.toString());
\ No newline at end of file
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index 5b137905a27d6d47aa2e3b03ef3cd6898aeb46b9..bacd4cd101bf6204fbe070899602d47442afcd16 100644
--- a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
+++ b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>SalutationDistinct_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalutationDistinct_entity/documentation.adoc</documentation>
@@ -34,6 +34,10 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index 152cb887a0a27f2ec2cefbc18ca499e371eb4dc6..e23ed314f9c293c89abced5dd2aad800d5deddd9 100644
--- a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
+++ b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>SalutationTitleDistinct_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalutationTitleDistinct_entity/documentation.adoc</documentation>
@@ -43,6 +43,10 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index f7f79d1f0136d7b330265d712fd41d100d13e2f6..48def7ff858d71be38bba90a5da0a11ae0c556a1 100644
--- a/entity/Salutation_entity/Salutation_entity.aod
+++ b/entity/Salutation_entity/Salutation_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Salutation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Salutation_entity/documentation.adoc</documentation>
@@ -79,6 +79,10 @@
<fieldName>ISO3Name</fieldName>
</dependency>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
index b4a130f61cf1eb57d035d82a65cb7d5c28ef9b1f..c643905de84e79b430cf929c900304b5ad382a8a 100644
--- a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
+++ b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>SerialLetterAddRecipients_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SerialLetterAddRecipients_entity/documentation.adoc</documentation>
@@ -49,11 +49,31 @@
<iconId>VAADIN:ENVELOPES</iconId>
<stateProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/addparticipants/stateProcess.js</stateProcess>
</entityActionField>
+ <entityParameter>
+ <name>comingFrom_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>currentRecipients</name>
+ <documentation>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/documentation.adoc</documentation>
+ <title>Current Recipients</title>
+ <valueProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/valueProcess.js</valueProcess>
+ </entityField>
<entityField>
<name>recipientcount</name>
<state>EDITABLE</state>
<valueProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/recipientcount/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>futureRecipients</name>
+ <documentation>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/documentation.adoc</documentation>
+ <title>Recipients after adding</title>
+ <valueProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/documentation.adoc b/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..74e2caafdf491b4df68860937a0817c4ce434251
--- /dev/null
+++ b/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/documentation.adoc
@@ -0,0 +1,2 @@
+== currentRecipients;
+needed for the score card, to display extra information.
diff --git a/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/valueProcess.js b/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1554f48883f0ab02553defcc9e53d0d111b635be
--- /dev/null
+++ b/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var currentCount = newSelect("count(CONTACT_ID)")
+ .from("LETTERRECIPIENT")
+ .where("LETTERRECIPIENT.SERIALLETTER_ID", vars.get("$field.SERIALLETTER_ID"))
+ .cell();
+if(currentCount)
+ result.string(currentCount);
+else
+ result.string("0");
\ No newline at end of file
diff --git a/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/documentation.adoc b/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..b3fd706b46e908ad4dd49cd1fb023137ed6717ae
--- /dev/null
+++ b/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/documentation.adoc
@@ -0,0 +1,2 @@
+== futureRecipients;
+needed for the score card, to display extra information.
diff --git a/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/valueProcess.js b/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..138ce6ef236a6fae0ef36ac938ebc8378b0a179d
--- /dev/null
+++ b/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("system.eMath")
+
+var res = eMath.addInt(vars.get("$field.recipientcount"), vars.get("$field.currentRecipients"));
+if(res)
+ result.string(res);
+else
+ result.string(0);
\ No newline at end of file
diff --git a/entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js b/entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
index 8a46791dce81c87d35e2c6cf4e985156068e211b..385706891b99b737c6892b3b1f818cbf0a7c48f2 100644
--- a/entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
+++ b/entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
@@ -1,3 +1,4 @@
+import("FilterviewMenuAction_lib");
import("Contact_lib");
import("system.result");
import("Bulkmail_lib");
@@ -7,7 +8,18 @@ import("system.db");
import("Sql_lib");
import("system.vars");
-var contactIds = JSON.parse(vars.getString("$param.ContactIds_param"));
+var selection = JSON.parse(vars.getString("$param.ContactIds_param"));
+var comingfrom = vars.getString("$param.comingFrom_param");
+var contactIds;
+
+if(!Array.isArray(selection)) //if selection is an array, data has been selected
+{
+ var condition = selection.condition;
+ if(comingfrom == "Organisation")
+ contactIds = FilterviewMenuActionUtils.organisationIdsFilter(condition);
+ else if (comingfrom == "Person")
+ contactIds = FilterviewMenuActionUtils.contactIdsFilter(condition);
+}
var serialLetterId = vars.get("$field.SERIALLETTER_ID")
var res;
@@ -16,5 +28,4 @@ if (serialLetterId)
else
res = null;
-result.string(res);
-
+result.string(res);
\ No newline at end of file
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index fbc49981d88a7628cc9e7a781fc4c77d862e92e4..f7d8c265e98e23fb12a9c4e7611637664ada76f1 100644
--- a/entity/SerialLetter_entity/SerialLetter_entity.aod
+++ b/entity/SerialLetter_entity/SerialLetter_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>SerialLetter_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SerialLetter_entity/documentation.adoc</documentation>
@@ -201,6 +201,10 @@
<iconId>VAADIN:FILE_PROCESS</iconId>
<tooltip>Generate letter</tooltip>
</entityActionField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -231,7 +235,7 @@
<name>DOCUMENTTEMPLATE_ID.value</name>
<recordfield>SERIALLETTER.DOCUMENTTEMPLATE_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SERIALLETTERID.value</name>
@@ -251,13 +255,13 @@
<name>DESCRIPTION.value</name>
<recordfield>SERIALLETTER.DESCRIPTION</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.value</name>
<recordfield>SERIALLETTER.STATUS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.displayValue</name>
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index 18c1480e22c325013a11ad667da771e9ea936a98..41ff421fb24975e2ac5117cc70209fbb641ce1e8 100644
--- a/entity/Social_entity/Social_entity.aod
+++ b/entity/Social_entity/Social_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Social_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Social_entity/documentation.adoc</documentation>
@@ -33,5 +33,9 @@
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
</entity>
diff --git a/entity/Social_entity/contentProcess.js b/entity/Social_entity/contentProcess.js
deleted file mode 100644
index 9a4d854baa7ad851819c3d3d1c99bfb59d72e551..0000000000000000000000000000000000000000
--- a/entity/Social_entity/contentProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.object([["1"]]);
\ No newline at end of file
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index 5aeda5c11957825733bec480fecc9e3d89db43bb..79a929f5a6b9403a98d9b9d03c1d6c07c7401b98 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Stock_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Stock_entity/documentation.adoc</documentation>
@@ -108,6 +108,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Stock_entity/conditionProcess.js b/entity/Stock_entity/conditionProcess.js
deleted file mode 100644
index 06122e880d685e56bab06d82c4f5434348b411c2..0000000000000000000000000000000000000000
--- a/entity/Stock_entity/conditionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != "")
- result.string(newWhere("STOCK.PRODUCT_ID", "$param.ProductId_param").toString());
-else
- result.string("1 = 2");
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/date_edit/valueProcess.js b/entity/Stock_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Stock_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/date_new/valueProcess.js b/entity/Stock_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/Stock_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/user_edit/valueProcess.js b/entity/Stock_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Stock_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/user_new/valueProcess.js b/entity/Stock_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Stock_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Stock_entity/orderClauseProcess.js b/entity/Stock_entity/orderClauseProcess.js
deleted file mode 100644
index ec31c7395e9c1d4b368d0f9310e4b76f30f11ac1..0000000000000000000000000000000000000000
--- a/entity/Stock_entity/orderClauseProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object( {"STOCK.ENTRYDATE": "down"} );
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 69f29f9e7f9cd60dbc419f66159e5423d41e0096..23f83fc09c4d9449f6417d8d3b3fa3f2674d57a7 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>SupportTicket_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SupportTicket_entity/documentation.adoc</documentation>
@@ -7,7 +7,9 @@
<contentTitleProcess>%aditoprj%/entity/SupportTicket_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/SupportTicket_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/SupportTicket_entity/onValidation.js</onValidation>
+ <useFavorites v="true" />
<iconId>VAADIN:CHAT</iconId>
+ <imageProcess>%aditoprj%/entity/SupportTicket_entity/imageProcess.js</imageProcess>
<titlePlural>Support Tickets</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -395,6 +397,10 @@
<name>RowId_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>SUPPORTTICKET_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/supportticket_objecttype/valueProcess.js</valueProcess>
+ </entityField>
<entityField>
<name>COUNT</name>
<title>Count</title>
@@ -405,6 +411,10 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -437,31 +447,32 @@
<dbRecordFieldMapping>
<name>CODE.value</name>
<recordfield>TICKET.CODE</recordfield>
- <isFilterable v="false" />
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TASK_DESCRIPTION.value</name>
<recordfield>TASK.DESCRIPTION</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TASK_EDITOR_CONTACT_ID.value</name>
<recordfield>TASK.EDITOR_CONTACT_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TASK_MATURITY_DATE.value</name>
<recordfield>TASK.MATURITY_DATE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TASK_PRIORITY.value</name>
<recordfield>TASK.PRIORITY</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TASK_REQUESTOR_CONTACT_ID.value</name>
@@ -471,13 +482,13 @@
<name>TASK_START_DATE.value</name>
<recordfield>TASK.START_DATE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TASK_STATUS.value</name>
<recordfield>TASK.STATUS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TASK_SUBJECT.value</name>
@@ -497,7 +508,7 @@
<name>TASK_PROGRESS.value</name>
<recordfield>TASK.PROGRESS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TASK_PROGRESS.displayValue</name>
@@ -537,10 +548,6 @@
<name>TASK_PARENT_CONTEXT.value</name>
<recordfield>TASK.PARENT_CONTEXT</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>COUNT.value</name>
- <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
- </dbRecordFieldMapping>
<aggregateFieldDbMapping>
<name>COUNT_aggregate.value</name>
<recordfield>TICKET.TICKETID</recordfield>
diff --git a/entity/SupportTicket_entity/afterUiInit.js b/entity/SupportTicket_entity/afterUiInit.js
index 0e588e61aa69e7aa2ff720affb4992b4ab8b4d84..9080cb34c8aa3a5e80c59ab564a3014f11216c9c 100644
--- a/entity/SupportTicket_entity/afterUiInit.js
+++ b/entity/SupportTicket_entity/afterUiInit.js
@@ -1,3 +1,4 @@
+import("Contact_lib");
import("Ticket_lib");
import("Context_lib");
import("Attribute_lib");
@@ -7,6 +8,16 @@ import("ActivityTask_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
- TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.TASK_PARENT_CONTEXT", "$field.TASK_PARENT_ID");
+ var presetLinks = JSON.parse(vars.getString("$param.PresetLinks_param"));
+ if(presetLinks[0][0] == "Person")
+ {
+ var contactId = presetLinks[0][1];
+
+ var orgContactId = ContactUtils.getOrganisationContactId(contactId);
+
+ presetLinks[1] = ["Organisation", orgContactId];
+ }
+
+ TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", presetLinks, "$field.TASK_PARENT_CONTEXT", "$field.TASK_PARENT_ID");
AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes", TicketUtils.begin(vars.get("$field.TICKETTYPE")).getTypeAttributes());
}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/contentTitleProcess.js b/entity/SupportTicket_entity/contentTitleProcess.js
index d46871e0448b31bbfb5511705ca9f4ebcfffc3b6..aae1064b78ee311afec427a24872f4136046df42 100644
--- a/entity/SupportTicket_entity/contentTitleProcess.js
+++ b/entity/SupportTicket_entity/contentTitleProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.TICKETTYPE.displayValue"))
\ No newline at end of file
+result.string(vars.get("$field.TASK_SUBJECT"))
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/supportticket_objecttype/valueProcess.js b/entity/SupportTicket_entity/entityfields/supportticket_objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b111482e01700c32a7642db41eedd0fbb1ba6daa
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/supportticket_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SupportTicket");
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/imageProcess.js b/entity/SupportTicket_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..14bc9ba718d66bd9ded2e2709f1091e1ea4b043d
--- /dev/null
+++ b/entity/SupportTicket_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:"+vars.get("$field.TASK_SUBJECT"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
index 05d2e05eca452c8c0739c7c39eaae157f6e37576..a3fb601aa08385a85a4370d783a55ea681ed90f6 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
@@ -9,15 +9,13 @@ var cond = newWhere()
.and("TASK.KIND", $KeywordRegistry.taskType$ticket())
.andIfSet("TICKET.TICKETTYPE", "$param.TicketType_param")
-var loadNothing = false;
-
if (vars.getString("$param.FilterOnlyOwnTicket_param") == "true")
{
var ownContactId = EmployeeUtils.getCurrentContactId();
if (ownContactId)
cond.andIfSet("TASK.EDITOR_CONTACT_ID", ownContactId);
else
- loadNothing = true;
+ cond.noResult();
}
if (vars.get("$param.RowId_param") && vars.get("$param.ObjectId_param"))
@@ -30,12 +28,5 @@ if (vars.get("$param.RowId_param") && vars.get("$param.ObjectId_param"))
, SqlBuilder.IN());
}
-if (loadNothing)
-{
- result.string("1=2");
-}
-else
-{
- //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
- result.string(cond.toString());
-}
\ No newline at end of file
+//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js
deleted file mode 100644
index e5961584dd2e3bd5741ac96032105a8cc43ec58b..0000000000000000000000000000000000000000
--- a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Person_lib");
-
-//TODO: try to find a better solution for this -> #TITLE-mechanic when available
-var subSql = PersUtils.getResolvingDisplaySubSql("TASK.EDITOR_CONTACT_ID");
-result.string(subSql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
deleted file mode 100644
index 0b2c6568c32b748a32d429eddffbc29e9f24d980..0000000000000000000000000000000000000000
--- a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskPriority(), "TASK.PRIORITY");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/progress.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/progress.displayvalue/expression.js
deleted file mode 100644
index 4666f5143991d0e7ade783064a6094470f7f397e..0000000000000000000000000000000000000000
--- a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/progress.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskProgress(), "TASK.PROGRESS");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js
deleted file mode 100644
index 6c6d6087a2615c447bc2b84294d4e029b1cde9ba..0000000000000000000000000000000000000000
--- a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Person_lib");
-
-//TODO: try to find a better solution for this -> #TITLE-mechanic when available
-var subSql = PersUtils.getResolvingDisplaySubSql("TASK.REQUESTOR_CONTACT_ID");
-result.string(subSql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
deleted file mode 100644
index 7f15c2dfb29cfb0697cf46955ed2840b4480a8ef..0000000000000000000000000000000000000000
--- a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// do not use this, because TaskUtils.getTypeStatusKeyword(vars.get("$field.TASK_TYPE")) has to be called, which is not possible in a subselect.
-// --> only use display value process
\ No newline at end of file
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 5c8923df4d6b3a01939036838a4021874fee4149..759282daf39bbcbd59b7a37223e1c9d4873dfaca 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>TaskLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/TaskLink_entity/documentation.adoc</documentation>
@@ -37,6 +37,7 @@
<name>Link</name>
<targetContextField>OBJECT_TYPE</targetContextField>
<targetIdField>OBJECT_ROWID</targetIdField>
+ <documentation>%aditoprj%/entity/TaskLink_entity/entityfields/link/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -86,6 +87,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/TaskLink_entity/entityfields/link/documentation.adoc b/entity/TaskLink_entity/entityfields/link/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..34f2521ccb43a373cae26c3ce30dcfe15921d898
--- /dev/null
+++ b/entity/TaskLink_entity/entityfields/link/documentation.adoc
@@ -0,0 +1,3 @@
+Provides links of tasks where data is filtered for one specific task.
+
+Use case: "give me all task links for task X".
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 14cdb18785867088dbb7220fa1bb33afc7b479a3..9a00aa3164d3148083d61c2e8ce81d210b3fcc99 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -1,13 +1,14 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Task_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
<title>Task</title>
<grantDeleteProcess>%aditoprj%/entity/Task_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Task_entity/contentTitleProcess.js</contentTitleProcess>
- <onInit>%aditoprj%/entity/Task_entity/onInit.js</onInit>
+ <afterUiInit>%aditoprj%/entity/Task_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Task_entity/onValidation.js</onValidation>
+ <initFilterProcess>%aditoprj%/entity/Task_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:TASKS</iconId>
<iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess>
<titlePlural>Tasks</titlePlural>
@@ -287,6 +288,7 @@
</entityConsumer>
<entityProvider>
<name>Tasks</name>
+ <documentation>%aditoprj%/entity/Task_entity/entityfields/tasks/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>dd79df43-264c-494b-9c92-cadf19e61db6</name>
@@ -463,6 +465,10 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -487,49 +493,49 @@
<name>DESCRIPTION.value</name>
<recordfield>TASK.DESCRIPTION</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>EDITOR_CONTACT_ID.value</name>
<recordfield>TASK.EDITOR_CONTACT_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>MATURITY_DATE.value</name>
<recordfield>TASK.MATURITY_DATE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PRIORITY.value</name>
<recordfield>TASK.PRIORITY</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PROTECTIONLEVEL.value</name>
<recordfield>TASK.PROTECTIONLEVEL</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>REQUESTOR_CONTACT_ID.value</name>
<recordfield>TASK.REQUESTOR_CONTACT_ID</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>START_DATE.value</name>
<recordfield>TASK.START_DATE</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.value</name>
<recordfield>TASK.STATUS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SUBJECT.value</name>
@@ -566,7 +572,7 @@
<name>PROGRESS.value</name>
<recordfield>TASK.PROGRESS</recordfield>
<isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PROGRESS.displayValue</name>
@@ -580,10 +586,6 @@
<name>TYPE.value</name>
<recordfield>TASK.KIND</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>COUNT.value</name>
- <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
- </dbRecordFieldMapping>
<aggregateFieldDbMapping>
<name>COUNT_aggregate.value</name>
<recordfield>TASK.TASKID</recordfield>
diff --git a/entity/Task_entity/afterUiInit.js b/entity/Task_entity/afterUiInit.js
new file mode 100644
index 0000000000000000000000000000000000000000..2f108ba446930b67156ba07b5e880b1ff371117a
--- /dev/null
+++ b/entity/Task_entity/afterUiInit.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.PARENT_CONTEXT", "$field.PARENT_ID");
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/date_edit/valueProcess.js b/entity/Task_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/date_new/valueProcess.js b/entity/Task_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 408c498a4c90f59cd95eafbf74a8ea2683bab068..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
-
diff --git a/entity/Task_entity/entityfields/keywordprogress/children/containername_param/code.js b/entity/Task_entity/entityfields/keywordprogress/children/containername_param/code.js
deleted file mode 100644
index b19308201a587f0681e4a6486ea3751b784e1ebb..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/keywordprogress/children/containername_param/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.taskProgress());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/links/children/taskid_param/code.js b/entity/Task_entity/entityfields/links/children/taskid_param/code.js
deleted file mode 100644
index cf73f1e2a3c4acf31c86f28a5120f1728fd55aa1..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/links/children/taskid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.TASKID"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/moduletrees/children/id/valueProcess.js b/entity/Task_entity/entityfields/moduletrees/children/id/valueProcess.js
deleted file mode 100644
index 890f0a3405749e82541e057057f75d24166006d7..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/moduletrees/children/id/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.TASKID"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/tasks/documentation.adoc b/entity/Task_entity/entityfields/tasks/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..2d404a44292ca92a10d14e3559666267bb9bf9ff
--- /dev/null
+++ b/entity/Task_entity/entityfields/tasks/documentation.adoc
@@ -0,0 +1 @@
+Generic provider that provides task where data is filtered for a given task link. (e.g.: "give me all tasks for Company X").
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/user_edit/valueProcess.js b/entity/Task_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/user_new/valueProcess.js b/entity/Task_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Task_entity/initFilterProcess.js b/entity/Task_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bfea2877c6eecc3503612abe4076f4e337ee51d3
--- /dev/null
+++ b/entity/Task_entity/initFilterProcess.js
@@ -0,0 +1,24 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
+{
+ var statusEnded = $KeywordRegistry.taskStatus$ended();
+ var filter = {
+ type: "group",
+ operator: "AND",
+ childs: [{
+ type: "row",
+ name: "STATUS",
+ operator: "NOT_EQUAL",
+ contenttype: "TEXT",
+ key: statusEnded,
+ value: KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), statusEnded)
+ }]
+ };
+
+ result.string(JSON.stringify(filter));
+}
\ No newline at end of file
diff --git a/entity/Task_entity/onInit.js b/entity/Task_entity/onInit.js
deleted file mode 100644
index 0a610862cbb9ecae7e44e15eabbc31b0b20eceda..0000000000000000000000000000000000000000
--- a/entity/Task_entity/onInit.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.neon");
-import("ActivityTask_lib");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var recordState = vars.get("$sys.recordstate");
-if(recordState == neon.OPERATINGSTATE_NEW)
-{
- TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.PARENT_CONTEXT", "$field.PARENT_ID");
-}
-else if (recordState != neon.OPERATINGSTATE_SEARCH)
-{
- var statusFilterElement = {
- "type":"row",
- "name":"STATUS",
- "operator":"NOT_EQUAL",
- "key":$KeywordRegistry.taskStatus$ended(),
- "contenttype": "TEXT"
- };
- statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), statusFilterElement.key);
-
- var filter = {
- "type":"group",
- "operator":"AND",
- "childs": [statusFilterElement]
- };
- filter = JSON.stringify(filter);
- neon.setFilter("#ENTITY", filter);
-}
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/conditionProcess.js b/entity/Task_entity/recordcontainers/db/conditionProcess.js
index bf89d69810e24d611916e499974711d72c438654..aeaf998bec85dc61e32fafcbb7c2138486c7e21a 100644
--- a/entity/Task_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Task_entity/recordcontainers/db/conditionProcess.js
@@ -29,7 +29,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
if (loadNothing)
{
- result.string("1=2");
+ result.string(SqlBuilder.NORESULT_CONDITION());
}
else
{
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 8c62a0b51b24844fc84b6c894313853a4df69e21..fc202492285ba2545d3502221077c49200a9f2cf 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Timetracking_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Timetracking_entity/documentation.adoc</documentation>
@@ -118,6 +118,10 @@
<valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/year/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/year/displayValueProcess.js</displayValueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Timetracking_entity/entityfields/date_edit/valueProcess.js b/entity/Timetracking_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/Timetracking_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/entityfields/date_new/valueProcess.js b/entity/Timetracking_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/Timetracking_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/entityfields/user_edit/valueProcess.js b/entity/Timetracking_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/Timetracking_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/entityfields/user_new/valueProcess.js b/entity/Timetracking_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/Timetracking_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
index 412433f0950fd8d93d64fee60e73c9d96b126e4f..d275ce95c96dde9bf3a79215960a2701d79a014d 100644
--- a/entity/TurnoverTree_entity/TurnoverTree_entity.aod
+++ b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>TurnoverTree_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/TurnoverTree_entity/documentation.adoc</documentation>
@@ -95,6 +95,10 @@
<entityField>
<name>LAYER</name>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index 667240d5777e33d3962402836c12071498acd21b..0737e151be2ff946ccf52770b97fc832bbae30ea 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Turnover_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Turnover_entity/documentation.adoc</documentation>
@@ -113,6 +113,10 @@
<valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/showturnover_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod b/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
index b46af9a58f2764af6f2b9ba85d9baf6c2f419cda..1abb59ffc8bc30f70492cbe64475651d62da62a8 100644
--- a/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
+++ b/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>UniversalFileProcessor_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/UniversalFileProcessor_entity/documentation.adoc</documentation>
@@ -36,5 +36,9 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
</entity>
diff --git a/entity/UniversalFileProcessor_entity/entityfields/activities/children/activityids_param/valueProcess.js b/entity/UniversalFileProcessor_entity/entityfields/activities/children/activityids_param/valueProcess.js
index 826d12e6b5386f0ca1808c840e61d740ac726b3d..005f7ca5ac1ed5f7275f3c13e74ab1cc185e924d 100644
--- a/entity/UniversalFileProcessor_entity/entityfields/activities/children/activityids_param/valueProcess.js
+++ b/entity/UniversalFileProcessor_entity/entityfields/activities/children/activityids_param/valueProcess.js
@@ -1,4 +1,8 @@
import("system.vars");
import("system.result");
-result.string(vars.exists("$global.ACTIVITY_IDS")? vars.get("$global.ACTIVITY_IDS"):"[]");
\ No newline at end of file
+if (vars.exists("$global.ACTIVITY_IDS") && vars.get("$global.ACTIVITY_IDS")) {
+ result.string(vars.get("$global.ACTIVITY_IDS"));
+} else {
+ result.string("[]");
+}
\ No newline at end of file
diff --git a/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js b/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js
index 43feeb028966f9f5e0da867224d550f289cc459b..8f1c9f0ead9994903655b9abd71da047ca14e850 100644
--- a/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js
+++ b/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js
@@ -32,6 +32,7 @@ for (var i = 0, l = files.length; i < l; i++)
var mailObj = _getMailObj(files[i]);
if (mailObj)
{
+ mailObj.filename = files[i].filename;
var incomingMailExec = new IncomingEmailExecutor(mailObj);
incomingMailExec.setAlias(dbAlias);
var mailImportResult = incomingMailExec.autoProcess()
diff --git a/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod b/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
index 38d93fe74e2772d2fdb4e95844e32af6a084997b..32072b9ff371549124437be92adcfdb598f6be37 100644
--- a/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
+++ b/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>UnlinkedMailMappingLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/UnlinkedMailMappingLink_entity/documentation.adoc</documentation>
@@ -50,6 +50,10 @@
<state>INVISIBLE</state>
<valueProcess>%aditoprj%/entity/UnlinkedMailMappingLink_entity/entityfields/context_name/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
index 6459c62cbff2a97d0ac078107888482f419bc7a9..42eb73a718ae614066df3597d25cc982dc96b69b 100644
--- a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
+++ b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>UnlinkedMailMappingWrapper_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc</documentation>
@@ -11,6 +11,7 @@
</entityProvider>
<entityProvider>
<name>ForUnlinkedMail</name>
+ <documentation>%aditoprj%/entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc</documentation>
<children>
<entityParameter>
<name>UnlinkedMailId_param</name>
@@ -60,6 +61,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc b/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc
index 8559ac9a3d3510fee097ccf7ae20ef2a3d086328..27350aa2712ba518f31b0b0c9d5d7efa80ed86f4 100644
--- a/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc
+++ b/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc
@@ -1,3 +1,7 @@
= UnlinkedMailMappingWrapper_entity
-For manual linking of an unlinked mail
\ No newline at end of file
+For manual linking of an unlinked mail
+
+WARNING: This is deprecated and should not longer be used. Activites are now created always and have some or no activity links.
+
+//todo: remove entity
\ No newline at end of file
diff --git a/entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc b/entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..1f1f3de9c73313db7d1f9710219e3fca49911c45
--- /dev/null
+++ b/entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc
@@ -0,0 +1,3 @@
+Provides a wrapper for Unlinked Mails.
+
+WARNING: This is deprecated and should not longer be used. Activites are now created always and have some or no activity links.
\ No newline at end of file
diff --git a/entity/UnlinkedMailMappingWrapper_entity/recordcontainers/dummyjdito/onUpdate.js b/entity/UnlinkedMailMappingWrapper_entity/recordcontainers/dummyjdito/onUpdate.js
index f6cc9442f35488dd9da83caac5ccfc035569b55d..1910f493948e777cbf153d2fc3dcacd413a0666c 100644
--- a/entity/UnlinkedMailMappingWrapper_entity/recordcontainers/dummyjdito/onUpdate.js
+++ b/entity/UnlinkedMailMappingWrapper_entity/recordcontainers/dummyjdito/onUpdate.js
@@ -16,7 +16,6 @@ var changedRows = vars.get("$field.UnlinkedMailMappingLinks.insertedRows");
var communicationsToInsert = [];
var communicationCols = ["COMMUNICATIONID", "ADDR", "CONTACT_ID", "ISSTANDARD", "MEDIUM_ID", "USER_NEW", "DATE_NEW"];
-var communicationTypes = db.getColumnTypes("COMMUNICATION", communicationCols);
if (changedRows.length > 0)
{
@@ -51,7 +50,7 @@ if (changedRows.length > 0)
{
var standardFlag = contactRows[i]["STANDARD_EMAIL_COMMUNICATION"] ? "0" : "1";//when no standard mail exists already: set it
var vals = [util.getNewUUID(), emailAddrToAdd, contactId, standardFlag, $KeywordRegistry.communicationMedium$mail(), vars.get("$sys.user"), datetime.date()];
- communicationsToInsert.push(["COMMUNICATION", communicationCols, communicationTypes, vals]);
+ communicationsToInsert.push(["COMMUNICATION", communicationCols, null, vals]);
//TODO: insert the COMM via a entities.***-method when available
}
}
diff --git a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
index d47ae7b80fb9461d53c2587e10289b32292a6f14..7cc21c5dc1d1bc6760394038399e025abe51dc7d 100644
--- a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
+++ b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>UnlinkedMail_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/UnlinkedMail_entity/documentation.adoc</documentation>
@@ -60,6 +60,10 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/UnlinkedMail_entity/entityfields/downloadmail_actiongroup/children/downloadmail_actiongroup/children/downloadmail_action/onActionProcess.js b/entity/UnlinkedMail_entity/entityfields/downloadmail_actiongroup/children/downloadmail_actiongroup/children/downloadmail_action/onActionProcess.js
deleted file mode 100644
index 62b2cac763a9837786ddac88a1551fc9ceeed1c5..0000000000000000000000000000000000000000
--- a/entity/UnlinkedMail_entity/entityfields/downloadmail_actiongroup/children/downloadmail_actiongroup/children/downloadmail_action/onActionProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.util");
-import("system.vars");
-import("system.mail");
-import("system.neon");
-
-var email = vars.get("$field.MAIL");
-var fileName = "Mail.eml";//if you want to use the subject here, remember to sanitize it first
-neon.download(util.encodeBase64String(email), fileName);
\ No newline at end of file
diff --git a/entity/UserhelpResources/UserhelpResources.aod b/entity/UserhelpResources/UserhelpResources.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9a1b9a31ac53d820cfeed19fdd689c0c796a9bdd
--- /dev/null
+++ b/entity/UserhelpResources/UserhelpResources.aod
@@ -0,0 +1,35 @@
+<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+ <name>UserhelpResources</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>image</name>
+ </entityField>
+ <entityConsumer>
+ <name>Documents</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ </entityFields>
+</entity>
diff --git a/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2031e39685e18098a6950fee8f257f6bfa29f3c7
--- /dev/null
+++ b/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+//result.string(vars.get("$field.CONTACTID"));
+result.string("meinetestid");
\ No newline at end of file
diff --git a/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..886237ba81cbd1152dfe676853ebc2e71060ca8e
--- /dev/null
+++ b/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("USERHELP");
\ No newline at end of file
diff --git a/entity/Usersettings_entity/Usersettings_entity.aod b/entity/Usersettings_entity/Usersettings_entity.aod
index eb65941d79ad231c6a6aef600ca4c232f0b5e8fb..0214bb75b50a9467e503653a3f415170ae56a24c 100644
--- a/entity/Usersettings_entity/Usersettings_entity.aod
+++ b/entity/Usersettings_entity/Usersettings_entity.aod
@@ -1,17 +1,86 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>Usersettings_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Usersettings_entity/documentation.adoc</documentation>
<title>Settings</title>
+ <grantDelete v="false" />
+ <afterUiInit>%aditoprj%/entity/Usersettings_entity/afterUiInit.js</afterUiInit>
<titlePlural>Settings</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
+ <entityField>
+ <name>calHourdivider</name>
+ <title>Calendar hour divider</title>
+ <contentType>NUMBER</contentType>
+ <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/calhourdivider/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityField>
+ <name>calMaintimeEnd</name>
+ <title>Calendar maintime end</title>
+ <contentType>NUMBER</contentType>
+ <placeholder>HH:mm</placeholder>
+ <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js</dropDownProcess>
+ <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/calmaintimeend/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>calMaintimeStart</name>
+ <title>Calendar maintime start</title>
+ <contentType>NUMBER</contentType>
+ <placeholder>HH:mm</placeholder>
+ <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js</dropDownProcess>
+ <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/calmaintimestart/onValidation.js</onValidation>
+ </entityField>
<entityField>
<name>UID</name>
+ <title>UID</title>
+ </entityField>
+ <entityField>
+ <name>selectionIgnoreCase</name>
+ <title>Selection ignore case</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/selectionignorecase/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityField>
+ <name>selectionPlaceholder</name>
+ <title>Selection placeholder</title>
+ <contentType>NUMBER</contentType>
+ <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/selectionplaceholder/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityField>
+ <name>jPassword</name>
+ <title>New password</title>
+ <contentType>PASSWORD</contentType>
+ <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/jpassword/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>jPasswordRepeat</name>
+ <title>Repeat password</title>
+ <contentType>PASSWORD</contentType>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>jPasswordSave</name>
+ </entityField>
+ <entityField>
+ <name>currentPassword</name>
+ <title>Current password</title>
+ <contentType>PASSWORD</contentType>
+ <stateProcess>%aditoprj%/entity/Usersettings_entity/entityfields/currentpassword/stateProcess.js</stateProcess>
+ <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js</onValidation>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -19,6 +88,30 @@
<jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
<onInsert>%aditoprj%/entity/Usersettings_entity/recordcontainers/jdito/onInsert.js</onInsert>
<recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>calHourdivider.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>calMaintimeEnd.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>calMaintimeStart.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>jPassword.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>jPasswordRepeat.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>jPasswordSave.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>selectionIgnoreCase.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>selectionPlaceholder.value</name>
+ </jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>UID.value</name>
</jDitoRecordFieldMapping>
diff --git a/entity/Usersettings_entity/afterUiInit.js b/entity/Usersettings_entity/afterUiInit.js
new file mode 100644
index 0000000000000000000000000000000000000000..7549fc54591bc1c99586e3e729d1f33cb2082a13
--- /dev/null
+++ b/entity/Usersettings_entity/afterUiInit.js
@@ -0,0 +1,4 @@
+import("UserSettings_lib");
+
+
+UserSettingUtil.initSettings();
diff --git a/entity/Usersettings_entity/documentation.adoc b/entity/Usersettings_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..5eb27c8972d266957edf45e9924c283553d49309
--- /dev/null
+++ b/entity/Usersettings_entity/documentation.adoc
@@ -0,0 +1,44 @@
+= Usersettings_entity
+
+
+== Overview
+
+=== Definition
+
+Entity to read, write and handle user settings.
+
+
+=== Purpose
+
+Enables users to edit their own settings and change their password.
+
+
+=== Particularities
+
+* The settings are stored in the table `ASYS_USERS` as key-value pairs and therefore direct access via DB container is not possible
+* The read/write logic is implemented in the `UserSettings_lib` and will be accessed in the jDito Container
+* The field `UID` exists to prevent errors but is not actually needed
+
+
+== Related entities
+
+-
+
+
+== Best Practice
+
+-
+
+
+== FAQ
+
+[qanda]
+How can I add more fields to the settings view?::
+ You need to do the following:
+
+ * Add a new field to this entity. The name must be the same as in the users data model/the settings table
+ * Add the field to `UsersettingsEdit_view`
+ * Add the name of the field to the arrays in `UserSettings_lib`. Most of them are located in the user objects `params` property => `paramSettings`
+
+Which setting fields are possible?::
+ You can find out if you have a look at the return value of `tools.getCurrentUser()`
\ No newline at end of file
diff --git a/entity/Usersettings_entity/entityfields/calhourdivider/dropDownProcess.js b/entity/Usersettings_entity/entityfields/calhourdivider/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8bca50580ed1e714cd7d8d47571e98140c808f68
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/calhourdivider/dropDownProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.translate");
+
+
+result.object([
+ ["1", "1 " + translate.text("hour")],
+ ["2", "2 " + translate.text("hours")],
+ ["4", "4 " + translate.text("hours")],
+ ["6", "6 " + translate.text("hours")]
+]);
\ No newline at end of file
diff --git a/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js b/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..47b14ebf814c49e6af528d73ff0d880b0dd94787
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js
@@ -0,0 +1,19 @@
+import("system.result");
+
+
+const hourStart = 0;
+const hourEnd = 23;
+const minuteSteps = [0, 15, 30, 45];
+let dropdown = [];
+
+for(let h = hourStart; h <= hourEnd; h++) {
+ for(let mIndex in minuteSteps) {
+ let m = minuteSteps[mIndex];
+ let timestamp = (new Date(1970, 0, 1, h, m)).getTime();
+ let displayTime = h.toString().padStart(2, '0') + ":" + m.toString().padStart(2, '0');
+
+ dropdown.push([timestamp.toString(), displayTime]);
+ }
+}
+
+result.object(dropdown);
diff --git a/entity/Usersettings_entity/entityfields/calmaintimeend/onValidation.js b/entity/Usersettings_entity/entityfields/calmaintimeend/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..71eae42d8bc3e6d7bdd0b0232e5fbc688875958a
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/calmaintimeend/onValidation.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+
+let endValue = vars.get("$local.value");
+let startValue = vars.get("$field.calMaintimeStart");
+
+if(endValue && startValue && parseFloat(startValue) >= parseFloat(endValue)) {
+ result.string(translate.text("End time must be later than start time"));
+}
diff --git a/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js b/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..47b14ebf814c49e6af528d73ff0d880b0dd94787
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js
@@ -0,0 +1,19 @@
+import("system.result");
+
+
+const hourStart = 0;
+const hourEnd = 23;
+const minuteSteps = [0, 15, 30, 45];
+let dropdown = [];
+
+for(let h = hourStart; h <= hourEnd; h++) {
+ for(let mIndex in minuteSteps) {
+ let m = minuteSteps[mIndex];
+ let timestamp = (new Date(1970, 0, 1, h, m)).getTime();
+ let displayTime = h.toString().padStart(2, '0') + ":" + m.toString().padStart(2, '0');
+
+ dropdown.push([timestamp.toString(), displayTime]);
+ }
+}
+
+result.object(dropdown);
diff --git a/entity/Usersettings_entity/entityfields/calmaintimestart/onValidation.js b/entity/Usersettings_entity/entityfields/calmaintimestart/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..7a6d7dd248b7de1105fa4be913c27c8b287e9425
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/calmaintimestart/onValidation.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+
+let startValue = vars.get("$local.value");
+let endValue = vars.get("$field.calMaintimeEnd");
+
+if(startValue && endValue && parseFloat(endValue) <= parseFloat(startValue)) {
+ result.string(translate.text("Start time must be earlier than end time"));
+}
diff --git a/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js b/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..b297a811ecb676a3e7450fcb2b9fbeec20c69556
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js
@@ -0,0 +1,17 @@
+import("system.result");
+import("system.neon");
+import("system.translate");
+import("system.tools");
+import("system.vars");
+import("UserSettings_lib");
+
+
+let login = UserSettingUtil.getValue("title");
+let password = vars.get("$local.value");
+
+
+if(vars.get("$property.currentPassword.state") !== neon.COMPONENTSTATE_INVISIBLE) {
+ if(password && !tools.verifyPassword(login, password)) {
+ result.string(translate.text("Wrong password"));
+ }
+}
diff --git a/entity/Usersettings_entity/entityfields/currentpassword/stateProcess.js b/entity/Usersettings_entity/entityfields/currentpassword/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c2a5cd75d975d60115b8f7a956693da816bc92e4
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/currentpassword/stateProcess.js
@@ -0,0 +1,11 @@
+import("system.neon");
+import("system.result");
+import("system.tools");
+import("UserSettings_lib");
+
+
+let login = UserSettingUtil.getValue("title");
+
+if(tools.verifyPassword(login, "")) {
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
diff --git a/entity/Usersettings_entity/entityfields/jpassword/onValidation.js b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..a2d5661928c420ebdb2f323ebbabb52b5c8c108f
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
@@ -0,0 +1,29 @@
+import("system.neon");
+import("system.result");
+import("system.translate");
+import("system.tools");
+import("system.vars");
+
+
+let newPassword = vars.get("$local.value");
+let currentPassword = vars.get("$field.currentPassword");
+let policyMessages = tools.validatePasswordPolicies(newPassword, vars.get("$sys.user"));
+let messages = [];
+
+if(newPassword) {
+ if(vars.get("$property.currentPassword.state") !== neon.COMPONENTSTATE_INVISIBLE) {
+ if(!currentPassword) {
+ messages.push(translate.text("Enter current password to verify"));
+ } else if(newPassword === currentPassword) {
+ messages.push(translate.text("New password must not be the same as the current password"));
+ }
+ }
+
+ if(policyMessages.length > 0) {
+ for(let msg in policyMessages) {
+ messages.push(policyMessages[msg]);
+ }
+ }
+
+ result.string(messages.join("\n", messages));
+}
diff --git a/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js b/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..5ec99b485fdbefae5a3203f9af7ef6a177c20d66
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+
+let passwordRepeat = vars.get("$local.value");
+let newPassword = vars.get("$field.jPassword");
+
+if(newPassword !== passwordRepeat) {
+ result.string(translate.text("Passwords do not match"));
+}
diff --git a/entity/Usersettings_entity/entityfields/selectionignorecase/dropDownProcess.js b/entity/Usersettings_entity/entityfields/selectionignorecase/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b73697eca483c058d00de291ef80158daa96a206
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/selectionignorecase/dropDownProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.translate");
+
+
+result.object([
+ ["true", translate.text("True")],
+ ["false", translate.text("False")]
+]);
diff --git a/entity/Usersettings_entity/entityfields/selectionplaceholder/dropDownProcess.js b/entity/Usersettings_entity/entityfields/selectionplaceholder/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5872dc3e28b4610c806735fc636cb6f72ade46cf
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/selectionplaceholder/dropDownProcess.js
@@ -0,0 +1,12 @@
+import("system.translate");
+import("system.tools");
+import("system.result");
+
+
+result.object([
+ [tools.SELECTION_POSTFIX, translate.text("SELECTION_POSTFIX")],
+ [tools.SELECTION_PREFIX, translate.text("SELECTION_PREFIX")],
+ [tools.SELECTION_BOTH, translate.text("SELECTION_BOTH")],
+ [tools.SELECTION_NEITHER, translate.text("SELECTION_NEITHER")],
+ [tools.SELECTION_NULL, translate.text("SELECTION_NULL")]
+]);
diff --git a/entity/Usersettings_entity/recordcontainers/jdito/onInsert.js b/entity/Usersettings_entity/recordcontainers/jdito/onInsert.js
index 0ffdd02fcbce683e436c0030ffe0517135c6ceda..a99cd8a7709c098de31142af24e6342e83c1ae8a 100644
--- a/entity/Usersettings_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Usersettings_entity/recordcontainers/jdito/onInsert.js
@@ -1 +1,4 @@
-// TODO
\ No newline at end of file
+import("UserSettings_lib");
+
+
+UserSettingUtil.updateSettings();
\ No newline at end of file
diff --git a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
index 531c1918d2452b84b8a0548b723dc849f0906793..e285bf117fd449c0c0986c0044d4a32aece2822c 100644
--- a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
+++ b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
@@ -1,9 +1,10 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>VisitPlanEmployeeWeek_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/documentation.adoc</documentation>
<title>Visitplan Weekly Overview</title>
+ <grantDeleteProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/grantDeleteProcess.js</grantDeleteProcess>
<iconId>VAADIN:CAR</iconId>
<image>VAADIN:CAR</image>
<recordContainer>db</recordContainer>
@@ -95,6 +96,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/VisitPlanEmployeeWeek_entity/grantDeleteProcess.js b/entity/VisitPlanEmployeeWeek_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c5a2db6695f758cd88f0ac2e599d418c292f2ac4
--- /dev/null
+++ b/entity/VisitPlanEmployeeWeek_entity/grantDeleteProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Entity_lib");
+
+var id = vars.get("$field.VISITPLANEMPLOYEEWEEKID")
+var canDelete = new HasLinkedObjectTester()
+ .andNoEntityRows("VisitPlanEntry_entity", "Entries", {Entries_param : id})
+ .validate();
+
+result.string(canDelete)
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
index 46740270752b5207fb8b62d480d5ebf3c57259e9..f059c7a9862bda4da4b6708cac9b114e81fd9423 100644
--- a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+++ b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>VisitPlanEntry_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/VisitPlanEntry_entity/documentation.adoc</documentation>
@@ -30,14 +30,14 @@
<displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
- <name>ORGANISATION_ID</name>
- <documentation>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_id/documentation.adoc</documentation>
+ <name>ORGANISATION_CONTACT_ID</name>
+ <documentation>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/documentation.adoc</documentation>
<title>Organisation</title>
<consumer>Organisations</consumer>
<mandatory v="true" />
- <stateProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_id/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
+ <stateProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ENTRYDATE</name>
@@ -182,9 +182,7 @@
<title>Contact</title>
<consumer>Persons</consumer>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js</onValidation>
</entityField>
<entityConsumer>
<name>Persons</name>
@@ -196,9 +194,12 @@
<children>
<entityParameter>
<name>ExcludedContactIds_param</name>
- <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>OnlyShowContactIds_param</name>
+ <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityParameter>
@@ -217,6 +218,10 @@
</entityDependency>
</dependencies>
</entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -247,10 +252,10 @@
<name>END_TIME.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>ORGANISATION_ID.value</name>
+ <name>ORGANISATION_CONTACT_ID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>ORGANISATION_ID.displayValue</name>
+ <name>ORGANISATION_CONTACT_ID.displayValue</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CONTACT_ID.value</name>
diff --git a/entity/VisitPlanEntry_entity/documentation.adoc b/entity/VisitPlanEntry_entity/documentation.adoc
index fe840f04ecae1b740eca60633420ce2d1f362c95..13c58c22da0edc3d1657fcdc58b7043705a181e2 100644
--- a/entity/VisitPlanEntry_entity/documentation.adoc
+++ b/entity/VisitPlanEntry_entity/documentation.adoc
@@ -2,7 +2,8 @@
For storing Visitentries with their information(date, time, contact, and most importantly: it's Status).
Linked to VisitPlanEmployeeWeek_entity so you only see the entries in the chosen week.
-ORGANISATION_ID is used to store the company that's being visited, CONTACT_ID to Store the Point-of-Contact,
+ORGANISATION_CONTACT_ID is used to store the company that's being visited,
+CONTACT_ID to Store the Point-of-Contact,
since you are normally visiting one specific person.
Keep in mind, that only the organization is important for the visitRecommendations and not the Point of Contact.
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js
index 5384d5effe7fa9821b498472979d30014d7104bd..c86af17417bd7854ad67136e3d6472a83e2c372b 100644
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js
@@ -1,10 +1,9 @@
-import("Person_lib");
+import("Contact_lib");
import("system.db");
import("system.result");
import("system.vars");
-
var contactId = vars.get("$field.CONTACT_ID");
-var res = db.cell(PersUtils.getResolvingDisplaySubSql("'" + contactId + "'"));
+var res = ContactUtils.getFullTitleByContactId(contactId);
result.string(res);
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js
deleted file mode 100644
index 03f6b8014252f4c2405882dda74d4955d797c27f..0000000000000000000000000000000000000000
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.translate");
-import("system.result");
-import("Contact_lib");
-import("system.vars");
-
-var orgId = vars.get("$field.ORGANISATION_ID");
-var contactId = vars.get("$field.CONTACT_ID");
-var orgContactId = ContactUtils.getPersOrgIds(contactId)[2];
-
-if(orgId != orgContactId)
- result.string(translate.text("Contact has to be employee in the chosen Organisation"))
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
deleted file mode 100644
index fe203ca7a71f6d00e5a41fc9b1d2447822c43177..0000000000000000000000000000000000000000
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import("Sql_lib");
-import("system.logging");
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null
- && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
-{
- var contactId = vars.get("$param.ContactId_param");
- var orgId = newSelect("CONTACT.ORGANISATION_ID")
- .from("CONTACT")
- .where("CONTACT.CONTACTID", contactId)
- .cell();
- neon.setFieldValue("$field.ORGANISATION_ID", orgId);
- result.string(vars.get("$param.ContactId_param"));
-}
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js
index 0af8e295e63255fb7540147e6904e87cc65eb4fa..5fdb3779fc2b8699a502c17353bbf34ff9a59bb1 100644
--- a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js
@@ -17,7 +17,7 @@ var pointOfContact = newSelect("CONTACT.CONTACTID", db.getCurrentAlias())
.leftJoin("AB_ATTRIBUTE", "AB_ATTRIBUTE.AB_ATTRIBUTEID = AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID")
.leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
.where("AB_ATTRIBUTE.AB_ATTRIBUTEID", $AttributeRegistry.visitPlanPointOfContact())
- .and("CONTACT.CONTACTID", vars.get("$field.ORGANISATION_ID"))
+ .and("CONTACT.CONTACTID", vars.get("$field.ORGANISATION_CONTACT_ID"))
.cell();
var context;
@@ -25,7 +25,7 @@ if(pointOfContact)
links.push([ContactUtils.getContextByContactId(pointOfContact), pointOfContact]);
else
{
- var contactId = vars.get("$field.ORGANISATION_ID");
+ var contactId = vars.get("$field.ORGANISATION_CONTACT_ID");
context = ContactUtils.getContextByContactId(contactId);
if(context == 'Person')
{
diff --git a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
index e9a7e5846d28fb6ffb8fcd6d7878ff3ea199d5f9..d5d0373503802bd20c6e17d52696af9a2ae87961 100644
--- a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
@@ -20,17 +20,8 @@ import("system.util");
import("system.eMath");
import("system.text");
-
-var entry;
var params = {};
-var pointOfContact;
var mailAffectedUser = [];
-var uidAppointment;
-var values;
-var columns;
-var columnTypes;
-var update;
-var i;
var selectionRowData = vars.get("$sys.selectionRows");
@@ -40,8 +31,8 @@ var entryDateAsLong = selectionRowData[0].ENTRYDATE;
var entryDate = datetime.toDate(entryDateAsLong, "dd-MM-yyyy");
var startTime = selectionRowData[0].BEGIN_TIME;
var endTime = selectionRowData[0].END_TIME;
-var organisation_id = selectionRowData[0].ORGANISATION_ID;
-var organisationName = OrganisationUtils.getNameByOrganisationId(organisation_id);
+var organisationContact_id = selectionRowData[0].ORGANISATION_CONTACT_ID;
+var organisationName = OrganisationUtils.getNameByContactId(organisationContact_id);
var contact_id = selectionRowData[0].CONTACT_ID;
var contactName = ContactUtils.getFullTitleByContactId(contact_id);
var contactMail = CommUtil.getStandardSubSqlMail(contact_id)
@@ -53,9 +44,9 @@ var department = contactData[0];
var contactRole = contactData[1];
var addressId = newSelect("CONTACT.ADDRESS_ID")
.from("CONTACT")
- .where("CONTACT.CONTACTID", organisation_id)
+ .where("CONTACT.CONTACTID", organisationContact_id)
.cell();
-var organisationAddress = new AddrObject(organisation_id);
+var organisationAddress = new AddrObject(organisationContact_id);
var organisationAddressFormatted = organisationAddress.getFormattedAddress(false, "{salutation_name}\n {street} {buildingno}\n {country_short} - {zip} {city}");
var contactCommunication = newSelect("COMMUNICATION.MEDIUM_ID, COMMUNICATION.ADDR")
.from("COMMUNICATION")
@@ -64,7 +55,7 @@ var contactCommunication = newSelect("COMMUNICATION.MEDIUM_ID, COMMUNICATION.ADD
if(contactCommunication.length > 0)
{
var communicationString;
- for (i = 0; i < contactCommunication.length; i++)
+ for (let i = 0; i < contactCommunication.length; i++)
{
communicationString += KeywordUtils.getViewValue($KeywordRegistry.communicationMedium(), contactCommunication[i][0]) + ": "
+ contactCommunication[i][1] + "</br>"
@@ -89,37 +80,34 @@ startdate = datetime.toLong(startdate, "dd-MM-yyyy HH:mm:ss.S");
var duration = eMath.subInt(endTime, startTime);
-entry = CalendarUtil.createEntry("", calendars.VEVENT, summary, description, false, false, false,
+var entry = CalendarUtil.createEntry("", calendars.VEVENT, summary, description, false, false, false,
vars.get("$sys.user"), [vars.get("$sys.user")], startdate, duration, null, calendars.STATUS_TENTATIVE, null, null);
params["Entry_param"] = JSON.stringify(entry);
-uidAppointment = calendars.insert([entry]);
+var uidAppointment = calendars.insert([entry]);
-columns = ["AB_APPOINTMENTLINK_ID",
+var columns = ["AB_APPOINTMENTLINK_ID",
"APPOINTMENT_ID",
"OBJECT_TYPE",
"OBJECT_ROWID"]
-
-columnTypes = db.getColumnTypes("AB_APPOINTMENTLINK", columns, db.getCurrentAlias());
-values = [util.getNewUUID(),
+var values = [util.getNewUUID(),
uidAppointment[0],
"Organisation",
- organisation_id]
-insert = db.insertData("AB_APPOINTMENTLINK", columns, columnTypes, values)
+ organisationContact_id]
+db.insertData("AB_APPOINTMENTLINK", columns, null, values)
values = [util.getNewUUID(),
uidAppointment[0],
"Person",
contact_id]
-insert = db.insertData("AB_APPOINTMENTLINK", columns, columnTypes, values)
+db.insertData("AB_APPOINTMENTLINK", columns, null, values)
values = [$KeywordRegistry.visitPlanEntryStatus$Appointmentarranged(), uidAppointment[0]];
columns = ["STATUS", "APPOINTMENT_ID"];
-columnTypes = db.getColumnTypes("VISITPLANENTRY", columns, db.getCurrentAlias());
-update = newWhere("VISITPLANENTRY.VISITPLANENTRYID", uid)
- .updateData(true, "VISITPLANENTRY", columns, columnTypes, values);
+newWhere("VISITPLANENTRY.VISITPLANENTRYID", uid)
+ .updateData(true, "VISITPLANENTRY", columns, null, values);
neon.setFieldValue("$field.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged());
neon.refreshAll();
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/openroute/onActionProcess.js b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/openroute/onActionProcess.js
index b926fc89ff6515951fc64f5cec927a60f8434174..dc5b0f07067f9de2b8ea08deebdb04d1940ce157 100644
--- a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/openroute/onActionProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/openroute/onActionProcess.js
@@ -59,7 +59,7 @@ if(vars.exists("$param.Entries_param") && vars.get("$param.Entries_param"))
var childAddresses = newSelect("ADDRESS, BUILDINGNO, ZIP, CITY, COUNTRY")
.from("ADDRESS")
.leftJoin("VISITPLANENTRY", "ADDRESS.ADDRESSID = (select ADDRESS_ID from CONTACT where CONTACT.CONTACTID \n\
- = VISITPLANENTRY.ORGANISATION_ID)")
+ = VISITPLANENTRY.ORGANISATION_CONTACT_ID)")
.where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", entryid)
.and("VISITPLANENTRY.ENTRYDATE", entrydateDB)
.table();
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_id/displayValueProcess.js b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js
similarity index 74%
rename from entity/VisitPlanEntry_entity/entityfields/organisation_id/displayValueProcess.js
rename to entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js
index 4a069cec9dd05ddca04014ff4a5a534e07aff0fc..a5833c922a458e88908fd9b6a1f529d12ed6f498 100644
--- a/entity/VisitPlanEntry_entity/entityfields/organisation_id/displayValueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js
@@ -3,7 +3,7 @@ import("system.db");
import("system.vars");
import("Contact_lib");
-var contactid = vars.get("$field.ORGANISATION_ID");
+var contactid = vars.get("$field.ORGANISATION_CONTACT_ID");
var res = ContactUtils.getFullTitleByContactId(contactid);
result.string(res);
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_id/documentation.adoc b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/documentation.adoc
similarity index 100%
rename from entity/VisitPlanEntry_entity/entityfields/organisation_id/documentation.adoc
rename to entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/documentation.adoc
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_id/stateProcess.js b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/stateProcess.js
similarity index 100%
rename from entity/VisitPlanEntry_entity/entityfields/organisation_id/stateProcess.js
rename to entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/stateProcess.js
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_id/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
similarity index 92%
rename from entity/VisitPlanEntry_entity/entityfields/organisation_id/valueProcess.js
rename to entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
index f641a6b32d121c19d65e3ad57e6b7fc5ca7e3953..8e22e5c11f08455e5f445c1fbd3d05e4a222cd75 100644
--- a/entity/VisitPlanEntry_entity/entityfields/organisation_id/valueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.neon");
import("system.result");
import("system.vars");
diff --git a/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
deleted file mode 100644
index ec94b86401b566ada90ac2bd3f2d2c43bf78c950..0000000000000000000000000000000000000000
--- a/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Sql_lib");
-
-var contactIdArray = newSelect("CONTACT.CONTACTID")
- .from("CONTACT")
- .where("CONTACT.ORGANISATION_ID", vars.get("$field.ORGANISATION_ID"), SqlBuilder.NOT_EQUAL())
- .arrayColumn()
-result.object(contactIdArray)
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a11c9601feff0a1405f971aa786c5137ec825881
--- /dev/null
+++ b/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js
@@ -0,0 +1,13 @@
+import("Contact_lib");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var orgContactId = vars.get("$field.ORGANISATION_CONTACT_ID");
+var contactIdArray = newSelect("CONTACT.CONTACTID")
+ .from("CONTACT")
+ .where("CONTACT.ORGANISATION_ID", ContactUtils.getPersOrgIds(orgContactId)[2], SqlBuilder.EQUAL())
+ .and("CONTACT.CONTACTID", orgContactId, SqlBuilder.NOT_EQUAL())
+ .arrayColumn();
+
+result.object(contactIdArray)
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js
index 9711f6208cf7dff928ac21b7b0a8cfc89f4b57e1..ce8bb62314fa0a0ae0023f81b31d95a3871bd812 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js
@@ -16,7 +16,7 @@ var items = [];
var group = [];
var entryData = "";
-var entrySQL = newSelect("ENTRYDATE, VISITPLANENTRYID, BEGIN_TIME, END_TIME, ORGANISATION_ID, CONTACT_ID,STATUS, VISITPLANEMPLOYEEWEEK_ID, APPOINTMENT_ID")
+var entrySQL = newSelect("ENTRYDATE, VISITPLANENTRYID, BEGIN_TIME, END_TIME, ORGANISATION_CONTACT_ID, CONTACT_ID,STATUS, VISITPLANEMPLOYEEWEEK_ID, APPOINTMENT_ID")
.from("VISITPLANENTRY");
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
@@ -46,11 +46,11 @@ if(entryData.length > 0)
{
for(var i = 0; i < entryData.length; i++)
{
- var entryDateRaw, visitPlanEntryId, beginn_time, end_time, organisation_id, contact_id, status, visitplanemployeeweek_id, appointmentid;
- [entryDateRaw, visitPlanEntryId, beginn_time, end_time, organisation_id, contact_id, status, visitplanemployeeweek_id, appointmentid] = entryData[i]
+ var entryDateRaw, visitPlanEntryId, beginn_time, end_time, organisationContact_id, contact_id, status, visitplanemployeeweek_id, appointmentid;
+ [entryDateRaw, visitPlanEntryId, beginn_time, end_time, organisationContact_id, contact_id, status, visitplanemployeeweek_id, appointmentid] = entryData[i]
var contactname = db.cell(PersUtils.getResolvingDisplaySubSql("'" + contact_id + "'"));
- var orgname = OrganisationUtils.getNameByOrganisationId(organisation_id);
+ var orgname = OrganisationUtils.getNameByContactId(organisationContact_id);
var parentName = translate.text(datetime.toDate(entryDateRaw, "EEEE"));
entryDate = datetime.toDate(entryDateRaw, "dd.MM.yyyy");
@@ -58,7 +58,7 @@ if(entryData.length > 0)
var alias = SqlUtils.getSystemAlias();
items.push([visitPlanEntryId, false, parentName + "#" + entryDate, "", beginn_time
- , end_time, organisation_id, orgname, contact_id, contactname, entryDateRaw, status, visitplanemployeeweek_id, appointmentid, statusDisplay]);
+ , end_time, organisationContact_id, orgname, contact_id, contactname, entryDateRaw, status, visitplanemployeeweek_id, appointmentid, statusDisplay]);
if(!vars.get("$local.idvalues"))
{
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onDelete.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onDelete.js
index 053a7f39e023be7246f83d5c5a43be027a45f283..a507271c6792ee838fad76db423cae2fb2209c8b 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onDelete.js
@@ -1,6 +1,16 @@
+import("system.vars");
+import("Calendar_lib");
import("system.neon");
import("Sql_lib");
import("system.db");
+var id = vars.get("$field.APPOINTMENT_ID") //deletes appointmententries (+ the linked Objects) if an appointment has been made
+
+new SqlBuilder(SqlUtils.getSystemAlias()).whereIfSet("ASYS_CALENDARBACKEND.ELEMENTUID", id)
+ .deleteData();
+
+newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", id)
+ .deleteData();
+
newWhereIfSet("VISITPLANENTRY.VISITPLANENTRYID", "$field.UID")
.deleteData();
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js
index c0f1048f2920e1035145fc0c8ac1dfb49f915cc3..513409e05735c092c8170ae3dc7184dc1c7e0933 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js
@@ -42,10 +42,8 @@ else
"VISITPLAN_YEAR",
"CONTACT_ID",
];
-
- var columnTypesWeek = db.getColumnTypes("VISITPLANEMPLOYEEWEEK", columnsWeek, db.getCurrentAlias());
- insertData.push(["VISITPLANEMPLOYEEWEEK", columnsWeek, columnTypesWeek, valuesWeek]);
+ insertData.push(["VISITPLANEMPLOYEEWEEK", columnsWeek, null, valuesWeek]);
visitPlanEmployeeWeekID = newWeekId;
}
@@ -58,7 +56,7 @@ var valuesEntry = [
rowData["ENTRYDATE.value"],
rowData["BEGIN_TIME.value"],
rowData["END_TIME.value"],
- rowData["ORGANISATION_ID.value"],
+ rowData["ORGANISATION_CONTACT_ID.value"],
rowData["CONTACT_ID.value"],
visitPlanEmployeeWeekID,
rowData["STATUS.value"]
@@ -69,15 +67,12 @@ var columnsEntry = [
"ENTRYDATE",
"BEGIN_TIME",
"END_TIME",
- "ORGANISATION_ID",
+ "ORGANISATION_CONTACT_ID",
"CONTACT_ID",
"VISITPLANEMPLOYEEWEEK_ID",
"STATUS"
];
-
-var columnTypesEntry = db.getColumnTypes("VISITPLANENTRY", columnsEntry, db.getCurrentAlias());
-
-insertData.push(["VISITPLANENTRY", columnsEntry, columnTypesEntry, valuesEntry])
+insertData.push(["VISITPLANENTRY", columnsEntry, null, valuesEntry])
db.inserts(insertData);
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js
index 412b3644103fb32f8c640a802d03e2c8ef5782da..c22eeca42034c0676686e931650daeb0b22b5bb1 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js
@@ -10,7 +10,7 @@ var values = [
rowData["ENTRYDATE.value"],
rowData["BEGIN_TIME.value"],
rowData["END_TIME.value"],
- rowData["ORGANISATION_ID.value"],
+ rowData["ORGANISATION_CONTACT_ID.value"],
rowData["STATUS"]
];
@@ -18,12 +18,10 @@ var columns = [
"ENTRYDATE",
"BEGIN_TIME",
"END_TIME",
- "ORGANISATION_ID",
+ "ORGANISATION_CONTACT_ID",
"STATUS"
];
-var columnTypes = db.getColumnTypes("VISITPLANENTRY", columns, db.getCurrentAlias());
-
var cond = newWhere("VISITPLANENTRY.VISITPLANENTRYID", vars.get("$field.UID")).toString();
-db.updateData("VISITPLANENTRY", columns, columnTypes, values, cond);
+db.updateData("VISITPLANENTRY", columns, null, values, cond);
diff --git a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
index 12ff61c90d3335d882c896970ab01667a7961c5e..a52a61b1dab8a83407cf4870e944cf448e0dcc73 100644
--- a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
+++ b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>VisitRecommendation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/VisitRecommendation_entity/documentation.adoc</documentation>
@@ -58,6 +58,8 @@
<entityField>
<name>PRIORITY_SOURCE</name>
<title>Priority Source</title>
+ <consumer>KeywordVisitRecommendationSource</consumer>
+ <displayValueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>DUE_DATE</name>
@@ -154,6 +156,24 @@
<name>TARGET_CONTEXT</name>
<valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/target_context/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityConsumer>
+ <name>KeywordVisitRecommendationSource</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js b/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..06491a0184adef6625940873337299d34dd2fc1a
--- /dev/null
+++ b/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.visitRecommendationPrioSource());
\ No newline at end of file
diff --git a/entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js b/entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a52185f9fcf8f4d79b310065b92d9b56452fe621
--- /dev/null
+++ b/entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.visitRecommendationPrioSource(), vars.get("$field.PRIORITY_SOURCE")));
\ No newline at end of file
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
index 26a88f95717ce53ce1723ca71443089d0e3a1540..2dcf9d475228056db770c57f0e2cfaef41fd5c80 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
@@ -44,15 +44,15 @@ if(idValues == false)
.leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
.where("AB_ATTRIBUTE.AB_ATTRIBUTEID", $AttributeRegistry.visitPlanPointOfContact())
.cell(), AddressUtils.formatOnelineSql(),
- "visitPlanFrequency.ID_VALUE", "'VISITFREQUENCY '", activitySubQuery, "CONTACTID",
+ "visitPlanFrequency.ID_VALUE", "'" + $KeywordRegistry.visitRecommendationPrioSource$visitFrequency()+"'" , activitySubQuery, "CONTACTID",
newSelect("min(ENTRYDATE)")
.from("VISITPLANENTRY")
- .where("CONTACT.CONTACTID", "VISITPLANENTRY.ORGANISATION_ID")
+ .where("CONTACT.CONTACTID", "VISITPLANENTRY.ORGANISATION_CONTACT_ID")
.and(newWhere("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
.or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged()))
.and("VISITPLANENTRY.ENTRYDATE", newSelect("min(vp.ENTRYDATE)")
.from("VISITPLANENTRY", "vp")
- .where(["VISITPLANENTRY", "ORGANISATION_ID", "vp"], "visitplanentry.ORGANISATION_ID")
+ .where(["VISITPLANENTRY", "ORGANISATION_CONTACT_ID", "vp"], "visitplanentry.ORGANISATION_CONTACT_ID")
.and(["VISITPLANENTRY", "ENTRYDATE", "vp"], datetime.today())
.and(newWhere(["VISITPLANENTRY", "STATUS", "vp"],
$KeywordRegistry.visitPlanEntryStatus$planned())
@@ -62,7 +62,7 @@ if(idValues == false)
.from("CONTACT")
.join("ORGANISATION", "CONTACT.ORGANISATION_ID = org.ORGANISATIONID", "org")
.leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
- .join("ADDRESS", "ADDRESS_ID = ADDRESSID")
+ .leftJoin("ADDRESS", "ADDRESS_ID = ADDRESSID")
.join("AB_ATTRIBUTERELATION", "visitPlanFrequency.OBJECT_ROWID = CONTACT.CONTACTID", "visitPlanFrequency")
.where(["AB_ATTRIBUTERELATION", "AB_ATTRIBUTE_ID", "visitPlanFrequency"], $AttributeRegistry.visitPlanFrequency())
.table();
@@ -80,7 +80,7 @@ var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDA
newSelect("min(ENTRYDATE)")
.from("VISITPLANENTRY")
- .where("VISITPLANENTRY.ORGANISATION_ID", "VISITRECOMMENDATION.CONTACT_ID")
+ .where("VISITPLANENTRY.ORGANISATION_CONTACT_ID", "VISITRECOMMENDATION.CONTACT_ID")
.and("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
.or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged())
.and("VISITPLANENTRY.entrydate", datetime.today(), SqlBuilder.GREATER())
@@ -88,8 +88,8 @@ var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDA
newSelect("VISITRECOMMENDATION.CONTACT_ID")
.from("VISITPLANEMPLOYEEWEEK, VISITPLANENTRY")
- .where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", "VISITPLANEMPLOYEEWEEKID")
- .and("VISITRECOMMENDATION.CONTACT_ID", "VISITPLANENTRY.ORGANISATION_ID")
+ .where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", "VISITPLANEMPLOYEEWEEK.VISITPLANEMPLOYEEWEEKID")
+ .and("VISITRECOMMENDATION.CONTACT_ID", "VISITPLANENTRY.ORGANISATION_CONTACT_ID")
.and(newWhere("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
.or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged()))
.and("VISITPLANENTRY.entrydate", newSelect("min(vp.entrydate)")
@@ -132,11 +132,12 @@ for( let i = 0; i < recommendationSQLData.length; i++)
tmpData[1] = organisationName; //Organisation Name
tmpData[3] = recommendationSQLData[i][6]; //Address
tmpData[4] = prio;
- tmpData[5] = recommendationSQLData[i][4]; //Source of Priority
+ tmpData[5] = recommendationSQLData[i][4]; //Source of Priority (Id)
tmpData[7] = recommendationSQLData[i][3]; //Due Date
tmpData[8] = recommendationSQLData[i][5]; //Info
tmpData[9] = recommendationSQLData[i][1]; //CONTACT_ID
tmpData[2] = recommendationSQLData[i][8]; //Data_planned
+ tmpData[6] = KeywordUtils.getViewValue($KeywordRegistry.visitRecommendationPrioSource(), recommendationSQLData[i][4]) //Source of Priority (displayvalue)
recommendationData.push(tmpData);
@@ -164,10 +165,12 @@ if(idValues == false)
tmpData[0] = visitFrequencyData[i][0]; //UID
tmpData[1] = visitFrequencyData[i][1]; //Organisation Name
tmpData[3] = visitFrequencyData[i][2]; //Address
- tmpData[5] = visitFrequencyData[i][4]; //Source of Priority
+ tmpData[5] = visitFrequencyData[i][4]; //Source of Priority (Id)
tmpData[8] = "";
- tmpData[9] = visitFrequencyData[i][5]; //last visit
- tmpData[2] = visitFrequencyData[i][6]; //CONTACT_ID
+ tmpData[4] = visitFrequencyData[i][5]; //last visit
+ tmpData[9] = visitFrequencyData[i][6]; //ContactId
+ tmpData[2] = visitFrequencyData[i][1]; //OrganisationId
+ tmpData[6] = KeywordUtils.getViewValue($KeywordRegistry.visitRecommendationPrioSource(), visitFrequencyData[i][4]) //Source of Priority (displayvalue)
var dueDate = "";
var lastVisitDate = "";
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/onInsert.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/onInsert.js
index f362c1d033e797fd7ea14b2d7e1ea613f7661752..1da186c5ef681fd19c07d840b01e23304d33dba9 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/onInsert.js
@@ -24,6 +24,4 @@ var columns = [
"INFO"
];
-var columnTypes = db.getColumnTypes("VISITRECOMMENDATION", columns, db.getCurrentAlias());
-
-db.insertData("VISITRECOMMENDATION", columns, columnTypes, values);
\ No newline at end of file
+db.insertData("VISITRECOMMENDATION", columns, null, values);
\ No newline at end of file
diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index 1cd52f7035f12fffa8d282df67384589bd7c0eb5..6b03a4c7d185c740eb76076e115aeb50afdea57e 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>WorkflowDefinition_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowDefinition_entity/documentation.adoc</documentation>
@@ -7,7 +7,7 @@
<grantCreateProcess>%aditoprj%/entity/WorkflowDefinition_entity/grantCreateProcess.js</grantCreateProcess>
<grantDelete v="false" />
<contentTitleProcess>%aditoprj%/entity/WorkflowDefinition_entity/contentTitleProcess.js</contentTitleProcess>
- <onInit>%aditoprj%/entity/WorkflowDefinition_entity/onInit.js</onInit>
+ <useFavorites v="true" />
<iconId>VAADIN:DROP</iconId>
<titlePlural>Workflow definitions</titlePlural>
<recordContainer>jdito</recordContainer>
@@ -219,6 +219,10 @@
<iconId>VAADIN:EDIT</iconId>
<tooltip>Edit workflow</tooltip>
</entityActionField>
+ <entityField>
+ <name>WORKFLOWDEFINITION_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/WorkflowDefinition_entity/entityfields/workflowdefinition_objecttype/valueProcess.js</valueProcess>
+ </entityField>
<entityConsumer>
<name>CategoryKeyword</name>
<dependency>
@@ -233,6 +237,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -243,7 +251,6 @@
<contentProcess>%aditoprj%/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/WorkflowDefinition_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/WorkflowDefinition_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/WorkflowDefinition_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFieldMappings>
<jDitoRecordFieldMapping>
<name>UID.value</name>
diff --git a/entity/WorkflowDefinition_entity/entityfields/workflowdefinition_objecttype/valueProcess.js b/entity/WorkflowDefinition_entity/entityfields/workflowdefinition_objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..10f8662348bed956769505dba49101956c8ca800
--- /dev/null
+++ b/entity/WorkflowDefinition_entity/entityfields/workflowdefinition_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("WorkflowDefinition");
\ No newline at end of file
diff --git a/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js b/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js
index bec4b9a0b8c4954217e7d33ed77af5640f95311f..dcb98822ddaa667429169f1b0ba63417ab4ccbd0 100644
--- a/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js
@@ -64,7 +64,7 @@ result.object((function ()
if (context)
{
possibleKeysMap = {};
- WorkflowUtils.getPossibleWorkflowDefinitions(context, $KeywordRegistry.workflowTrigger$manual()).forEach(function (key)
+ WorkflowUtils.getPossibleWorkflowDefinitions(context).forEach(function (key)
{
this[key] = true;
}, possibleKeysMap);
diff --git a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
index ae42bbb03a6bf0ad9a0a61cb5d5134c6196d87aa..606db71e8c973f170c928b4eebebbb107835c771 100644
--- a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
+++ b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>WorkflowInstanceHistory_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowInstanceHistory_entity/documentation.adoc</documentation>
@@ -89,6 +89,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
index 37c5a337ba3fef1c5b2d8e9c3574bbea5404ef21..5a1d85e3aee32b207d101e5b44181d03349990e6 100644
--- a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
+++ b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
@@ -1,10 +1,11 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>WorkflowInstance_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowInstance_entity/documentation.adoc</documentation>
<title>Workflow instance</title>
<contentTitleProcess>%aditoprj%/entity/WorkflowInstance_entity/contentTitleProcess.js</contentTitleProcess>
+ <initFilterProcess>%aditoprj%/entity/WorkflowInstance_entity/initFilterProcess.js</initFilterProcess>
<titlePlural>Workflow instances</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
@@ -193,6 +194,10 @@
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/WorkflowInstance_entity/entityfields/diagram/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/WorkflowDefinition_entity/onInit.js b/entity/WorkflowInstance_entity/initFilterProcess.js
similarity index 67%
rename from entity/WorkflowDefinition_entity/onInit.js
rename to entity/WorkflowInstance_entity/initFilterProcess.js
index 7199fd35b05e991cb7f35e577f1a7e593a28c60e..d4649f5520545d0b269fda11729c9e90d8b6e697 100644
--- a/entity/WorkflowDefinition_entity/onInit.js
+++ b/entity/WorkflowInstance_entity/initFilterProcess.js
@@ -1,8 +1,9 @@
import("system.neon");
import("system.vars");
+import("system.result");
import("system.translate");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
{
var filterOnlyUnfinished = {
type : "group",
@@ -16,5 +17,6 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && vars.get("$sys.v
contenttype : "BOOLEAN"
}]
};
- neon.setFilter("Instances", JSON.stringify(filterOnlyUnfinished));
+
+ result.string(JSON.stringify(filterOnlyUnfinished));
}
\ No newline at end of file
diff --git a/entity/WorkflowModel_entity/WorkflowModel_entity.aod b/entity/WorkflowModel_entity/WorkflowModel_entity.aod
index 0829152a67cdfd9ff43a5f9514a755d47cb36b91..73b8d4ebc7888490bfb767a15e59fe1fddf44f94 100644
--- a/entity/WorkflowModel_entity/WorkflowModel_entity.aod
+++ b/entity/WorkflowModel_entity/WorkflowModel_entity.aod
@@ -1,21 +1,16 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>WorkflowModel_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowModel_entity/documentation.adoc</documentation>
<title>Workflow Model</title>
<contentTitleProcess>%aditoprj%/entity/WorkflowModel_entity/contentTitleProcess.js</contentTitleProcess>
+ <afterSave>%aditoprj%/entity/WorkflowModel_entity/afterSave.js</afterSave>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
- <entityActionField>
- <name>openModelEditor</name>
- <title>and open modeler</title>
- <onActionProcess>%aditoprj%/entity/WorkflowModel_entity/entityfields/openmodeleditor/onActionProcess.js</onActionProcess>
- <isSaveAction v="true" />
- </entityActionField>
<entityField>
<name>KEY</name>
<title>Key</title>
@@ -34,6 +29,10 @@
<title>Name</title>
<mandatory v="true" />
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/WorkflowModel_entity/entityfields/openmodeleditor/onActionProcess.js b/entity/WorkflowModel_entity/afterSave.js
similarity index 86%
rename from entity/WorkflowModel_entity/entityfields/openmodeleditor/onActionProcess.js
rename to entity/WorkflowModel_entity/afterSave.js
index a7ebffe2899cad5a9213dd85275a7cf4cf147c99..98156c50f8dae9c7b03bfb5c128e3e1b59c3a55c 100644
--- a/entity/WorkflowModel_entity/entityfields/openmodeleditor/onActionProcess.js
+++ b/entity/WorkflowModel_entity/afterSave.js
@@ -1,5 +1,6 @@
import("system.vars");
import("system.neon");
+import("system.result");
import("Workflow_lib");
var createdModelId = vars.exists("$context.createdModelId") ? vars.get("$context.createdModelId") : null;
@@ -7,4 +8,5 @@ if (createdModelId)
{
vars.set("$context.createdModelId", null);
neon.openUrl(WorkflowUtils.getModelerUrl(createdModelId, true), false);
+ result.string(true);
}
\ No newline at end of file
diff --git a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod b/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
index 05b77e9fea96cde4f1b68245d886d207ff6d41df..0482a952cde7ed445aa8048cbb38c08eaee58570 100644
--- a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
+++ b/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>WorkflowSignal_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowSignal_entity/documentation.adoc</documentation>
@@ -108,6 +108,10 @@
<selectionMode>MULTI</selectionMode>
<valueProcess>%aditoprj%/entity/WorkflowSignal_entity/entityfields/variables/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
index 52186117b0ede7cb65a57fce5de0b5b2056a2c14..e57032a87e242a6b8ff0c370c488b2b318835316 100644
--- a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
+++ b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>WorkflowStartConfig_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowStartConfig_entity/documentation.adoc</documentation>
@@ -79,6 +79,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/WorkflowStartConfig_entity/imageProcess.js b/entity/WorkflowStartConfig_entity/imageProcess.js
index 34147b89bd271ec01be2bb3fa1c6eb055186963f..8b918cbc285c80f90e305b0b2aee6655949db65f 100644
--- a/entity/WorkflowStartConfig_entity/imageProcess.js
+++ b/entity/WorkflowStartConfig_entity/imageProcess.js
@@ -2,5 +2,5 @@ import("system.result");
import("system.vars");
import("system.project");
-var contextModel = project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"));
+var contextModel = vars.get("$field.OBJECT_TYPE") && project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"));
result.string(contextModel ? contextModel[5] : "");
\ No newline at end of file
diff --git a/entity/WorkflowTask_entity/WorkflowTask_entity.aod b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
index f5bcf9949894d5335e68613b990e62b9066e0208..96272fe5f1d9bb562efd850639fc9254cccf61e6 100644
--- a/entity/WorkflowTask_entity/WorkflowTask_entity.aod
+++ b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>WorkflowTask_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowTask_entity/documentation.adoc</documentation>
@@ -7,6 +7,7 @@
<grantCreate v="false" />
<grantUpdateProcess>%aditoprj%/entity/WorkflowTask_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDelete v="false" />
+ <afterSave>%aditoprj%/entity/WorkflowTask_entity/afterSave.js</afterSave>
<imageProcess>%aditoprj%/entity/WorkflowTask_entity/imageProcess.js</imageProcess>
<titlePlural>Tasks</titlePlural>
<recordContainer>jdito</recordContainer>
@@ -27,9 +28,11 @@
</entityField>
<entityField>
<name>FORMDEFINITION</name>
+ <valueProcess>%aditoprj%/entity/WorkflowTask_entity/entityfields/formdefinition/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>FORMRESULT</name>
+ <onValueChange>%aditoprj%/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>NAME</name>
@@ -228,6 +231,10 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -257,9 +264,6 @@
<isFilterable v="true" />
<isLookupFilter v="true" />
</jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>FORMDEFINITION.value</name>
- </jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>FORMRESULT.value</name>
</jDitoRecordFieldMapping>
diff --git a/entity/WorkflowTask_entity/afterSave.js b/entity/WorkflowTask_entity/afterSave.js
new file mode 100644
index 0000000000000000000000000000000000000000..68fae8b0d2432769e1c21ae7d594d02fd20cdb87
--- /dev/null
+++ b/entity/WorkflowTask_entity/afterSave.js
@@ -0,0 +1,38 @@
+import("system.neon");
+import("system.workflow");
+import("system.vars");
+
+var entityData = vars.get("$local.entitydata");
+
+//open the next workflow task if one exists
+if (entityData["FORMRESULT"])
+{
+ var processInstanceId = entityData["PROCESSINSTANCE_ID"];
+ var createTime = entityData["CREATE_TIME"];
+
+ var loadConfig = workflow.createConfigForLoadingTasks()
+ .processInstanceId(processInstanceId);
+
+ var startVal = {
+ id : null,
+ createTime : new Date(+createTime).toString()
+ };
+ var newestTask = JSON.parse(workflow.getTasks(loadConfig)).reduce(function (prev, curr)
+ {
+ var prevTime = Date.parse(prev.createTime);
+ var currTime = Date.parse(curr.createTime);
+
+ return prevTime > currTime ? prev : curr;
+ }, startVal);
+
+ if (newestTask.id !== null)
+ neon.openContext("WorkflowTask", "WorkflowTaskPreview_view", [newestTask.id], neon.OPERATINGSTATE_VIEW, null);
+ else
+ {
+ var params = {
+ "TaskTitle_param" : rowData["NAME.value"]
+ };
+ //if you try to open the task now, it will display "Task done"
+ neon.openContext("WorkflowTask", "WorkflowTaskPreview_view", [rowData["UID.value"]], neon.OPERATINGSTATE_VIEW, params);
+ }
+}
\ No newline at end of file
diff --git a/entity/WorkflowTask_entity/entityfields/formdefinition/valueProcess.js b/entity/WorkflowTask_entity/entityfields/formdefinition/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8fc3f05f70c0f41c45cc8b15489f265bfd8695d4
--- /dev/null
+++ b/entity/WorkflowTask_entity/entityfields/formdefinition/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+import("system.workflow");
+import("system.neon");
+
+//the value of this field can be set by the onValueChange process of FORMRESULT
+
+if (vars.get("$this.value") == null)
+ result.string(workflow.getFormProperties(vars.get("$field.UID")));
\ No newline at end of file
diff --git a/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js b/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..249aba04bbb279e4e8ae4dc4f7164fbeee463fe5
--- /dev/null
+++ b/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js
@@ -0,0 +1,25 @@
+import("system.result");
+import("system.vars");
+import("system.workflow");
+import("system.neon");
+
+var taskId = vars.get("$field.UID");
+var newResult = vars.get("$local.value");
+var oldResult = vars.get("$field.FORMRESULT");
+
+if (newResult && newResult !== oldResult)
+{
+ /*
+ * fieldListeners = all fields that are used inside a visibility expression
+ * -> if one of these fields is changed, set the new FORMDEFINITION
+ */
+ var fieldListeners = JSON.parse(workflow.getFormFieldListeners(taskId));
+ newResult = newResult ? JSON.parse(newResult) : {};
+ oldResult = oldResult ? JSON.parse(oldResult) : {};
+ var isRefreshRequired = fieldListeners.some(function (fieldId)
+ {
+ return newResult[fieldId] !== oldResult[fieldId];
+ });
+ if (isRefreshRequired)
+ neon.setFieldValue("$field.FORMDEFINITION", workflow.getFormProperties(taskId, newResult));
+}
diff --git a/entity/WorkflowTask_entity/recordcontainers/jdito/contentProcess.js b/entity/WorkflowTask_entity/recordcontainers/jdito/contentProcess.js
index de6e83f10c3755c6281daacaedff352aeb93ba55..ed15981f641e6ef0941c2d5298ba177b24c8a080 100644
--- a/entity/WorkflowTask_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/WorkflowTask_entity/recordcontainers/jdito/contentProcess.js
@@ -96,7 +96,6 @@ result.object((function ()
task.processDefinitionId,
task.processInstanceId,
Date.parse(task.createTime).toString(),
- workflow.getFormProperties(task.id) || "",
"",
variables.USER_ID || "",
task.description || "",
diff --git a/entity/WorkflowTask_entity/recordcontainers/jdito/onUpdate.js b/entity/WorkflowTask_entity/recordcontainers/jdito/onUpdate.js
index 9144b8ba06ba1196f6858e0b47fc80ad8a90d103..911cd08a9f37eddcb408944f6b98a038ffe0644a 100644
--- a/entity/WorkflowTask_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/WorkflowTask_entity/recordcontainers/jdito/onUpdate.js
@@ -18,39 +18,5 @@ vars.get("$local.changed").forEach(function (field)
if (!rowData["ASSIGNEE.value"] && !vars.get("$field.ASSIGNEE"))
workflow.setTaskAssignee(taskId, EmployeeUtils.getCurrentUserId());
workflow.completeTaskWithFormData(taskId, JSON.parse(value));
- _openNextTaskIfExists(rowData["PROCESSINSTANCE_ID.value"], rowData["CREATE_TIME.value"]);
}
});
-
-/*
- * checks if a new task has been created for that process instance,
- * if that's the case the new task will be opened
- */
-function _openNextTaskIfExists (pProcessInstanceId, pCreateTime)
-{
- var loadConfig = workflow.createConfigForLoadingTasks()
- .processInstanceId(pProcessInstanceId);
-
- var startVal = {
- id : null,
- createTime : new Date(+pCreateTime).toString()
- };
- var newestTask = JSON.parse(workflow.getTasks(loadConfig)).reduce(function (prev, curr)
- {
- var prevTime = Date.parse(prev.createTime);
- var currTime = Date.parse(curr.createTime);
-
- return prevTime > currTime ? prev : curr;
- }, startVal);
-
- if (newestTask.id !== null)
- neon.openContext("WorkflowTask", "WorkflowTaskPreview_view", [newestTask.id], neon.OPERATINGSTATE_VIEW, null);
- else
- {
- var params = {
- "TaskTitle_param" : rowData["NAME.value"]
- };
- //if you try to open the task now, it will display "Task done"
- neon.openContext("WorkflowTask", "WorkflowTaskPreview_view", [rowData["UID.value"]], neon.OPERATINGSTATE_VIEW, params);
- }
-}
\ No newline at end of file
diff --git a/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod b/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
index ce29046a14bf0f13c1ca416aa0fcd736527e2d4e..df6d2af4a4fbaaefe03d95087d1f7062bfbb4ff3 100644
--- a/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
+++ b/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
@@ -1,5 +1,5 @@
<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>WorkflowVariableValue_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowVariableValue_entity/documentation.adoc</documentation>
@@ -44,6 +44,10 @@
<name>WorkflowInstanceId_param</name>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index ed12fc0f39983f65d9e03fa38e9411b86427147a..ee5347bbdad31dc22668608f0cb8517374ce56db 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6782,21 +6782,96 @@
<entry>
<key>Offerrequest</key>
</entry>
+ <entry>
+ <key>Number of employees</key>
+ </entry>
+ <entry>
+ <key>2. Customer value</key>
+ </entry>
+ <entry>
+ <key>Product preference</key>
+ </entry>
+ <entry>
+ <key>Business development</key>
+ </entry>
+ <entry>
+ <key>Headquarters</key>
+ </entry>
+ <entry>
+ <key>Current supply share</key>
+ </entry>
+ <entry>
+ <key>Purchasing potential p. a.</key>
+ </entry>
+ <entry>
+ <key>ScoreTargetGgroup</key>
+ </entry>
+ <entry>
+ <key>Stagnated</key>
+ </entry>
+ <entry>
+ <key>Negative</key>
+ </entry>
+ <entry>
+ <key>1. Target group</key>
+ </entry>
+ <entry>
+ <key>Positive</key>
+ </entry>
+ <entry>
+ <key>0-50</key>
+ </entry>
+ <entry>
+ <key>Till Score</key>
+ </entry>
+ <entry>
+ <key>251-1000</key>
+ </entry>
+ <entry>
+ <key>ab 1000</key>
+ </entry>
<entry>
<key>Full Permissions</key>
</entry>
+ <entry>
+ <key>200-349 T€</key>
+ </entry>
+ <entry>
+ <key>100-199 T€</key>
+ </entry>
<entry>
<key>Full permissions already assigned</key>
</entry>
+ <entry>
+ <key>51-100</key>
+ </entry>
<entry>
<key>Import Daten</key>
</entry>
+ <entry>
+ <key>ab 350 T€</key>
+ </entry>
+ <entry>
+ <key>0-49 T€</key>
+ </entry>
+ <entry>
+ <key>Grading</key>
+ </entry>
<entry>
<key>Import Logs</key>
</entry>
<entry>
<key>Transferdaten</key>
</entry>
+ <entry>
+ <key>50-99 T€</key>
+ </entry>
+ <entry>
+ <key>101-250</key>
+ </entry>
+ <entry>
+ <key>Gradings</key>
+ </entry>
<entry>
<key>Valid from (as </key>
</entry>
@@ -6804,25 +6879,34 @@
<key>${SQL_LIB_FIELD_WRONG_FORMAT}</key>
</entry>
<entry>
- <key>Settings</key>
+ <key>yellow</key>
</entry>
<entry>
- <key>workflow notification</key>
+ <key>Borrow</key>
</entry>
<entry>
- <key>Permission received</key>
+ <key>Is unlinked activity</key>
</entry>
<entry>
- <key>leadimport notification</key>
+ <key>Fantasy</key>
</entry>
<entry>
- <key>granted permission</key>
+ <key>Extend</key>
</entry>
<entry>
- <key>bulk mail sent</key>
+ <key>Krimi</key>
</entry>
<entry>
- <key>download ready</key>
+ <key>red</key>
+ </entry>
+ <entry>
+ <key>Return</key>
+ </entry>
+ <entry>
+ <key>green</key>
+ </entry>
+ <entry>
+ <key>Actionthriller</key>
</entry>
<entry>
<key>No new recipients found that can be added to the bulk mail.</key>
@@ -6852,10 +6936,452 @@
<key>send mail</key>
</entry>
<entry>
- <key>Add new Department Permission</key>
+ <key>and open modeler</key>
</entry>
- <entry>
- <key>Add new User Permission</key>
+ <entry>
+ <key>Create model</key>
+ </entry>
+ <entry>
+ <key>Edit workflow</key>
+ </entry>
+ <entry>
+ <key>Receive new Department Permission</key>
+ </entry>
+ <entry>
+ <key>Receive new User Permission</key>
+ </entry>
+ <entry>
+ <key>workflow notification</key>
+ </entry>
+ <entry>
+ <key>Permission received</key>
+ </entry>
+ <entry>
+ <key>leadimport notification</key>
+ </entry>
+ <entry>
+ <key>granted permission</key>
+ </entry>
+ <entry>
+ <key>Bulk mail sent</key>
+ </entry>
+ <entry>
+ <key>download ready</key>
+ </entry>
+ <entry>
+ <key>Total in euros</key>
+ </entry>
+ <entry>
+ <key>Workflow Model</key>
+ </entry>
+ <entry>
+ <key>{SENT_MAIL}</key>
+ </entry>
+ <entry>
+ <key>The Sales Project can only be filled when a company has been specified</key>
+ </entry>
+ <entry>
+ <key>The workflow could not be deployed</key>
+ </entry>
+ <entry>
+ <key>Workflow deploy failed</key>
+ </entry>
+ <entry>
+ <key>Ø Probability</key>
+ </entry>
+ <entry>
+ <key>Probability AI</key>
+ </entry>
+ <entry>
+ <key>{SEND_MAIL}</key>
+ </entry>
+ <entry>
+ <key>New</key>
+ </entry>
+ <entry>
+ <key>Release</key>
+ </entry>
+ <entry>
+ <key>Archived</key>
+ </entry>
+ <entry>
+ <key>asdf</key>
+ </entry>
+ <entry>
+ <key>Settings</key>
+ </entry>
+ <entry>
+ <key>Latitude</key>
+ </entry>
+ <entry>
+ <key>Longitude</key>
+ </entry>
+ <entry>
+ <key>Favorites</key>
+ </entry>
+ <entry>
+ <key>Favorite</key>
+ </entry>
+ <entry>
+ <key>Show all Favorites</key>
+ </entry>
+ <entry>
+ <key>Default</key>
+ </entry>
+ <entry>
+ <key>Titel</key>
+ </entry>
+ <entry>
+ <key>Set missing address locations</key>
+ </entry>
+ <entry>
+ <key>FavoriteFilter_view</key>
+ </entry>
+ <entry>
+ <key>Typ</key>
+ </entry>
+ <entry>
+ <key>Set all address locations</key>
+ </entry>
+ <entry>
+ <key>favorties</key>
+ </entry>
+ <entry>
+ <key>Gruppenname</key>
+ </entry>
+ <entry>
+ <key>Password must contain special characters</key>
+ </entry>
+ <entry>
+ <key>Password must be at least %0 characters</key>
+ </entry>
+ <entry>
+ <key>favorite</key>
+ </entry>
+ <entry>
+ <key>Repeat password</key>
+ </entry>
+ <entry>
+ <key>%0: %1/%2points = %3</key>
+ </entry>
+ <entry>
+ <key>SELECTION_NULL</key>
+ </entry>
+ <entry>
+ <key>Selection ignore case</key>
+ </entry>
+ <entry>
+ <key>Calendar maintime end</key>
+ </entry>
+ <entry>
+ <key>%0: %1/%2 points = %3</key>
+ </entry>
+ <entry>
+ <key>Classification: </key>
+ </entry>
+ <entry>
+ <key>Classificationgroup</key>
+ </entry>
+ <entry>
+ <key>Classificationgroups</key>
+ </entry>
+ <entry>
+ <key>Indicator</key>
+ </entry>
+ <entry>
+ <key>favorites</key>
+ </entry>
+ <entry>
+ <key>Refresh</key>
+ </entry>
+ <entry>
+ <key>Run ServerProcess</key>
+ </entry>
+ <entry>
+ <key>SELECTION_NEITHER</key>
+ </entry>
+ <entry>
+ <key>Password must contain numbers</key>
+ </entry>
+ <entry>
+ <key>New password</key>
+ </entry>
+ <entry>
+ <key>Calendar hour divider</key>
+ </entry>
+ <entry>
+ <key>SELECTION_BOTH</key>
+ </entry>
+ <entry>
+ <key>SELECTION_POSTFIX</key>
+ </entry>
+ <entry>
+ <key>Password must contain letters</key>
+ </entry>
+ <entry>
+ <key>SELECTION_PREFIX</key>
+ </entry>
+ <entry>
+ <key>Password must contain spaces</key>
+ </entry>
+ <entry>
+ <key>The use of any of your previous %0 passwords is prohibited</key>
+ </entry>
+ <entry>
+ <key>export using the selected template</key>
+ </entry>
+ <entry>
+ <key>${DISPLAY_AND_OPEN_ONE_HIT}</key>
+ </entry>
+ <entry>
+ <key>${DISPLAY_AND_OPEN_%0_OF_%1_HITS}</key>
+ </entry>
+ <entry>
+ <key>${ACTION_DO_OPEN}</key>
+ </entry>
+ <entry>
+ <key>${DISPLAY_AND_OPEN_%0_HITS}</key>
+ </entry>
+ <entry>
+ <key>Radius Search</key>
+ </entry>
+ <entry>
+ <key>Input value</key>
+ </entry>
+ <entry>
+ <key>Output value</key>
+ </entry>
+ <entry>
+ <key>Enddatum</key>
+ </entry>
+ <entry>
+ <key>Startdatum</key>
+ </entry>
+ <entry>
+ <key>Mapping</key>
+ </entry>
+ <entry>
+ <key>Mappings</key>
+ </entry>
+ <entry>
+ <key>Radius in km</key>
+ </entry>
+ <entry>
+ <key>Members</key>
+ </entry>
+ <entry>
+ <key>The radius has to be %0 or lesser.</key>
+ </entry>
+ <entry>
+ <key>The given starting location is empty. An area search can not be performed.</key>
+ </entry>
+ <entry>
+ <key>The radius has to be at least %0.</key>
+ </entry>
+ <entry>
+ <key>Sort up</key>
+ </entry>
+ <entry>
+ <key>Sort down</key>
+ </entry>
+ <entry>
+ <key>Enter current password to verify</key>
+ </entry>
+ <entry>
+ <key>Serverprocess has been started</key>
+ </entry>
+ <entry>
+ <key>Run Serverprocess</key>
+ </entry>
+ <entry>
+ <key>ab 350 D€</key>
+ </entry>
+ <entry>
+ <key>200-349 D€</key>
+ </entry>
+ <entry>
+ <key>0-49 D€</key>
+ </entry>
+ <entry>
+ <key>100-199 D€</key>
+ </entry>
+ <entry>
+ <key>50-99 D€</key>
+ </entry>
+ <entry>
+ <key>Max Value</key>
+ </entry>
+ <entry>
+ <key>Points</key>
+ </entry>
+ <entry>
+ <key>OLDACTION</key>
+ </entry>
+ <entry>
+ <key>Run Upgrade Serverprocess</key>
+ </entry>
+ <entry>
+ <key>Child Attributes</key>
+ </entry>
+ <entry>
+ <key>Recalculate all Classifications</key>
+ </entry>
+ <entry>
+ <key>Reminder:</key>
+ </entry>
+ <entry>
+ <key>Start Serveprocess</key>
+ </entry>
+ <entry>
+ <key>Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!</key>
+ </entry>
+ <entry>
+ <key>This is how the Classification Gradings of the Classification will get affected by these changes:</key>
+ </entry>
+ <entry>
+ <key>Hint</key>
+ </entry>
+ <entry>
+ <key>Unread</key>
+ </entry>
+ <entry>
+ <key>Parent Filter</key>
+ </entry>
+ <entry>
+ <key>Filter information</key>
+ </entry>
+ <entry>
+ <key>District Responsible</key>
+ </entry>
+ <entry>
+ <key>Responsibles</key>
+ </entry>
+ <entry>
+ <key>Districts</key>
+ </entry>
+ <entry>
+ <key>{$DISTRICTNUMBER}</key>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_PARENT_DISTRICT}</key>
+ </entry>
+ <entry>
+ <key>Responsible Districts</key>
+ </entry>
+ <entry>
+ <key>District No.:</key>
+ </entry>
+ <entry>
+ <key>Customer counting</key>
+ </entry>
+ <entry>
+ <key>{$PARENT_DISTRICT}</key>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_NUMBER}</key>
+ </entry>
+ <entry>
+ <key>District definition</key>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_NO}</key>
+ </entry>
+ <entry>
+ <key>{$DISTRICT}</key>
+ </entry>
+ <entry>
+ <key>The district no has to be bigger than %0</key>
+ </entry>
+ <entry>
+ <key>District Filter</key>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_RESPONSIBLE}</key>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_TOTAL_TURNOVER}</key>
+ </entry>
+ <entry>
+ <key>Update all Classification entries in the system</key>
+ </entry>
+ <entry>
+ <key>Lead import</key>
+ </entry>
+ <entry>
+ <key>Nr</key>
+ </entry>
+ <entry>
+ <key>Verantwortlicher</key>
+ </entry>
+ <entry>
+ <key>Userhelp Ressources</key>
+ </entry>
+ <entry>
+ <key>Worklow started</key>
+ </entry>
+ <entry>
+ <key>Selection placeholder</key>
+ </entry>
+ <entry>
+ <key>%0 new recipients will be added to the bulk mail. \n\
+ %1 of the chosen records are already recipients or don't have an e-mail set</key>
+ </entry>
+ <entry>
+ <key>Grant new Department Permission</key>
+ </entry>
+ <entry>
+ <key>Current password</key>
+ </entry>
+ <entry>
+ <key>Calendar maintime start</key>
+ </entry>
+ <entry>
+ <key>The status of the offer was changed to \"sent\".</key>
+ </entry>
+ <entry>
+ <key>Permission Procurer Department</key>
+ </entry>
+ <entry>
+ <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
+ </entry>
+ <entry>
+ <key>Organisations will be exported</key>
+ </entry>
+ <entry>
+ <key>Recipients after adding</key>
+ </entry>
+ <entry>
+ <key>Contacts will be exported</key>
+ </entry>
+ <entry>
+ <key>%0 new participants will be added to the campaign.</key>
+ </entry>
+ <entry>
+ <key>%0 of the chosen records are already in the campaign</key>
+ </entry>
+ <entry>
+ <key>Permission Procurer User</key>
+ </entry>
+ <entry>
+ <key>The status of the order was changed to \"sent\".</key>
+ </entry>
+ <entry>
+ <key>Mark all cached record containers as invalid</key>
+ </entry>
+ <entry>
+ <key>Current Recipients</key>
+ </entry>
+ <entry>
+ <key>Date (Month)</key>
+ </entry>
+ <entry>
+ <key>Date (Year)</key>
+ </entry>
+ <entry>
+ <key>Date (Day)</key>
+ </entry>
+ <entry>
+ <key>Grant new User Permission</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
@@ -6872,11 +7398,11 @@ select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO
union
select AB_OBJECTRELATIONTYPE.RELATION_TITLE from AB_OBJECTRELATIONTYPE
union
-select TITLE from CLASSIFICATIONSCORE
+select distinct CLASSIFICATIONSCORE.TITLE from CLASSIFICATIONSCORE
union
-select SCORETYPE from CLASSIFICATIONTYPE
+select distinct CLASSIFICATIONTYPE.SCORETYPE from CLASSIFICATIONTYPE
union
-select distinct CLASSIFICATIONGROUP from CLASSIFICATIONTYPE
+select distinct CLASSIFICATIONGROUP.TITLE from CLASSIFICATIONGROUP
union
select AB_ATTRIBUTE.ATTRIBUTE_NAME from AB_ATTRIBUTE</element>
</statements>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index a4c956a47885f4d1a8c17b2e4c016cc676c2df32..383204d77c128bca4ce2559212e660be19b5638e 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6,6 +6,14 @@
<country></country>
<variant></variant>
<keyValueMap>
+ <entry>
+ <key>Probability AI</key>
+ <value>Wahrscheinlichkeit KI</value>
+ </entry>
+ <entry>
+ <key>The given starting location is empty. An area search can not be performed.</key>
+ <value>Der übergebene Startpunkt ist leer. Die Umkreissuche kann nicht ausgeführt werden.</value>
+ </entry>
<entry>
<key>Settings</key>
<value>Einstellungen</value>
@@ -37,6 +45,10 @@
<key>Show my organisations</key>
<value>Meine Firmen anzeigen</value>
</entry>
+ <entry>
+ <key>Radius Search</key>
+ <value>Umkreissuche</value>
+ </entry>
<entry>
<key>${FILTER_DYNAMIC_VALUE_ME}</key>
<value>Ich</value>
@@ -81,10 +93,6 @@
<key>Has marketing approved this step?</key>
<value>Hat das Marketing diesem Schritt zugestimmt?</value>
</entry>
- <entry>
- <key>Create model</key>
- <value>Modell erstellen</value>
- </entry>
<entry>
<key>Task done</key>
<value>Aufgabe abgeschlossen</value>
@@ -701,7 +709,6 @@
</entry>
<entry>
<key>Edit workflow</key>
- <value>Workflow bearbeiten</value>
</entry>
<entry>
<key>Date of request</key>
@@ -1036,6 +1043,10 @@
<key>City</key>
<value>Stadt</value>
</entry>
+ <entry>
+ <key>Default</key>
+ <value>Standard</value>
+ </entry>
<entry>
<key>Region</key>
<value>Gebiet</value>
@@ -1762,6 +1773,7 @@
</entry>
<entry>
<key>Other</key>
+ <value>Andere</value>
</entry>
<entry>
<key>Show all sent offers</key>
@@ -2097,10 +2109,6 @@
<key>{$TASK_STATUS}</key>
<value>Status</value>
</entry>
- <entry>
- <key>and open modeler</key>
- <value>und Modeler öffnen</value>
- </entry>
<entry>
<key>Task</key>
<value>Aufgabe</value>
@@ -2441,6 +2449,10 @@
<key>Mayotte</key>
<value>Mayotte</value>
</entry>
+ <entry>
+ <key>Favorite</key>
+ <value>Favorit</value>
+ </entry>
<entry>
<key>Israel</key>
<value>Israel</value>
@@ -2834,7 +2846,7 @@
</entry>
<entry>
<key>unassigned</key>
- <value>nicht zugewiesen</value>
+ <value>nicht zugeordnet</value>
</entry>
<entry>
<key>Lithuania</key>
@@ -3203,6 +3215,10 @@
<key>Montenegro</key>
<value>Montenegro</value>
</entry>
+ <entry>
+ <key>Indicator</key>
+ <value>Kenngröße</value>
+ </entry>
<entry>
<key>Quarterly</key>
<value>vierteljährlich</value>
@@ -3295,6 +3311,10 @@
<key>Anguilla</key>
<value>Anguilla</value>
</entry>
+ <entry>
+ <key>Favorites</key>
+ <value>Favoriten</value>
+ </entry>
<entry>
<key>Euro</key>
<value>Euro</value>
@@ -3347,6 +3367,10 @@
<key>Turkmenistan</key>
<value>Turkmenistan</value>
</entry>
+ <entry>
+ <key>Show all Favorites</key>
+ <value>Alle Favoriten anzeigen</value>
+ </entry>
<entry>
<key>Venezuela (Bolivarian Republic of)</key>
<value>Venezuela (Bolivarische Republik)</value>
@@ -3529,6 +3553,10 @@
<key>Gambia</key>
<value>Gambia</value>
</entry>
+ <entry>
+ <key>Ø Probability</key>
+ <value>Ø Wahrscheinlichkeit</value>
+ </entry>
<entry>
<key>Qatar</key>
<value>Katar</value>
@@ -4016,9 +4044,11 @@
</entry>
<entry>
<key>false</key>
+ <value>falsch</value>
</entry>
<entry>
<key>true</key>
+ <value>wahr</value>
</entry>
<entry>
<key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
@@ -5062,7 +5092,7 @@
</entry>
<entry>
<key>Read</key>
- <value>gelesen</value>
+ <value>Gelesen</value>
</entry>
<entry>
<key>Permission Set ID</key>
@@ -5071,6 +5101,10 @@
<key>Create</key>
<value>erstelle</value>
</entry>
+ <entry>
+ <key>Unread</key>
+ <value>Ungelesen</value>
+ </entry>
<entry>
<key>Permission Overview</key>
<value>Berechtigungsüberblick</value>
@@ -5573,6 +5607,10 @@
<key>Target group</key>
<value>Zielgruppe</value>
</entry>
+ <entry>
+ <key>ScoreTargetGgroup</key>
+ <value>Zielgruppe</value>
+ </entry>
<entry>
<key>Interested person</key>
<value>Interessent</value>
@@ -6422,7 +6460,7 @@
</entry>
<entry>
<key>Print order</key>
- <value>Beleg drucken</value>
+ <value>Beleg anzeigen</value>
</entry>
<entry>
<key>Order number</key>
@@ -7723,6 +7761,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>low</key>
+ <value>niedrig</value>
</entry>
<entry>
<key>Show only own</key>
@@ -7799,6 +7838,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>${CANCELLED}</key>
+ <value>Abgebrochen</value>
</entry>
<entry>
<key>Workflow signal</key>
@@ -8165,6 +8205,10 @@ Bitte Datumseingabe prüfen</value>
<key>Monthly</key>
<value>monatlich</value>
</entry>
+ <entry>
+ <key>The status of the order was changed to \"sent\".</key>
+ <value>Der Status des Belegs wurde auf \"versendet\" gesetzt.</value>
+ </entry>
<entry>
<key>Yearly</key>
<value>jährlich</value>
@@ -8181,6 +8225,14 @@ Bitte Datumseingabe prüfen</value>
<key>Invalid year!</key>
<value>Ungültiges jahr!</value>
</entry>
+ <entry>
+ <key>The radius has to be %0 or lesser.</key>
+ <value>Der Radius muss %0 km oder weniger betragen.</value>
+ </entry>
+ <entry>
+ <key>The radius has to be at least %0.</key>
+ <value>Der Radius muss mindestens %0 km betragen.</value>
+ </entry>
<entry>
<key>high</key>
<value>hoch</value>
@@ -8416,8 +8468,8 @@ Bitte Datumseingabe prüfen</value>
<value>Angebot anzeigen</value>
</entry>
<entry>
- <key>The status of the offer was changed to \"Sent\".</key>
- <value>Der Status des Angebots wurde auf \"Versendet\" gesetzt.</value>
+ <key>The status of the offer was changed to \"sent\".</key>
+ <value>Der Status des Angebots wurde auf \"versendet\" gesetzt.</value>
</entry>
<entry>
<key>pCallbackFn is not a function</key>
@@ -8714,79 +8766,211 @@ Bitte Datumseingabe prüfen</value>
<key>Offerrequest</key>
<value>Angebotsanfrage</value>
</entry>
+ <entry>
+ <key>Number of employees</key>
+ <value>Anzahl Mitarbeiter</value>
+ </entry>
+ <entry>
+ <key>2. Customer value</key>
+ <value>2. Kundenwert</value>
+ </entry>
+ <entry>
+ <key>Product preference</key>
+ <value>Produktpräferenz</value>
+ </entry>
+ <entry>
+ <key>Business development</key>
+ <value>Wirtschaftliche Entwicklung</value>
+ </entry>
+ <entry>
+ <key>Headquarters</key>
+ <value>Hauptsitz</value>
+ </entry>
+ <entry>
+ <key>Current supply share</key>
+ <value>Aktueller Lieferanteil</value>
+ </entry>
+ <entry>
+ <key>Purchasing potential p. a.</key>
+ <value>Einkaufspotential p. a.</value>
+ </entry>
+ <entry>
+ <key>Stagnated</key>
+ <value>Stagniert </value>
+ </entry>
+ <entry>
+ <key>Negative</key>
+ </entry>
+ <entry>
+ <key>1. Target group</key>
+ <value>1. Zielgruppe</value>
+ </entry>
+ <entry>
+ <key>Positive</key>
+ </entry>
+ <entry>
+ <key>0-50</key>
+ </entry>
+ <entry>
+ <key>Till Score</key>
+ </entry>
+ <entry>
+ <key>251-1000</key>
+ </entry>
+ <entry>
+ <key>asdf</key>
+ </entry>
+ <entry>
+ <key>ab 1000</key>
+ </entry>
+ <entry>
+ <key>Gradings</key>
+ <value>Bewertungen</value>
+ </entry>
<entry>
<key>Full Permissions</key>
</entry>
+ <entry>
+ <key>200-349 D€</key>
+ </entry>
+ <entry>
+ <key>100-199 D€</key>
+ </entry>
<entry>
<key>Full permissions already assigned</key>
</entry>
+ <entry>
+ <key>51-100</key>
+ </entry>
<entry>
<key>Import Daten</key>
</entry>
+ <entry>
+ <key>ab 350 D€</key>
+ </entry>
+ <entry>
+ <key>0-49 D€</key>
+ </entry>
+ <entry>
+ <key>Grading</key>
+ <value>Bewertung</value>
+ </entry>
<entry>
<key>Import Logs</key>
</entry>
<entry>
<key>Transferdaten</key>
</entry>
+ <entry>
+ <key>50-99 D€</key>
+ </entry>
+ <entry>
+ <key>101-250</key>
+ </entry>
<entry>
<key>Valid from (as </key>
<value>gültig ab (in </value>
</entry>
<entry>
- <key>workflow notification</key>
+ <key>yellow</key>
</entry>
<entry>
- <key>Permission received</key>
- <value>erhaltene Berechtigung</value>
+ <key>Borrow</key>
</entry>
<entry>
- <key>leadimport notification</key>
+ <key>Is unlinked activity</key>
+ <value>Ist eine unverknüpfte Aktivität</value>
</entry>
<entry>
- <key>granted permission</key>
- <value>vergebene Berechtigung</value>
+ <key>Download letter and create Activity</key>
</entry>
<entry>
- <key>bulk mail sent</key>
+ <key>Extend</key>
</entry>
<entry>
- <key>download ready</key>
+ <key>Krimi</key>
</entry>
<entry>
- <key>Receive new Department Permission</key>
- <value>Neue Abteilungs-Berechtigung erhalten</value>
+ <key>red</key>
</entry>
<entry>
- <key>Receive new User Permission</key>
- <value>Neue Benutzer-Berechtigung erhalten</value>
+ <key>Return</key>
+ </entry>
+ <entry>
+ <key>green</key>
+ </entry>
+ <entry>
+ <key>Actionthriller</key>
+ </entry>
+ <entry>
+ <key>and open modeler</key>
</entry>
<entry>
<key>export</key>
</entry>
+ <entry>
+ <key>Receive new Department Permission</key>
+ </entry>
<entry>
<key>No new recipients found that can be added to the serial letter.</key>
- <value>Keine neuen Empfänger, die zum Serienbrief werden können, gefunden.</value>
</entry>
<entry>
- <key>No new recipients found that can be added to the bulk mail.</key>
- <value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value>
+ <key>New</key>
+ <value>Neu</value>
+ </entry>
+ <entry>
+ <key>Archived</key>
+ </entry>
+ <entry>
+ <key>Receive new User Permission</key>
+ </entry>
+ <entry>
+ <key>workflow notification</key>
+ </entry>
+ <entry>
+ <key>Permission received</key>
+ </entry>
+ <entry>
+ <key>leadimport notification</key>
+ </entry>
+ <entry>
+ <key>Workflow Model</key>
+ </entry>
+ <entry>
+ <key>Workflow deploy failed</key>
+ <value>Workflow deploy fehlgeschlagen</value>
+ </entry>
+ <entry>
+ <key>Total in euros</key>
</entry>
<entry>
<key>export using the selected template</key>
- <value>Mit der ausgewählten Vorlage Exportieren</value>
</entry>
<entry>
<key>send mail</key>
- <value>E-Mail losschicken</value>
+ <value>E-Mail versenden</value>
</entry>
<entry>
- <key>Download letter and create Activity</key>
- <value>Brief herunterladen und Aktivität erstellen</value>
+ <key>%0: %1/%2points = %3</key>
+ <value>%0: %1/%2Punkte = %3</value>
+ </entry>
+ <entry>
+ <key>%0: %1/%2 points = %3</key>
+ </entry>
+ <entry>
+ <key>Classification: </key>
+ <value>Klassifizierung: </value>
+ </entry>
+ <entry>
+ <key>Classificationgroup</key>
+ <value>Klassifizierungsgruppe</value>
+ </entry>
+ <entry>
+ <key>Classificationgroups</key>
+ <value>Klassifizierungsgruppen</value>
</entry>
<entry>
<key>Add Participants</key>
- <value>Teilnehmer hinzufügen</value>
</entry>
<entry>
<key>and open Report</key>
@@ -8794,7 +8978,431 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Add Recipients</key>
- <value>Empfänger hinzufügen</value>
+ </entry>
+ <entry>
+ <key>{SEND_MAIL}</key>
+ <value>Email versenden</value>
+ </entry>
+ <entry>
+ <key>The workflow could not be deployed</key>
+ </entry>
+ <entry>
+ <key>Create model</key>
+ </entry>
+ <entry>
+ <key>Recipients after adding</key>
+ <value>Empfänger nach dem hinzufügen</value>
+ </entry>
+ <entry>
+ <key>%0 new participants will be added to the campaign.</key>
+ <value>Der Kampagne werden %0 neue Empfänger hinzugefügt.</value>
+ </entry>
+ <entry>
+ <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
+ <value>%0 der ausgewählten Datensätze sind entweder schon Empfänger oder haben keine E-Mail Addresse angegeben.
+ </value>
+ </entry>
+ <entry>
+ <key>%0 of the chosen records are already in the campaign</key>
+ <value>%0 der ausgewählten Datensätze sind schon in der Kampagne.</value>
+ </entry>
+ <entry>
+ <key>Organisations will be exported</key>
+ <value>Firmen werden exportiert</value>
+ </entry>
+ <entry>
+ <key>Contacts will be exported</key>
+ <value>Kontakte werden exportiert</value>
+ </entry>
+ <entry>
+ <key>%0 new recipients will be added to the bulk mail. \n\
+ %1 of the chosen records are already recipients or don't have an e-mail set</key>
+ </entry>
+ <entry>
+ <key>download ready</key>
+ </entry>
+ <entry>
+ <key>export using the selected template</key>
+ <value>Mit der ausgewählten Vorlage Exportieren</value>
+ </entry>
+ <entry>
+ <key>Selection placeholder</key>
+ <value>Suche Platzhalter</value>
+ </entry>
+ <entry>
+ <key>Grant new Department Permission</key>
+ <value>Neue Abteilungs-Berechtigung vergeben</value>
+ </entry>
+ <entry>
+ <key>Current password</key>
+ <value>Aktuelles Passwort</value>
+ </entry>
+ <entry>
+ <key>Serverprocess has been started</key>
+ <value>Serverprozess wurde gestartet</value>
+ </entry>
+ <entry>
+ <key>Calendar maintime start</key>
+ <value>Kalender Kernzeit Beginn</value>
+ </entry>
+ <entry>
+ <key>favorite</key>
+ </entry>
+ <entry>
+ <key>New password</key>
+ <value>Neues Passwort</value>
+ </entry>
+ <entry>
+ <key>Repeat password</key>
+ <value>Passwort wiederholen</value>
+ </entry>
+ <entry>
+ <key>Enter current password to verify</key>
+ <value>Aktuelles Passwort zur Verifizierung eingeben</value>
+ </entry>
+ <entry>
+ <key>Password must contain special characters</key>
+ <value>Passwort muss Sonderzeichen enhalten</value>
+ </entry>
+ <entry>
+ <key>SELECTION_POSTFIX</key>
+ <value>Hinten</value>
+ </entry>
+ <entry>
+ <key>Password must be at least %0 characters</key>
+ <value>Passwort muss aus mindestens %0 Zeichen bestehen</value>
+ </entry>
+ <entry>
+ <key>SELECTION_PREFIX</key>
+ <value>Die Verwendung eines Ihrer vorherigen %0 Passwörter ist untersagt</value>
+ </entry>
+ <entry>
+ <key>SELECTION_BOTH</key>
+ <value>Vorne und hinten</value>
+ </entry>
+ <entry>
+ <key>SELECTION_NEITHER</key>
+ <value>Berücksichtigen</value>
+ </entry>
+ <entry>
+ <key>SELECTION_NULL</key>
+ <value>Ignorieren</value>
+ </entry>
+ <entry>
+ <key>Selection ignore case</key>
+ <value>Suche Groß-/Kleinschreibung ignorieren</value>
+ </entry>
+ <entry>
+ <key>Calendar hour divider</key>
+ <value>Kalender Stundenunterteilung</value>
+ </entry>
+ <entry>
+ <key>Calendar maintime end</key>
+ <value>Kalender Kernzeit Ende</value>
+ </entry>
+ <entry>
+ <key>{SENT_MAIL}</key>
+ <value>E-Mail versandt</value>
+ </entry>
+ <entry>
+ <key>Password must contain numbers</key>
+ <value>Passwort muss Zahlen enhalten</value>
+ </entry>
+ <entry>
+ <key>favorties</key>
+ </entry>
+ <entry>
+ <key>Fantasy</key>
+ </entry>
+ <entry>
+ <key>Permission Procurer Department</key>
+ <value>Rechteempfänger Abteilung</value>
+ </entry>
+ <entry>
+ <key>Release</key>
+ </entry>
+ <entry>
+ <key>granted permission</key>
+ </entry>
+ <entry>
+ <key>Bulk mail sent</key>
+ <value>Serienmail gesendet</value>
+ </entry>
+ <entry>
+ <key>Permission Procurer User</key>
+ <value>Rechteempfänger Benutzer</value>
+ </entry>
+ <entry>
+ <key>Latitude</key>
+ <value>Teilnehmer hinzufügen</value>
+ </entry>
+ <entry>
+ <key>No new recipients found that can be added to the bulk mail.</key>
+ </entry>
+ <entry>
+ <key>Titel</key>
+ </entry>
+ <entry>
+ <key>Password must contain spaces</key>
+ <value>Passwort muss Leerzeichen enhalten</value>
+ </entry>
+ <entry>
+ <key>Enddatum</key>
+ </entry>
+ <entry>
+ <key>Startdatum</key>
+ </entry>
+ <entry>
+ <key>Set all address locations</key>
+ </entry>
+ <entry>
+ <key>Input value</key>
+ </entry>
+ <entry>
+ <key>Output value</key>
+ </entry>
+ <entry>
+ <key>Mapping</key>
+ </entry>
+ <entry>
+ <key>Mappings</key>
+ </entry>
+ <entry>
+ <key>Sort up</key>
+ </entry>
+ <entry>
+ <key>Password must contain letters</key>
+ <value>Passwort muss Buchstaben enhalten</value>
+ </entry>
+ <entry>
+ <key>${DISPLAY_AND_OPEN_ONE_HIT}</key>
+ <value>Ein Ergebnis wurde gefunden und kann geöffnet werden.</value>
+ </entry>
+ <entry>
+ <key>Run Serverprocess</key>
+ <value>Serverprozess ausführen</value>
+ </entry>
+ <entry>
+ <key>${DISPLAY_AND_OPEN_%0_OF_%1_HITS}</key>
+ <value>%0 von insgesamt %1 Ergebnissen werden derzeit angezeigt und können geöffnet werden.</value>
+ </entry>
+ <entry>
+ <key>${ACTION_DO_OPEN}</key>
+ <value>Öffnen</value>
+ </entry>
+ <entry>
+ <key>${DISPLAY_AND_OPEN_%0_HITS}</key>
+ <value>Alle %0 Ergebnisse werden derzeit angezeigt und können geöffnet werden.</value>
+ </entry>
+ <entry>
+ <key>Radius in km</key>
+ </entry>
+ <entry>
+ <key>Set missing address locations</key>
+ </entry>
+ <entry>
+ <key>Gruppenname</key>
+ </entry>
+ <entry>
+ <key>FavoriteFilter_view</key>
+ </entry>
+ <entry>
+ <key>Typ</key>
+ </entry>
+ <entry>
+ <key>Members</key>
+ </entry>
+ <entry>
+ <key>Sort down</key>
+ </entry>
+ <entry>
+ <key>Longitude</key>
+ </entry>
+ <entry>
+ <key>0-49 T€</key>
+ </entry>
+ <entry>
+ <key>Refresh</key>
+ </entry>
+ <entry>
+ <key>Run ServerProcess</key>
+ </entry>
+ <entry>
+ <key>50-99 T€</key>
+ </entry>
+ <entry>
+ <key>Max Value</key>
+ <value>Maximalwert</value>
+ </entry>
+ <entry>
+ <key>Points</key>
+ <value>Punkte</value>
+ </entry>
+ <entry>
+ <key>OLDACTION</key>
+ </entry>
+ <entry>
+ <key>Run Upgrade Serverprocess</key>
+ </entry>
+ <entry>
+ <key>The Sales Project can only be filled when a company has been specified</key>
+ </entry>
+ <entry>
+ <key>Child Attributes</key>
+ </entry>
+ <entry>
+ <key>Recalculate all Classifications</key>
+ <value>Alle Klassifizierungen neuberechnen</value>
+ </entry>
+ <entry>
+ <key>Reminder:</key>
+ </entry>
+ <entry>
+ <key>Start Serveprocess</key>
+ <value>Serverprozess starten</value>
+ </entry>
+ <entry>
+ <key>This is how the Classification Gradings of the Classification will get affected by these changes:</key>
+ <value>Die Klassifizierungsbewertungen der klassifizierung werden durch diese Änderungen folgendermaßen beeinflußt:</value>
+ </entry>
+ <entry>
+ <key>Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!</key>
+ <value>Änderungen an dem Wert mit der höchsten Punktzahl beeinflußen die Klassifizierungsbewertungen der Klassifizierung!</value>
+ </entry>
+ <entry>
+ <key>Hint</key>
+ <value>Hinweis</value>
+ </entry>
+ <entry>
+ <key>200-349 T€</key>
+ </entry>
+ <entry>
+ <key>100-199 T€</key>
+ </entry>
+ <entry>
+ <key>ab 350 T€</key>
+ </entry>
+ <entry>
+ <key>The use of any of your previous %0 passwords is prohibited</key>
+ </entry>
+ <entry>
+ <key>Parent Filter</key>
+ <value>Ãœbergeordneter Filter</value>
+ </entry>
+ <entry>
+ <key>Filter information</key>
+ </entry>
+ <entry>
+ <key>District Responsible</key>
+ <value>Gebietsverantwortlicher</value>
+ </entry>
+ <entry>
+ <key>Responsibles</key>
+ <value>Verantwortliche</value>
+ </entry>
+ <entry>
+ <key>Districts</key>
+ </entry>
+ <entry>
+ <key>{$DISTRICTNUMBER}</key>
+ <value>Gebietsnummer</value>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_PARENT_DISTRICT}</key>
+ <value>Ãœbergeordnetes Gebiet</value>
+ </entry>
+ <entry>
+ <key>Responsible Districts</key>
+ <value>Verantwortliche Gebiete</value>
+ </entry>
+ <entry>
+ <key>District No.:</key>
+ <value>Gebiets-Nr.:</value>
+ </entry>
+ <entry>
+ <key>Customer counting</key>
+ <value>Anzahl Kunden</value>
+ </entry>
+ <entry>
+ <key>{$PARENT_DISTRICT}</key>
+ <value>Ãœbergeordnetes Gebiet</value>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_NUMBER}</key>
+ <value>Gebietsnummer</value>
+ </entry>
+ <entry>
+ <key>District definition</key>
+ <value>Gebietsdefinition</value>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_NO}</key>
+ <value>Gebietsnr.:</value>
+ </entry>
+ <entry>
+ <key>{$DISTRICT}</key>
+ <value>Gebiet</value>
+ </entry>
+ <entry>
+ <key>The district no has to be bigger than %0</key>
+ <value>Die Gebietsnummer sollte größer sein als %0</value>
+ </entry>
+ <entry>
+ <key>District Filter</key>
+ <value>Gebietsfilter</value>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_RESPONSIBLE}</key>
+ <value>Gebietsverantwortlicher</value>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_TOTAL_TURNOVER}</key>
+ <value>Umsatz gesamt</value>
+ </entry>
+ <entry>
+ <key>Update all Classification entries in the system</key>
+ <value>Aktualisiere alle gespeicherten Klassifizierungswerte im System.</value>
+ </entry>
+ <entry>
+ <key>Lead import</key>
+ <value>Leadimport</value>
+ </entry>
+ <entry>
+ <key>Nr</key>
+ </entry>
+ <entry>
+ <key>Verantwortlicher</key>
+ </entry>
+ <entry>
+ <key>Userhelp Ressources</key>
+ </entry>
+ <entry>
+ <key>Worklow started</key>
+ <value>Worklow gestartet</value>
+ </entry>
+ <entry>
+ <key>The status of the offer was changed to \"Sent\".</key>
+ </entry>
+ <entry>
+ <key>favorites</key>
+ </entry>
+ <entry>
+ <key>Mark all cached record containers as invalid</key>
+ </entry>
+ <entry>
+ <key>Current Recipients</key>
+ </entry>
+ <entry>
+ <key>Date (Month)</key>
+ </entry>
+ <entry>
+ <key>Date (Year)</key>
+ </entry>
+ <entry>
+ <key>Date (Day)</key>
+ </entry>
+ <entry>
+ <key>Grant new User Permission</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index f795919fd82d323b6293b5b6ada7effe00920d07..9aeb4aa1c6478d95c5c6b95a9f307e79b433b039 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -10,15 +10,27 @@
<key>${ORDER_CANCELLED}</key>
<value>cancelled</value>
</entry>
+ <entry>
+ <key>${DISPLAY_AND_OPEN_%0_HITS}</key>
+ <value>%0 results are displayed and will be opened.</value>
+ </entry>
<entry>
<key>Company</key>
</entry>
<entry>
<key>New step</key>
</entry>
+ <entry>
+ <key>${DISPLAY_AND_OPEN_%0_OF_%1_HITS}</key>
+ <value>%0 of %1 results are displayed and will be opened.</value>
+ </entry>
<entry>
<key>E-Mail</key>
</entry>
+ <entry>
+ <key>${DISPLAY_AND_OPEN_ONE_HIT}</key>
+ <value>One result is displayed and will be opened.</value>
+ </entry>
<entry>
<key>Male</key>
</entry>
@@ -113,6 +125,10 @@
<entry>
<key>Salutation</key>
</entry>
+ <entry>
+ <key>${ACTION_DO_OPEN}</key>
+ <value>Open</value>
+ </entry>
<entry>
<key>Middlename</key>
</entry>
@@ -2661,6 +2677,9 @@
<entry>
<key>Locked</key>
</entry>
+ <entry>
+ <key>Ø Probability</key>
+ </entry>
<entry>
<key>Timetracking Id</key>
</entry>
@@ -6074,6 +6093,7 @@
</entry>
<entry>
<key>${CANCELLED}</key>
+ <value>Cancelled</value>
</entry>
<entry>
<key>${WORKFLOW_SUSPEND}</key>
@@ -6478,7 +6498,7 @@
<key>Show offer</key>
</entry>
<entry>
- <key>The status of the offer was changed to \"Sent\".</key>
+ <key>The status of the offer was changed to \"sent\".</key>
</entry>
<entry>
<key>pCallbackFn is not a function</key>
@@ -6851,44 +6871,113 @@
<entry>
<key>Offerrequest</key>
</entry>
+ <entry>
+ <key>Number of employees</key>
+ </entry>
+ <entry>
+ <key>2. Customer value</key>
+ </entry>
+ <entry>
+ <key>Product preference</key>
+ </entry>
+ <entry>
+ <key>Business development</key>
+ </entry>
+ <entry>
+ <key>Headquarters</key>
+ </entry>
+ <entry>
+ <key>Current supply share</key>
+ </entry>
+ <entry>
+ <key>Purchasing potential p. a.</key>
+ </entry>
+ <entry>
+ <key>ScoreTargetGgroup</key>
+ </entry>
+ <entry>
+ <key>Stagnated</key>
+ </entry>
+ <entry>
+ <key>Negative</key>
+ </entry>
+ <entry>
+ <key>1. Target group</key>
+ </entry>
+ <entry>
+ <key>Positive</key>
+ </entry>
+ <entry>
+ <key>0-50</key>
+ </entry>
+ <entry>
+ <key>Till Score</key>
+ </entry>
+ <entry>
+ <key>251-1000</key>
+ </entry>
+ <entry>
+ <key>ab 1000</key>
+ </entry>
<entry>
<key>Full Permissions</key>
</entry>
<entry>
<key>Full permissions already assigned</key>
</entry>
+ <entry>
+ <key>51-100</key>
+ </entry>
<entry>
<key>Import Daten</key>
</entry>
+ <entry>
+ <key>Grading</key>
+ </entry>
<entry>
<key>Import Logs</key>
</entry>
<entry>
<key>Transferdaten</key>
</entry>
+ <entry>
+ <key>101-250</key>
+ </entry>
+ <entry>
+ <key>Gradings</key>
+ </entry>
<entry>
<key>Valid from (as </key>
</entry>
<entry>
- <key>Settings</key>
+ <key>yellow</key>
</entry>
<entry>
- <key>workflow notification</key>
+ <key>Borrow</key>
</entry>
<entry>
- <key>Permission received</key>
+ <key>Is unlinked activity</key>
</entry>
<entry>
- <key>leadimport notification</key>
+ <key>Fantasy</key>
</entry>
<entry>
- <key>granted permission</key>
+ <key>Extend</key>
</entry>
<entry>
- <key>bulk mail sent</key>
+ <key>Krimi</key>
</entry>
<entry>
- <key>download ready</key>
+ <key>red</key>
+ </entry>
+ <entry>
+ <key>Return</key>
+ </entry>
+ <entry>
+ <key>green</key>
+ </entry>
+ <entry>
+ <key>Actionthriller</key>
</entry>
<entry>
<key>No new recipients found that can be added to the bulk mail.</key>
@@ -6923,6 +7012,458 @@
<entry>
<key>Receive new User Permission</key>
</entry>
+ <entry>
+ <key>and open modeler</key>
+ </entry>
+ <entry>
+ <key>Create model</key>
+ </entry>
+ <entry>
+ <key>Edit workflow</key>
+ </entry>
+ <entry>
+ <key>workflow notification</key>
+ </entry>
+ <entry>
+ <key>Permission received</key>
+ </entry>
+ <entry>
+ <key>leadimport notification</key>
+ </entry>
+ <entry>
+ <key>granted permission</key>
+ </entry>
+ <entry>
+ <key>Bulk mail sent</key>
+ </entry>
+ <entry>
+ <key>download ready</key>
+ </entry>
+ <entry>
+ <key>Total in euros</key>
+ </entry>
+ <entry>
+ <key>Workflow Model</key>
+ </entry>
+ <entry>
+ <key>The Sales Project can only be filled when a company has been specified</key>
+ </entry>
+ <entry>
+ <key>{SEND_MAIL}</key>
+ <value>Send mail</value>
+ </entry>
+ <entry>
+ <key>Classification: </key>
+ </entry>
+ <entry>
+ <key>Classificationgroup</key>
+ </entry>
+ <entry>
+ <key>Classificationgroups</key>
+ </entry>
+ <entry>
+ <key>%0: %1/%2points = %3</key>
+ </entry>
+ <entry>
+ <key>%0: %1/%2 points = %3</key>
+ </entry>
+ <entry>
+ <key>Indicator</key>
+ </entry>
+ <entry>
+ <key>Probability AI</key>
+ </entry>
+ <entry>
+ <key>{SENT_MAIL}</key>
+ <value>Mail sent</value>
+ </entry>
+ <entry>
+ <key>favorites</key>
+ </entry>
+ <entry>
+ <key>Refresh</key>
+ </entry>
+ <entry>
+ <key>Run ServerProcess</key>
+ </entry>
+ <entry>
+ <key>favorite</key>
+ </entry>
+ <entry>
+ <key>favorties</key>
+ </entry>
+ <entry>
+ <key>Serverprocess has been started</key>
+ </entry>
+ <entry>
+ <key>Run Serverprocess</key>
+ </entry>
+ <entry>
+ <key>New</key>
+ </entry>
+ <entry>
+ <key>Release</key>
+ </entry>
+ <entry>
+ <key>Archived</key>
+ </entry>
+ <entry>
+ <key>Settings</key>
+ </entry>
+ <entry>
+ <key>Latitude</key>
+ </entry>
+ <entry>
+ <key>Longitude</key>
+ </entry>
+ <entry>
+ <key>Favorites</key>
+ </entry>
+ <entry>
+ <key>Favorite</key>
+ </entry>
+ <entry>
+ <key>Show all Favorites</key>
+ </entry>
+ <entry>
+ <key>Default</key>
+ </entry>
+ <entry>
+ <key>Titel</key>
+ </entry>
+ <entry>
+ <key>Set missing address locations</key>
+ </entry>
+ <entry>
+ <key>FavoriteFilter_view</key>
+ </entry>
+ <entry>
+ <key>Typ</key>
+ </entry>
+ <entry>
+ <key>Set all address locations</key>
+ </entry>
+ <entry>
+ <key>Gruppenname</key>
+ </entry>
+ <entry>
+ <key>Password must be at least %0 characters</key>
+ </entry>
+ <entry>
+ <key>Repeat password</key>
+ </entry>
+ <entry>
+ <key>SELECTION_NULL</key>
+ </entry>
+ <entry>
+ <key>Selection ignore case</key>
+ </entry>
+ <entry>
+ <key>Calendar maintime end</key>
+ </entry>
+ <entry>
+ <key>SELECTION_NEITHER</key>
+ </entry>
+ <entry>
+ <key>Password must contain numbers</key>
+ </entry>
+ <entry>
+ <key>New password</key>
+ </entry>
+ <entry>
+ <key>Calendar hour divider</key>
+ </entry>
+ <entry>
+ <key>SELECTION_BOTH</key>
+ </entry>
+ <entry>
+ <key>SELECTION_POSTFIX</key>
+ </entry>
+ <entry>
+ <key>Password must contain letters</key>
+ </entry>
+ <entry>
+ <key>SELECTION_PREFIX</key>
+ </entry>
+ <entry>
+ <key>Password must contain spaces</key>
+ </entry>
+ <entry>
+ <key>The use of any of your previous %0 passwords is prohibited</key>
+ </entry>
+ <entry>
+ <key>export using the selected template</key>
+ </entry>
+ <entry>
+ <key>Radius Search</key>
+ </entry>
+ <entry>
+ <key>Input value</key>
+ </entry>
+ <entry>
+ <key>Output value</key>
+ </entry>
+ <entry>
+ <key>Enddatum</key>
+ </entry>
+ <entry>
+ <key>Startdatum</key>
+ </entry>
+ <entry>
+ <key>Mapping</key>
+ </entry>
+ <entry>
+ <key>Mappings</key>
+ </entry>
+ <entry>
+ <key>Radius in km</key>
+ </entry>
+ <entry>
+ <key>Members</key>
+ </entry>
+ <entry>
+ <key>The radius has to be %0 or lesser.</key>
+ </entry>
+ <entry>
+ <key>The given starting location is empty. An area search can not be performed.</key>
+ </entry>
+ <entry>
+ <key>The radius has to be at least %0.</key>
+ </entry>
+ <entry>
+ <key>Sort up</key>
+ </entry>
+ <entry>
+ <key>Sort down</key>
+ </entry>
+ <entry>
+ <key>Enter current password to verify</key>
+ </entry>
+ <entry>
+ <key>ab 350 D€</key>
+ </entry>
+ <entry>
+ <key>200-349 D€</key>
+ </entry>
+ <entry>
+ <key>0-49 D€</key>
+ </entry>
+ <entry>
+ <key>100-199 D€</key>
+ </entry>
+ <entry>
+ <key>50-99 D€</key>
+ </entry>
+ <entry>
+ <key>asdf</key>
+ </entry>
+ <entry>
+ <key>OLDACTION</key>
+ </entry>
+ <entry>
+ <key>200-349 T€</key>
+ </entry>
+ <entry>
+ <key>100-199 T€</key>
+ </entry>
+ <entry>
+ <key>ab 350 T€</key>
+ </entry>
+ <entry>
+ <key>0-49 T€</key>
+ </entry>
+ <entry>
+ <key>50-99 T€</key>
+ </entry>
+ <entry>
+ <key>Max Value</key>
+ </entry>
+ <entry>
+ <key>Points</key>
+ </entry>
+ <entry>
+ <key>Run Upgrade Serverprocess</key>
+ </entry>
+ <entry>
+ <key>Child Attributes</key>
+ </entry>
+ <entry>
+ <key>Recalculate all Classifications</key>
+ </entry>
+ <entry>
+ <key>Reminder:</key>
+ </entry>
+ <entry>
+ <key>Start Serveprocess</key>
+ </entry>
+ <entry>
+ <key>Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!</key>
+ </entry>
+ <entry>
+ <key>This is how the Classification Gradings of the Classification will get affected by these changes:</key>
+ </entry>
+ <entry>
+ <key>Hint</key>
+ </entry>
+ <entry>
+ <key>Unread</key>
+ </entry>
+ <entry>
+ <key>Parent Filter</key>
+ </entry>
+ <entry>
+ <key>Filter information</key>
+ </entry>
+ <entry>
+ <key>District Responsible</key>
+ </entry>
+ <entry>
+ <key>Responsibles</key>
+ </entry>
+ <entry>
+ <key>Districts</key>
+ </entry>
+ <entry>
+ <key>{$DISTRICTNUMBER}</key>
+ <value>District Number</value>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_PARENT_DISTRICT}</key>
+ <value>Parent District</value>
+ </entry>
+ <entry>
+ <key>Responsible Districts</key>
+ </entry>
+ <entry>
+ <key>District No.:</key>
+ </entry>
+ <entry>
+ <key>Customer counting</key>
+ </entry>
+ <entry>
+ <key>{$PARENT_DISTRICT}</key>
+ <value>Parent District</value>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_NUMBER}</key>
+ <value>District Number</value>
+ </entry>
+ <entry>
+ <key>District definition</key>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_NO}</key>
+ <value>District Number</value>
+ </entry>
+ <entry>
+ <key>{$DISTRICT}</key>
+ <value>District</value>
+ </entry>
+ <entry>
+ <key>The district no has to be bigger than %0</key>
+ </entry>
+ <entry>
+ <key>District Filter</key>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_RESPONSIBLE}</key>
+ <value>Responsible</value>
+ </entry>
+ <entry>
+ <key>{$DISTRICT_TOTAL_TURNOVER}</key>
+ <value>Total Turnover</value>
+ </entry>
+ <entry>
+ <key>Update all Classification entries in the system</key>
+ </entry>
+ <entry>
+ <key>Lead import</key>
+ </entry>
+ <entry>
+ <key>Nr</key>
+ </entry>
+ <entry>
+ <key>Verantwortlicher</key>
+ </entry>
+ <entry>
+ <key>Userhelp Ressources</key>
+ </entry>
+ <entry>
+ <key>Worklow started</key>
+ </entry>
+ <entry>
+ <key>Selection placeholder</key>
+ </entry>
+ <entry>
+ <key>%0 new recipients will be added to the bulk mail. \n\
+ %1 of the chosen records are already recipients or don't have an e-mail set</key>
+ </entry>
+ <entry>
+ <key>Grant new Department Permission</key>
+ </entry>
+ <entry>
+ <key>Current password</key>
+ </entry>
+ <entry>
+ <key>Calendar maintime start</key>
+ </entry>
+ <entry>
+ <key>Password must contain special characters</key>
+ </entry>
+ <entry>
+ <key>Permission Procurer Department</key>
+ </entry>
+ <entry>
+ <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
+ </entry>
+ <entry>
+ <key>Organisations will be exported</key>
+ </entry>
+ <entry>
+ <key>Recipients after adding</key>
+ </entry>
+ <entry>
+ <key>Contacts will be exported</key>
+ </entry>
+ <entry>
+ <key>The status of the offer was changed to \"Sent\".</key>
+ </entry>
+ <entry>
+ <key>The workflow could not be deployed</key>
+ </entry>
+ <entry>
+ <key>Workflow deploy failed</key>
+ </entry>
+ <entry>
+ <key>%0 new participants will be added to the campaign.</key>
+ </entry>
+ <entry>
+ <key>%0 of the chosen records are already in the campaign</key>
+ </entry>
+ <entry>
+ <key>Permission Procurer User</key>
+ </entry>
+ <entry>
+ <key>The status of the order was changed to \"sent\".</key>
+ </entry>
+ <entry>
+ <key>Mark all cached record containers as invalid</key>
+ </entry>
+ <entry>
+ <key>Current Recipients</key>
+ </entry>
+ <entry>
+ <key>Date (Month)</key>
+ </entry>
+ <entry>
+ <key>Date (Year)</key>
+ </entry>
+ <entry>
+ <key>Date (Day)</key>
+ </entry>
+ <entry>
+ <key>Grant new User Permission</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/AroundLocation/AroundLocation.aod b/neonContext/AroundLocation/AroundLocation.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0df97bbbfd3e491a9ccb6ec79732d658c5bbaab1
--- /dev/null
+++ b/neonContext/AroundLocation/AroundLocation.aod
@@ -0,0 +1,20 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>AroundLocation</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>AroundLocation_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>b0b5f41e-d5c6-4532-8d1a-be7efb23bd33</name>
+ <view>AroundOrganisationLocation_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>606fdae5-244e-4258-8f04-770ca6ca04a3</name>
+ <view>AroundLocationHeader_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6bf1facb-814a-41ef-b8c8-5dee49b54e56</name>
+ <view>AroundOrganisationFooter_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Attribute/Attribute.aod b/neonContext/Attribute/Attribute.aod
index cc3899d5c03bcda604c700543ca54f86a66f8540..749cae00feb54558e374c68bcbe98aa78a8c1877 100644
--- a/neonContext/Attribute/Attribute.aod
+++ b/neonContext/Attribute/Attribute.aod
@@ -30,5 +30,13 @@
<name>a380915a-6946-4923-9b13-7a981606ce60</name>
<view>AttributeLookup_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>db1f22e8-46f8-40aa-a5eb-00c606666c96</name>
+ <view>AttributeMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>1cf7d11d-d593-4518-b7aa-aca1a9a2fb8a</name>
+ <view>AttributeList_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Campaign/Campaign.aod b/neonContext/Campaign/Campaign.aod
index 355bc08150fab6ab5386e5270d80b186a86747e2..36cdf483335292baf54abb472c038999081e2b0a 100644
--- a/neonContext/Campaign/Campaign.aod
+++ b/neonContext/Campaign/Campaign.aod
@@ -39,9 +39,5 @@
<name>11240bc6-700c-443a-bfa3-1190ad58fccd</name>
<view>CampaignOverview_view</view>
</neonViewReference>
- <neonViewReference>
- <name>c32002ad-92ff-408c-a399-2998868f94d0</name>
- <view>CampaignCostFix_view</view>
- </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/CampaignAddParticipants/CampaignAddParticipants.aod b/neonContext/CampaignAddParticipants/CampaignAddParticipants.aod
index 6e0db09316e290aa2d4ad7de62a796b6e4dd9775..11ff951e226c0184d2d4da14ea317a249ae44502 100644
--- a/neonContext/CampaignAddParticipants/CampaignAddParticipants.aod
+++ b/neonContext/CampaignAddParticipants/CampaignAddParticipants.aod
@@ -9,9 +9,5 @@
<name>c4f11246-9c24-4c1c-8e53-96acabf04bab</name>
<view>CampaignAddParticipantsEdit_view</view>
</neonViewReference>
- <neonViewReference>
- <name>87d572bd-f2ce-4283-8db0-a7d9f9441fa0</name>
- <view>campaignParticipantMessage_view</view>
- </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/CampaignCost/CampaignCost.aod b/neonContext/CampaignCost/CampaignCost.aod
index 56cc86e548426777a6fbf261a6d30ee4b26fa00f..53037d640711f1e4fe24d715c0ea34eccceabeda 100644
--- a/neonContext/CampaignCost/CampaignCost.aod
+++ b/neonContext/CampaignCost/CampaignCost.aod
@@ -22,5 +22,9 @@
<name>a4f131e8-2371-4070-83f7-fd69dfd6a7df</name>
<view>CampaignCostExtendedFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>4d06f59b-f801-460e-8efd-3c08b14541ec</name>
+ <view>CampaignCostFix_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/CampaignStep/CampaignStep.aod b/neonContext/CampaignStep/CampaignStep.aod
index 99969c1dc8f63c8de66e18866f2b7eae6560f02e..6e9810b632fff5969a2b21be2d6dc11816966bb8 100644
--- a/neonContext/CampaignStep/CampaignStep.aod
+++ b/neonContext/CampaignStep/CampaignStep.aod
@@ -45,9 +45,5 @@
<name>99367402-93e6-49d4-b60c-143b6e71df00</name>
<view>CampaignStepsGantt_view</view>
</neonViewReference>
- <neonViewReference>
- <name>f146ea29-77d2-4141-b04a-36c29594e670</name>
- <view>CampaignStepMembers_view</view>
- </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Classification/Classification.aod b/neonContext/Classification/Classification.aod
index aa3443a0f9f2c1236251a3080bfd567b1ddfe45b..b6c29daeda62c2747e8e1f8ba59e94c5b727ada8 100644
--- a/neonContext/Classification/Classification.aod
+++ b/neonContext/Classification/Classification.aod
@@ -3,7 +3,7 @@
<name>Classification</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/neonContext/Classification/documentation.adoc</documentation>
- <previewView>ClassificatonPreview_view</previewView>
+ <previewView>ClassificationPreview_view</previewView>
<entity>Classification_entity</entity>
<references>
<neonViewReference>
@@ -12,15 +12,7 @@
</neonViewReference>
<neonViewReference>
<name>50c0d5c5-c84f-452d-9f77-41b82ac0319f</name>
- <view>ClassificatonPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>cabdb49c-4faf-4581-8bb5-8a409f27ac3f</name>
- <view>ClassificationDrawer_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>4e367ebf-3da3-4252-949c-a5793fd15384</name>
- <view>ClassificationChart_view</view>
+ <view>ClassificationPreview_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/ClassificationAdmin/ClassificationAdmin.aod b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
index 22a7232b630202774172709b13ffbc34be3b6582..63467269d2b7d076e78009147ca25fade5504e31 100644
--- a/neonContext/ClassificationAdmin/ClassificationAdmin.aod
+++ b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
@@ -4,22 +4,17 @@
<title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/neonContext/ClassificationAdmin/documentation.adoc</documentation>
- <filterView>ClassificationAdminTree_view</filterView>
+ <filterView>ClassificationAdminFilter_view</filterView>
<editView>ClassificationAdminEdit_view</editView>
- <previewView>ClassificatonAdminPreview_view</previewView>
<entity>ClassificationAdmin_entity</entity>
<references>
- <neonViewReference>
- <name>d2a900f6-8860-4bd6-bc8a-3a8261fb9b3d</name>
- <view>ClassificationAdminTree_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>3d860a00-13a4-45ef-8087-487ea80bb84b</name>
- <view>ClassificatonAdminPreview_view</view>
- </neonViewReference>
<neonViewReference>
<name>2c6e2b30-0fd1-4f12-bf9f-d4bbcfbed8aa</name>
<view>ClassificationAdminEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>664dbc06-1ec3-4c6c-ba4f-ed1ed13a1d4b</name>
+ <view>ClassificationAdminFilter_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/ClassificationGrading/ClassificationGrading.aod b/neonContext/ClassificationGrading/ClassificationGrading.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4c4e4c60ea8d0900e20f03efe72fd924d3e613db
--- /dev/null
+++ b/neonContext/ClassificationGrading/ClassificationGrading.aod
@@ -0,0 +1,15 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>ClassificationGrading</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainView>ClassificationGradingMultipleEdit_view</mainView>
+ <previewView>ClassificationGradingMultipleEdit_view</previewView>
+ <lookupView>ClassificationGradingMultipleEdit_view</lookupView>
+ <entity>ClassificationGrading_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>9209d983-8388-4a72-96a8-905cdc8fd454</name>
+ <view>ClassificationGradingMultipleEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/ClassificationGroup/ClassificationGroup.aod b/neonContext/ClassificationGroup/ClassificationGroup.aod
new file mode 100644
index 0000000000000000000000000000000000000000..fee41ed5eb8790fb2ddf6b67c740c4e611718f79
--- /dev/null
+++ b/neonContext/ClassificationGroup/ClassificationGroup.aod
@@ -0,0 +1,13 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>ClassificationGroup</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <previewView>ClassificationGroupPreview_view</previewView>
+ <entity>ClassificationGroup_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>4d074481-d3cc-4809-b1ee-1c83698146c6</name>
+ <view>ClassificationGroupPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/ClassificationScore/ClassificationScore.aod b/neonContext/ClassificationScore/ClassificationScore.aod
index b3b46da3a9495d519e51955175f36af103a5a5fc..d8069cffe97f8d0a6e788bb42544e7c51fd03713 100644
--- a/neonContext/ClassificationScore/ClassificationScore.aod
+++ b/neonContext/ClassificationScore/ClassificationScore.aod
@@ -2,14 +2,11 @@
<neonContext 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/neonContext/1.1.1">
<name>ClassificationScore</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <previewView>ClassificationScoreMultipleEdit_view</previewView>
<entity>ClassificationScore_entity</entity>
<references>
<neonViewReference>
<name>ccaf4443-07e0-4e29-a73d-2073d132fbe6</name>
- <view>ClassificationScoreMultiplePreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>e857034a-2e2c-4026-8833-12ba4ce597d0</name>
<view>ClassificationScoreMultipleEdit_view</view>
</neonViewReference>
</references>
diff --git a/neonContext/ClassificationType/ClassificationType.aod b/neonContext/ClassificationType/ClassificationType.aod
new file mode 100644
index 0000000000000000000000000000000000000000..bad9b9b514aa815a46b2236cdef4391a23ac86f5
--- /dev/null
+++ b/neonContext/ClassificationType/ClassificationType.aod
@@ -0,0 +1,13 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>ClassificationType</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <previewView>ClassificationTypePreview_View</previewView>
+ <entity>ClassificationType_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>2cf0a9e0-a9ed-47c9-9543-7cf580e99e99</name>
+ <view>ClassificationTypePreview_View</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/District/District.aod b/neonContext/District/District.aod
new file mode 100644
index 0000000000000000000000000000000000000000..78099d98a22fffa01fd478bdfb484a17398e70ab
--- /dev/null
+++ b/neonContext/District/District.aod
@@ -0,0 +1,35 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>District</name>
+ <title>Districts</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:GLOBE</icon>
+ <mainView>DistrictMain_view</mainView>
+ <filterView>DistrictFilter_view</filterView>
+ <editView>DistrictEdit_view</editView>
+ <previewView>DistrictPreview_view</previewView>
+ <lookupView>DistrictFilter_view</lookupView>
+ <entity>District_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>7e7c84fd-f4c5-4907-ab43-b31d6fafb42a</name>
+ <view>DistrictFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>12843ee8-b70b-41e3-88e8-4500d299b588</name>
+ <view>DistrictEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>db6ac483-a73c-462f-8e2d-e59db4c7c6a2</name>
+ <view>DistrictMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>bb3c4a77-62b0-4749-a4ef-55c60c6b9e5c</name>
+ <view>DistrictPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>bb8600b2-a4ee-49a5-b120-b2e12db7e25c</name>
+ <view>DistrictList_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/DistrictResponsible/DistrictResponsible.aod b/neonContext/DistrictResponsible/DistrictResponsible.aod
new file mode 100644
index 0000000000000000000000000000000000000000..58d47bc30bb3ee9a657e860f9b9f6b45872194e5
--- /dev/null
+++ b/neonContext/DistrictResponsible/DistrictResponsible.aod
@@ -0,0 +1,21 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>DistrictResponsible</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:GLOBE</icon>
+ <entity>DistrictResponsible_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>ee2298ba-af17-492b-9128-714e82def8e3</name>
+ <view>DistrictResponsibleMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>fc24246c-51de-4d00-b2aa-7e9505461c2e</name>
+ <view>DistrictResponsibleList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>cba355d3-4ef4-441e-8976-f51c8fe65eec</name>
+ <view>DistrictResponsiblePreviewList_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Document/Document.aod b/neonContext/Document/Document.aod
index 23df7610e8382e65b899deb3cad08e580d3b3403..cfb02a7f2b32b641b632905df49b01ef560bd62c 100644
--- a/neonContext/Document/Document.aod
+++ b/neonContext/Document/Document.aod
@@ -33,5 +33,9 @@
<name>cd17be33-73ae-4e8d-a852-65152a772926</name>
<view>DocumentMultipleEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>434ed60c-8219-4ef5-b795-6d72b9ae48c9</name>
+ <view>DocumentWithIdFilter_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Favorite/Favorite.aod b/neonContext/Favorite/Favorite.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e884dea2a6694a1709378f83eb7a1ee0121472eb
--- /dev/null
+++ b/neonContext/Favorite/Favorite.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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>Favorite</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterView>FavoriteFilter_view</filterView>
+ <previewView>FavoritePreview_view</previewView>
+ <entity>Favorite_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>46a9a725-f618-4689-80db-a867d26aff7e</name>
+ <view>FavoriteFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>41857726-5138-4f86-b904-ef2132634e6c</name>
+ <view>FavoritePreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/LeadimportMappingAssistant/LeadimportMappingAssistant.aod b/neonContext/LeadimportMappingAssistant/LeadimportMappingAssistant.aod
new file mode 100644
index 0000000000000000000000000000000000000000..2877b87630fc1014be2d110b0542baafd7eceea7
--- /dev/null
+++ b/neonContext/LeadimportMappingAssistant/LeadimportMappingAssistant.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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>LeadimportMappingAssistant</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterView>LeadimportMappingAssistantFilter_view</filterView>
+ <devices>
+ <element>MOBILE</element>
+ <element>TABLET</element>
+ <element>DESKTOP</element>
+ </devices>
+ <entity>LeadimportMappingAssistant_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>bc357365-04aa-4c3b-8448-9992fdb363f8</name>
+ <view>LeadimportMappingAssistantFilter_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Offer/Offer.aod b/neonContext/Offer/Offer.aod
index 2a823d8bf9e71c15d73fdddddfde09bb4b38834d..e8a6d8d34e56933b89b40bd124432ff6e1a89d0c 100644
--- a/neonContext/Offer/Offer.aod
+++ b/neonContext/Offer/Offer.aod
@@ -8,6 +8,7 @@
<filterView>OfferFilter_view</filterView>
<editView>OfferEdit_view</editView>
<previewView>OfferPreview_view</previewView>
+ <previewMultipleView>OfferPreviewMultiple_view</previewMultipleView>
<lookupView>OfferFilter_view</lookupView>
<entity>Offer_entity</entity>
<references>
@@ -39,5 +40,9 @@
<name>02938f44-bc24-4542-916b-8db5d1976b40</name>
<view>OfferReport_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>136dceaa-0eca-452a-9757-132fd54e8c55</name>
+ <view>OfferPreviewMultiple_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Order/Order.aod b/neonContext/Order/Order.aod
index ea7e701bba26b98364ca4f372841e1aaaf43dd0e..d3f8ba0860f318063c886afe075a841d34da9858 100644
--- a/neonContext/Order/Order.aod
+++ b/neonContext/Order/Order.aod
@@ -35,10 +35,6 @@
<name>ac222647-40b8-43e3-a054-edfc3d69106b</name>
<view>OrderLink_view</view>
</neonViewReference>
- <neonViewReference>
- <name>e8fb5f3b-e166-4ee3-9752-e20d9aec0e75</name>
- <view>OrderClassification_view</view>
- </neonViewReference>
<neonViewReference>
<name>cea44230-2a80-4a3e-9dc4-3d199f8f6edc</name>
<view>OrderDunning_view</view>
diff --git a/neonContext/Orderitem/Orderitem.aod b/neonContext/Orderitem/Orderitem.aod
index 7317e72be684374f98fb8797603cf4d6a3ec1819..7f83b02e3c96c59afcef3fcd95509ab6950e035e 100644
--- a/neonContext/Orderitem/Orderitem.aod
+++ b/neonContext/Orderitem/Orderitem.aod
@@ -4,7 +4,6 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterView>OrderitemFilter_view</filterView>
<editView>OrderitemEdit_view</editView>
- <previewView>OrderitemPreview_view</previewView>
<entity>Orderitem_entity</entity>
<references>
<neonViewReference>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 956f247c2277e85bca16c3278e05e6ef2d4bf434..46f4d763f74192de719ed9a8ee7ba7a5c04436d8 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -51,13 +51,25 @@
<name>c72caf13-37cf-4af9-811d-832f43801369</name>
<view>OrganisationAttributeRestriction_view</view>
</neonViewReference>
- <neonViewReference>
- <name>a97ac17d-171b-4c9a-83fa-bb5a466c7b20</name>
- <view>OrganisationDuplicateEditview_view</view>
- </neonViewReference>
<neonViewReference>
<name>ade0ed85-260d-4da5-bf4c-f838cfdcc693</name>
<view>OrganisationReport_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>d27a8b2d-2fcf-4626-843c-e709c2ed71b0</name>
+ <view>OrganisationClassification</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>d9065774-5ef3-4d1c-b96f-b2f98e6a581c</name>
+ <view>OrganisationNoNoiseTable_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>0b052872-d6b4-41ac-ad0b-580575893e1b</name>
+ <view>OrganisationLesserNoiseTable_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>2193fe84-ff57-4382-8200-5d1d846f455c</name>
+ <view>OrganisationDistrictResponsibles_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Person/Person.aod b/neonContext/Person/Person.aod
index 5a9b1ecbe90107c4e484b01a2a7755d85faa8284..0d4160ba11000d5a5b3388a502c2767644e76db0 100644
--- a/neonContext/Person/Person.aod
+++ b/neonContext/Person/Person.aod
@@ -63,5 +63,9 @@
<name>2a6c44be-53e2-469e-84b3-615841bd4430</name>
<view>PersonDuplicateEditview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>93a274f8-8d73-4e18-b77c-a7eda6028116</name>
+ <view>PersonDistricts_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Product/Product.aod b/neonContext/Product/Product.aod
index 455bfd342154a96988ccb39462c28d9f9ddee768..7d36aaa10f0f067db17fc1a209b7905efb611917 100644
--- a/neonContext/Product/Product.aod
+++ b/neonContext/Product/Product.aod
@@ -8,7 +8,7 @@
<filterView>ProductFilter_view</filterView>
<editView>ProductEdit_view</editView>
<previewView>ProductPreview_view</previewView>
- <lookupView>ProductFilter_view</lookupView>
+ <lookupView>ProductLookup_view</lookupView>
<entity>Product_entity</entity>
<references>
<neonViewReference>
@@ -27,5 +27,9 @@
<name>5580ead4-2257-4cdb-a3ac-5e7067c4c1ab</name>
<view>ProductPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ec872778-87d1-4070-a3da-3808da326119</name>
+ <view>ProductLookup_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 70d024650c84335066184d6b4c604c31323adc66..fc510061011c9a189deefff688d5284d4855b38f 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -31,10 +31,6 @@
<name>9d4603e0-6e0e-4c9e-af97-f5c059debe9e</name>
<view>SalesprojectMilestone_view</view>
</neonViewReference>
- <neonViewReference>
- <name>5990b9d2-b9b8-495e-85de-68a765d09b7f</name>
- <view>SalesprojectClassification_view</view>
- </neonViewReference>
<neonViewReference>
<name>6640a2aa-cd7f-41d0-ab55-30a99256c2c6</name>
<view>SalesprojectMemberActivity_view</view>
@@ -51,14 +47,6 @@
<name>d878f3b7-1de6-4319-93c7-0fff621c0458</name>
<view>SalesprojectFurtherInfo_view</view>
</neonViewReference>
- <neonViewReference>
- <name>68e9257b-d402-4edc-8345-7da46c3b63f9</name>
- <view>SalesprojectClassificationAndChart_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>99f70216-c195-4c08-a6ab-3a4d5acc759b</name>
- <view>SalesprojectClassificationAttribute_view</view>
- </neonViewReference>
<neonViewReference>
<name>b3e34681-eef6-48d3-a4e6-975a6fe77e7b</name>
<view>SalesprojectOfferForecastChart_view</view>
@@ -71,14 +59,6 @@
<name>589b0f12-a4d9-4108-9da1-4ddb418c3991</name>
<view>SalesprojectOverview_view</view>
</neonViewReference>
- <neonViewReference>
- <name>1c957028-bf6b-4b9c-9b46-60f8b53f9edd</name>
- <view>SaleprojectOverviewCharts_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>42bc01e0-ba80-4e7f-bcf9-30b3d647f565</name>
- <view>SalesprojectClassificationDrawer_view</view>
- </neonViewReference>
<neonViewReference>
<name>8db978be-4362-48e2-9cc9-6b6774d92f5a</name>
<view>SalesprojectForecastDrawer_view</view>
diff --git a/neonContext/Social/Social.aod b/neonContext/Social/Social.aod
index a2e96e0735b239931303269de6032e86769fc4a4..339a5a5470eda10e445766329fe61bbb2fdc9904 100644
--- a/neonContext/Social/Social.aod
+++ b/neonContext/Social/Social.aod
@@ -3,8 +3,6 @@
<name>Social</name>
<title>Social</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <mainView></mainView>
- <filterView><null value></filterView>
<entity>Social_entity</entity>
<references>
<neonViewReference>
diff --git a/neonContext/ClassificationGroupAnalyses/ClassificationGroupAnalyses.aod b/neonContext/Userhelp/Userhelp.aod
similarity index 65%
rename from neonContext/ClassificationGroupAnalyses/ClassificationGroupAnalyses.aod
rename to neonContext/Userhelp/Userhelp.aod
index 65aaf6ffe91d607113cb559d4a3193cc12b60680..435de68c2c1e230ca426a074593bb1004a7ebf6d 100644
--- a/neonContext/ClassificationGroupAnalyses/ClassificationGroupAnalyses.aod
+++ b/neonContext/Userhelp/Userhelp.aod
@@ -1,12 +1,13 @@
<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
- <name>ClassificationGroupAnalyses</name>
+ <name>Userhelp</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>ClassificationGroupAnalyses_entity</entity>
+ <filterView>Userhelp_FilterView</filterView>
+ <entity>UserhelpResources</entity>
<references>
<neonViewReference>
- <name>7f1a88f1-c5de-4657-aa44-8309a61422be</name>
- <view>ClassificationGroupAnalysesChart_view</view>
+ <name>2a1dd62b-0f30-442b-aa1d-969b46312d2a</name>
+ <view>Userhelp_FilterView</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index a6ca35f6cba049f162b252adbba2b7f913310576..c0e2ae19ee5b4820a766d646fdc6a153121dc08b 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -2,7 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>360DegreeFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
+ <filterable v="false" />
<layout>
<groupLayout>
<name>layout</name>
@@ -15,10 +15,11 @@
<titleField>TITLE</titleField>
<descriptionField>DATE</descriptionField>
<iconField>ICON</iconField>
+ <hideContentSearch v="false" />
+ <entityField>#ENTITY</entityField>
<defaultGroupFields>
<element>ENTITY_NAME</element>
</defaultGroupFields>
- <entityField>#ENTITY</entityField>
</treeViewTemplate>
<timelineViewTemplate>
<name>Timeline</name>
@@ -26,6 +27,7 @@
<titleField>TITLE</titleField>
<descriptionField>ENTITY_NAME</descriptionField>
<iconIdField>ICON</iconIdField>
+ <hideContentSearch v="false" />
<entityField>#ENTITY</entityField>
</timelineViewTemplate>
</children>
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 2d9626e9c380c820c6e26c3ff4da7ae521eba0b7..870b77975c3fde5e3c371ff98ac417bc4d57b598 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -19,7 +19,7 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>ca781b9b-9e93-41c3-9373-cb559c347194</name>
+ <name>041a6ded-06b3-4d84-be29-d89d01df6dec</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index f98f7fde3b330d24fa869233e49db372c5ddf179..bd5826a7da483c1146e31ec6f855bb07bf3458cc 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -74,6 +74,14 @@
<name>6af52273-25bf-4286-83cc-217aea94ad09</name>
<entityField>ADDRIDENTIFIER</entityField>
</neonTitledListTableColumn>
+ <neonTitledListTableColumn>
+ <name>86444859-eb8c-4ee7-a400-eb10770c28b9</name>
+ <entityField>LAT</entityField>
+ </neonTitledListTableColumn>
+ <neonTitledListTableColumn>
+ <name>9c37669e-e577-44b9-b43f-3734b88de205</name>
+ <entityField>LON</entityField>
+ </neonTitledListTableColumn>
</columns>
</titledListViewTemplate>
</children>
diff --git a/neonView/AddressOrgMultiEdit_view/AddressOrgMultiEdit_view.aod b/neonView/AddressOrgMultiEdit_view/AddressOrgMultiEdit_view.aod
index c9ff1b4175634f1dea86d1d1b4ef7ffc5dfa1109..dd7ee5507e2bd5b56d4987b657bd9069fdf4ca56 100644
--- a/neonView/AddressOrgMultiEdit_view/AddressOrgMultiEdit_view.aod
+++ b/neonView/AddressOrgMultiEdit_view/AddressOrgMultiEdit_view.aod
@@ -70,6 +70,14 @@
<name>443b9d7d-dac2-40b2-bb2b-d5e0091877a9</name>
<entityField>ADDRIDENTIFIER</entityField>
</neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>65ccb00c-c9b0-4a7b-a555-f54b494cbd62</name>
+ <entityField>LAT</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>5567205d-7c1d-4c87-b895-fb93a02f1c76</name>
+ <entityField>LON</entityField>
+ </neonGenericMultipleTableColumn>
</columns>
</genericMultipleViewTemplate>
</children>
diff --git a/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod b/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
index 5c41ff868f03a65f9db081d6fbf8a8f81b476290..7372c60c7af018c61811155bd1f4ad7eb39c7725 100644
--- a/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
+++ b/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
@@ -30,15 +30,7 @@
</neonTableColumn>
<neonTableColumn>
<name>a272c3cb-7bbf-41a4-9490-884c2f449b40</name>
- <entityField>STREET</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>e842bb68-96c6-4d1f-bf44-70a29c7c7d72</name>
- <entityField>FROM_BN</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>59162b47-ec96-4076-8e57-929fccbf133d</name>
- <entityField>TO_BN</entityField>
+ <entityField>STREET_AND_BUILDINGNO</entityField>
</neonTableColumn>
<neonTableColumn>
<name>d32d92bf-db7d-443f-b911-6731ea89cf3b</name>
diff --git a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
index 9aa8cfe2a71723abdaab24dcf2266f54cc7d3f41..b4612adcf1a8e53a8a8019260f542eb8d0d76905 100644
--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -69,6 +69,14 @@
<name>443b9d7d-dac2-40b2-bb2b-d5e0091877a9</name>
<entityField>ADDRIDENTIFIER</entityField>
</neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>6554a8d1-9dbd-4690-89fd-9b467e859b1c</name>
+ <entityField>LAT</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>82dea925-d175-423d-843c-fbe194388ffc</name>
+ <entityField>LON</entityField>
+ </neonGenericMultipleTableColumn>
</columns>
</genericMultipleViewTemplate>
</children>
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index 23c9de063b24cd94a46c4d2e998832ff9c752798..727a644d89918b72ba8e573978d45cf9f7118157 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -27,6 +27,7 @@
<organizerField>ORGANIZER</organizerField>
<ownerField>OWNER</ownerField>
<categoriesField>CATEGORIES</categoriesField>
+ <recurrenceIdField>RECURRENCEID</recurrenceIdField>
<favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>seriesActionGroup</favoriteActionGroup2>
<entityField>#ENTITY</entityField>
diff --git a/neonView/campaignParticipantMessage_view/campaignParticipantMessage_view.aod b/neonView/AroundLocationHeader_view/AroundLocationHeader_view.aod
similarity index 62%
rename from neonView/campaignParticipantMessage_view/campaignParticipantMessage_view.aod
rename to neonView/AroundLocationHeader_view/AroundLocationHeader_view.aod
index f11aa26b7622597f92bbebfaa15af9b47767ff8e..ce86ba2afd585215bb100fec728104b427bdfd4c 100644
--- a/neonView/campaignParticipantMessage_view/campaignParticipantMessage_view.aod
+++ b/neonView/AroundLocationHeader_view/AroundLocationHeader_view.aod
@@ -1,22 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>campaignParticipantMessage_view</name>
+ <name>AroundLocationHeader_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <noneLayout>
+ <boxLayout>
<name>layout</name>
- </noneLayout>
+ <autoHeight v="true" />
+ </boxLayout>
</layout>
<children>
<genericViewTemplate>
- <name>Message_view</name>
- <hideLabels v="true" />
- <hideEmptyFields v="true" />
+ <name>GenericEditable</name>
+ <editMode v="true" />
+ <hideEmptyFields v="false" />
<entityField>#ENTITY</entityField>
+ <isEditable v="true" />
<fields>
<entityFieldLink>
- <name>bc1db862-a448-47f6-b534-2ce28dc993a8</name>
- <entityField>campaignParticipantMessage</entityField>
+ <name>2b61a88c-d3ca-42df-98ab-0db350346fef</name>
+ <entityField>SearchRadius</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod b/neonView/AroundOrganisationFooter_view/AroundOrganisationFooter_view.aod
similarity index 51%
rename from neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod
rename to neonView/AroundOrganisationFooter_view/AroundOrganisationFooter_view.aod
index 29ebb148c72534308c92c4a75a65077122bd422e..74bac1d84439489938b5751fe465909d5128e69d 100644
--- a/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod
+++ b/neonView/AroundOrganisationFooter_view/AroundOrganisationFooter_view.aod
@@ -1,9 +1,7 @@
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>ClassificatonPreview_view</name>
+ <name>AroundOrganisationFooter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <isOverlay v="false" />
- <overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
<boxLayout>
<name>layout</name>
@@ -12,27 +10,24 @@
</layout>
<children>
<genericViewTemplate>
- <name>classification</name>
- <showDrawer v="true" />
- <drawerCaption>Classification</drawerCaption>
+ <name>readonlyGeneric</name>
+ <hideLabels v="true" />
+ <hideEmptyFields v="false" />
<entityField>#ENTITY</entityField>
+ <isEditable v="false" />
<fields>
<entityFieldLink>
- <name>dfdbc6f4-4859-495b-96e7-0853bdbc611f</name>
- <entityField>CLASSIFICATIONSCORE_ID</entityField>
+ <name>60b0acd1-288c-4b45-87fb-c135282b9a70</name>
+ <entityField>RecordCountInformation</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
- <genericViewTemplate>
- <name>info</name>
+ <actionsViewTemplate>
+ <name>actions</name>
+ <actions>
+ <element>Open</element>
+ </actions>
<entityField>#ENTITY</entityField>
- <title></title>
- <fields>
- <entityFieldLink>
- <name>2d1fae5e-1b2b-4e29-9bcb-646db9fd9653</name>
- <entityField>Info</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
+ </actionsViewTemplate>
</children>
</neonView>
diff --git a/neonView/AroundOrganisationLocation_view/AroundOrganisationLocation_view.aod b/neonView/AroundOrganisationLocation_view/AroundOrganisationLocation_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6ee6f9459fd4bc34294cfec67617be540463888a
--- /dev/null
+++ b/neonView/AroundOrganisationLocation_view/AroundOrganisationLocation_view.aod
@@ -0,0 +1,33 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>AroundOrganisationLocation_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="false" />
+ <size>NORMAL</size>
+ <isOverlay v="true" />
+ <overlayOrientation>LANDSCAPE</overlayOrientation>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>b156824b-7611-4f94-a42e-d49e3878d93c</header>
+ <footer>1d0bb6f6-e645-438a-9601-683798899187</footer>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>b156824b-7611-4f94-a42e-d49e3878d93c</name>
+ <entityField>#ENTITY</entityField>
+ <view>AroundLocationHeader_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>66974669-21d3-47bd-b776-f8cc6a5106a4</name>
+ <entityField>Organisations</entityField>
+ <view>OrganisationLesserNoiseTable_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>1d0bb6f6-e645-438a-9601-683798899187</name>
+ <entityField>#ENTITY</entityField>
+ <view>AroundOrganisationFooter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/AttributeEdit_view/AttributeEdit_view.aod b/neonView/AttributeEdit_view/AttributeEdit_view.aod
index 5668d586c04c0e91bed27a582690be7b0cdab2dd..f0540f0420d82a95401fb023d144ebba72f28923 100644
--- a/neonView/AttributeEdit_view/AttributeEdit_view.aod
+++ b/neonView/AttributeEdit_view/AttributeEdit_view.aod
@@ -39,10 +39,6 @@
<name>d26696ac-199c-45f0-9147-b75dee3f4b65</name>
<entityField>ATTRIBUTE_ACTIVE</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>c8a5f45e-8092-45f4-ac22-681700447235</name>
- <entityField>ATTRIBUTE_LEVEL</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
@@ -50,5 +46,10 @@
<entityField>AttributeUsages</entityField>
<view>AttributeUsageMultiEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>90d4edc1-699d-413f-bbcd-d14a90cd8cf9</name>
+ <entityField>ChildAttributes</entityField>
+ <view>AttributeMultiEdit_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/AttributeList_view/AttributeList_view.aod b/neonView/AttributeList_view/AttributeList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..167cf43d52b6481ab3ad36f745aa899f2e53cc3f
--- /dev/null
+++ b/neonView/AttributeList_view/AttributeList_view.aod
@@ -0,0 +1,33 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>AttributeList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>AttributeList</name>
+ <entityField>#ENTITY</entityField>
+ <isDeletable v="false" />
+ <isEditable v="false" />
+ <isCreatable v="false" />
+ <columns>
+ <neonTitledListTableColumn>
+ <name>96544713-a302-4e2f-ab7f-6c02d44d9908</name>
+ <entityField>ATTRIBUTE_NAME</entityField>
+ </neonTitledListTableColumn>
+ <neonTitledListTableColumn>
+ <name>5c536673-78f5-482c-aa98-f027f08659e1</name>
+ <entityField>ATTRIBUTE_TYPE</entityField>
+ </neonTitledListTableColumn>
+ <neonTitledListTableColumn>
+ <name>fcd31169-8b19-4165-bb85-200ab6045cdd</name>
+ <entityField>DROPDOWNDEFINITION</entityField>
+ </neonTitledListTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AttributeMultiEdit_view/AttributeMultiEdit_view.aod b/neonView/AttributeMultiEdit_view/AttributeMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..21e86a1d4deaeeb08225ddcb0e05d793de0d5381
--- /dev/null
+++ b/neonView/AttributeMultiEdit_view/AttributeMultiEdit_view.aod
@@ -0,0 +1,30 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>AttributeMultiEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>GenericMultiple</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonGenericMultipleTableColumn>
+ <name>59d4b058-675b-4124-a510-a576e2222815</name>
+ <entityField>ATTRIBUTE_NAME</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>e6660015-3e4a-47d3-aee5-0458e8e8b8e3</name>
+ <entityField>ATTRIBUTE_TYPE</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>67d03576-b62e-42ab-a17e-220b2468a315</name>
+ <entityField>DROPDOWNDEFINITION</entityField>
+ </neonGenericMultipleTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index bdcc18983596cdacc5e214a705ecccfe5b75aafd..f7164ab6941bd0255686fb2ac2d85837af4371c1 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -34,10 +34,6 @@
<name>70953962-9472-484b-ac95-567d2249f42e</name>
<entityField>ATTRIBUTE_ACTIVE</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>1b1cfdcb-fcab-4ca9-b0e0-b69fe88b65f0</name>
- <entityField>SORTING</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
@@ -45,5 +41,10 @@
<entityField>AttributeUsages</entityField>
<view>AttributeUsageList_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>87719160-f477-49c7-b8de-5386d4c03a45</name>
+ <entityField>ChildAttributes</entityField>
+ <view>AttributeList_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
index fa91f1febec69188ad0af542924ed847969d3e72..f0161b804b5aa9a8a7856e36eb5e3b557878e0c0 100644
--- a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
+++ b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
@@ -1,6 +1,7 @@
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>AttributeRelationTree_view</name>
+ <title>Attributes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod b/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod
index b51a66ffd812ac5f4afbec1d20584fe3be8998b9..3e391de817552197a795d56eae398c21e37f0fdf 100644
--- a/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod
+++ b/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod
@@ -6,11 +6,26 @@
<isOverlay v="false" />
<overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
- <boxLayout>
+ <headerFooterLayout>
<name>layout</name>
- </boxLayout>
+ <header>SelectedBulkMailInfosScore</header>
+ </headerFooterLayout>
</layout>
<children>
+ <scoreCardViewTemplate>
+ <name>SelectedBulkMailInfosScore</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>1b9e38a5-e921-48f7-ba04-71b758fa9ed3</name>
+ <entityField>currentRecipients</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4578042c-9210-4dc4-870f-298a390aebd8</name>
+ <entityField>futureRecipients</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
<genericViewTemplate>
<name>Generic</name>
<editMode v="true" />
diff --git a/neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod b/neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod
index 51e47fdf6319fc525098bfd9ec85a8432ed0503a..c5448b2e2f2a2ff8b9012a77e0ebae80c3056c21 100644
--- a/neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod
+++ b/neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod
@@ -30,22 +30,18 @@
<name>campaignDetail</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
+ <informationField>campaignParticipantMessage</informationField>
<fields>
<entityFieldLink>
- <name>4968ad35-3651-4654-a1b0-0e3d0fc6165d</name>
+ <name>e4fa5e06-cc8e-40c2-983c-371bd6b46958</name>
<entityField>CAMPAIGN_ID</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>b9016725-1345-4526-88eb-2b05fb4089c8</name>
+ <name>f5cd3e7d-e2e3-401c-a314-6853ff269065</name>
<entityField>CAMPAIGNSTEP_ID</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
- <neonViewReference>
- <name>1bfb0564-f81f-4c60-ae5b-1d9778a519ab</name>
- <entityField>#ENTITY</entityField>
- <view>campaignParticipantMessage_view</view>
- </neonViewReference>
<actionsViewTemplate>
<name>ContinueActions</name>
<actions>
diff --git a/neonView/CampaignCostFix_view/CampaignCostFix_view.aod b/neonView/CampaignCostFix_view/CampaignCostFix_view.aod
index 810bd1d346de0ccd495f545db7e1eda47d5ff882..4397f42cbf18230de40eb4ebb24f8505ada8c7a8 100644
--- a/neonView/CampaignCostFix_view/CampaignCostFix_view.aod
+++ b/neonView/CampaignCostFix_view/CampaignCostFix_view.aod
@@ -1,17 +1,29 @@
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>CampaignCostFix_view</name>
+ <title>Fix costs</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <noneLayout>
+ <drawerLayout>
<name>layout</name>
- </noneLayout>
+ <layoutCaption>Fix costs</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
</layout>
<children>
- <neonViewReference>
- <name>127a0cab-ec21-47e6-ba6c-c091cb31c794</name>
- <entityField>CampaignCosts</entityField>
- <view>CampaignCostFilter_view</view>
- </neonViewReference>
+ <tableViewTemplate>
+ <name>CampaignCostFix</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>1b2b3ce3-eaff-472b-a873-5e054adac89a</name>
+ <entityField>CATEGORY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>00630ccd-689f-4cf7-9dfc-cc0a67771c0c</name>
+ <entityField>NET</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
</children>
</neonView>
diff --git a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
index c06e0922320bf320166cf42e3444e2208a7098c7..95a79e654d6cb9a4fe5a661811b9c8f5e05f3035 100644
--- a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
+++ b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
@@ -14,11 +14,9 @@
<children>
<treeTableViewTemplate>
<name>CostTreeTable</name>
- <favoriteActionGroup1>alter</favoriteActionGroup1>
<defaultGroupFields>
<element>CAMPAIGNSTEP_ID</element>
</defaultGroupFields>
- <entityField>#ENTITY</entityField>
<columns>
<neonTreeTableColumn>
<name>457caff8-0403-425f-839c-62e5d05fe3a1</name>
diff --git a/neonView/CampaignCost_view/CampaignCost_view.aod b/neonView/CampaignCost_view/CampaignCost_view.aod
index 5fdcc86527717b04f2342d680a95644a45b8bfd9..03ccab3dbb9ccba29ba81793ec30f82fa684d0b2 100644
--- a/neonView/CampaignCost_view/CampaignCost_view.aod
+++ b/neonView/CampaignCost_view/CampaignCost_view.aod
@@ -17,8 +17,8 @@
<view>CampaignCostVariable_view</view>
</neonViewReference>
<neonViewReference>
- <name>c4476130-ca57-4707-9448-266138c09880</name>
- <entityField>#ENTITY</entityField>
+ <name>cc960341-1f55-4ad5-8ae9-dece0df73b5c</name>
+ <entityField>CampaignCosts</entityField>
<view>CampaignCostFix_view</view>
</neonViewReference>
<neonViewReference>
diff --git a/neonView/CampaignEdit_view/CampaignEdit_view.aod b/neonView/CampaignEdit_view/CampaignEdit_view.aod
index e16693943d7e5b050d64c854e6e3a0208cef9dfc..09b485472214afe13ea75e7c74e38728eb6f02de 100644
--- a/neonView/CampaignEdit_view/CampaignEdit_view.aod
+++ b/neonView/CampaignEdit_view/CampaignEdit_view.aod
@@ -4,7 +4,7 @@
<title>Campaign</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:GROUP</icon>
- <size>SMALL</size>
+ <size>NORMAL</size>
<overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
<noneLayout>
diff --git a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
index 7d4a4e5d2a84ef5c9f155fc6f2d4b9bd223fc1e8..3dde5d4e26421ec75dbe34bc35a40fdb4fd0d3f2 100644
--- a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
+++ b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
@@ -4,7 +4,7 @@
<title></title>
<description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="false" />
+ <filterable v="true" />
<layout>
<groupLayout>
<name>layout</name>
@@ -15,8 +15,8 @@
<name>ParticipantsTable</name>
<favoriteActionGroup1>FilterViewActionGroup</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
- <isCreatable v="false" />
- <isEditable v="false" />
+ <isCreatable v="true" />
+ <isEditable v="true" />
<columns>
<neonTableColumn>
<name>1bd3a82e-89c1-4b3b-809b-b9bac7f78e58</name>
diff --git a/neonView/CampaignPreview_view/CampaignPreview_view.aod b/neonView/CampaignPreview_view/CampaignPreview_view.aod
index b0af52feaadb6d5be77f466d30fe087305378202..a85780112dc3b54a37cb4fb08a11199bc1dfe5a0 100644
--- a/neonView/CampaignPreview_view/CampaignPreview_view.aod
+++ b/neonView/CampaignPreview_view/CampaignPreview_view.aod
@@ -22,6 +22,13 @@
<entityField>#ENTITY</entityField>
<title></title>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>CAMPAIGN_OBEJCTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>TimespanGeneric</name>
<showDrawer v="true" />
diff --git a/neonView/CampaignStepAddParticipants_view/CampaignStepAddParticipants_view.aod b/neonView/CampaignStepAddParticipants_view/CampaignStepAddParticipants_view.aod
index 52b5809134df11f418be3df6730105fc7bb397d3..975475f46305254376b82932f589d15c80d3f7c1 100644
--- a/neonView/CampaignStepAddParticipants_view/CampaignStepAddParticipants_view.aod
+++ b/neonView/CampaignStepAddParticipants_view/CampaignStepAddParticipants_view.aod
@@ -22,10 +22,6 @@
<name>62805d6e-3b77-4af3-b282-13720dd615df</name>
<entityField>CAMPAIGNSTEPID</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>6c1ec68e-64fd-4eaf-8d74-047e9a8703fa</name>
- <entityField>ADDPARTICIPANTSMESSAGE</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod b/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod
index fde3568e952b0346a17a8a4fe005d46bc41cd490..43fd31c31ab964d4bd4d7d0ef08b179b70d9c9e0 100644
--- a/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod
+++ b/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod
@@ -5,9 +5,10 @@
<size>SMALL</size>
<overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
- <noneLayout>
+ <headerFooterLayout>
<name>layout</name>
- </noneLayout>
+ <header>classification</header>
+ </headerFooterLayout>
</layout>
<children>
<genericViewTemplate>
@@ -18,23 +19,26 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>c702f17c-af6c-4674-bbef-9586adfa3f3b</name>
- <entityField>CLASSIFICATIONTYPE</entityField>
+ <name>d7a7faff-5693-41ce-ae4d-2f847fa46c18</name>
+ <entityField>OBJECT_TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>66ce2c02-1cd3-4867-91a6-825655d6d16a</name>
<entityField>CLASSIFICATIONGROUP</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>85cf625b-8ea4-4e6f-8b21-2e42314b46d6</name>
- <entityField>SCORETYPE</entityField>
+ <name>5493520c-27d9-4333-a804-02c07b0b0747</name>
+ <entityField>SORTING</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>502ba6a6-f3bd-4c10-80a5-d6c779b9adb1</name>
+ <entityField>CLASSIFICATIONTYPEID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>91f2555e-214c-44f0-8798-029b94be9c00</name>
+ <entityField>CLASSIFICATIONTYPEIDDISPLAYVALUE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
- <neonViewReference>
- <name>cedafb39-a59c-480f-aeff-e6276ea4fb9e</name>
- <entityField>ClassificationScores</entityField>
- <view>ClassificationScoreMultipleEdit_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..616066188353b8e65c14944886f0d9e36692ef62
--- /dev/null
+++ b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
@@ -0,0 +1,27 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ClassificationAdminFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <treeTableViewTemplate>
+ <name>treetable</name>
+ <parentField>CLASSIFICATION_PARENT_ID</parentField>
+ <favoriteActionGroup1>FilterviewActionGroup</favoriteActionGroup1>
+ <entityField>#ENTITY</entityField>
+ <linkedColumns />
+ <defaultGroupFields />
+ <fixedFilterFields />
+ <columns>
+ <neonTreeTableColumn>
+ <name>2e04e92e-9af8-46a6-9845-8bf822cd05f3</name>
+ <entityField>#CONTENTTITLE</entityField>
+ </neonTreeTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod b/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
deleted file mode 100644
index e9cb5c6bed02e2930c5e3f12203711a01b520c3e..0000000000000000000000000000000000000000
--- a/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
+++ /dev/null
@@ -1,23 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>ClassificationAdminTree_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <treeViewTemplate>
- <name>classificationTree</name>
- <titleField>SCORETYPE</titleField>
- <defaultGroupFields>
- <element>CLASSIFICATIONTYPE</element>
- <element>CLASSIFICATIONGROUP</element>
- </defaultGroupFields>
- <showChildrenCount v="false" />
- <entityField>#ENTITY</entityField>
- </treeViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/ClassificationGradingMultipleEdit_view/ClassificationGradingMultipleEdit_view.aod b/neonView/ClassificationGradingMultipleEdit_view/ClassificationGradingMultipleEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6ba9ff49effd10c4f9e1292bf94f92e3070303d7
--- /dev/null
+++ b/neonView/ClassificationGradingMultipleEdit_view/ClassificationGradingMultipleEdit_view.aod
@@ -0,0 +1,26 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ClassificationGradingMultipleEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <size>SMALL</size>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>titledList</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>titledList</name>
+ <titleField>GRADING</titleField>
+ <fixedDrawer v="false" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTitledListTableColumn>
+ <name>9fffb1ac-b842-4c1c-9f81-85a17d78f649</name>
+ <entityField>MAXGRADEFORSCORE</entityField>
+ </neonTitledListTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod b/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod
deleted file mode 100644
index 40d2afea5d3b5c0291a1bb9ef1d7652ac9cacc6f..0000000000000000000000000000000000000000
--- a/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod
+++ /dev/null
@@ -1,22 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>ClassificationGroupAnalysesChart_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <drawerLayout>
- <name>layout</name>
- <layoutCaption>Classification</layoutCaption>
- <fixedDrawer v="true" />
- </drawerLayout>
- </layout>
- <children>
- <singleDataChartViewTemplate>
- <name>Groups</name>
- <chartType>PIE</chartType>
- <xAxis>GROUP</xAxis>
- <yAxis>SCORE</yAxis>
- <entityField>#ENTITY</entityField>
- <title></title>
- </singleDataChartViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/ClassificationGroupPreview_view/ClassificationGroupPreview_view.aod b/neonView/ClassificationGroupPreview_view/ClassificationGroupPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ac701fd79bb19e0d3b9afcee91964fda6b03c8d7
--- /dev/null
+++ b/neonView/ClassificationGroupPreview_view/ClassificationGroupPreview_view.aod
@@ -0,0 +1,36 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ClassificationGroupPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>generic</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>generic</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>856aa380-f737-4e33-b97a-fdc9230cddaa</name>
+ <entityField>object_type</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9c5775b3-8000-4d2f-9400-e049afba2f60</name>
+ <entityField>TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7a847889-24f7-4cfd-8dbc-786eaf9db963</name>
+ <entityField>SORTING</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>83bafcf6-7329-4fe8-b5dd-a3cb88babbd3</name>
+ <entityField>ClassificationGradings</entityField>
+ <view>ClassificationGradingMultipleEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ClassificationPreview_view/ClassificationPreview_view.aod b/neonView/ClassificationPreview_view/ClassificationPreview_view.aod
index af9b4f0582b4b37575db7111fe5732d5f8d837b1..8c55fe145f75d6653dc2ba4968b158c6dcf796ed 100644
--- a/neonView/ClassificationPreview_view/ClassificationPreview_view.aod
+++ b/neonView/ClassificationPreview_view/ClassificationPreview_view.aod
@@ -2,30 +2,42 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>ClassificationPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <isOverlay v="false" />
+ <overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
- <headerFooterLayout>
+ <boxLayout>
<name>layout</name>
- </headerFooterLayout>
+ <autoHeight v="true" />
+ </boxLayout>
</layout>
<children>
<genericViewTemplate>
- <name>Info</name>
+ <name>classification</name>
+ <showDrawer v="true" />
+ <fixedDrawer v="true" />
+ <hideLabels v="false" />
+ <hideEmptyFields v="false" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>51712a19-9a8c-4967-bd15-a448b5bffb77</name>
- <entityField>CLASSNAME</entityField>
+ <name>dfdbc6f4-4859-495b-96e7-0853bdbc611f</name>
+ <entityField>CLASSIFICATIONSCORE_ID</entityField>
</entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>info</name>
+ <showDrawer v="true" />
+ <fixedDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <isEditable v="false" />
+ <title></title>
+ <fields>
<entityFieldLink>
- <name>c3621e4e-53b0-4932-b943-e1c07fe16a24</name>
- <entityField>POINTS</entityField>
+ <name>2d1fae5e-1b2b-4e29-9bcb-646db9fd9653</name>
+ <entityField>Info</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/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod b/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
index 806bac6774503f46b8bbff201d09f144d80ed4d1..add9fa38736033c557315fd3b6920b080be9e10f 100644
--- a/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
+++ b/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
@@ -3,29 +3,22 @@
<name>ClassificationScoreMultipleEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <drawerLayout>
+ <noneLayout>
<name>layout</name>
- <layoutCaption>Possible Values</layoutCaption>
- </drawerLayout>
+ </noneLayout>
</layout>
<children>
- <genericMultipleViewTemplate>
+ <titledListViewTemplate>
<name>scores</name>
+ <titleField>TITLE</titleField>
+ <autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
- <neonGenericMultipleTableColumn>
- <name>7d49c1b4-3525-410c-92d2-b21a69fd8dec</name>
- <entityField>TITLE</entityField>
- </neonGenericMultipleTableColumn>
- <neonGenericMultipleTableColumn>
- <name>db21eec0-16c6-4267-a785-cb63f15e43b3</name>
+ <neonTitledListTableColumn>
+ <name>d56f97c1-a634-4b12-8dd3-c2c32a9e16f1</name>
<entityField>SCORE</entityField>
- </neonGenericMultipleTableColumn>
- <neonGenericMultipleTableColumn>
- <name>38641e7a-a8fe-4ad4-af63-efde73d66a9a</name>
- <entityField>SORT</entityField>
- </neonGenericMultipleTableColumn>
+ </neonTitledListTableColumn>
</columns>
- </genericMultipleViewTemplate>
+ </titledListViewTemplate>
</children>
</neonView>
diff --git a/neonView/ClassificationTree_view/ClassificationTree_view.aod b/neonView/ClassificationTree_view/ClassificationTree_view.aod
index d8b43717e9063dde797ea445c6c21d919d5e6765..ca36f8fd5fa5bb784aa2111d11e4981e1bf01081 100644
--- a/neonView/ClassificationTree_view/ClassificationTree_view.aod
+++ b/neonView/ClassificationTree_view/ClassificationTree_view.aod
@@ -10,12 +10,12 @@
<children>
<treeTableViewTemplate>
<name>ClassificationTreeTable</name>
- <defaultGroupFields>
- <element>CLASSIFICATIONGROUP</element>
- </defaultGroupFields>
<hideActions v="true" />
<showChildrenCount v="false" />
<entityField>#ENTITY</entityField>
+ <defaultGroupFields>
+ <element>CLASSIFICATIONGROUP</element>
+ </defaultGroupFields>
<columns>
<neonTreeTableColumn>
<name>246c0212-dadb-4d71-9567-ceab37e9ef10</name>
diff --git a/neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod b/neonView/ClassificationTypePreview_View/ClassificationTypePreview_View.aod
similarity index 53%
rename from neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod
rename to neonView/ClassificationTypePreview_View/ClassificationTypePreview_View.aod
index 2d8fc5a44b010ad8e28036dd1685784eb75a20b9..9b7072fc51941a61d42ed0f8044da5e86732ddc1 100644
--- a/neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod
+++ b/neonView/ClassificationTypePreview_View/ClassificationTypePreview_View.aod
@@ -1,40 +1,40 @@
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>ClassificatonAdminPreview_view</name>
+ <name>ClassificationTypePreview_View</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <isOverlay v="false" />
- <overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
- <boxLayout>
+ <headerFooterLayout>
<name>layout</name>
- <autoHeight v="true" />
- </boxLayout>
+ <header>generic</header>
+ </headerFooterLayout>
</layout>
<children>
<genericViewTemplate>
- <name>classification</name>
- <showDrawer v="true" />
- <drawerCaption>Classification</drawerCaption>
+ <name>generic</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>31662c73-7352-4eb2-889d-3f63bff25686</name>
- <entityField>CLASSIFICATIONTYPE</entityField>
+ <name>108530e0-ba87-4db3-9053-6bab10973cb9</name>
+ <entityField>OBJECT_TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>7fddc4d4-6bdc-4c7a-9d69-bba4a9506707</name>
- <entityField>CLASSIFICATIONGROUP</entityField>
+ <name>4aac1cf8-9ada-4459-b831-02064b43bc24</name>
+ <entityField>CLASSIFICATIONGROUP_ID</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>cb6e8f64-b2a4-4cc4-88b7-2f64f56b83dc</name>
+ <name>8853a07b-0a5e-468a-84a4-c59bfd8eec9c</name>
<entityField>SCORETYPE</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>d070599e-2a60-4de2-ae65-efda4943d199</name>
+ <entityField>infoField</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
- <name>214fbe22-378d-404e-99f8-f175e037f196</name>
+ <name>6b9f9dc6-8fbf-4f8a-8ba2-250178f1dd1e</name>
<entityField>ClassificationScores</entityField>
- <view>ClassificationScoreMultiplePreview_view</view>
+ <view>ClassificationScoreMultipleEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/CompetitionEdit_view/CompetitionEdit_view.aod b/neonView/CompetitionEdit_view/CompetitionEdit_view.aod
index ae4b045d5f0371d9e6a027219786e043b7d9a5b1..2dc804c8fa5e5cc62683314a6c0c390457b807f1 100644
--- a/neonView/CompetitionEdit_view/CompetitionEdit_view.aod
+++ b/neonView/CompetitionEdit_view/CompetitionEdit_view.aod
@@ -39,18 +39,6 @@
<name>087036b6-4b07-4f7e-90fe-b35c5ceb6dd9</name>
<entityField>REASON</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>cb795feb-20f0-48d8-a147-5edb6a911d19</name>
- <entityField>PRICE_POLITICS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>755e1dc3-08f6-4a03-a572-3bb84ec73b05</name>
- <entityField>STRENGTH</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e14f29e5-36ff-4740-ae72-854d713c3f8f</name>
- <entityField>WEAKNESS</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/ContractPreview_view/ContractPreview_view.aod b/neonView/ContractPreview_view/ContractPreview_view.aod
index af1ed3be29ab10958aca11aefbc4d2d3b948f2ac..d825a03fee18e23e58567ec90ac565079048fae9 100644
--- a/neonView/ContractPreview_view/ContractPreview_view.aod
+++ b/neonView/ContractPreview_view/ContractPreview_view.aod
@@ -17,6 +17,13 @@
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>CONTRACT_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>Details</name>
<showDrawer v="true" />
diff --git a/neonView/DSGVOReport_view/DSGVOReport_view.aod b/neonView/DSGVOReport_view/DSGVOReport_view.aod
index bd894e65e4f84f17dc877903fc87ef21260e7c92..3835fcb15b87bf51c774399be84dcfd926d76757 100644
--- a/neonView/DSGVOReport_view/DSGVOReport_view.aod
+++ b/neonView/DSGVOReport_view/DSGVOReport_view.aod
@@ -11,6 +11,7 @@
<reportViewTemplate>
<name>Report</name>
<reportData>REPORT_DATA</reportData>
+ <favoriteActionGroup1>dsgvoReportDispatch</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
</reportViewTemplate>
</children>
diff --git a/neonView/DistrictEdit_view/DistrictEdit_view.aod b/neonView/DistrictEdit_view/DistrictEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ef598ae5665601c0ec565416dd283b994c2c4db6
--- /dev/null
+++ b/neonView/DistrictEdit_view/DistrictEdit_view.aod
@@ -0,0 +1,57 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DistrictEdit_view</name>
+ <title>Responsible Districts</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>genericViewTemplate</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>3c4e3069-f8ce-4cfc-84f5-17b5cbe606ec</name>
+ <entityField>DISTRICT_NAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>fd54e6af-1045-402d-a464-0bcd8d27573c</name>
+ <entityField>DISTRICT_NUMBER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ec0706b4-dcf4-4c0d-b99a-cc0b129f3e46</name>
+ <entityField>DISTRICT_INFO</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>325331a3-facb-4fd3-9efb-2bd8ed6f08f0</name>
+ <entityField>ISO3</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>941cb436-8b93-427d-ae2d-3731e55dd040</name>
+ <entityField>DISTRICT_STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f77428c6-eaff-4554-aedb-cf56d4c573d6</name>
+ <entityField>PARENTDISTRICT_DISTRICTID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>914ec7a6-f89f-44c5-9ea9-1a6223e4cf62</name>
+ <entityField>parentFilter</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>44d4f67e-5041-4b3f-a64f-71910050e035</name>
+ <entityField>DISTRICT_FILTER</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>f1dddbee-5718-46b8-b682-ba4e707bf529</name>
+ <entityField>DistrictResponsibles</entityField>
+ <view>DistrictResponsibleMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/DistrictFilter_view/DistrictFilter_view.aod b/neonView/DistrictFilter_view/DistrictFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0ae033d2346776a6bb816ef83e21f016045031e5
--- /dev/null
+++ b/neonView/DistrictFilter_view/DistrictFilter_view.aod
@@ -0,0 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DistrictFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <treeTableViewTemplate>
+ <name>treetableViewTemplate</name>
+ <parentField>PARENTDISTRICT_DISTRICTID</parentField>
+ <hideContentSearch v="false" />
+ <showChildrenCount v="false" />
+ <entityField>#ENTITY</entityField>
+ <linkedColumns>
+ <element>DISTRICT_NAME</element>
+ <element>DISTRICT_NUMBER</element>
+ </linkedColumns>
+ <columns>
+ <neonTreeTableColumn>
+ <name>923c5603-ed8f-4924-8a1d-9f6cc0d170e6</name>
+ <entityField>#ICON</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>9f8e99dc-cfb3-4038-b949-27571f787db2</name>
+ <entityField>DISTRICT_NAME</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>98f4acf0-ecb3-4999-8727-16df56e502cc</name>
+ <entityField>DISTRICT_NUMBER</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>9533ae87-3b08-4dd6-8265-13024cbab918</name>
+ <entityField>DISTRICT_INFO</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>df5ff116-cead-46c3-9569-0a51f2243c81</name>
+ <entityField>ISO3</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>87184bb1-4d44-4872-bae7-9be903f71354</name>
+ <entityField>DISTRICT_STATUS</entityField>
+ </neonTreeTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DistrictList_view/DistrictList_view.aod b/neonView/DistrictList_view/DistrictList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..161c81303a534d682d1517acae5abfef351e9904
--- /dev/null
+++ b/neonView/DistrictList_view/DistrictList_view.aod
@@ -0,0 +1,53 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DistrictList_view</name>
+ <title>Responsible Districts</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treeTableViewTemplate>
+ <name>treeTableViewTemplate</name>
+ <parentField>PARENTDISTRICT_DISTRICTID</parentField>
+ <hideActions v="true" />
+ <showChildrenCount v="false" />
+ <entityField>#ENTITY</entityField>
+ <linkedColumns />
+ <defaultGroupFields />
+ <fixedFilterFields />
+ <hideHeader v="false" />
+ <isCreatable v="false" />
+ <isDeletable v="false" />
+ <isEditable v="false" />
+ <columns>
+ <neonTreeTableColumn>
+ <name>6c3d52d5-8a51-4fd5-9b26-a54485c8f5a6</name>
+ <entityField>#ICON</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>15a66360-dff7-4d21-b4e1-f48102f0bda1</name>
+ <entityField>DISTRICT_NAME</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>ca9631f4-f48b-49a6-83dd-3c5b33ee669a</name>
+ <entityField>DISTRICT_NUMBER</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>257e37e4-e6b0-4d74-aa46-9c0643aed985</name>
+ <entityField>DISTRICT_INFO</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>54a43aa1-1347-474c-9465-3a018d0cb99f</name>
+ <entityField>ISO3</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>932b9d0a-ccfc-4d17-b158-b19e3795af0b</name>
+ <entityField>DISTRICT_STATUS</entityField>
+ </neonTreeTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DistrictMain_view/DistrictMain_view.aod b/neonView/DistrictMain_view/DistrictMain_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..2babd2f4b0b697301ad2cc98105a9779c53e8da9
--- /dev/null
+++ b/neonView/DistrictMain_view/DistrictMain_view.aod
@@ -0,0 +1,33 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DistrictMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>8b52b148-a054-4e85-8de0-856be82abc77</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>8b52b148-a054-4e85-8de0-856be82abc77</name>
+ <entityField>#ENTITY</entityField>
+ <view>DistrictPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b409f300-c8b4-4052-9012-5e6b79c03a9c</name>
+ <entityField>Organisations</entityField>
+ <view>OrganisationFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>665bcb1a-aeb5-4dc5-9c2b-5398ee85bdc9</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>7001aa5a-75d1-42b4-bc45-db303d89184e</name>
+ <entityField>LogHistories</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/DistrictPreview_view/DistrictPreview_view.aod b/neonView/DistrictPreview_view/DistrictPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..041618ad4f16173a728ff37ad60df553bed5c3b8
--- /dev/null
+++ b/neonView/DistrictPreview_view/DistrictPreview_view.aod
@@ -0,0 +1,59 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DistrictPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>cardViewTemplate</header>
+ <footer>scoreCardViewTemplate</footer>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>cardViewTemplate</name>
+ <titleField>DISTRICT_NAME</titleField>
+ <descriptionField>DISTRICT_NUMBER_fieldGroup</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <neonViewReference>
+ <name>a7a731e8-f93e-4d90-8459-d249a13ecf0d</name>
+ <entityField>DistrictResponsibles</entityField>
+ <view>DistrictResponsiblePreviewList_view</view>
+ </neonViewReference>
+ <genericViewTemplate>
+ <name>furtherInfosGenericViewTemplate</name>
+ <showDrawer v="true" />
+ <drawerCaption>Further informations</drawerCaption>
+ <fixedDrawer v="false" />
+ <hideEmptyFields v="true" />
+ <entityField>#ENTITY</entityField>
+ <title>Further informations</title>
+ <fields>
+ <entityFieldLink>
+ <name>f1c69329-5a9f-456f-b37d-1ca1b0e4943c</name>
+ <entityField>DISTRICT_INFO</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0dddb53a-30ea-4c82-b7c2-7c3372a2968a</name>
+ <entityField>DISTRICT_FILTER</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <scoreCardViewTemplate>
+ <name>scoreCardViewTemplate</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>5aa54d53-a6c2-4b5f-9eae-67c8e4208cfc</name>
+ <entityField>totalTurnover</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c76e215e-e2f4-42e5-a245-810003fec56b</name>
+ <entityField>customerCounting</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod b/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..2d6c800894abe07282d9c453e96878b9c08f11c4
--- /dev/null
+++ b/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
@@ -0,0 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DistrictResponsibleList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>tableViewTemplate</name>
+ <hideActions v="true" />
+ <entityField>#ENTITY</entityField>
+ <linkedColumns>
+ <element>EMPLOYEE_CONTACT_ID</element>
+ <element>DISTRICT_ID</element>
+ </linkedColumns>
+ <fixedFilterFields />
+ <isCreatable v="false" />
+ <isDeletable v="false" />
+ <isEditable v="false" />
+ <columns>
+ <neonTableColumn>
+ <name>158f589a-497f-4522-9b43-d7a6155c6818</name>
+ <entityField>DISTRICT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>32e7b066-76b4-4bd2-b440-bc7844c929a6</name>
+ <entityField>EMPLOYEE_CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>dc9bce22-9a99-4db9-a76a-8fd4a91d5f0f</name>
+ <entityField>departmentAttributeName</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fd46a7b9-60bb-48d1-aac5-0ef28943eac9</name>
+ <entityField>PHONE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5ae3b723-14b5-4100-b78b-2ae2ffa39bae</name>
+ <entityField>MAIL</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod b/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b03d4f16698d46b9d49d7b844dc0ece1d1f27b2b
--- /dev/null
+++ b/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod
@@ -0,0 +1,27 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DistrictResponsibleMultiEdit_view</name>
+ <title></title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>genericViewTemplate</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonGenericMultipleTableColumn>
+ <name>e1988e26-68a4-4a96-a484-4d9f7506505d</name>
+ <entityField>departmentAttributeName</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>2c588be3-a0df-4c3f-9632-574e5b975073</name>
+ <entityField>EMPLOYEE_CONTACT_ID</entityField>
+ </neonGenericMultipleTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod b/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7e50b1a7240dcc1ac96b3236f2c5811c2b31a705
--- /dev/null
+++ b/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod
@@ -0,0 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DistrictResponsiblePreviewList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>titledListViewTemplate</name>
+ <titleField>departmentAttributeName</titleField>
+ <entityField>#ENTITY</entityField>
+ <title>Contactperson</title>
+ <columns>
+ <neonTitledListTableColumn>
+ <name>007d67c4-146b-4202-a677-4390059b4a0a</name>
+ <entityField>EMPLOYEE_CONTACT_ID</entityField>
+ <fullWidth v="false" />
+ </neonTitledListTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentFilter_view/DocumentFilter_view.aod b/neonView/DocumentFilter_view/DocumentFilter_view.aod
index c1287b68b4c98656d81c5b1e74326871dc5d1106..300a26f92f9f0a8427c8bdbc8a3f762257b97d4b 100644
--- a/neonView/DocumentFilter_view/DocumentFilter_view.aod
+++ b/neonView/DocumentFilter_view/DocumentFilter_view.aod
@@ -11,7 +11,7 @@
<children>
<tilesViewTemplate>
<name>Tiles</name>
- <iconField>ICON</iconField>
+ <iconField>PREVIEW_IMAGE</iconField>
<titleField>NAME</titleField>
<subtitleField>TYPE</subtitleField>
<descriptionField>SIZE</descriptionField>
diff --git a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
index c09f4a9cc317e29c243f81d13878e6d83475a093..129100f62d8eb57c89eedd50321707bb21ac1f65 100644
--- a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
+++ b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
@@ -22,13 +22,13 @@
<treeTableViewTemplate>
<name>SearchTree</name>
<parentField>KIND</parentField>
- <defaultGroupFields>
- <element>KIND</element>
- </defaultGroupFields>
<entityField>#ENTITY</entityField>
<linkedColumns>
<element>NAME</element>
</linkedColumns>
+ <defaultGroupFields>
+ <element>KIND</element>
+ </defaultGroupFields>
<columns>
<neonTreeTableColumn>
<name>c0085121-edf6-4e3e-ace4-d599af4aa2f1</name>
diff --git a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
index 58d8c23792645e4dffae235a4469a9d4f40077e3..5c4100bd63747c9cbadff7297a9429ef795eb354 100644
--- a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
+++ b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
@@ -18,6 +18,13 @@
<entityField>#ENTITY</entityField>
<title>Document Template</title>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>DOCUMENTTEMPLATE_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorties</title>
+ </favoriteViewTemplate>
<neonViewReference>
<name>0da2cc6b-86c9-4455-b5b2-edc54b30e793</name>
<entityField>Documents</entityField>
diff --git a/neonView/DocumentWithIdFilter_view/DocumentWithIdFilter_view.aod b/neonView/DocumentWithIdFilter_view/DocumentWithIdFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3cafd27757d6dac8dd51c5ceb17fc1219e7bc3a0
--- /dev/null
+++ b/neonView/DocumentWithIdFilter_view/DocumentWithIdFilter_view.aod
@@ -0,0 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DocumentWithIdFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>documentsTable</name>
+ <favoriteActionGroup1>Document_actions</favoriteActionGroup1>
+ <iconField>PREVIEW_IMAGE</iconField>
+ <titleField>NAME</titleField>
+ <subtitleField>TYPE</subtitleField>
+ <descriptionField>SIZE</descriptionField>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>3c8f789e-f62f-4756-8ee4-347e77712ebe</name>
+ <entityField>UID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9138d75e-c7d1-4b49-8fd3-c67ef53d0e8b</name>
+ <entityField>NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3c8d2e5e-9db9-4a76-844e-85e84ea73078</name>
+ <entityField>TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1709dcf6-33ea-46ec-a2bc-e488289389bc</name>
+ <entityField>SIZE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>86ef02d8-ca90-44c8-9dc4-b8527016f3a5</name>
+ <entityField>DATE_EDIT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9b140660-1918-48dd-852b-d9802fef872e</name>
+ <entityField>IS_MAIN_DOCUMENT</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
index 267ca200f71bfc159e6e25a565728e3548086719..684c65d5dc6ece746f72a21d0c72a255d3a84a08 100644
--- a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
+++ b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
@@ -23,7 +23,7 @@
<entityField>ENTITY_TO_SCAN_NAME</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>a0eefe38-cd65-432e-819b-e108f44db7f2</name>
+ <name>840dda8e-0a7a-4c09-80d1-f7cec15b49fc</name>
<entityField>ID_FIELD_NAME</entityField>
</entityFieldLink>
<entityFieldLink>
diff --git a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
index 4758021fb527d055b064b03add37e344955c71df..7cb12f6d37d22a149b3a90ccb9c7ea1aceea89ba 100644
--- a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
+++ b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
@@ -48,10 +48,6 @@
<name>acf1037c-e198-4b2d-9c7f-a2438fa70089</name>
<entityField>EMAIL_ADDRESS</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>5acac530-7ff7-4fd1-ac48-4a9c441a8b13</name>
- <entityField>DESCRIPTION</entityField>
- </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
index 2255ea4658f8daca6da6eb922e876cd28b7ee1c6..c3b40d1ec2550fa5f1efc1bbc0462ce659ba8dc4 100644
--- a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
+++ b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
@@ -17,10 +17,6 @@
<entityField>ROLE</entityField>
<fullWidth v="true" />
</neonGenericMultipleTableColumn>
- <neonGenericMultipleTableColumn>
- <name>a67f3020-1438-483a-9897-647336002618</name>
- <entityField>UID</entityField>
- </neonGenericMultipleTableColumn>
</columns>
</genericMultipleViewTemplate>
</children>
diff --git a/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod b/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod
index 8e87cf2946ade2fa657836d621d1d855e3adaeba..06bcfe9edfd98a79a7c86135b7977b02f32da4d3 100644
--- a/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod
+++ b/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod
@@ -15,6 +15,13 @@
<subtitleField>ISOLANGUAGE</subtitleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>EXPORTTEMPLATE_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>generic</name>
<entityField>#ENTITY</entityField>
diff --git a/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod b/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod
index 7a9b755b2040d6f09825ca7133ccaf29750c34c5..3886dffb7b0ba7f28718efe0bd922ab036e71352 100644
--- a/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod
+++ b/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod
@@ -5,11 +5,22 @@
<size>SMALL</size>
<overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
- <boxLayout>
+ <headerFooterLayout>
<name>layout</name>
- </boxLayout>
+ <header>ExportedDataInfoScore</header>
+ </headerFooterLayout>
</layout>
<children>
+ <scoreCardViewTemplate>
+ <name>ExportedDataInfoScore</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>731880ab-e7fd-462b-ae21-431673f232cc</name>
+ <entityField>exportCount</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
<genericViewTemplate>
<name>generic</name>
<editMode v="true" />
diff --git a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..15187d33189f9f4462591dfb3a2baaf00a3618e8
--- /dev/null
+++ b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
@@ -0,0 +1,58 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>FavoriteFilter_view</name>
+ <title>FavoriteFilter_view</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>favoriteDashletConfiguration</name>
+ <title>Favorites</title>
+ <description>Show all Favorites</description>
+ <fragment>Favorite/filter?grouping=GROUP_TITLE</fragment>
+ <fragmentCustomizable v="true" />
+ <provider></provider>
+ <icon>VAADIN:STAR</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>favorites</name>
+ <title>Favorites</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <treeTableViewTemplate>
+ <name>FavoriteTree</name>
+ <entityField>#ENTITY</entityField>
+ <defaultGroupFields>
+ <element>GROUP_TITLE</element>
+ </defaultGroupFields>
+ <isCreatable v="false" />
+ <isEditable v="false" />
+ <columns>
+ <neonTreeTableColumn>
+ <name>3f35104a-7ccc-44aa-8b9a-9de31d410f81</name>
+ <entityField>PICTURE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>d6e9557d-1368-4bc3-8638-fa01e24fcbf3</name>
+ <entityField>GROUP_TITLE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>b7660bdb-7ae4-46c5-a0a6-5127244bfcf8</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>d68cc010-2d84-43d1-a333-39f9fdd3a23a</name>
+ <entityField>TITLE</entityField>
+ </neonTreeTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod b/neonView/FavoritePreview_view/FavoritePreview_view.aod
similarity index 72%
rename from neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod
rename to neonView/FavoritePreview_view/FavoritePreview_view.aod
index f66c1629d8103d1a135369cb9f519652a2750500..25f98d8ef427973cf9b81bb09087a39d1da92522 100644
--- a/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod
+++ b/neonView/FavoritePreview_view/FavoritePreview_view.aod
@@ -1,5 +1,10 @@
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>CampaignStepMembers_view</name>
+ <name>FavoritePreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
</neonView>
diff --git a/neonView/ForecastEdit_view/ForecastEdit_view.aod b/neonView/ForecastEdit_view/ForecastEdit_view.aod
index fe71618badc57d0394b5b8bf28484c9eddc2dc73..28debe56d0facef0164efd638b4d84b4c099a437 100644
--- a/neonView/ForecastEdit_view/ForecastEdit_view.aod
+++ b/neonView/ForecastEdit_view/ForecastEdit_view.aod
@@ -31,10 +31,6 @@
<name>f5e95dd2-c853-48be-ad18-e5fdbe714873</name>
<entityField>INFO</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>382caf7e-d3db-4bac-af99-a95d62504da7</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/ForecastFilter_view/ForecastFilter_view.aod b/neonView/ForecastFilter_view/ForecastFilter_view.aod
index 400bfb57ed5d2ddfb4f425fe3d4279b6dfc084d0..ffa08904f6bad6d9c86b4f0b7c64718d0bae3851 100644
--- a/neonView/ForecastFilter_view/ForecastFilter_view.aod
+++ b/neonView/ForecastFilter_view/ForecastFilter_view.aod
@@ -14,7 +14,6 @@
<iconField>#ICON</iconField>
<titleField>GROUPCODE</titleField>
<subtitleField>VOLUME</subtitleField>
- <descriptionField>TYPE</descriptionField>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
index 19ec98e97d3ca1fb6e441f2ef2ff5effc733f4fe..874bbf3c62f6c5150f3e208f50c825539a94715a 100644
--- a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
+++ b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
@@ -11,12 +11,12 @@
<children>
<treeTableViewTemplate>
<name>EntriesTreeTable</name>
- <nodeExpandedField>expanded</nodeExpandedField>
+ <nodeExpandedField></nodeExpandedField>
+ <hideContentSearch v="false" />
+ <entityField>#ENTITY</entityField>
<defaultGroupFields>
<element>CONTAINER</element>
</defaultGroupFields>
- <hideContentSearch v="false" />
- <entityField>#ENTITY</entityField>
<columns>
<neonTreeTableColumn>
<name>6100879d-dc6a-4c7e-b750-f5b7e627f48a</name>
diff --git a/neonView/LeadimportMain_view/LeadimportMain_view.aod b/neonView/LeadimportMain_view/LeadimportMain_view.aod
index 5dfdbbc4f8e72eb7bfc2663fc78392ad12988910..3cbee3d28bfd15e87892add5f422caf6f7d3116e 100644
--- a/neonView/LeadimportMain_view/LeadimportMain_view.aod
+++ b/neonView/LeadimportMain_view/LeadimportMain_view.aod
@@ -24,6 +24,11 @@
<entityField>ImportFieldID</entityField>
<view>ImportFieldFilterMapping_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>6382569f-b680-4d1e-9e5e-0198b71ebed7</name>
+ <entityField>LeadimportMappings</entityField>
+ <view>LeadimportMappingAssistantFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>5a6123d2-a2a4-416d-a138-fac6cdc5fb82</name>
<entityField>#ENTITY</entityField>
diff --git a/neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod b/neonView/LeadimportMappingAssistantFilter_view/LeadimportMappingAssistantFilter_view.aod
similarity index 63%
rename from neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod
rename to neonView/LeadimportMappingAssistantFilter_view/LeadimportMappingAssistantFilter_view.aod
index 2d3926c09f57841870d988be50e8b058587c53ce..0a32f33679c773b9301205153d56d3e8daf8c631 100644
--- a/neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod
+++ b/neonView/LeadimportMappingAssistantFilter_view/LeadimportMappingAssistantFilter_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>ClassificationScoreMultiplePreview_view</name>
+ <name>LeadimportMappingAssistantFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <noneLayout>
+ <boxLayout>
<name>layout</name>
- </noneLayout>
+ </boxLayout>
</layout>
<children>
<titledListViewTemplate>
- <name>scores</name>
- <titleField>TITLE</titleField>
- <autoNewRow v="true" />
+ <name>TitledList</name>
+ <titleField>FIELDNAME</titleField>
<entityField>#ENTITY</entityField>
<columns>
<neonTitledListTableColumn>
- <name>d56f97c1-a634-4b12-8dd3-c2c32a9e16f1</name>
- <entityField>SCORE</entityField>
+ <name>6319d5a7-4155-46c7-acee-288abf282b72</name>
+ <entityField>INPUTVALUE</entityField>
</neonTitledListTableColumn>
<neonTitledListTableColumn>
- <name>9fb3ba45-55e6-44f0-a612-7ddd54dacce0</name>
- <entityField>SORT</entityField>
+ <name>8736ffce-6731-4135-be61-60c986c5b564</name>
+ <entityField>OUTPUTVALUE</entityField>
</neonTitledListTableColumn>
</columns>
</titledListViewTemplate>
diff --git a/neonView/LeadimportPreview_view/LeadimportPreview_view.aod b/neonView/LeadimportPreview_view/LeadimportPreview_view.aod
index 7c0a2ef4066c8c8c7696f61f2a79fb0d28aaaf63..4e376d9f72a06e405dcbb8f176b68e93d5ecc93e 100644
--- a/neonView/LeadimportPreview_view/LeadimportPreview_view.aod
+++ b/neonView/LeadimportPreview_view/LeadimportPreview_view.aod
@@ -16,8 +16,20 @@
<titleField>NAME</titleField>
<subtitleField>IMPORTSOURCE</subtitleField>
<entityField>#ENTITY</entityField>
- <informationField>SENTENCESEPERATOR</informationField>
+ <informationField>SENTENCESEPARATOR</informationField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>LEADIMPORT_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ <devices>
+ <element>MOBILE</element>
+ <element>TABLET</element>
+ <element>DESKTOP</element>
+ </devices>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>info</name>
<editMode v="false" />
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index cc12313a6470ee4aa7d9a2a6ac1a905f942ab28f..8a6a92a86193ac6bf7ba7b82523fbf7577c1c420 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -28,11 +28,14 @@
<children>
<timelineViewTemplate>
<name>NotificationTimeline</name>
+ <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
<dateField>CREATEDATE</dateField>
<titleField>CAPTION</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconIdField>ICON</iconIdField>
<entityField>#ENTITY</entityField>
+ <isEditable v="false" />
+ <informationField>STATE</informationField>
</timelineViewTemplate>
<tableViewTemplate>
<name>NotificationTable</name>
@@ -51,14 +54,14 @@
<name>1cff3be1-523d-4a5a-b7d1-389d7cbb726f</name>
<entityField>ICON</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
- <entityField>CREATEDATE</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>3bf425ed-227c-4768-b339-4794aa0d6063</name>
<entityField>CAPTION</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
+ <entityField>CREATEDATE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>ff33a6c1-7ac6-4acd-a083-e56a36f89977</name>
<entityField>DESCRIPTION</entityField>
@@ -71,20 +74,22 @@
</tableViewTemplate>
<treeTableViewTemplate>
<name>NotificationTreeTable</name>
+ <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
+ <isEditable v="false" />
<columns>
<neonTreeTableColumn>
<name>c8799a54-569a-4667-9bdd-aa11a2f6e21e</name>
<entityField>ICON</entityField>
</neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>2b2d8359-3746-4fa2-8f51-859e50ead9ef</name>
- <entityField>CREATEDATE</entityField>
- </neonTreeTableColumn>
<neonTreeTableColumn>
<name>efefd3d9-7961-4299-aa7e-24d313ad6454</name>
<entityField>CAPTION</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>2b2d8359-3746-4fa2-8f51-859e50ead9ef</name>
+ <entityField>CREATEDATE</entityField>
+ </neonTreeTableColumn>
<neonTreeTableColumn>
<name>446c3d62-efa4-4f1a-85d4-e4f6a45019c7</name>
<entityField>DESCRIPTION</entityField>
diff --git a/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod b/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c879059396884d69af133ba2a4222fb8b8c4a840
--- /dev/null
+++ b/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod
@@ -0,0 +1,55 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>OfferPreviewMultiple_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <footer>Scorecard</footer>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <dynamicMultiDataChartViewTemplate>
+ <name>OfferChart</name>
+ <chartType>BAR</chartType>
+ <shareParent v="false" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonDynamicMultiDataChartColumn>
+ <name>53b01786-bb5d-41f2-8c30-36bff460b82b</name>
+ <entityField>NET</entityField>
+ </neonDynamicMultiDataChartColumn>
+ </columns>
+ </dynamicMultiDataChartViewTemplate>
+ <treeTableViewTemplate>
+ <name>StatusTreeTable</name>
+ <hideActions v="true" />
+ <entityField>#ENTITY</entityField>
+ <linkedColumns />
+ <defaultGroupFields>
+ <element>STATUS</element>
+ </defaultGroupFields>
+ <columns>
+ <neonTreeTableColumn>
+ <name>5cd9839b-0dea-44e8-9e2f-8f75a7e9cb16</name>
+ <entityField>NET</entityField>
+ <aggregateEntityField>NET_aggregate</aggregateEntityField>
+ </neonTreeTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ <scoreCardViewTemplate>
+ <name>AggregatedValues</name>
+ <entityField>OfferAggregates</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>71cd7dd5-c142-4b4c-8a6b-ca5ed8acf92e</name>
+ <entityField>NET_aggregate</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e76a8a8c-529a-457f-bb23-4dcef79f6f0f</name>
+ <entityField>PROBABILITY_aggregate</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index 83392a97061b4c5719cbade740c5d64d5cd1f09a..7b78909905af090ebc923109ba2ed9bdcb0492dd 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -17,6 +17,13 @@
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>OFFER_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>Details</name>
<editMode v="false" />
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index 6965423af47302f7a1d53f275197c4af7645d6ab..cd9156a57cc2dd16a96648a25f31a705d7f0ca8e 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -11,7 +11,6 @@
<children>
<treeTableViewTemplate>
<name>OfferitemsTreeTable</name>
- <parentField>ASSIGNEDTO</parentField>
<entityField>#ENTITY</entityField>
<columns>
<neonTreeTableColumn>
diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
index 244e22d007fcce28e5d7df9f7a69116e77d1af2c..3805f9a7120e5a727b9aae12a093697b62eaf9b8 100644
--- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -3,9 +3,9 @@
<name>OfferitemPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <headerFooterLayout>
+ <boxLayout>
<name>layout</name>
- </headerFooterLayout>
+ </boxLayout>
</layout>
<children>
<genericViewTemplate>
diff --git a/neonView/OrderClassification_view/OrderClassification_view.aod b/neonView/OrderClassification_view/OrderClassification_view.aod
deleted file mode 100644
index d5b6896eeb63b6e9c68ac6ac9e1f438dd316423e..0000000000000000000000000000000000000000
--- a/neonView/OrderClassification_view/OrderClassification_view.aod
+++ /dev/null
@@ -1,39 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>OrderClassification_view</name>
- <title>Classifications</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Classifications</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>6c01c691-c587-438c-9c92-77682c4fd34e</name>
- <entityField>PAYMENTTERMS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>16f9e458-eab5-4ed1-954c-0f2f8cb474e3</name>
- <entityField>DELIVERYTERMS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>aed251c9-caa6-462f-9b22-6a87f5998b4e</name>
- <entityField>PAYMENTADDRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>52dd0767-3a92-4d13-9f72-1bd9e7745b79</name>
- <entityField>DELIVERYADDRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>7c486c49-22e2-4d61-ac86-b599adbf9522</name>
- <entityField>NOTICE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index 9e876a6e5cb22b37ad233e3c14ab8c25073b2169..d912f8d7a10ffcbd8e1316878d2792510f6ed73c 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -1,7 +1,7 @@
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>OrderDetail_view</name>
- <title>Texts</title>
+ <title>Cover letter</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
@@ -27,6 +27,10 @@
<name>6c1b2311-f15f-4d03-9301-0839b504d24a</name>
<entityField>DUNNINGTEXT</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>a488b7cc-bd0e-404a-bb7a-057410a1466d</name>
+ <entityField>NOTICE</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index 7a97e3b7bd9acfe55d2c0627ebc7160415b2668a..e11f3390c8995c5511064190da120587eeb7c7ea 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -17,8 +17,8 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>17536f17-4160-4027-8486-07321692147d</name>
- <entityField>OrderCode_VersNr_fieldgroup</entityField>
+ <name>fa86e5bf-464c-4875-8ae7-630eca39888e</name>
+ <entityField>SALESORDERCODE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>0f63ee93-c4bb-41e9-a38d-c52bb07f5a11</name>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index 8986ad83d38ead3ea35912d1be6ddfa5f3068bbc..31110f64b91a482ce3b2a3122f0c45fd722a81d9 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -54,12 +54,13 @@
<inlineEdit v="true" />
<iconField>IMAGE</iconField>
<titleField>SALESORDERCODE</titleField>
- <subtitleField>STATUS</subtitleField>
+ <subtitleField>ORDERSTATUS</subtitleField>
<descriptionField>NET</descriptionField>
<entityField>#ENTITY</entityField>
<linkedColumns>
- <element>FullOrderCode</element>
+ <element>SALESORDERCODE</element>
</linkedColumns>
+ <fixedFilterFields />
<columns>
<neonTableColumn>
<name>71f23753-601d-49fa-810d-daa02a1323d8</name>
@@ -67,7 +68,7 @@
</neonTableColumn>
<neonTableColumn>
<name>60b83daa-9349-4bef-94d8-5f1fc350da59</name>
- <entityField>FullOrderCode</entityField>
+ <entityField>SALESORDERCODE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>dba5604f-cc1b-4083-8115-7bbe1ba07bf4</name>
@@ -100,23 +101,49 @@
</columns>
</tableViewTemplate>
<treeTableViewTemplate>
- <name>Treetable</name>
+ <name>tree</name>
+ <defaultGroupFields />
<entityField>#ENTITY</entityField>
<linkedColumns>
- <element>IMAGE</element>
- <element>FullOrderCode</element>
- <element>ORDERTYPE</element>
- <element>CONTACT_ORG_ID</element>
- <element>CONTACT_PERSON_ID</element>
- <element>ORDERSTATUS</element>
- <element>SALESORDERDATE</element>
- <element>CANCELLATION</element>
- <element>NET</element>
+ <element>SALESORDERCODE</element>
</linkedColumns>
+ <fixedFilterFields />
<columns>
<neonTreeTableColumn>
- <name>02e3c101-e4c4-4389-b372-8186b7f1e942</name>
- <entityField>FullOrderCode</entityField>
+ <name>b55edb3a-ecbc-4d4c-958e-6e491777895b</name>
+ <entityField>IMAGE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>61a86526-8928-4e85-979a-ca875730c913</name>
+ <entityField>SALESORDERCODE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>d85c081c-d45a-4b58-bfff-e393ca2d8ab9</name>
+ <entityField>ORDERTYPE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>a3e7168a-ea54-43da-9d88-943eba021d8c</name>
+ <entityField>CONTACT_ORG_ID</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>3ca66671-86ec-44bd-882b-ecd726a2a432</name>
+ <entityField>CONTACT_PERSON_ID</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>f3505b7d-4733-4b8b-a1ac-bd4c4b8ef6fe</name>
+ <entityField>ORDERSTATUS</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>93ace207-5c26-46ba-9cfc-2958a43e6c29</name>
+ <entityField>SALESORDERDATE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>9935b80c-fc62-4bd5-a26c-efbd53a6f438</name>
+ <entityField>CANCELLATION</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>7873c2f2-0dc4-4c54-814a-df970eddea65</name>
+ <entityField>NET</entityField>
</neonTreeTableColumn>
</columns>
</treeTableViewTemplate>
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index b76b54dcaaff68957fa6d0c26f48d5a57a2f9c02..428d0c02e07af523318e7f24d35f87230edab64f 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -29,16 +29,16 @@
<entityField>#ENTITY</entityField>
<view>OrderDetail_view</view>
</neonViewReference>
- <neonViewReference>
- <name>b3014999-da86-45ae-86ae-feb738d62906</name>
- <entityField>Documents</entityField>
- <view>DocumentFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>7ec102f5-fb45-44a7-9bbf-0eba7f1536d7</name>
<entityField>Activities</entityField>
<view>ActivityFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>b3014999-da86-45ae-86ae-feb738d62906</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>351a9b5d-a050-4fb9-b3e4-402dcd84b331</name>
<entityField>Tasks</entityField>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index d75cf66b97b4c084d58c56277a54e3e51a5be402..449cb53093e44483cf3aa756620e62102d37d113 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -12,11 +12,18 @@
<cardViewTemplate>
<name>Header</name>
<iconField>IMAGE</iconField>
- <titleField>OrderCode_VersNr_fieldgroup</titleField>
+ <titleField>SALESORDERCODE</titleField>
<descriptionField>CONTACT_ID</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>ORDER_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>Details</name>
<editMode v="false" />
@@ -28,10 +35,6 @@
<name>0ee64080-2459-4a56-b4b9-cab2cac0f8c3</name>
<entityField>SALESORDERDATE</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>d7bb0f49-34db-4485-9908-598e83f3e73b</name>
- <entityField>ORDERDATE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>beb2d15c-6ed9-41fb-b59b-f874568a9896</name>
<entityField>ORDERTYPE</entityField>
diff --git a/neonView/OrderReminderReport_view/OrderReminderReport_view.aod b/neonView/OrderReminderReport_view/OrderReminderReport_view.aod
index ca78ae38cf7495c86338ff4f3ceb317fbd5df3ae..8c0ed255d69772395ea09018326fa4259b6eb61c 100644
--- a/neonView/OrderReminderReport_view/OrderReminderReport_view.aod
+++ b/neonView/OrderReminderReport_view/OrderReminderReport_view.aod
@@ -11,6 +11,7 @@
<reportViewTemplate>
<name>Report</name>
<reportData>REMINDER_REPORT_DATA</reportData>
+ <favoriteActionGroup1>reminderReportDispatch</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
</reportViewTemplate>
</children>
diff --git a/neonView/OrderReport_view/OrderReport_view.aod b/neonView/OrderReport_view/OrderReport_view.aod
index 8a4fdcad3c61e86ddfebf2fd51d8d6b55fbc4224..0f3487512ac3b724cd6ca4aaba79f0e7c92b5def 100644
--- a/neonView/OrderReport_view/OrderReport_view.aod
+++ b/neonView/OrderReport_view/OrderReport_view.aod
@@ -11,6 +11,8 @@
<reportViewTemplate>
<name>Report</name>
<reportData>ORDER_REPORT_DATA</reportData>
+ <favoriteActionGroup1>orderReportDispatch</favoriteActionGroup1>
+ <favoriteActionGroup2></favoriteActionGroup2>
<entityField>#ENTITY</entityField>
</reportViewTemplate>
</children>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index e6eaeeb9f9ee7a2ca057202848bb3b97657f9382..4c6e8a7eac674bd309fbe4aefe1f9bda7c40bba0 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -11,7 +11,7 @@
<children>
<tableViewTemplate>
<name>Orderitems</name>
- <inlineEdit v="true" />
+ <inlineEdit v="false" />
<entityField>#ENTITY</entityField>
<autoNewRow v="true" />
<columns>
@@ -31,6 +31,10 @@
<name>a8dcb2bb-bb09-4a6e-b0f0-1b4d1111eb22</name>
<entityField>UNIT</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
+ <entityField>VAT</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>33ef0703-d4ea-4187-b555-648a1733ee99</name>
<entityField>PRICE</entityField>
@@ -39,22 +43,18 @@
<name>61a39c6b-f7dd-487c-bc5f-c2e95376ec37</name>
<entityField>DISCOUNT</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
- <entityField>VAT</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
<entityField>OPTIONAL</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>eecc066d-e380-4fe7-9e9b-99d80842981d</name>
<entityField>TotalPrice</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
<treeTableViewTemplate>
@@ -77,6 +77,10 @@
<name>4998fc65-67b7-465d-9891-808dcf0fe080</name>
<entityField>UNIT</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>e545cb87-e4a5-4154-89b1-1f88a6d59fde</name>
+ <entityField>VAT</entityField>
+ </neonTreeTableColumn>
<neonTreeTableColumn>
<name>b4470ca6-89e8-421b-bb91-7d32f9c48aa2</name>
<entityField>PRICE</entityField>
@@ -85,22 +89,18 @@
<name>0c533079-4b39-4412-8de5-086bf7a08706</name>
<entityField>DISCOUNT</entityField>
</neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>e545cb87-e4a5-4154-89b1-1f88a6d59fde</name>
- <entityField>VAT</entityField>
- </neonTreeTableColumn>
<neonTreeTableColumn>
<name>9ac44050-ea77-43d2-b0fe-f7ca411b91e7</name>
<entityField>OPTIONAL</entityField>
</neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>4d4f204a-1c2b-4587-93b9-df03f31da38e</name>
- <entityField>INFO</entityField>
- </neonTreeTableColumn>
<neonTreeTableColumn>
<name>c44b5bc2-4283-4dca-bd20-bd048e05fe45</name>
<entityField>TotalPrice</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>4d4f204a-1c2b-4587-93b9-df03f31da38e</name>
+ <entityField>INFO</entityField>
+ </neonTreeTableColumn>
</columns>
</treeTableViewTemplate>
</children>
diff --git a/neonView/SalesprojectClassificationAndChart_view/SalesprojectClassificationAndChart_view.aod b/neonView/OrganisationClassification/OrganisationClassification.aod
similarity index 66%
rename from neonView/SalesprojectClassificationAndChart_view/SalesprojectClassificationAndChart_view.aod
rename to neonView/OrganisationClassification/OrganisationClassification.aod
index 912611206de885cbb79c126b484218054b42c5c1..9019bf34d2fc9a1c046f10134326513ba14eef59 100644
--- a/neonView/SalesprojectClassificationAndChart_view/SalesprojectClassificationAndChart_view.aod
+++ b/neonView/OrganisationClassification/OrganisationClassification.aod
@@ -1,7 +1,6 @@
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>SalesprojectClassificationAndChart_view</name>
- <title></title>
+ <name>OrganisationClassification</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
@@ -12,14 +11,9 @@
</layout>
<children>
<neonViewReference>
- <name>b2bbddb9-1a44-4926-9707-7052f96e5963</name>
+ <name>b2ef616c-7605-429a-bace-868b52ce9b06</name>
<entityField>Classifications</entityField>
<view>ClassificationTree_view</view>
</neonViewReference>
- <neonViewReference>
- <name>0442c345-d0a3-4778-a906-c5ef86dacd16</name>
- <entityField>Classifications</entityField>
- <view>ClassificationChart_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod b/neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod
similarity index 76%
rename from neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod
rename to neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod
index a51cbe2ee81f7ab96d0de0a2047453c730d7ccad..3f81db3f2e4ff280a021b5b2b8b9271c3ebd5f19 100644
--- a/neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod
+++ b/neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod
@@ -1,6 +1,7 @@
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>SalesprojectClassificationDrawer_view</name>
+ <name>OrganisationClassificationDrawer_view</name>
+ <title>Classifications</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<drawerLayout>
@@ -11,9 +12,9 @@
</layout>
<children>
<neonViewReference>
- <name>8cec9c22-7304-47f3-9d46-909dec12ca2a</name>
+ <name>b49a0291-89cc-4962-8706-5044aa2f9e21</name>
<entityField>#ENTITY</entityField>
- <view>SalesprojectClassificationAndChart_view</view>
+ <view>OrganisationClassification</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/ClassificationChart_view/ClassificationChart_view.aod b/neonView/OrganisationDistrictResponsibles_view/OrganisationDistrictResponsibles_view.aod
similarity index 54%
rename from neonView/ClassificationChart_view/ClassificationChart_view.aod
rename to neonView/OrganisationDistrictResponsibles_view/OrganisationDistrictResponsibles_view.aod
index f7be2063e2adce5afedaeefcd74e2d1a9a4035ce..ab57158edfed4b568aeb345746fc7e6acfe527c0 100644
--- a/neonView/ClassificationChart_view/ClassificationChart_view.aod
+++ b/neonView/OrganisationDistrictResponsibles_view/OrganisationDistrictResponsibles_view.aod
@@ -1,18 +1,18 @@
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>ClassificationChart_view</name>
+ <name>OrganisationDistrictResponsibles_view</name>
+ <title>Responsibles</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <noneLayout>
<name>layout</name>
- </boxLayout>
+ </noneLayout>
</layout>
<children>
- <multiDataChartViewTemplate>
- <name>classificationPoints</name>
- <xAxis>CLASSIFICATIONGROUP</xAxis>
- <yAxis>GroupScore</yAxis>
- <entityField>#ENTITY</entityField>
- </multiDataChartViewTemplate>
+ <neonViewReference>
+ <name>a698babd-271c-4f21-94f7-391f4ad80877</name>
+ <entityField>DistrictResponsibles</entityField>
+ <view>DistrictResponsibleList_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
index 81ab662529757a2607ec8dc7421c97a730400b11..5a59c451c77ae1572ed36fc92ae2d97c156fa020 100644
--- a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
+++ b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
@@ -14,7 +14,7 @@
<neonViewReference>
<name>f2fa0351-15af-4d1c-b7dd-0e42d9c7889f</name>
<entityField>SelfDuplicatesUncached</entityField>
- <view>OrganisationDuplicateEditview_view</view>
+ <view>OrganisationNoNoiseTable_view</view>
</neonViewReference>
<genericViewTemplate>
<name>Edit</name>
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index 1cc87b9732a33851587d07a0ca3950c4d1c8d8c1..b969a541b7f3b3563add1bbf0bc2b4364bcafd7f 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -77,6 +77,10 @@
<name>1908e7ac-9e6a-4104-9d5b-da60a10a1c02</name>
<entityField>STATUS</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>c935dcaf-d1eb-4b2c-afee-a58f3f63458d</name>
+ <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>2a82ed1e-05bf-408a-82e0-4de6195dad49</name>
<entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
@@ -120,6 +124,10 @@
<name>2c8450d2-a8a5-49d3-92c5-bf08d32a46db</name>
<entityField>STATUS</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>3aedcc38-0313-43d7-9c84-67f03e28038a</name>
+ <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+ </neonTreeTableColumn>
<neonTreeTableColumn>
<name>d134034c-e391-4df3-9205-465d8a390996</name>
<entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
diff --git a/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod b/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6cdd2403b231c98ca046452948c2a4cb246e7e87
--- /dev/null
+++ b/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod
@@ -0,0 +1,42 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>OrganisationLesserNoiseTable_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>table</name>
+ <hideActions v="true" />
+ <hideContentSearch v="true" />
+ <iconField></iconField>
+ <entityField>#ENTITY</entityField>
+ <hideHeader v="false" />
+ <columns>
+ <neonTableColumn>
+ <name>8b764a88-ea38-4810-9647-036de8e2bdb5</name>
+ <entityField>#IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d45ea163-ac10-4a4c-8a6a-1f0680df3c2e</name>
+ <entityField>NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0fc13178-f186-4c1a-82f4-5a9f89ed6779</name>
+ <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d052d240-7001-4a65-bd04-7f90cac2b88e</name>
+ <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>8d815ffd-7b16-45bc-9ee9-557277147818</name>
+ <entityField>ADDRESS_ID</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 0ca88f9126acaf23b33e692c07397b64485cc398..f02268bc9b94a2cfe6a345b1665156e2a754699e 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -40,6 +40,11 @@
<entityField>ObjectTrees</entityField>
<view>ObjectTreeFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>0b618d7e-61e0-42f3-ad0b-176afb9f6da4</name>
+ <entityField>Classifications</entityField>
+ <view>ClassificationTree_view</view>
+ </neonViewReference>
<neonViewReference>
<name>45c0f486-e7df-48ac-a201-661ac07f5fed</name>
<entityField>#ENTITY</entityField>
@@ -55,6 +60,11 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>db26269b-32ae-47da-ba22-41e0a5952103</name>
+ <entityField>#ENTITY</entityField>
+ <view>OrganisationDistrictResponsibles_view</view>
+ </neonViewReference>
<neonViewReference>
<name>0686ad7e-8dc7-4b10-9df2-bf066ae3a310</name>
<entityField>LogHistories</entityField>
diff --git a/neonView/OrganisationDuplicateEditview_view/OrganisationDuplicateEditview_view.aod b/neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod
similarity index 94%
rename from neonView/OrganisationDuplicateEditview_view/OrganisationDuplicateEditview_view.aod
rename to neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod
index 3020a87d6f018fe786e4bd829fb891914ab9d0e7..22d274421a23d815278b17e4c67669b001611d04 100644
--- a/neonView/OrganisationDuplicateEditview_view/OrganisationDuplicateEditview_view.aod
+++ b/neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod
@@ -1,6 +1,6 @@
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>OrganisationDuplicateEditview_view</name>
+ <name>OrganisationNoNoiseTable_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>DuplicateEditview_Table</name>
+ <name>table</name>
<hideActions v="true" />
<hideContentSearch v="true" />
<iconField></iconField>
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index 77fbb80ddc792f0e9d24c977c3a03ffa887f84b2..b57cbbcf2f6b70b41115f6f620381b76b2778fa6 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -19,6 +19,18 @@
<entityField>#ENTITY</entityField>
<informationField>COMMRESTRICTIONS_ACTIVE</informationField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorite</name>
+ <objectType>ORGANISATION_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ <devices>
+ <element>MOBILE</element>
+ <element>TABLET</element>
+ <element>DESKTOP</element>
+ </devices>
+ </favoriteViewTemplate>
<neonViewReference>
<name>2cb11b4e-dd8e-419b-8fff-ef0852ef2641</name>
<entityField>Communications</entityField>
@@ -78,6 +90,7 @@
</genericViewTemplate>
<scoreCardViewTemplate>
<name>OrganistaionInformation</name>
+ <fieldActions />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
@@ -89,8 +102,8 @@
<entityField>LastActivity</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>f367d831-d594-4dc1-8e1e-b7c3bf45e2ad</name>
- <entityField>OpenTasks</entityField>
+ <name>7699811a-42f2-48d4-833d-1425db5ba5d0</name>
+ <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
</entityFieldLink>
</fields>
</scoreCardViewTemplate>
diff --git a/neonView/OrganisationReport_view/OrganisationReport_view.aod b/neonView/OrganisationReport_view/OrganisationReport_view.aod
index f8d29baac53e2de71d63e21d5eaa3f82976b710b..0c10fa2a0be68aabbdb477fce16f1adda9c1b55f 100644
--- a/neonView/OrganisationReport_view/OrganisationReport_view.aod
+++ b/neonView/OrganisationReport_view/OrganisationReport_view.aod
@@ -11,6 +11,7 @@
<reportViewTemplate>
<name>Report</name>
<reportData>ORGANISATION_REPORT_DATA</reportData>
+ <favoriteActionGroup1>orgReportDispatch</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
</reportViewTemplate>
</children>
diff --git a/neonView/PermissionCalendarEdit_view/PermissionCalendarEdit_view.aod b/neonView/PermissionCalendarEdit_view/PermissionCalendarEdit_view.aod
index 9e557d4f2eed1a851d46cd2b4d2525f38304ecb2..60c76072d2afc883a3e23ecccea591e5f236dfab 100644
--- a/neonView/PermissionCalendarEdit_view/PermissionCalendarEdit_view.aod
+++ b/neonView/PermissionCalendarEdit_view/PermissionCalendarEdit_view.aod
@@ -27,6 +27,14 @@
<name>bf110421-8305-47c4-8bab-d859b14c7bd4</name>
<entityField>PERMISSIONDEALER_USER_ROWID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>687b28e4-ea71-40d9-92b4-c771c5c04132</name>
+ <entityField>permissionProcurer_Department_RowId</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>413799e6-1f74-43c9-a947-6b5423b75aa2</name>
+ <entityField>permissionProcurer_User_RowId</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod b/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod
index ae077ac28d6a0d93a8073361d0467f7abc3a6478..c70bb0052949f5d742d12db7048ec520710913bf 100644
--- a/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod
+++ b/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod
@@ -14,11 +14,10 @@
<children>
<tableViewTemplate>
<name>PermissionCalendarFilterReverseTable</name>
- <favoriteActionGroup1>AddReverseAction</favoriteActionGroup1>
+ <favoriteActionGroup1>AddActionsReverse</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
<isCreatable v="false" />
- <isDeletable v="false" />
- <isEditable v="false" />
+ <isEditable v="true" />
<title></title>
<columns>
<neonTableColumn>
diff --git a/neonView/PermissionCalendarFilter_view/PermissionCalendarFilter_view.aod b/neonView/PermissionCalendarFilter_view/PermissionCalendarFilter_view.aod
index e32b8d2864701ed8303b9a07e29945f489a393ad..ffca2d78c9c23630df69eec76e2f882cd943872e 100644
--- a/neonView/PermissionCalendarFilter_view/PermissionCalendarFilter_view.aod
+++ b/neonView/PermissionCalendarFilter_view/PermissionCalendarFilter_view.aod
@@ -40,10 +40,10 @@
<treeTableViewTemplate>
<name>PermissionCalendarTreeTable</name>
<favoriteActionGroup1>AddActions</favoriteActionGroup1>
+ <entityField>#ENTITY</entityField>
<defaultGroupFields>
<element>PERMISSION</element>
</defaultGroupFields>
- <entityField>#ENTITY</entityField>
<isCreatable v="false" />
<isEditable v="true" />
<columns>
diff --git a/neonView/PersonDetail_view/PersonDetail_view.aod b/neonView/PersonDetail_view/PersonDetail_view.aod
index c4073f2110de59b0cb6e07f78c52995dcfed3994..bf877ec44c102df4803f41d11075dacecf76123c 100644
--- a/neonView/PersonDetail_view/PersonDetail_view.aod
+++ b/neonView/PersonDetail_view/PersonDetail_view.aod
@@ -25,10 +25,6 @@
<name>39ca0ab2-b2d5-4d56-9ded-f8df1ae4dd0a</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>86e3b7c4-44ee-4fd4-83f1-2842a0eabda7</name>
- <entityField>ORGNAME</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod b/neonView/PersonDistricts_view/PersonDistricts_view.aod
similarity index 61%
rename from neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod
rename to neonView/PersonDistricts_view/PersonDistricts_view.aod
index 3d71c2d3c9471bb9dc6a190f809b50acc6e06229..d665b77e67fd84ddbffcf34c6bc2e926d2b31098 100644
--- a/neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod
+++ b/neonView/PersonDistricts_view/PersonDistricts_view.aod
@@ -1,18 +1,18 @@
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>ClassificationDrawer_view</name>
+ <name>PersonDistricts_view</name>
+ <title>Responsible Districts</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <drawerLayout>
+ <noneLayout>
<name>layout</name>
- <layoutCaption>Classification</layoutCaption>
- </drawerLayout>
+ </noneLayout>
</layout>
<children>
<neonViewReference>
- <name>ddde18ed-2617-4f7e-9a6b-71e4625e2cdc</name>
- <entityField>#ENTITY</entityField>
- <view>ClassificationTree_view</view>
+ <name>c461b0a2-316c-481f-9697-0b24adbcf8bc</name>
+ <entityField>Districts</entityField>
+ <view>DistrictList_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index f59ffc93a3820bf72035b5c719272c599d506113..918eaa3936a5af858592aa56b8461d4f9ed0dbfe 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -49,6 +49,11 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>f826f154-bf7f-4c7e-9ce2-3105cc629851</name>
+ <entityField>#ENTITY</entityField>
+ <view>PersonDistricts_view</view>
+ </neonViewReference>
<neonViewReference>
<name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name>
<entityField>LogHistories</entityField>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index 4f02cea4c0270be1453cc2bfa738afe39e9bc689..b1717f65bcff8f9c0493e2da9396beaa829bcf78 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -19,6 +19,18 @@
<entityField>#ENTITY</entityField>
<informationField>COMMRESTRICTIONS_ACTIVE</informationField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>PERSON_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ <devices>
+ <element>MOBILE</element>
+ <element>TABLET</element>
+ <element>DESKTOP</element>
+ </devices>
+ </favoriteViewTemplate>
<neonViewReference>
<name>5a1b7683-2fec-4763-9b45-e4c7a18d70fd</name>
<entityField>Communications</entityField>
@@ -79,9 +91,6 @@
</genericViewTemplate>
<scoreCardViewTemplate>
<name>Scores</name>
- <fieldActions>
- <element>openTaskView</element>
- </fieldActions>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index 5a2312e1f735abdb644f2145dbaa24f5edb0b514..63a4b1e6d2a04258afe7327e8eb90dd93d3f6617 100644
--- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
@@ -4,9 +4,9 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
- <boxLayout>
+ <groupLayout>
<name>layout</name>
- </boxLayout>
+ </groupLayout>
</layout>
<children>
<tableViewTemplate>
@@ -60,5 +60,52 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
+ <treeTableViewTemplate>
+ <name>tree</name>
+ <favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTreeTableColumn>
+ <name>b18db709-56e9-4f7e-89a2-f0e2b81c75d0</name>
+ <entityField>PICTURE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>7d8d985a-dfec-452c-8b6c-a55bfe5ede54</name>
+ <entityField>SALUTATION</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>92be2c7c-99c8-4e05-8f0a-e18d7a2daf3e</name>
+ <entityField>TITLE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>1b427ee7-e139-48a0-a28a-fc6df7dcd973</name>
+ <entityField>FIRSTNAME</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>d783cfe2-b9de-4ffc-88b3-01d6f9fdecbe</name>
+ <entityField>LASTNAME</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>e2bb18db-6b2b-49d2-a02a-de671cab56a7</name>
+ <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>9b8fee81-dc82-42c3-9b8e-6327567f6e51</name>
+ <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>3eda2fc2-6f6d-4b88-a25b-565f854f69db</name>
+ <entityField>DEPARTMENT</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>9013309d-9823-43b7-940e-0b1dce0e7588</name>
+ <entityField>CONTACTROLE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>ece44de8-f5c0-4cdd-a9d9-4d7c004a1367</name>
+ <entityField>POSITION</entityField>
+ </neonTreeTableColumn>
+ </columns>
+ </treeTableViewTemplate>
</children>
</neonView>
diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod
index 6cafb03d52f973c897caca580ccb0ea0176a76ff..768f479d12d49821655426ff6908c69d9824cc27 100644
--- a/neonView/ProductEdit_view/ProductEdit_view.aod
+++ b/neonView/ProductEdit_view/ProductEdit_view.aod
@@ -25,10 +25,6 @@
<name>77197b19-54ea-493c-8d12-27391cd54a7a</name>
<entityField>MINSTOCK</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>472939e5-a69b-4eba-986f-0b47e72d0e9d</name>
- <entityField>ORGANISATION_ID</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>cefb3dc8-8d9b-47c4-a0f8-e78e66303ec7</name>
<entityField>PRODUCTCODE</entityField>
diff --git a/neonView/ProductLookup_view/ProductLookup_view.aod b/neonView/ProductLookup_view/ProductLookup_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e038ed3765c689f36212619cc246abf2196bd6f9
--- /dev/null
+++ b/neonView/ProductLookup_view/ProductLookup_view.aod
@@ -0,0 +1,52 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ProductLookup_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/neonView/ProductLookup_view/documentation.adoc</documentation>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>table</name>
+ <titleField>PRODUCTNAME</titleField>
+ <subtitleField>PRODUCTCODE</subtitleField>
+ <entityField>#ENTITY</entityField>
+ <linkedColumns>
+ <element>PRODUCTNAME</element>
+ </linkedColumns>
+ <columns>
+ <neonTableColumn>
+ <name>6d4cafea-bc73-4df1-949e-1aba224780ed</name>
+ <entityField>#IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ef5fa8f0-7a72-4201-ad2e-44496490d2b2</name>
+ <entityField>PRODUCTCODE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>35834ce8-cd8b-452f-b558-484d2a3a8f02</name>
+ <entityField>PRODUCTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>f125dbe5-3f46-46dc-b037-4765b115997f</name>
+ <entityField>GROUPCODEID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>40b14795-afcb-4ae5-b5df-cd667a5b8219</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>86fce471-6d2e-4066-9bdb-2ed04f940f7d</name>
+ <entityField>CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2a2e74e4-dc45-4133-92d6-f2797fc3dcd7</name>
+ <entityField>UNIT</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ProductLookup_view/documentation.adoc b/neonView/ProductLookup_view/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..38d4dc8ee1b0f1fd3d772287075d7adb212b09df
--- /dev/null
+++ b/neonView/ProductLookup_view/documentation.adoc
@@ -0,0 +1,3 @@
+== ProductLookup_view
+
+Needed, because using the normal filterview as the lookup would result in the tileTemplate being used as the lookup.
\ No newline at end of file
diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod
index cb7e8496aa5566db89ca147f371e6144bd88f4fa..61b9a8f77cd8b031702ff6bd1345c5950d7a79f2 100644
--- a/neonView/ProductPreview_view/ProductPreview_view.aod
+++ b/neonView/ProductPreview_view/ProductPreview_view.aod
@@ -17,6 +17,13 @@
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>PRODUCT_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>Info</name>
<showDrawer v="true" />
diff --git a/neonView/ProductpricePreview_view/ProductpricePreview_view.aod b/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
index c5ea3ef98f516b5da0935f245119f37f04e4d96b..bf1fad13d59c383237b85a5751735e30afaa7778 100644
--- a/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
+++ b/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
@@ -9,6 +9,13 @@
</headerFooterLayout>
</layout>
<children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>IMAGE</iconField>
+ <titleField>PRICELIST</titleField>
+ <subtitleField>PRODUCT_ID</subtitleField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
<genericViewTemplate>
<name>PriceInfo</name>
<showDrawer v="true" />
@@ -45,12 +52,5 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>IMAGE</iconField>
- <titleField>PRICELIST</titleField>
- <subtitleField>PRODUCT_ID</subtitleField>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
</children>
</neonView>
diff --git a/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod b/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod
deleted file mode 100644
index cf426058ce5702f9dbe96151abe91d548cb0a906..0000000000000000000000000000000000000000
--- a/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod
+++ /dev/null
@@ -1,24 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>SaleprojectOverviewCharts_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- <direction>HORIZONTAL</direction>
- <maxDirectionElements v="3" />
- </boxLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>4191cb26-76aa-4094-8ff4-b0cfc17bda2c</name>
- <entityField>ClassificationGroups</entityField>
- <view>ClassificationGroupAnalysesChart_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>a5583507-7e5a-40dd-9af8-a227b6be5af3</name>
- <entityField>SalesprojectForecastCharts</entityField>
- <view>TurnoverChartForcastDrawer_view</view>
- </neonViewReference>
- </children>
-</neonView>
diff --git a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
deleted file mode 100644
index 6097fe64b235e5b44beb8e33baf39de6ef8754b2..0000000000000000000000000000000000000000
--- a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
+++ /dev/null
@@ -1,23 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>SalesprojectClassificationAttribute_view</name>
- <title>Categorization</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>2cb777a4-cf46-4337-9b17-fc8b6026209b</name>
- <entityField>#ENTITY</entityField>
- <view>SalesprojectClassificationDrawer_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>523e3855-eade-4cce-842d-9b272b028cbb</name>
- <entityField>AttributeTree</entityField>
- <view>AttributeRelationTreeDrawer_view</view>
- </neonViewReference>
- </children>
-</neonView>
diff --git a/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod b/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod
deleted file mode 100644
index b6a3767d13dc962239c7da8f748b9d4f3c339bff..0000000000000000000000000000000000000000
--- a/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod
+++ /dev/null
@@ -1,28 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>SalesprojectClassification_view</name>
- <title>Classifications</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <scoreCardViewTemplate>
- <name>ClassificationResult</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>c9fef1fc-21d2-4b6d-913f-a4507fde4dcb</name>
- <entityField>ClassificationResult</entityField>
- </entityFieldLink>
- </fields>
- </scoreCardViewTemplate>
- <neonViewReference>
- <name>e8de8288-df16-4deb-9ce0-6554a669724f</name>
- <entityField>Classifications</entityField>
- <view>ClassificationTree_view</view>
- </neonViewReference>
- </children>
-</neonView>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index e33726ea532675f1e0153a893bf977d1e66c7812..3ca5b6aa0b8c43f19dac0478246cd0f935a86917 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -57,6 +57,7 @@
<descriptionField>CONTACT_ID</descriptionField>
<entityField>#ENTITY</entityField>
<linkedColumns>
+ <element>PROJECTCODE</element>
<element>PROJECTTITLE</element>
</linkedColumns>
<fixedFilterFields />
@@ -70,13 +71,21 @@
<name>59001269-3ca3-4e13-9b8a-d62e2e602e29</name>
<entityField>PROJECTCODE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>9f6b967e-5140-420f-84ca-2273920221bd</name>
+ <entityField>PROJECTTITLE</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>
+ <name>20f132ef-161e-4b84-b6ae-1f4daf016d16</name>
+ <entityField>PROBABILITY_AI</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>88e6bebb-e83d-43ec-82f1-cc778fac458e</name>
+ <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
@@ -100,6 +109,7 @@
<name>Treetable</name>
<entityField>#ENTITY</entityField>
<linkedColumns>
+ <element>PROJECTCODE</element>
<element>PROJECTTITLE</element>
</linkedColumns>
<defaultGroupFields />
@@ -113,13 +123,17 @@
<name>90e4ddd7-1e1c-48da-a347-adadf075d9f0</name>
<entityField>PROJECTCODE</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>392b25fe-e7ce-463e-ae92-af426d523c2a</name>
+ <entityField>PROJECTTITLE</entityField>
+ </neonTreeTableColumn>
<neonTreeTableColumn>
<name>9b7b8a15-4a8d-41cb-bb46-3b1ed573dc6e</name>
<entityField>CONTACT_ID</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
- <name>392b25fe-e7ce-463e-ae92-af426d523c2a</name>
- <entityField>PROJECTTITLE</entityField>
+ <name>6d9d1365-985a-4357-8ecc-16ddcc201ea8</name>
+ <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>745d6192-4817-49e6-8cb2-8470c9c25f4d</name>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index d6b9bf5e3aaf46caf04875bb11cdd9e3aea18993..fed4306d69ba3ab501235143b0b80f179adc79c8 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -25,9 +25,14 @@
<view>SalesprojectMemberActivity_view</view>
</neonViewReference>
<neonViewReference>
- <name>67659a20-068f-4522-ad33-2c35e29f929a</name>
- <entityField>#ENTITY</entityField>
- <view>SalesprojectClassificationAttribute_view</view>
+ <name>7ac103ea-1131-41e0-85ce-e7d2fc86dfd8</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>d0c1344f-c143-43b4-9c44-f823fb525eff</name>
+ <entityField>Classifications</entityField>
+ <view>ClassificationTree_view</view>
</neonViewReference>
<neonViewReference>
<name>8a83afee-e02c-4714-9641-13b62c95cea1</name>
diff --git a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
index a43785597b8812ea61a288ac3271315ec425e741..178eb3816ff68e66731ce8faa605c31de9295f53 100644
--- a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
+++ b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
@@ -21,7 +21,7 @@
<columns>
<neonTableColumn>
<name>4c261b96-17d3-424e-8297-3ff46d780516</name>
- <entityField>VALUE</entityField>
+ <entityField>MILESTONEVALUE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>c055c340-0f7b-4c91-a0a6-22e20511d2a9</name>
diff --git a/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod b/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
index 6385f42110ad2479dcb550376ffa2094159aa143..9a84bbb876ca23e4febca4440f2caaddaf6c263b 100644
--- a/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
+++ b/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
@@ -24,9 +24,9 @@
</devices>
</neonViewReference>
<neonViewReference>
- <name>dd0dd64f-1135-46c5-82d7-9d1e67cf4810</name>
- <entityField>#ENTITY</entityField>
- <view>SaleprojectOverviewCharts_view</view>
+ <name>729108f8-a054-4ea7-9ef8-14b686c6340b</name>
+ <entityField>SalesprojectForecastCharts</entityField>
+ <view>TurnoverChartForcastDrawer_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index f60df34993767240c24c9f83ccf24cda3369cce9..8e7de8cdcb5ea97f7e0c04791b6bc0128bf6f5e4 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -19,16 +19,24 @@
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>SALESPROJECT_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ <devices>
+ <element>MOBILE</element>
+ <element>TABLET</element>
+ <element>DESKTOP</element>
+ </devices>
+ </favoriteViewTemplate>
<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>b3e902de-072f-4a41-8562-f4d30ad9a564</name>
<entityField>STATUS</entityField>
@@ -53,6 +61,10 @@
<name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
<entityField>PROBABILITY</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>bee2acfb-20ac-485e-be6c-c9c6a25e6013</name>
+ <entityField>PROBABILITY_AI</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
<entityField>VOLUME</entityField>
@@ -87,6 +99,7 @@
</neonViewReference>
<scoreCardViewTemplate>
<name>AdditionalInfo</name>
+ <fieldActions />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
@@ -94,8 +107,8 @@
<entityField>InactiveTime</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>838cc7e2-6d6a-484a-92ad-d01adc2504df</name>
- <entityField>ClassificationResult</entityField>
+ <name>49513dd7-f19a-450b-9fcf-d320e2f72c42</name>
+ <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ce670b75-346e-4aeb-b72d-5ef68dd77e71</name>
diff --git a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
index 6bac5280054d1d3eb7fc0bd1da08593013fc6f23..ca41ad24d87b50d8d5ab56b98bc517506176fc93 100644
--- a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
+++ b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
@@ -12,7 +12,6 @@
<tableViewTemplate>
<name>Entries</name>
<iconField>#ICON</iconField>
- <titleField>SOURCE</titleField>
<subtitleField>ENTRYDATE</subtitleField>
<descriptionField>INFO</descriptionField>
<entityField>#ENTITY</entityField>
diff --git a/neonView/SerialLetterAddRecipientsEdit_view/SerialLetterAddRecipientsEdit_view.aod b/neonView/SerialLetterAddRecipientsEdit_view/SerialLetterAddRecipientsEdit_view.aod
index b3b8d67e1ba188142d23e3795d039485844f397b..cc896e3f349b75903b76419669dc8a6114b1dbd8 100644
--- a/neonView/SerialLetterAddRecipientsEdit_view/SerialLetterAddRecipientsEdit_view.aod
+++ b/neonView/SerialLetterAddRecipientsEdit_view/SerialLetterAddRecipientsEdit_view.aod
@@ -6,11 +6,26 @@
<isOverlay v="false" />
<overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
- <noneLayout>
+ <headerFooterLayout>
<name>layout</name>
- </noneLayout>
+ <header>SelectedSerialLetterInfosScore</header>
+ </headerFooterLayout>
</layout>
<children>
+ <scoreCardViewTemplate>
+ <name>SelectedSerialLetterInfosScore</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>02bc3eb7-4ceb-4a54-ab56-9980b7653152</name>
+ <entityField>currentRecipients</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5e91781a-d640-4096-a084-259c23bea825</name>
+ <entityField>futureRecipients</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
<genericViewTemplate>
<name>Generic</name>
<editMode v="true" />
@@ -24,17 +39,6 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
- <genericViewTemplate>
- <name>Message</name>
- <hideLabels v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>ab256925-6375-4b7f-880d-039f6a68ccbc</name>
- <entityField>recipientCountMessage</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
<actionsViewTemplate>
<name>ContinueActions</name>
<actions>
diff --git a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
index f233e247a8ea243775ec164648f5d61952f791fd..4dcf1f49a40c366db1732289228e81769f879764 100644
--- a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
+++ b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
@@ -37,7 +37,6 @@
<children>
<timelineViewTemplate>
<name>TicketsTimeline</name>
- <favoriteActionGroup1>tableActions</favoriteActionGroup1>
<dateField>TASK_MATURITY_DATE</dateField>
<titleField>TASK_SUBJECT_DETAILS</titleField>
<descriptionField>TASK_DESCRIPTION</descriptionField>
diff --git a/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod b/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod
index 502655061de230ce84fff9767aaeaa3e64aa35a2..48b48a2a48f8e708592ca947d409de64ffa6243f 100644
--- a/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod
+++ b/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod
@@ -17,6 +17,13 @@
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>SUPPORTTICKET_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>Info</name>
<showDrawer v="true" />
diff --git a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
index d56fbc0ca0b5edfc59b07f8a84cb7ee26af64943..c05c5db874a747d5fb6c8e5803fafd6a5aea9c8a 100644
--- a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
+++ b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
@@ -14,8 +14,8 @@
<name>Timetrackings</name>
<iconField>#IMAGE</iconField>
<titleField>CONTACT_ID</titleField>
- <subtitleField>MINUTES</subtitleField>
- <descriptionField>DATE</descriptionField>
+ <subtitleField>TRACKINGMINUTES</subtitleField>
+ <descriptionField>TRACKINGDATE</descriptionField>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/TurnoverChart_view/TurnoverChart_view.aod b/neonView/TurnoverChart_view/TurnoverChart_view.aod
index 48b21c537b37eb6f43e25a9bcdaf52c082fd1513..09c915ae244fe4d5a1f755ef287ef850ef2cd3c4 100644
--- a/neonView/TurnoverChart_view/TurnoverChart_view.aod
+++ b/neonView/TurnoverChart_view/TurnoverChart_view.aod
@@ -3,6 +3,25 @@
<name>TurnoverChart_view</name>
<title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>TurnoverDashlet</name>
+ <title>Turnover</title>
+ <fragment>Turnover/full</fragment>
+ <singleton v="true" />
+ <storeRoles>
+ <element>INTERNAL_ADMINISTRATOR</element>
+ <element>INTERNAL_DASHBOARDSTOREADMIN</element>
+ </storeRoles>
+ <icon>VAADIN:CHART</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>turnover</name>
+ <title>Turnover</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
<layout>
<groupLayout>
<name>layout</name>
diff --git a/neonView/Userhelp_FilterView/Userhelp_FilterView.aod b/neonView/Userhelp_FilterView/Userhelp_FilterView.aod
new file mode 100644
index 0000000000000000000000000000000000000000..88b815cc8abf6bce8158d4c51a19641f4f8dfb38
--- /dev/null
+++ b/neonView/Userhelp_FilterView/Userhelp_FilterView.aod
@@ -0,0 +1,19 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>Userhelp_FilterView</name>
+ <title>Userhelp Ressources</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>baf3ef50-4798-47b6-bb1a-f311cf4b3307</name>
+ <entityField>Documents</entityField>
+ <view>DocumentWithIdFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
index 2625a04f4de17ef81b06ad3d372dc755085180ce..4a500fdf7246e1762edf965f7bb31092bfd8dd13 100644
--- a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
+++ b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
@@ -10,11 +10,29 @@
</layout>
<children>
<genericViewTemplate>
- <name>Edit</name>
+ <name>PasswordEdit</name>
<editMode v="true" />
+ <showDrawer v="true" />
+ <drawerCaption>Password</drawerCaption>
+ <fixedDrawer v="true" />
<hideEmptyFields v="false" />
<entityField>#ENTITY</entityField>
<isEditable v="true" />
+ <title>Settings</title>
+ <fields>
+ <entityFieldLink>
+ <name>f1f04b31-7ca3-4183-9b26-1726caf3e0b8</name>
+ <entityField>currentPassword</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>203ba8b9-2004-40e4-9612-b3e8089fb827</name>
+ <entityField>jPassword</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d4f20a8d-edf8-468b-870e-43dec3fb6d3b</name>
+ <entityField>jPasswordRepeat</entityField>
+ </entityFieldLink>
+ </fields>
</genericViewTemplate>
</children>
</neonView>
diff --git a/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod b/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
index 7c1d4abf3b4166c10b31c6b3caed3362dff0bba5..7e053c7391add6378ede3a38de3bba9cfb51a644 100644
--- a/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
+++ b/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
@@ -4,7 +4,6 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<size>SMALL</size>
<isOverlay v="false" />
- <overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
<headerFooterLayout>
<name>layout</name>
diff --git a/neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod b/neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod
index 950d8706d14ac77e9e0f45694cd50f8b4abb9fc1..4a216530f8c322ab9d408cf5e305e0423d473f33 100644
--- a/neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod
+++ b/neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod
@@ -17,8 +17,8 @@
<isEditable v="true" />
<fields>
<entityFieldLink>
- <name>6cb39117-71cf-432b-afe7-b3446921d89e</name>
- <entityField>ORGANISATION_ID</entityField>
+ <name>8c3a2df7-3928-43d4-baa9-686747ed020c</name>
+ <entityField>ORGANISATION_CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>7584baf6-340c-419b-ad16-03c75b96aa39</name>
diff --git a/neonView/VisitPlanEntryFilter_view/VisitPlanEntryFilter_view.aod b/neonView/VisitPlanEntryFilter_view/VisitPlanEntryFilter_view.aod
index d7dcd500c7cd98ba11fb59219587d07c538a05fc..4233a41959165dbc19972cf740ef8fab1fdbece6 100644
--- a/neonView/VisitPlanEntryFilter_view/VisitPlanEntryFilter_view.aod
+++ b/neonView/VisitPlanEntryFilter_view/VisitPlanEntryFilter_view.aod
@@ -54,7 +54,7 @@
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>646193df-c713-4b40-85cc-0fbe6f8cb316</name>
- <entityField>ORGANISATION_ID</entityField>
+ <entityField>ORGANISATION_CONTACT_ID</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>bcaf81b5-0e84-47e0-91aa-b62cec49ed17</name>
diff --git a/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod b/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod
index 4b0e3f5af68d91af8afee1ca6aeebdae57f21584..7f955c5616034ee3bc71ca328f071c2c5857c6cb 100644
--- a/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod
+++ b/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod
@@ -17,6 +17,13 @@
<entityField>#ENTITY</entityField>
<isEditable v="false" />
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>WORKFLOWDEFINITION_OBJECTTYPE</objectType>
+ <rowId>UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>Generic</name>
<showDrawer v="true" />
diff --git a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
index 9c98d1fe51548d2c24a3f1e415cf83a1de05e69d..cdac1faccf7f16acf27044fd57f434dea9502e3c 100644
--- a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
+++ b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
@@ -3,9 +3,9 @@
<name>WorkflowStartConfigFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <groupLayout>
+ <boxLayout>
<name>layout</name>
- </groupLayout>
+ </boxLayout>
</layout>
<children>
<tableViewTemplate>
@@ -24,19 +24,5 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treeTableViewTemplate>
- <name>Treetable</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTreeTableColumn>
- <name>4874074f-80af-4e99-8449-2a4dc4428360</name>
- <entityField>OBJECT_TYPE</entityField>
- </neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>d479a082-ea95-40c6-81a2-9318fcf9ce98</name>
- <entityField>TRIGGER_EVENT</entityField>
- </neonTreeTableColumn>
- </columns>
- </treeTableViewTemplate>
</children>
</neonView>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 22f219b49bafb1432bcdd8087bc7b9a79baea1a1..968a54d4dc625ab534f66f560d146f17b2d5c625 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -27,9 +27,10 @@
<value></value>
</entry>
</calendarCategoriesEvent>
+ <recordContainerCachingAlias>RecordContainerCache</recordContainerCachingAlias>
<clientSearchOptimizedForSpeed v="true" />
<clientSearchExcludeForIgnorecase v="true" />
- <neonClientPermissionsEnabled v="true" />
+ <neonClientPermissionsEnabled v="false" />
<clientFeedbackMailaddress />
<blobHandlingMethod>DATABASE</blobHandlingMethod>
<databaseAuditGetOldValueLobs v="false" />
@@ -75,7 +76,7 @@
</customDurationProperty>
<customBooleanProperty>
<name>nominatim.enable</name>
- <property v="false" />
+ <property v="true" />
</customBooleanProperty>
<customStringProperty>
<name>nominatim.url</name>
@@ -85,10 +86,6 @@
<name>nominatim.user</name>
<property>aditouser</property>
</customStringProperty>
- <customStringProperty>
- <name>nominatim.pw</name>
- <property>useradito</property>
- </customStringProperty>
<customIntegerProperty>
<name>duplicates.dataBlockSize</name>
<property v="5000" />
@@ -103,6 +100,20 @@
<description></description>
<property>http://localhost:8080/flowable-modeler/</property>
</customStringProperty>
+ <customBooleanProperty>
+ <name>ai.salesprojectProbability</name>
+ <description></description>
+ <property v="false" />
+ </customBooleanProperty>
+ <customPasswordProperty>
+ <name>nominatim.pw</name>
+ <description></description>
+ <property>useradito</property>
+ </customPasswordProperty>
+ <customIntegerProperty>
+ <name>nominatim.resultLimit</name>
+ <description>Amount of rows returned by the address search. Default is 10, maximum is 50.</description>
+ </customIntegerProperty>
</customProperties>
<customConfigProperties>
<customBooleanProperty>
@@ -129,5 +140,9 @@
<name>sigparser.apiUrl</name>
<description>The url to the mail signature webservice sigparser.</description>
</customStringProperty>
+ <customBooleanProperty>
+ <name>dataCaching.client.forceDisable</name>
+ <description>Enabling this option will disable the per-client-context data-cache within the customzing (for exameple the caching of Keywords). This is usefull if you're testing and want to frequently add data like keywords, etc. which are cached which help of the "DataCaching_lib".</description>
+ </customBooleanProperty>
</customConfigProperties>
</preferences>
diff --git a/process/AISalesproject_lib/AISalesproject_lib.aod b/process/AISalesproject_lib/AISalesproject_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..13b8a275db57d71b190f905695f39072a7756756
--- /dev/null
+++ b/process/AISalesproject_lib/AISalesproject_lib.aod
@@ -0,0 +1,10 @@
+<?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>AISalesproject_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/AISalesproject_lib/process.js</process>
+ <alias>Data_alias</alias>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/AISalesproject_lib/process.js b/process/AISalesproject_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0ceec91ec4f07fe072160f85fdbf3133a09ca71
--- /dev/null
+++ b/process/AISalesproject_lib/process.js
@@ -0,0 +1,210 @@
+import("AttributeRegistry_basic");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+import("system.logging");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("AI_lib");
+import("AISalesproject_lib");
+import("Attribute_lib");
+import("system.entities");
+import("DataCaching_lib");
+
+/**
+ * Provides static methods for artificial intelligence.<br>
+ * <b>Do not create an instance of this!</b>
+ *
+ * @class
+ */
+function AISalesprojectUtil(){}
+
+
+AISalesprojectUtil.getTrainedModel = function()
+{
+ var cache = new CachedData("SalesprojectNBData", false);
+ return cache.load(function (pTranslationNecessary, pLocale){
+ var data = AISalesprojectUtil.train();
+ return data;
+ });
+};
+
+
+AISalesprojectUtil.train = function ()
+{
+ //Trainingdata
+ var data = new NBDataSet();
+
+ var loadConfig = entities.createConfigForLoadingRows()
+ .entity("Salesproject_entity")
+ .fields(["#UID", "CONTACT_ID", "PHASE", "STATUS", "VOLUME", "PROBABILITY"]);
+
+ var spRecords = entities.getRows(loadConfig).map(function (spRow)
+ {
+ if(spRow["STATUS"] == $KeywordRegistry.salesprojectState$lost() || spRow["STATUS"] == $KeywordRegistry.salesprojectState$order())
+ {
+ var attributes = [];
+ attributes.push(spRow["PHASE"]) //PHASE
+ if(spRow["VOLUME"] != null && parseFloat(spRow["VOLUME"]) > 0)
+ attributes.push(AISalesprojectUtil.getVolumeClassification(parseFloat(spRow["VOLUME"]))); //VOLUME
+ if(spRow["PROBABILITY"] != null)
+ attributes.push(AISalesprojectUtil.getProbabilityValue(spRow["PROBABILITY"])); //PROBABILITY
+ var sectorSP = new AttributeRelationQuery(spRow["CONTACT_ID"], $AttributeRegistry.industry()).getSingleAttributeValue();
+ if(sectorSP != null)
+ attributes.push(sectorSP); //Sector
+ var doc = new NBDocument(spRow["#UID"], attributes);
+
+ //Classification
+
+ //Department
+ var department = AISalesprojectUtil.getClassificationValues("SALESPROJ", "Salesproject", spRow["#UID"], "ScoreDepartment");
+ if(department)
+ attributes.push(department);
+
+ //Standard
+ var standard = AISalesprojectUtil.getClassificationValues("SALESPROJ", "Salesproject", spRow["#UID"], "ScoreStandard");
+ if(standard)
+ attributes.push(standard);
+
+ //Users
+ var users = AISalesprojectUtil.getClassificationValues("SALESPROJ", "Salesproject", spRow["#UID"], "ScoreUsers");
+ if(users)
+ attributes.push(users);
+
+
+ var loadCompConfig = entities.createConfigForLoadingRows()
+ .entity("Competition_entity")
+ .provider("Links")
+ .addParameter("ObjectType_param", "Salesproject")
+ .addParameter("ObjectRowId_param", spRow["#UID"])
+ .fields(["ORGANISATION_NAME"]);
+
+ var compRecords = entities.getRows(loadCompConfig).map(function (compRow)
+ {
+ doc.add(compRow["ORGANISATION_NAME"]); //competitors
+ });
+
+ data.add(spRow["STATUS"], [doc]); // train model with lost and order salesprojects
+ //logging.log("data:");
+ //logging.log(JSON.stringify(doc));
+ }
+
+ });
+
+ // an optimisation for working with small vocabularies
+ var options = {
+ applyInverse: true
+ };
+
+ // create a classifier
+ var classifier = new NBClassifier(options);
+
+ // train the classifier
+ classifier.train(data);
+
+ //logging.log('Classifier trained.');
+ //logging.log(JSON.stringify(classifier));
+ return JSON.stringify(classifier);
+
+};
+
+AISalesprojectUtil.classify = function (pSalesprojectId, pContactId, pPhase, pStatus, pVolume, pProb)
+{
+
+ if(pSalesprojectId == null || pContactId == null)
+ return "--";
+ var testAttributes = [];
+ testAttributes.push(pPhase) //PHASE
+ if(pVolume != null && parseFloat(pVolume) > 0)
+ testAttributes.push(AISalesprojectUtil.getVolumeClassification(parseFloat(pVolume))); //VOLUME
+ if(pProb != null)
+ testAttributes.push(AISalesprojectUtil.getProbabilityValue(pProb)); //PROBABILITY
+ if(pContactId != null)
+ {
+ var sectorSP = new AttributeRelationQuery(pContactId, $AttributeRegistry.industry()).getSingleAttributeValue();
+ if(sectorSP != null)
+ testAttributes.push(sectorSP); //Sector
+ }
+
+ //Classification
+
+ //Department
+ var department = AISalesprojectUtil.getClassificationValues("SALESPROJ", "Salesproject", pSalesprojectId, "ScoreDepartment");
+ if(department)
+ testAttributes.push(department);
+
+ //Standard
+ var standard = AISalesprojectUtil.getClassificationValues("SALESPROJ", "Salesproject", pSalesprojectId, "ScoreStandard");
+ if(standard)
+ testAttributes.push(standard);
+
+ //Users
+ var users = AISalesprojectUtil.getClassificationValues("SALESPROJ", "Salesproject", pSalesprojectId, "ScoreUsers");
+ if(users)
+ testAttributes.push(users);
+
+ var loadCompConfig = entities.createConfigForLoadingRows()
+ .entity("Competition_entity")
+ .provider("Links")
+ .addParameter("ObjectType_param", "Salesproject")
+ .addParameter("ObjectRowId_param", pSalesprojectId)
+ .fields(["ORGANISATION_NAME"]);
+
+ var compRecords = entities.getRows(loadCompConfig).map(function (compRow)
+ {
+ testAttributes.push(compRow["ORGANISATION_NAME"]); //competitors
+ });
+
+ //logging.log("testdata");
+ //logging.log(JSON.stringify(testAttributes));
+
+ var model = AISalesprojectUtil.getTrainedModel();
+ var classifier = new NBClassifier(JSON.parse(model));
+
+ // test the classifier on a new test object
+ var testDoc = new NBDocument(pSalesprojectId, testAttributes);
+ var classifyResult = classifier.classify(testDoc);
+ //logging.log("result");
+ //logging.log(JSON.stringify(classifyResult));
+ if(classifyResult.probability == null || isNaN(classifyResult.probability))
+ return "--";
+ else
+ return Math.round(parseFloat((classifyResult.probability) * 100)) + "% / " + KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), classifyResult.category);
+};
+
+AISalesprojectUtil.getVolumeClassification = function (pVolume)
+{
+ if(pVolume < 100000)
+ return "low";
+ else if(pVolume >= 100000 && pVolume < 250000)
+ return "middle";
+ else
+ return "high";
+};
+
+AISalesprojectUtil.getProbabilityValue = function (pProbId)
+{
+ if(pProbId == "SALPROJPROB0" || pProbId == "SALPROJPROB25")
+ return "negative";
+ else if(pProbId == "SALPROJPROB50")
+ return "neutral";
+ else if(pProbId == "SALPROJPROB75" || pProbId == "SALPROJPROB100")
+ return "positive";
+ return "";
+};
+
+AISalesprojectUtil.getClassificationValues = function (pClassificationType, pObjectType, pObjectRowid, pScoreType)
+{
+ var value = newSelect("TITLE")
+ .from("CLASSIFICATIONTYPE")
+ .leftJoin("CLASSIFICATION", newWhere("CLASSIFICATIONTYPEID = CLASSIFICATIONTYPE_ID")
+ .and("CLASSIFICATION.OBJECT_TYPE", pObjectType)
+ .and("CLASSIFICATION.OBJECT_ROWID", pObjectRowid))
+ .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCOREID")
+ .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pClassificationType)
+ .andIfSet("CLASSIFICATIONTYPE.SCORETYPE", pScoreType)
+ .cell()
+
+ return value;
+};
diff --git a/process/AI_lib/AI_lib.aod b/process/AI_lib/AI_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..153e8fc6b66bfd5d8016c8a0a22521c04ad0e209
--- /dev/null
+++ b/process/AI_lib/AI_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>AI_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/AI_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/AI_lib/process.js b/process/AI_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..0709d3aeef15fdbc0ef317561c794e49d94acc35
--- /dev/null
+++ b/process/AI_lib/process.js
@@ -0,0 +1,219 @@
+import("system.logging");
+import("system.vars");
+import("AI_lib");
+
+/**
+ * Provides static methods for artificial intelligence.<br>
+ * <b>Do not create an instance of this!</b>
+ *
+ * @class
+ */
+function AIUtil(){}
+
+
+function NBClassifier(pOptions) {
+ pOptions = pOptions || {};
+ this.applyInverse = pOptions.applyInverse || false;
+ this.probabilityThreshold = pOptions.probabilityThreshold || 0.5;
+ this.defaultCategory = pOptions.defaultCategory || null;
+ this.tokens = pOptions.tokens || {};
+ this.categoryCounts = pOptions.categoryCounts || {};
+ this.probabilities = pOptions.probabilities || {};
+}
+
+
+NBClassifier.prototype = {
+ train: function (trainingSet) {
+ var categories = Object.keys(trainingSet.categorizedItems);
+ var i = 0, j = 0, k = 0, category = "";
+ // Iterate over each category in the training set
+ for (i = 0; i < categories.length; i++) {
+ category = categories[i];
+ var subSet = trainingSet.categorizedItems[category];
+ this.categoryCounts[category] = subSet.length;
+ // Iterate over each data item in the category
+ for (j = 0; j < subSet.length; j++) {
+ var item = subSet[j];
+ // for each token in the data item, increment the token:category counter
+ var tokenlist = item.tokens;
+ for (k = 0; k < tokenlist.length; k++) {
+ var token = tokenlist[k];
+ if (!this.tokens[token]) {
+ this.tokens[token] = {};
+ }
+ if (!this.tokens[token][category]) {
+ this.tokens[token][category] = 1;
+ } else {
+ this.tokens[token][category] = 1 + this.tokens[token][category];
+ }
+ }
+ }
+ }
+ //After counting occurences of tokens, calculate probabilities.
+ for (i = 0; i < categories.length; i++) {
+ category = categories[i];
+ for (k in this.tokens) {
+ if (this.tokens.hasOwnProperty(k)) {
+ var count = this.tokens[k][category] || 0;
+ var total = this.categoryCounts[category];
+ var percentage = count / total;
+ if (!this.probabilities[category]) {
+ this.probabilities[category] = {};
+ }
+ this.probabilities[category][k] = percentage;
+ }
+ }
+ }
+ },
+
+ validate: function (testSet) {
+ var total = 0;
+ var correctGuesses = 0;
+ var wrongGuesses = 0;
+ var wrongCategories = {};
+ var wrongItems = [];
+ var categories = testSet.categorizedItems;
+ var category;
+ for (category in categories) {
+ validateCategory(category);
+ }
+
+ function validateCategory(category) {
+ if (categories.hasOwnProperty(category)) {
+ var items = categories[category];
+ var item;
+ for (item in items) {
+ if (items.hasOwnProperty(item)) {
+ total += 1;
+ item = items[item];
+ var result1 = this.classify(item);
+ // if certainty is below probabilityThreshold, go with the default
+ if (result1.probability <= this.probabilityThreshold) {
+ result1.category = this.defaultCategory || result1.category;
+ }
+ if (result1.category === category) {
+ correctGuesses++;
+ } else {
+ wrongCategories[result1.category] = (wrongCategories[result1.category]) ? wrongCategories[result1.category]++ : 1;
+ wrongItems.push(item.id);
+ wrongGuesses++;
+ }
+ }
+ }
+ }
+ }
+
+ return {
+ 'total': total,
+ 'correct': correctGuesses,
+ 'wrong': wrongGuesses,
+ 'accuracy': (correctGuesses / (correctGuesses + wrongGuesses)),
+ 'wrongCategories': wrongCategories,
+ 'wrongItems': wrongItems
+ };
+ },
+
+ classify: function (item) {
+ // for each category
+ var category;
+ var learnedProbabilities = this.probabilities;
+ var itemProbabilities = {};
+ var itemTokens = item.tokens;
+ for (category in learnedProbabilities) {
+ if (learnedProbabilities.hasOwnProperty(category)) {
+ itemProbabilities[category] = 1;
+ var t;
+ var probs = learnedProbabilities[category];
+ for (t in probs) {
+ // iterate over the tokens
+ if (probs.hasOwnProperty(t)) {
+ // and take the product of all probabilities
+ if (itemTokens.indexOf(t) !== -1) {
+ itemProbabilities[category] = itemProbabilities[category] * probs[t];
+ } else if (this.applyInverse) {
+ itemProbabilities[category] = itemProbabilities[category] * (1 - probs[t]);
+ }
+ }
+ }
+ }
+ }
+
+ // Pick the highest two probabilities
+ function compareCategories(a, b) {
+ if (a.probability > b.probability) {
+ return -1;
+ }
+ if (a.probability < b.probability) {
+ return 1;
+ }
+ return 0;
+ }
+
+ var categoryScores = [];
+ var sumOfProbabilities = 0;
+ var k;
+ for (k in itemProbabilities) {
+ if (itemProbabilities.hasOwnProperty(k)) {
+ categoryScores.push({
+ category: k,
+ probability: itemProbabilities[k]
+ });
+ sumOfProbabilities += itemProbabilities[k];
+ }
+ }
+ categoryScores = categoryScores.sort(compareCategories);
+
+ var firstPlace = categoryScores[0];
+ var secondPlace = categoryScores[1];
+ var timesMoreLikely = firstPlace.probability / secondPlace.probability;
+ var probability = firstPlace.probability / sumOfProbabilities;
+
+ return ({
+ 'category': firstPlace.category,
+ 'probability': probability,
+ 'timesMoreLikely': timesMoreLikely,
+ 'secondCategory': secondPlace.category,
+ 'probabilities': categoryScores
+ });
+ }
+};
+
+
+function NBDataSet() {
+ this.categorizedItems = {};
+}
+
+NBDataSet.prototype = {
+ add: function (label, items) {
+ var originalItems = this.categorizedItems[label] || [];
+ this.categorizedItems[label] = originalItems.concat(items);
+ }
+};
+
+
+
+function NBDocument(id, tokens) {
+ if (!id) {
+ logging.log('Document(id, tokens) requires an id string');
+ }
+ this.id = id;
+ this.tokens = tokens || [];
+}
+
+NBDocument.prototype = {
+ add: function (token, factor) {
+ if(factor == undefined)
+ factor = 1
+ if (Array.isArray(token)) { // array of tokens
+ for (var i = 0; i < token.length; i++) {
+ this.add(token[i], factor);
+ }
+ return;
+ }
+ if (typeof token === 'string') {
+ for (var j = 0; j < factor; j++) {
+ this.tokens.push(token);
+ }
+ }
+ }
+};
\ No newline at end of file
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index 0e23cd7b6c2028c7812508707862273ad150795b..b3b2b927cbb84804190b0474f677228f7671704d 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -89,17 +89,16 @@ ActivityUtils.insertNewActivity = function(pDataPreset, pActivityLinks, pDocumen
_addActivityCol("RESPONSIBLE", dataPreset.responsibleContactId);
_addActivityCol("SUBJECT", dataPreset.subject);
- insertStatements.push(["ACTIVITY", activityColumns, db.getColumnTypes("ACTIVITY", activityColumns, dbAlias), activityValues]);
+ insertStatements.push(["ACTIVITY", activityColumns, null, activityValues]);
if (pActivityLinks)
{
var activityLinkColumns = ["ACTIVITYLINKID", "ACTIVITY_ID", "DATE_NEW", "USER_NEW", "OBJECT_TYPE", "OBJECT_ROWID"];
- var activityLinkColumnTypes = db.getColumnTypes("ACTIVITYLINK", activityLinkColumns, dbAlias);
var activityLinkValues;
for (var i = 0, l = pActivityLinks.length; i < l; i++)
{
activityLinkValues = [util.getNewUUID(), activityId, creationDate, creationUser, pActivityLinks[i][0], pActivityLinks[i][1]];
- insertStatements.push(["ACTIVITYLINK", activityLinkColumns, activityLinkColumnTypes, activityLinkValues]);
+ insertStatements.push(["ACTIVITYLINK", activityLinkColumns, null, activityLinkValues]);
}
}
diff --git a/process/Address_lib/Address_lib.aod b/process/Address_lib/Address_lib.aod
index 5e7cbd6ac0376eb634046a65ee1b9468154061fc..dc170bb2e025b240f859db1cdca75dd3eb7d972c 100644
--- a/process/Address_lib/Address_lib.aod
+++ b/process/Address_lib/Address_lib.aod
@@ -2,6 +2,7 @@
<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>Address_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/process/Address_lib/documentation.adoc</documentation>
<process>%aditoprj%/process/Address_lib/process.js</process>
<variants>
<element>LIBRARY</element>
diff --git a/process/Address_lib/documentation.adoc b/process/Address_lib/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..08a8841eb5207366ee9654a11101f18fddc76da9
--- /dev/null
+++ b/process/Address_lib/documentation.adoc
@@ -0,0 +1,29 @@
+= Address_lib
+
+This is a library for working with big amounts of the combination of the following data:
+
+* addresses
+* person-contacts
+* organisation-contacts
+
+as well as related data like the standard communication data.
+
+This is mainly done via the `AddrObject` which uses database access for loading the data and
+placeholder-definitions for preparing and formatting the data.
+
+== FAQ
+
+[qanda]
+How to get the correct formatted standard address for a single contact, depending on the country?::
+ This can be easily done via the following code-snippet where the variable `contactId` is
+ the `CONTACT.CONTACTID` of the address where you want to load the data:
+
+ new AddrObject(contactId).getFormattedAddress();
+
+
+How to get the correct formatted standard address for several contacts, depending on their country?::
+ This can be easily done via the following code-snippet where the variable `contactIds` is
+ an array of `CONTACT.CONTACTID` where you want to load the address data from and `config` the
+ placeholder configuration:
+
+ getAddressesData([contactIds], config);
\ No newline at end of file
diff --git a/process/Address_lib/process.js b/process/Address_lib/process.js
index ecd34ddbbcc7821e3781a340ba8e55588bfcb4ea..1a49b23e15710f5465c3a94afc99cb5b038ae5bb 100644
--- a/process/Address_lib/process.js
+++ b/process/Address_lib/process.js
@@ -1,4 +1,3 @@
-import("system.swing");
import("system.text");
import("system.db");
import("system.logging");
@@ -11,6 +10,73 @@ import("Util_lib");
import("DocumentTemplate_lib");
+function AddressObject (pAddress, pBuildingNo, pZipCode, pCity, pCountry, pState)
+{
+ this.address = pAddress;
+ this.buildingNo = pBuildingNo;
+ this.zipCode = pZipCode;
+ this.city = pCity;
+ this.country = pCountry;
+ this.state = pState;
+ this.addressAddition = null;
+ this.addressIdentifier = null;
+ this.district = null;
+ this.region = null;
+}
+
+function AddressParts () {}
+
+AddressParts.ADDRESS = function ()
+{
+ return "address";
+}
+
+AddressParts.BUILDINGNO = function ()
+{
+ return "buildingNo";
+}
+
+AddressParts.ZIPCODE = function ()
+{
+ return "zipCode";
+}
+
+AddressParts.CITY = function ()
+{
+ return "city";
+}
+
+AddressParts.COUNTRY = function ()
+{
+ return "country";
+}
+
+AddressParts.STATE = function ()
+{
+ return "state";
+}
+
+AddressParts.ADDRESSADDITION = function ()
+{
+ return "addressAddition";
+}
+
+AddressParts.ADDRESSIDENTIFIER = function ()
+{
+ return "addressIdentifier";
+}
+
+AddressParts.DISTRICT = function ()
+{
+ return "district";
+}
+
+AddressParts.REGION = function ()
+{
+ return "region";
+}
+
+
// TODO: muss überarbeitet werden / evtl neu gemacht werden
/*
@@ -336,6 +402,8 @@ function _getAddrData( pData )
pData[15] = "";
case 3:
sformat = _getSalutation( pData[22] + pData[19] + pData[20] );
+ //no title defined
+ if ( sformat == undefined ) sformat = _getSalutation( pData[22] + pData[19] );
//no language defined
if ( sformat == undefined ) sformat = _getSalutation( pData[19] + pData[20] );
// no language specific entry in salutation
diff --git a/process/AttributeFilter_lib/process.js b/process/AttributeFilter_lib/process.js
index f64477390ffc247d5e6fd9768f2840dae133c1e1..d70501cef8425a1503b22892f6d8f34341c4c947 100644
--- a/process/AttributeFilter_lib/process.js
+++ b/process/AttributeFilter_lib/process.js
@@ -25,7 +25,7 @@ function AttributeSearchNameCoder(){}
*
* @param {String} pUid <p/> attribute uid of the attribute that has to be encoded
* @param {String} pAttributeType <p/> attribute type of the attribute that has to be encoded
- * <br /> while you may able to specify any string, only values of $AttributeTypes.*** are useful
+ * <br/> while you may able to specify any string, only values of $AttributeTypes.*** are useful
*
* @return {String} <p/> an encoded string of the given parametervalues
* <br/> this is basically a serialized object which is base64 encoded
@@ -155,7 +155,7 @@ AttributeFilterExtensionMaker.getFilterValues = function(pFilter)
var attrType = name.type;
if (attrType == $AttributeTypes.VOID.toString())
attrType = $AttributeTypes.BOOLEAN.toString();
- var res = AttributeUtil.getPossibleListValues(attributeId, attrType);
+ var res = AttributeUtil.getPossibleListValues(attributeId, attrType, true);
if (res == null)
res = [];
return res;
diff --git a/process/AttributeRegistry_basic/process.js b/process/AttributeRegistry_basic/process.js
index cacb5a18c5652984a98533ed93ff819bc030ed6e..0d5b68b1c70a1889289312420d1b8902818b0866 100644
--- a/process/AttributeRegistry_basic/process.js
+++ b/process/AttributeRegistry_basic/process.js
@@ -18,6 +18,7 @@ $AttributeRegistry.targetGroup$competitior = function(){return "1d30d0ab-6103-49
$AttributeRegistry.departments = function(){return "87d4ff5b-0ab6-4534-be26-76c6ef486072";};
$AttributeRegistry.salesprojectType = function(){return "fd3963bc-8e60-411a-9911-b97eb73e5cf7";};
$AttributeRegistry.responsibleADsupervisor = function(){return "c0b26482-c0aa-413d-a9c3-f44c56bd04a9";};
+$AttributeRegistry.industry = function(){return "7e9927a4-41e4-426f-bddd-c3e9ee3b093e";};
$AttributeRegistry.visitPlanFrequency = function(){return "547b8b9d-88ba-4590-9e01-34d2a58116cc";};
$AttributeRegistry.visitPlanFrequency$monthly = function(){return "8c100817-1d2b-4fc7-8fdd-fd0370e19385";};
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 40eed67b874f583649eda1b1369df0ea870e9921..b7b8f699980ce3f83df7a4426019d916ab9c70fe 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -148,7 +148,7 @@ AttributeUtil.getPossibleListValues = function (pAttributeId, pAttributeType, pI
{
var attributeId = pAttributeId;
var attrType = pAttributeType.trim();
- var onlyActives = (pIncludeInactives == undefined ? false : pIncludeInactives);
+ var onlyActives = !pIncludeInactives;
if (attrType == $AttributeTypes.COMBO.toString())
{
var valuesSelect = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_NAME")
@@ -1224,7 +1224,6 @@ AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
return;
var table = "AB_ATTRIBUTEUSAGE";
var columns = ["AB_ATTRIBUTEUSAGEID", "AB_ATTRIBUTE_ID", "OBJECT_TYPE", "MAX_COUNT"];
- var types = db.getColumnTypes(table, columns);
var inserts = [];
_addInserts(pAttributeId, pObjectType);
@@ -1250,7 +1249,7 @@ AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
? "1"
: "";
let values = [util.getNewUUID(), row[0], pObjectType, maxCount];
- inserts.push([table, columns, types, values]);
+ inserts.push([table, columns, null, values]);
}
_addInserts(row[0], pObjectType);
});
@@ -1528,7 +1527,7 @@ AttributeRelationQuery.prototype.includeDisplayValue = function ()
/**
* Executes the query and returns the result, depending on the properties of the AttributeRelationQuery object.
*
- * @return {Object[]} <p>
+ * @return {AttributeRelation[]} <p>
* Array of objects. By default, the objects contain the properties:
* <ul>
* <li>attributeId</li>
@@ -1549,8 +1548,11 @@ AttributeRelationQuery.prototype.getAttributes = function ()
"AB_ATTRIBUTE.ATTRIBUTE_NAME",
"COMBOVAL.ATTRIBUTE_NAME",
"AB_ATTRIBUTE.AB_ATTRIBUTEID",
- "AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID"
+ "AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID",
+ "AB_ATTRIBUTERELATION.OBJECT_ROWID",
+ "AB_ATTRIBUTERELATION.OBJECT_TYPE"
];
+
var valueFields = AttributeTypeUtil.getAllDatabaseFields();
@@ -1564,13 +1566,8 @@ AttributeRelationQuery.prototype.getAttributes = function ()
var mappingFn = function (row)
{
- var attrObj = {
- attributeId : row[4],
- value : row[AttributeTypeUtil.getTypeColumnIndex(row[0]) + defaultFields.length],
- attributeRelationId : row[5],
- attributeName : row[2],
- attributeType : row[0]
- };
+ var attrObj = new AttributeRelation(row[5], row[4], row[AttributeTypeUtil.getTypeColumnIndex(row[0]) + defaultFields.length],
+ row[2], row[0], row[6], row[7]);
if (this._includeDisplayValue)
{
@@ -1594,7 +1591,7 @@ AttributeRelationQuery.prototype.getAttributes = function ()
* If this method is executed on your AttributeRelationQuery<br>
* object it will return only one attribute.
*
- * @return {Object} <p>
+ * @return {AttributeRelation} <p>
* Returns the AttributeRelationQuery object<br>
* with only a sinlge attribute.<br>
*/
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index ede9be7097f894fb89139076e79f0c1305f4b015..0715bd9e1ce5c6fcab1e43ae18fcbafd85e1572f 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -393,6 +393,38 @@ BulkMailUtils.copy = function(pBulkMailId)
};
neon.openContext("BulkMail", null, null, neon.OPERATINGSTATE_NEW, params);
}
+/**
+ * Adds contacts or organistaions to a bulk mail by contactIds.<br>
+ *
+ * @param {String} pContactIds <p>
+ * The contact ids as JSON array.<br>
+ */
+BulkMailUtils.addParticipantsByRowIds = function(pContactIds)
+{
+ var params = {
+ "ContactIds_param" : pContactIds
+ };
+ neon.openContext("BulkMailAddRecipients", "BulkMailAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+}
+
+/**
+ * Adds contacts or organistaions to a bulk mail by condition (filter).<br>
+ *
+ * @param {String} pCondition <p>
+ * Contact ids.
+ * @param {String} pSourceTableName <p>
+ * The source table.<br>
+ */
+BulkMailUtils.addParticipantsByCondition = function(pCondition, pSourceTableName)
+{
+ var params = {
+ "ContactIds_param" : pCondition,
+ "comingFrom_param" : pSourceTableName}
+ neon.openContext("BulkMailAddRecipients", "BulkMailAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+}
+
+
+
function SerialLetterUtils () {}
@@ -551,4 +583,34 @@ SerialLetterUtils.getSerialLetterTemplate = function (pLetterId, pDocumentTempla
if (!template.type)
template = DocumentTemplate.loadTemplate(pDocumentTemplateId);
return template;
+}
+
+/**
+ * Adds contacts or organistaions to a serial letter by contactIds.<br>
+ *
+ * @param {String} pContactIds <p>
+ * The contact ids as JSON array.<br>
+ */
+SerialLetterUtils.addParticipantsByRowIds = function(pContactIds)
+{
+ var params = {
+ "ContactIds_param" : pContactIds
+ };
+ neon.openContext("SerialLetterAddRecipients", "SerialLetterAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+}
+
+/**
+ * Adds contacts or organistaions to a serial letter by condition (filter).<br>
+ *
+ * @param {String} pCondition <p>
+ * Contact ids.
+ * @param {String} pSourceTableName <p>
+ * The source table.<br>
+ */
+SerialLetterUtils.addParticipantsByCondition = function(pCondition, pSourceTableName)
+{
+ var params = {
+ "ContactIds_param" : pCondition,
+ "comingFrom_param" : pSourceTableName}
+ neon.openContext("SerialLetterAddRecipients", "SerialLetterAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
}
\ No newline at end of file
diff --git a/process/CachedRecordContainer_lib/CachedRecordContainer_lib.aod b/process/CachedRecordContainer_lib/CachedRecordContainer_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..07b3e2150f48a91844aeada49cb40dfbb5d04cf1
--- /dev/null
+++ b/process/CachedRecordContainer_lib/CachedRecordContainer_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>CachedRecordContainer_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/CachedRecordContainer_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/CachedRecordContainer_lib/process.js b/process/CachedRecordContainer_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..e44f4dfa90c436f711c74ec22c5c4ad01d9942f2
--- /dev/null
+++ b/process/CachedRecordContainer_lib/process.js
@@ -0,0 +1,177 @@
+import("system.vars");
+import("Util_lib");
+
+/**
+ * provides field-preset-constants for cached data records
+ * Do not create an instance of this!
+ *
+ * @class
+ * @static
+ */
+function CachedRecordContainerFieldPresets(){}
+
+/*this is right now (2020-08-25) the only way to get something like a constant with
+ - a prober name
+ - autocomplete support within the ADITO Designer
+ - and proper packageing all constants together
+This may change in the future, if there is something better feel free to improve this */
+
+/**
+ * Constant for field presets that represents no varaiblenames
+ */
+CachedRecordContainerFieldPresets.NONE = function(){
+ return [];
+};
+
+/**
+ * Constant for field presets that represents some standard varaiblenames
+ * Does not include a locale, but includes:
+ * <ul>
+ * <li>$local.idvalues</li>
+ * <li>$local.filters</li>
+ * <li>$local.order</li>
+ * <li>$local.grouping</li>
+ * <ul>
+ */
+CachedRecordContainerFieldPresets.STANDARD = function(){
+ //grants are parts of the $local.filter-variable
+ return ["$local.idvalues", "$local.filters", "$local.order", "$local.grouping"];
+};
+/**
+ * Constant for field presets that represents some standard varaiblenames
+ * Does include a locale (if clientside) and:
+ * <ul>
+ * <li>$local.idvalues</li>
+ * <li>$local.filters</li>
+ * <li>$local.order</li>
+ * <li>$local.grouping</li>
+ * <ul>
+ */
+CachedRecordContainerFieldPresets.STANDARD_WITH_LOCALE = function(){
+ //grants are parts of the $local.filter-variable
+ var res = CachedRecordContainerFieldPresets.STANDARD();
+ if (vars.getString("$sys.isclient"))
+ {
+ res.unshift("$sys.clientlocale");
+ }
+ else
+ {
+ //there is no locale-variable for the server, so let's just store THAT it's the locale of the serverprocess
+ res.unshift("_____serverlocale");
+ }
+ return res;
+};
+
+
+/**
+ * provides utility functions to work with CachedRecordContainers
+ * Do not create an instance of this!
+ *
+ * @class
+ * @static
+ */
+function CachedRecordContainerUtils(){}
+
+/**
+ * Builds a key string that can be used in the cacheKeyProcess of a record container depending on the passed parameters. <br />
+ * This will use the most common preset by default (this is the preset STANDARD_WITH_LOCALE). <br />
+ * Therefor you will only need to pass the parameter names ("$param.") that are relevant for the data of your recordContainer.<br />
+ * The cacheKeyProcess is used to build up a key for retrieving the correct cached records from the cache.<br />
+ * Will check automatically if the variable exists or is null. You can pass an arbitrary amount of parameters to this functions, all of the parameters
+ * have to be a name of a varaible to be checked ("$local, $sys, $field, $param, etc.)<br />
+ *
+ * @param {String} pExtendedVariable1 <p>Name of the first variable that is checked and
+ * thats value is used to extend the most common variable names
+ * @param {String} pExtendedVariableN=undefined <p>Name of the next variables that is checked and
+ * thats value is used to extend the most common variable names.<br />
+ * You can pass an arbitrary amount of parameters (see more in the function description text)
+ *
+ * @return {String} <p>The key ready to use for the cacheKeyProcess
+ *
+ * @example
+ * var res = CachedRecordContainerUtils.getCommonKey("$param.ContainerName_param", "$param.ExcludedKeyIdsSubquery_param", "$param.OnlyActives_param"
+ * , "$param.WhitelistIds_param");
+ * result.string(key);
+ */
+CachedRecordContainerUtils.getCommonKey = function(pExtendedVariable1, pExtendedVariableN) {
+ var functionParams = Array.from(arguments);//arguments is an array-like object so let's convert it to an array for further processing
+ var params = [CachedRecordContainerFieldPresets.STANDARD_WITH_LOCALE].concat(functionParams);
+ return CachedRecordContainerUtils.getKeyWithPreset.apply(null, params);
+};
+
+
+/**
+ * Builds a key string that can be used in the cacheKeyProcess of a record container depending on the passed parameters and a given preset.<br />
+ * The cacheKeyProcess is used to build up a key for retrieving the correct cached records from the cache.<br />
+ * Will check automatically if the variable exists or is null. You can pass an arbitrary amount of parameters to this functions, all of the parameters
+ * have to be a name of a varaible to be checked ("$local, $sys, $field, $param, etc.) <br />
+ *
+ * @param {function|array} pPreset <p>The preset should be a value of CachedRecordContainerFieldPresets, e.g.
+ * CachedRecordContainerFieldPresets.STANDARD.<br />
+ * The following parameters will expand the list of the fields that are used in the preset.<br />
+ * The function type (e.g.CachedRecordContainerFieldPresets.STANDARD) is supported as well as
+ * the array type (e.g.CachedRecordContainerFieldPresets.STANDARD()) for better useability.
+ * @param {String} pExtendedVariable1 <p>Name of the first variable that is checked and thats value is used to extend the preset
+ * @param {String} pExtendedVariableN=undefined <p>Name of the next variables that is checked and thats value is used to extend the preset.<br />
+ * You can pass an arbitrary amount of parameters (see more in the function description text)
+ *
+ * @return {String} <p>The key ready to use for the cacheKeyProcess
+ *
+ * @example
+ * var key = CachedRecordContainerUtils.getKeyWithPreset(CachedRecordContainerFieldPresets.STANDARD,"$sys.clientlocale", "$param.contactId"
+ * , "$param.onlyActives");
+ * result.string(key);
+ */
+CachedRecordContainerUtils.getKeyWithPreset = function(pPreset, pExtendedVariable1, pExtendedVariableN) {
+ var varsToCheck;
+ if (Utils.isFunction(pPreset))
+ varsToCheck = pPreset.call();
+ else if (Array.isArray(pPreset))
+ varsToCheck = pPreset;
+ else
+ throw new Error();
+
+ //skip pPreset with the call of .slice() because it is handled separately above
+ var functionParams = Array.from(arguments).slice(1); //arguments is an array-like object so let's convert it to an array for further processing
+ if (functionParams.length > 0)
+ varsToCheck = varsToCheck.concat(functionParams);
+ return CachedRecordContainerUtils.getKey.apply(null, varsToCheck);
+};
+
+/**
+ * Builds a key string that can be used in the cacheKeyProcess of a record container depending on the passed parameters. <br />
+ * The cacheKeyProcess is used to build up a key for retrieving the correct cached records from the cache.<br />
+ * Will check automatically if the variable exists or is null. You can pass an arbitrary amount of parameters to this functions, all of the parameters
+ * have to be a name of a varaible to be checked ("$local, $sys, $field, $param, etc.) <br />
+ *
+ * @param {String} pVariable1 <p>Name of the first variable that is checked and thats value is used
+ * @param {String} pVariableN=undefined <p>Name of the next variables that is checked and thats value is used.<br />
+ * You can pass an arbitrary amount of parameters (see more in the function description text)
+ *
+ * @return {String} <p>The key ready to use for the cacheKeyProcess
+ *
+ * @example
+ * var key = CachedRecordContainerUtils.getKey("$sys.clientlocale", "$local.filter", "$param.contactId");
+ * result.string(key);
+ */
+CachedRecordContainerUtils.getKey = function(pVariable1, pVariableN) {
+ var varsToCheck = Array.from(arguments);//arguments is an array-like object so let's convert it to an array for further processing
+
+ var key = [];
+ varsToCheck.forEach(function (varToCheck){
+ if (vars.exists(varToCheck))
+ {
+ var value = vars.getString(varToCheck);
+ if (value != null)
+ key.push(value);
+ else
+ key.push("_____" + varToCheck);
+ }
+ else
+ {
+ key.push("_____" + varToCheck);
+ }
+ });
+
+ return key.join(".");
+};
\ No newline at end of file
diff --git a/process/Calendar_lib/process.js b/process/Calendar_lib/process.js
index 7cc5df86754571039fbac5b7806a5c2b51f3e7cf..0a9a4b99e7c0c1abbe9d41af4f6ca2b2a734cab1 100644
--- a/process/Calendar_lib/process.js
+++ b/process/Calendar_lib/process.js
@@ -108,7 +108,7 @@ CalendarUtil.getEffectiveCalendarIdFromUser = function(pUser)
var email = userParams["email"];
if(exchangeEmail)
- return exhangeEmail;
+ return exchangeEmail;
else if(calendarId)
return calendarId;
else if(email)
@@ -165,7 +165,7 @@ CalendarUtil.newEvent = function( pSummary, pDescription, pWithLink, pUser, pAff
prompts["comp4refresh"] = [];
if (pComps4Refresh == undefined)
pComps4Refresh = ["$comp.Aufgabe", "$comp.tbl_Termine"];
- for (i = 0; i < pComps4Refresh.length; i++)
+ for (let i = 0; i < pComps4Refresh.length; i++)
{
if ( vars.exists(pComps4Refresh[i])) prompts["comp4refresh"].push(pComps4Refresh[i]);
}
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index b38ab24f96c87d6895583dcb9f2b787ea503fd34..2791c6b51fac53391ecb97ae14276ac935bb7305 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -453,7 +453,7 @@ CampaignUtils.GetParticipantsCountByCondition = function(pWhereCondition)
// If pWhereCondition would be used directly,
// .cell() would return number of all participants and
// .cell(true) would return an empty string "", not 0
- .where(pWhereCondition.build("1=2"))
+ .where(pWhereCondition.build(SqlBuilder.NORESULT_CONDITION()))
.cell();
}
@@ -484,7 +484,7 @@ CampaignUtils.GetParticipantsAlreadyAddedCountByCondition = function(pWhereCondi
// If pWhereCondition would be used directly,
// .cell() would return number of all participants and
// .cell(true) would return an empty string "", not 0
- .where(pWhereCondition.build("1=2"))
+ .where(pWhereCondition.build(SqlBuilder.NORESULT_CONDITION()))
return select.cell();
}
@@ -649,7 +649,7 @@ CampaignUtils.copyCampaignSteps = function(pSourceCampaignId, pTargetCampaignId)
{
var InputMapping = {
"CAMPAIGNSTEP": {
- condition: newWhereIfSet("CAMPAIGN.CAMPAIGN_ID", pSourceCampaignId).orderBy("SORTING").toString("1=2", true),
+ condition: newWhereIfSet("CAMPAIGN.CAMPAIGN_ID", pSourceCampaignId).orderBy("SORTING").toString(SqlBuilder.NORESULT_CONDITION(), true),
ValueMapping: {
"CAMPAIGN_ID" : pTargetCampaignId
}
@@ -693,5 +693,5 @@ _CampaignUtils._openAddParticipantContext = function(pContext, pTargetDataExpres
params["isUpdate_param"] = false;
params["dataSourceTableName_param"] = pSourceTableName;
- neon.openContext(pContext, "CampaignAddParticipantsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+ neon.openContext(pContext, pView, null, neon.OPERATINGSTATE_VIEW, params);
}
\ No newline at end of file
diff --git a/process/ClassificationFilter_lib/ClassificationFilter_lib.aod b/process/ClassificationFilter_lib/ClassificationFilter_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9b182044a8785df3037df931f0df656d095ae109
--- /dev/null
+++ b/process/ClassificationFilter_lib/ClassificationFilter_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>ClassificationFilter_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/ClassificationFilter_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/ClassificationFilter_lib/process.js b/process/ClassificationFilter_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..e2200e6e6e8ad55b95fa5fbfdf8cf38c71884677
--- /dev/null
+++ b/process/ClassificationFilter_lib/process.js
@@ -0,0 +1,423 @@
+import("Context_lib");
+import("Classification_lib");
+import("Entity_lib");
+import("Sql_lib");
+import("system.entities");
+import("system.SQLTYPES");
+import("system.translate");
+import("system.util");
+import("system.vars");
+import("Util_lib");
+
+/**
+ * Methods used for the classification type filter extension set
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function ClassificationTypeFilterUtils() {}
+
+/**
+ * fetches classificationtypes and transforms them into filter fields
+ *
+ * @param {String} pObjectType <p/> contextId of the context whoes classification types are used for providing the filter fields
+ *
+ * @return {String} <p/> field-definitions (array of objects) that are ready to use for a filterExtensionSet in a stringified form
+ * <br/> The object within the array contains the following properties:
+ * <ul>
+ * <li>name - classificationtypeid (UUID of the classificationtype)</li>
+ * <li>title - "classification: " + string of the classificationtype translated (for the end user)</li>
+ * <li>contentType - string of the neon-contentType (TEXT)</li>
+ * <li>hasDropDownValues - boolean if possible values have to be calculated or not (always true atm)</li>
+ * </ul>
+ * @static
+ */
+ClassificationTypeFilterUtils.getFilterFields = function(pObjectType)
+{
+ var res = [];
+ var scoreTypes = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE.SCORETYPE, CLASSIFICATIONGROUP.TITLE")
+ .from("CLASSIFICATIONTYPE")
+ .join("CLASSIFICATIONGROUP", "CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID = CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID")
+ .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pObjectType)
+ .orderBy("CLASSIFICATIONTYPE.SCORETYPE asc")
+ .table();
+
+ var titleField = SqlUtils.translateStatementWithQuotes(ClassificationTypeFilterUtils.getTranslationSql());
+ for (let i = 0; i < scoreTypes.length; i++)
+ {
+ res.push({
+ name: scoreTypes[i][0],
+ title: translate.text(scoreTypes[i][2])+ ": " + translate.text(scoreTypes[i][1]),
+ contentType: "TEXT",
+ hasDropDownValues: true,
+ isGroupable: true, // These Fields are also able to be grouped
+ groupedRecordField: "CLASSIFICATION.CLASSIFICATIONSCORE_ID", // The DB-field that is being grouped by (see also groupQueryProcess)
+ titleRecordField: titleField // The displayname (see also groupQueryProcess)
+ });
+ }
+
+ return JSON.stringify(res);
+}
+
+/**
+ * fetches classificationscores that are filterable and transforms them into filter fields for the current context
+ *
+ * @see ClassificationTypeFilterUtils.getFilterFields for more details
+ * @static
+ */
+ClassificationTypeFilterUtils.makeFilterFields = function()
+{
+var filter = JSON.parse(vars.getString("$local.filter"));
+
+var classificationTypeId = filter.name;
+
+var classificationValue = newSelect("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID, CLASSIFICATIONSCORE.TITLE")
+ .from("CLASSIFICATIONSCORE")
+ .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", classificationTypeId)
+ .orderBy("CLASSIFICATIONSCORE.TITLE")
+ .table();
+
+for (let i = 0; i < classificationValue.length; i++)
+ classificationValue[i][1] = translate.text(classificationValue[i][1])
+
+return classificationValue;
+}
+
+/**
+ * Builds a Sql-condition for a classification filter extension set. This allows to filter for classificationtypes within a db-table
+ *
+ * @see ClassificationTypeFilterUtils.getFilterCondition for more details
+ * @static
+ */
+ClassificationTypeFilterUtils.makeFilterConditionSql = function()
+{
+ var filterCond = vars.get("$local.condition");
+ var uidInfo = EntityUtils.parseUidColumn(vars.get("$sys.uidcolumn"));
+ var columnPlaceholder = vars.get("$local.columnPlaceholder");
+ var res = ClassificationTypeFilterUtils.getFilterCondition(filterCond, uidInfo.table, uidInfo.column, columnPlaceholder);
+
+ return res;
+}
+
+/**
+ * Builds a Sql-condition that may be used in a filter extension set and allows to filter for classificationtypes within a db-table
+ *
+ * @param {String} pCondition <p/> a SQL-condition like it is given in the "$local.condition"-variable in filter extension sets
+ * @param {String} pIdTableName <p/> name of the db-table where the data shall be filtered
+ * @param {String} pIdColumnName <p/> name of the primarykey-column of the table that was given via pIdTablename
+ * @param {String} pColumnPlaceholder <p/> name of the placeholder where the columnname should be like it is given in the
+ * "$local.columnPlaceholder"-variable in filter extension sets
+ *
+ * @return {SqlBuilder} <p/> a SqlBuilder-condition that contains a sub-select and may be used for filtering data
+ * @static
+ */
+ClassificationTypeFilterUtils.getFilterCondition = function(pCondition, pIdTableName, pIdColumnName, pColumnPlaceholder)
+{
+ var resSql;
+
+ var condition = StringUtils.replaceAll(pCondition, pColumnPlaceholder, "CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID");
+
+ //a SqlBuilder.IN() in a newWhere is not used here since the subselect can contain a placeholder
+ //(the variable condition) that would break the function
+ resSql = pIdTableName + "." + pIdColumnName + " in (" + newSelect(pIdTableName + "." + pIdColumnName)
+ .from(pIdTableName)
+ .leftJoin("CLASSIFICATION", newWhere("CLASSIFICATION.OBJECT_ROWID = " + pIdTableName + "." + pIdColumnName))
+ .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATION.CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID")
+ .where(condition) + ")";
+
+ return resSql;
+};
+
+/**
+* gets all titletranslations of the classification scores
+*
+*
+* @return {String} a SQL-expression (case-when-statement) that resolves the KEYID into the title -> as preparedSatement-elements
+*/
+ClassificationTypeFilterUtils.getTranslationSql = function()
+{
+
+ var config = entities.createConfigForLoadingRows().entity("ClassificationScore_entity")
+ .fields(["CLASSIFICATIONSCOREID", "translatedTitle"]);
+
+
+ var rows = entities.getRows(config);
+ var res = SqlUtils.getResolvingCaseWhenFromObject(rows, "CLASSIFICATIONSCOREID", "translatedTitle", "CLASSIFICATIONSCORE_ID");
+ return res;
+}
+
+
+
+/**
+ * Procides static methods for en- or decoding classification group filter names
+ * ClassifcationGroupFilter names are shared over several processes and contain therefore various information
+ * The infomration needs to be encoded to be able to transfer it over the different processes
+ *
+ * @class
+ *
+ */
+function ClassificationGroupFilterNameCoder(){}
+
+/**
+ * encodes several parameters into one string that can be used as classification group filter-name
+ *
+ * @param {String} pClassificationGroupId <p/> uid-value of a classification group
+ * @param {String} pRepresentingSqlExpression <p/> sql expressions that represents one classification group result, for example an sql
+ * expression that returns the Value "B" for the classificationvalue "CBA" when the fielter field
+ * for the second level classification group is generated
+ *
+ * @return {String} <p/> an encoded string of the given parametervalues
+ * <br/> this is basically a serialized object which is base64 encoded
+ * @static
+ */
+ClassificationGroupFilterNameCoder.encode = function (pClassificationGroupId, pRepresentingSqlExpression)
+{
+ var res = {
+ classificationGroupId: pClassificationGroupId,
+ representingSqlExpression: pRepresentingSqlExpression
+ };
+ res = JSON.stringify(res);
+ res = util.encodeBase64String(res);//encode base64 to ensure that there a no problematic characters in the filterfield name
+ return res;
+};
+
+/**
+ * decodes a string that was encoded with ClassificationGroupFilterNameCoder.encode
+ *
+ *
+ * @param {String} pEncodedString <p/> string that shall be decoded; the origin of the name has to be a filter-object
+ *
+ * @return {Object} <p/> an object that contains all keys and values that have been encoded with
+ * ClassificationGroupFilterNameCoder.encode
+ * @static
+ */
+ClassificationGroupFilterNameCoder.decode = function (pEncodedString)
+{
+ var res = pEncodedString.substr(pEncodedString.lastIndexOf(".") + 1);
+ res = util.decodeBase64String(res);
+ res = JSON.parse(res);
+ return res;
+};
+
+/**
+ * Methods used for the classification group filter extension set
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function ClassificationGroupFilterUtils() {}
+
+
+/**
+ * fetches classificationgroups and transforms them into filter fields
+ *
+ * @param {String} pObjectType <p/> contextId of the context whoes classification groups are used for providing the filter fields
+ *
+ * @return {String} <p/> field-definitions (array of objects) that are ready to use for a filterExtensionSet in a stringified form
+ * <br/> The object within the array contains the following properties:
+ * <ul>
+ * <li>name - classificationtypeid (UUID of the classificationtype)</li>
+ * <li>title - "classification: " + string of the classificationtype translated (for the end user)</li>
+ * <li>contentType - string of the neon-contentType (TEXT)</li>
+ * <li>hasDropDownValues - boolean if possible values have to be calculated or not (always true atm)</li>
+ * </ul>
+ * @static
+ */
+ClassificationGroupFilterUtils.getFilterFields = function(pObjectType)
+{
+ var sqlHelper = new SqlMaskingUtils();
+ var res = [];
+
+ var config = entities.createConfigForLoadingRows()
+ .entity("ClassificationGroup_entity")
+ .fields(["CLASSIFICATIONGROUPID", "#CONTENTTITLE"])
+ .provider("SpecificObjectTypeGroups")
+ .addParameter("ObjectType_param", pObjectType);
+ var classificationGroups = entities.getRows(config);
+ classificationGroups = ArrayUtils.sortArrayOfObjects(classificationGroups, "#CONTENTTITLE", true, false);
+
+ classificationGroups.forEach(function(classificationGroup, idx){
+ var classificationGroupId = classificationGroup["CLASSIFICATIONGROUPID"];
+ var classificationGroupTitle = classificationGroup["#CONTENTTITLE"];
+
+ var representingSqlExpression = sqlHelper.substring("CLASSIFICATIONVALUE", idx+1, 1);
+ var name = ClassificationGroupFilterNameCoder.encode(classificationGroupId, representingSqlExpression);
+ res.push({
+ name: name,
+ title: classificationGroupTitle,
+ contentType: "TEXT",
+ hasDropDownValues: true,
+ isGroupable: true,
+ groupedRecordField: representingSqlExpression //title and group valure are the same (for example a resulting "A")
+ });
+ });
+ return JSON.stringify(res);
+};
+
+ClassificationGroupFilterUtils.makeFilterFields = function()
+{
+ var objectType = ContextUtils.getCurrentContextId();
+ var res = ClassificationGroupFilterUtils.getFilterFields(objectType);
+ return res;
+};
+
+
+/**
+ * fetches classificationscores that are filterable and transforms them into filter fields for the current context
+ *
+ * @see ClassificationTypeFilterUtils.getFilterFields for more details
+ * @static
+ */
+ClassificationGroupFilterUtils.getFilterValues = function(pFilter)
+{
+ var filter = JSON.parse(pFilter);
+ var filterName = filter.name;
+ var classificationGroupId = ClassificationGroupFilterNameCoder.decode(filterName).classificationGroupId;
+
+ var classificationValue = newSelect("CLASSIFICATIONGRADING.GRADING, CLASSIFICATIONGRADING.GRADING")
+ .from("CLASSIFICATIONGRADING")
+ .where("CLASSIFICATIONGRADING.CLASSIFICATIONGROUP_ID", classificationGroupId)
+ .orderBy("CLASSIFICATIONGRADING.MAXGRADEFORSCORE desc")
+ .table();
+
+ return classificationValue;
+};
+
+
+/**
+ * fetches classificationscores that are filterable and transforms them into filter fields for the current context
+ *
+ * @see ClassificationTypeFilterUtils.getFilterFields for more details
+ * @static
+ */
+ClassificationGroupFilterUtils.makeFilterValues = function()
+{
+ var filter = vars.getString("$local.filter")
+ var res = ClassificationGroupFilterUtils.getFilterValues(filter);
+ return res;
+};
+
+/**
+ * Builds a Sql-condition that may be used in a filter extension set and allows to filter for classificationtypes within a db-table
+ *
+ * @param {String} pObjectType <p/> contextId of the objects thats records
+ * @param {String} pFilterName <p/> name of the filter that was prior encoded and contains various information
+ * @param {String} pCondition <p/> a SQL-condition like it is given in the "$local.condition"-variable in filter extension sets
+ * @param {String} pRawValue <p/> the raw input value that the user has entered for a filter operation
+ * @param {String} pOperatorName <p/> the operator of the condition (equals, smaller, greater, etc.) as a resolved name; e.g. "IS NOT NULL"
+ * @param {String} pIdTableName <p/> name of the db-table where the data shall be filtered
+ * @param {String} pIdColumnName <p/> name of the primarykey-column of the table that was given via pIdTablename
+ * @param {String} pColumnPlaceholder <p/> name of the placeholder where the columnname should be like it is given in the
+ * "$local.columnPlaceholder"-variable in filter extension sets
+ *
+ * @return {SqlBuilder} <p/> a SqlBuilder-condition that contains a sub-select and may be used for filtering data
+ * @static
+ */
+ClassificationGroupFilterUtils.getFilterCondition = function(pObjectType, pFilterName, pCondition, pRawValue, pOperatorName, pIdTableName,
+ pIdColumnName, pColumnPlaceholder)
+{
+ var decodedFilterName = ClassificationGroupFilterNameCoder.decode(pFilterName);
+ var condition = StringUtils.replaceAll(pCondition, pColumnPlaceholder, decodedFilterName.representingSqlExpression);
+
+ return condition;
+};
+
+
+/**
+ * Builds a Sql-condition for a classification group filter extension set. This allows to filter for classificationgroups within a db-table
+ *
+ *
+ * @see ClassificationGroupFilterUtils.getFilterCondition for more details
+ * @static
+ */
+ClassificationGroupFilterUtils.makeFilterConditionSql = function()
+{
+ var objectType = ContextUtils.getCurrentContextId();
+ var filterName = vars.get("$local.name");
+ var filterCond = vars.get("$local.condition");
+ var filterRawValue = vars.get("$local.rawvalue");
+ var filterOpratorName = vars.get("$local.operator2").trim();
+ var uidInfo = EntityUtils.parseUidColumn(vars.get("$sys.uidcolumn"));
+ var columnPlaceholder = vars.get("$local.columnPlaceholder");
+
+ var res = ClassificationGroupFilterUtils.getFilterCondition(objectType, filterName, filterCond, filterRawValue, filterOpratorName,
+ uidInfo.table, uidInfo.column, columnPlaceholder);
+
+ return res;
+};
+
+/**
+ * Builds a group-by-sql-statement for a classification group filter extension set. This allows to group for classificationgroups within a db-table.<br/>
+ * Use the stringified result of this in groupQueryProcess (see the example). <br/>
+ * Note that in some cases you need to write your own process (for example: Organisations, since there is the special case that you need the
+ * ORGANISATION and CONTACT table). This function is useful for the default-cases.
+ *
+* @return {SqlBuilder} <p/>Statement as SqlBuilder-object that respresents the query that can be passed to the groupQueryProcess of a
+ * filterExtenionSet
+ *
+ * @see ClassificationGroupFilterUtils.getDefaultGroupQuery for more details
+ * @static
+ * @example
+ * import("ClassificationFilter_lib");
+ * import("system.result");
+ *
+ * var res = ClassificationGroupFilterUtils.makeDefaultGroupQuery().toString();
+ * result.string(res);
+ *
+ */
+ClassificationGroupFilterUtils.makeDefaultGroupQuery = function()
+{
+ var isCount = vars.get("$local.count"); // TRUE if the count of the records is needed
+ var columns = vars.get("$local.columnlist"); // The column, expected from the querry, see the filterFieldsProcess
+ var condition = vars.get("$local.condition"); // The Condition that's beeing used, includes the grouphirachy
+ var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
+ var order = vars.get("$local.order"); // The order of the result
+ var name = vars.get("$local.name");
+ var uidColumn = vars.get("$sys.uidcolumn");
+ uidColumn = EntityUtils.parseUidColumn(uidColumn);
+ var table = uidColumn.table;
+ var column = uidColumn.column;
+ var context = ContextUtils.getCurrentContextId();
+ return ClassificationGroupFilterUtils.getDefaultGroupQuery(table, column, context, isCount, columns, condition, groupedColumns, order, name);
+};
+
+/**
+ * returns a group-by-sql-statement depending on the given params for a classification group filter extension set
+ * This allows to group for classificationgroups within a db-table
+ *
+ * @param {String} pIdTableName <p/> name of the db-table where the data shall be filtered
+ * @param {String} pIdColumnName <p/> name of the primarykey-column of the table that was given via pIdTablename
+ * @param {String} pObjectType <p/> contextId of the objects thats records
+ * @param {Boolean} pIsCount <p/> true, if the count of the records is requested
+ * @param {Array} pColumns <p/> an array that contains all the columns that should be returned by the statement
+ * @param {String} pCondition <p/> a SQL-condition that's beeing used for filtering the records, includes the group hirachy
+ * @param {Array} pGroupedColumns <p/> an array that contains all the grouping columns (these are specified in the filterValuesProcess)
+ * that should be returned by the statement
+ * @param {String} pOrder <p/> the order-by clause definition for the statement that is requested
+ * @param {String} pName <p/> name of the group field (this is the name as specified in the filterValuesProcess)
+ *
+ * @return {SqlBuilder} <p/>Statement as SqlBuilder-object that respresents the query that can be passed to the groupQueryProcess of a
+ * filterExtenionSet
+ * @static
+ */
+ClassificationGroupFilterUtils.getDefaultGroupQuery = function(pIdTableName, pIdColumnName, pObjectType, pIsCount, pColumns, pCondition
+ , pGroupedColumns, pOrder, pName)
+{
+ var stmt = newSelect(pIsCount ? pGroupedColumns : pColumns)
+ .from(pIdTableName)
+ .leftJoin("CLASSIFICATIONSTORAGE", newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID = " + pIdTableName + "." + pIdColumnName)
+ .and("CLASSIFICATIONSTORAGE.OBJECT_TYPE", pObjectType));
+
+ if (pCondition)
+ {
+ var condition = pCondition.trim();
+ if (condition)
+ stmt.where(condition);
+ }
+
+ if (pOrder)
+ stmt.orderBy(pOrder);
+
+ stmt.groupBy(pGroupedColumns);
+ return stmt;
+};
\ No newline at end of file
diff --git a/process/Classification_lib/process.js b/process/Classification_lib/process.js
index 150dc27f19e1cd30a9be9629f44dba8108e4fe20..c56bb0f4c82bc644c0fcbe635d23bd6252fa3572 100644
--- a/process/Classification_lib/process.js
+++ b/process/Classification_lib/process.js
@@ -1,7 +1,13 @@
+import("system.text");
+import("system.translate");
+import("system.result");
+import("system.entities");
+import("system.eMath");
import("system.util");
import("system.vars");
import("system.db");
import("Sql_lib");
+import("Util_lib");
/**
* Methods to manage classifications.<br>
@@ -11,12 +17,35 @@ import("Sql_lib");
*/
function ClassificationUtils() {}
+/**
+ * Formats the summary title for one specific group <br/>
+ * This is done by
+ *
+
+ * @param {Number|String} pCurrentScore <p/>Current score that is reached for a group, e.g. 45
+ * @param {String} pGroupId <p/>UID of the classification group where the display value is determined. <br/>
+ * This is used for determing the maximum value of the group and the resulting
+ * classificaiton value (for example: "B")
+ * @param {String} pGroupName <p/>Name of the group that was passed as ID. This is used as display value and will not be translated,
+ * you have to pass this value already translated to the target locale. <br/>
+ * The reason for not loading this value based on the groupId is: better performance optimization
+ * @return {String} <p/>formated and translated title, e.g.: "1. Target Group: 45/120 points = B"
+ */
+ClassificationUtils.formatDisplaySummaryForGroup = function(pCurrentScore, pGroupId, pGroupName)
+{
+ var maxScore = ClassificationUtils.getMaxScore(pGroupId);
+ var classifications = ClassificationUtils.getClassifications(pCurrentScore, pGroupId);
+
+ pCurrentScore = text.formatDouble(pCurrentScore, "#");
+ maxScore = text.formatDouble(maxScore, "#");
+ var res = translate.withArguments("%0: %1/%2 points = %3", [pGroupName, pCurrentScore, maxScore, classifications]);
+ return res;
+};
+
/**
* Get the score of the classification. You can get all groups at once or only the score for one group.
*
- * @param {String} pClassificationType <p>
- * The classification-type (usage) e.g. the key id<br>
- * from keyword 'ClassificationType'.<br>
+
* @param {String} pObjectType <p>
* The object type.<br>
* @param {String} pObjectRowid <p>
@@ -29,18 +58,18 @@ function ClassificationUtils() {}
* Returns all scores as object-map.<br>
* (e.g. {"scoreGroup1": 0, "scoreGroup2": 20})
*/
-ClassificationUtils.getScore = function(pClassificationType, pObjectType, pObjectRowid, pClassificationGroup)
+ClassificationUtils.getScoreAsObject = function(pObjectType, pObjectRowid, pClassificationGroup)
{
- var score = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP, case when sum(score) is not null then sum(score) else 0 end")
+ var score = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID, case when sum(score) is not null then sum(score) else 0 end")
.from("CLASSIFICATIONTYPE")
.leftJoin("CLASSIFICATION", newWhere("CLASSIFICATIONTYPEID = CLASSIFICATIONTYPE_ID")
.and("CLASSIFICATION.OBJECT_TYPE", pObjectType)
.and("CLASSIFICATION.OBJECT_ROWID", pObjectRowid))
.leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCOREID")
- .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", pClassificationType)
- .andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", pClassificationGroup)
- .groupBy("CLASSIFICATIONGROUP")
- .orderBy("CLASSIFICATIONGROUP")
+ .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pObjectType)
+ .andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", pClassificationGroup)
+ .groupBy("CLASSIFICATIONGROUP_ID")
+ .orderBy("CLASSIFICATIONGROUP_ID")
.table();
var scores = {};
@@ -52,214 +81,376 @@ ClassificationUtils.getScore = function(pClassificationType, pObjectType, pObjec
}
/**
- * Get all classifications for one dataset as String.<br>
- * Each char represents one classification.<br>
+ * Gets the scores of a Object, either for all of them or only for one group (depending on the pClassificationGroupId param,
+ * if it's set you get only the score of that group)
*
- * @param {String} pClassificationType <p>
- * The classification-type (usage)<br>
- * (e.g. the key id from keyword ClassificationType)
- * @param {String} pObjectType <p>
- * The object type.<br>
- * @param {String} pObjectRowid <p>
- * The row id.<br>
-* @return {String} <p>
-* The resulting classification. (e.g. "ACB")<br>
+ * @param {String} pObjectType <p>
+ * The object type.<br>
+ * @param {String} pObjectRowid <p>
+ * The row id. (UUID of the object, e.g: OrganisationId of Organisation)<br>
+ * @param {String} pClassificationGroupId (optional) <p>
+ * The classification group id. If it is undefined,<br>
+ * the classificationScores for all groups are returned <br>
+ * as Object(-map)<br>
+ * @return {Array} <p>
+ * Returns all scores in a Array with this structure:<br>
+ *
+ * [[ID, SCORE], [ID, SCORE], [ID, SCORE]];
*/
-ClassificationUtils.getClass = function(pClassificationType, pObjectType, pObjectRowid)
+ClassificationUtils.getScore = function(pObjectType, pObjectRowid, pClassificationGroupId)
{
- var score = ClassificationUtils.getScore(pClassificationType, pObjectType, pObjectRowid);
- return Object.keys(score).map(function(classNum)
- {
- return ClassificationUtils.mapToClass(score[classNum]);
- }).join("");
+ var scoreArray = [];
+ var score = newSelect("sum(score), CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID")
+ .from("CLASSIFICATIONTYPE")
+ .leftJoin("CLASSIFICATION", newWhere("CLASSIFICATIONTYPEID = CLASSIFICATIONTYPE_ID")
+ .and("CLASSIFICATION.OBJECT_TYPE", pObjectType)
+ .and("CLASSIFICATION.OBJECT_ROWID", pObjectRowid))
+ .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCOREID")
+ .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pObjectType)
+ .andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", pClassificationGroupId)
+ .groupBy("CLASSIFICATIONGROUP_ID")
+ .orderBy("CLASSIFICATIONGROUP_ID")
+ .table();
+
+ var sorting = newSelect("distinct CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, CLASSIFICATIONGROUP.SORTING")
+ .from("CLASSIFICATIONGROUP")
+ .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+ .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pObjectType)
+ .orderBy("CLASSIFICATIONGROUP.SORTING")
+ .table();
+
+ for (var i = 0; i < sorting.length; i++)
+ {
+ for (var ii = 0; ii < score.length; ii++) {
+ if(score[ii][1] == sorting[i][0])
+ {
+ scoreArray[i] = score[ii]
+ }
+ }
+ }
+
+ return scoreArray;
}
/**
- * Get the classification for a score.<br>
- * The classes are hardcoded like this:<br>
+ * Get all classifications for one dataset as String.<br>
+ * Each char represents one classification.<br>
*
* @param {String} pScore <p>
- * The score:<br>
- * <ul>
- * <li>>=0 to 25: D</li>
- * <li>> 25 to 50: C</li>
- * <li>> 50 to 75: B</li>
- * <li>> 75 to 100: A</li>
- * <li>< 0 || > 100: _</li>
- * </ul>
+ * The archieved score
+ * @param {String} pClassificationGroupId <p>
+ * The Id of the Classification Group
* @return {String} <p>
* Returns the corresponding classification.<br>
*/
-ClassificationUtils.mapToClass = function(pScore)
+ClassificationUtils.getClassifications = function(pScore, pClassificationGroupId)
{
- if(pScore >= 0 && pScore <= 25)
- return "D";
- if(pScore > 25 && pScore <= 50)
- return "C";
- if(pScore > 50 && pScore <= 75)
- return "B";
- if(pScore > 75 && pScore <= 100)
- return "A";
-
- return "_";
-}
+ var score = pScore;
+ var classificationGroupId = pClassificationGroupId
+ var gradingTable = ClassificationUtils.getClassificationGrading(classificationGroupId);
+ var grade = "-";
+
+ for(let i = 0; i < gradingTable.length; i++)
+ {
+ if(Number(score) <= Number(gradingTable[i][0]) && score !=0 && grade == "-")
+ {
+ grade = gradingTable[i][1];
+ break;
+ }
+ }
+ return grade;
+}
/**
- * Get the lowest score for a letter.<br>
- * The classes are hardcoded like this:<br>
- * <ul>
- * <li>>=0 to 25: D</li>
- * <li>> 25 to 50: C</li>
- * <li>> 50 to 75: B</li>
- * <li>> 75 to 100: A</li>
- * </ul>
- * @param {String} pLetter <p>
- * The letter which stands for the classification.<br>
- * @return {Array} <p>
- * Points the Letter is between (min, max).<br>
+ * Gets the classification table <br>
+ *
+ * @param {String} pClassificationGroupId <p>
+ * The Classification Group
+ * @return {String} <p>
+ * Returns the corresponding classification table, ordered by the maxscore ascending.<br>
*/
-ClassificationUtils.mapClassLetter = function(pLetter)
+ClassificationUtils.getClassificationGrading = function(pClassificationGroupId)
{
- var res;
- switch (pLetter) {
- case 'A':
- res = [75,100]
- break;
- case 'B':
- res = [50, 75];
- break;
- case 'C':
- res = [25, 50];
- break;
- case 'D':
- res = [0, 25];
- break;
- }
- if(!res)
- res = false;
- return res;
+ var config = entities.createConfigForLoadingRows()
+ .entity("ClassificationGrading_entity")
+ .addParameter("ClassificationTypeId_param", pClassificationGroupId)
+ .fields(["MAXGRADEFORSCORE", "GRADING"])
+ .ignorePermissions(true);
+
+ var gradings = entities.getRows(config);
+ ArrayUtils.sortArrayOfObjects(gradings, "MAXGRADEFORSCORE", true, true);
+ gradings = gradings.map(function (row){
+ return [row["MAXGRADEFORSCORE"], row["GRADING"]];
+ });
+ return gradings;
}
+/**@cl
+ * Gets the maximum score for one group depending on the pClassificationGroupId param.
+ *
+ * @param {String} pClassificationGroupId <p>
+ * The classification groupname.<br>
+ * @return {String} <p>
+ * Returns the maximum possible score of the chosen group.<br>
+ *
+ */
+ClassificationUtils.getMaxScore = function(pClassificationGroupId)
+{
+ var sumMaxScore = 0;
+
+ var config = entities.createConfigForLoadingRows()
+ .entity("ClassificationType_entity")
+ .ignorePermissions(true)
+ .addParameter("ClassificationGroupId_param", pClassificationGroupId)
+ .fields(["maxScore"]);
+ var scores = entities.getRows(config);
+
+ for (let i = 0; i < scores.length; i++)
+ {
+ var maxScore = scores[i]["maxScore"];
+ if (maxScore)
+ sumMaxScore = eMath.addInt(sumMaxScore, parseInt(maxScore));
+ }
+
+ return sumMaxScore;
+}
/**
* Get all possible groupnames for a classificationtype.<br>
* Either as [["group", "group"]] (for the possible items process).
* Or as [["group"]].<br>
*
- * @param {String} pClassificationtype <p>
- * The classification type.<br>
- * @param {Boolean} pTwoCol <p>
- * Use two columns (for possible items process).<br>
+ * @param {String} pObjectType <p>
+ * The object type.<br>
*/
-ClassificationUtils.getAllGroups = function(pClassificationtype, pTwoCol)
+ClassificationUtils.getAllGroups = function(pObjectType)
{
var sql = new SqlBuilder()
- .select(["distinct CLASSIFICATIONGROUP", (pTwoCol ? "CLASSIFICATIONGROUP" : "")])
- .from("CLASSIFICATIONTYPE")
- .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", pClassificationtype)
- .orderBy("CLASSIFICATIONGROUP");
+ .select(["distinct CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", "CLASSIFICATIONGROUP.TITLE"])
+ .from("CLASSIFICATIONGROUP")
+ .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+ .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pObjectType)
+ .orderBy("CLASSIFICATIONGROUP.TITLE");
- if (pTwoCol)
- return sql.table();
- else
- return sql.arrayColumn();
+ return sql.table();
}
+
/**
- * Load the classification group for a classificaiton type<br>
- * id from the db.<br>
+ * Set a value for a classification type
*
- * @param {String} pClassificationtypeId <p>
- * The id of the classification type.<br>
+ * @param {String} pObjectType
+ * @param {String} pObjectId
+ * @param {String} pClassificationTypeId
+ * @param {String} pClassificationScoreId
*/
-ClassificationUtils.getGroupFromDb = function(pClassificationtypeId)
+ClassificationUtils.setClassificationValue = function(pObjectType, pObjectId, pClassificationTypeId, pClassificationScoreId)
+{
+ var newId = util.getNewUUID();
+ db.insertData("CLASSIFICATION", ["CLASSIFICATIONID", "OBJECT_TYPE", "OBJECT_ROWID", "CLASSIFICATIONTYPE_ID", "CLASSIFICATIONSCORE_ID"], null, [
+ newId,
+ pObjectType,
+ pObjectId,
+ pClassificationTypeId,
+ pClassificationScoreId,
+ ]);
+}
+
+
+/**
+ * Gets the classificationGradingTable for a classificationGroup as Array.<br>
+ * ordered by the MaxGradeForScore descending <br>
+ *
+ * @param {String} pClassificationGroupId <p>
+ * The classificationgroup you want the grading for <br>
+ *
+* @return {Array} <p>
+* The resulting gradingTable. <br>
+ */
+ClassificationUtils.getGradingTableByGroupId = function(pClassificationGroupId)
{
- return newSelect("CLASSIFICATIONGROUP")
- .from("CLASSIFICATIONTYPE")
- .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", pClassificationtypeId)
- .orderBy("CLASSIFICATIONGROUP")
- .cell();
+
+ var classificationGroupId = pClassificationGroupId;
+
+ var gradingTable = newSelect("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID, CLASSIFICATIONGRADING.MAXGRADEFORSCORE, CLASSIFICATIONGRADING.GRADING")
+ .from("CLASSIFICATIONGRADING")
+ .where("CLASSIFICATIONGRADING.CLASSIFICATIONGROUP_ID", classificationGroupId)
+ .orderBy("MAXGRADEFORSCORE desc")
+ .table()
+ return gradingTable;
}
/**
- * Update the groupname. Checks if it is already used and only updates it, if not.
- * TODO: message to the user if it failed? (or return value - bool?)
+ * Gets the classificationgroupId of a classification type as String.<br>
*
- * @param {String} pOldName <p>
- * The old name, which shall be changed.<br>
- * @param {String} pNewName <p>
- * The new name.<br>
- * @param {String} pClassificationType <p>
- * The classification type.<br>
+ * @param {String} pClassificationType <p>
+ * The classification-type (usage)<br>
+ * (e.g. the key id from keyword ClassificationType)
+* @return {String} <p>
+* The classificationgroupId of the chosen classificationtype<br>
*/
-ClassificationUtils.changeGroupName = function(pOldName, pNewName, pClassificationType)
+ClassificationUtils.getClassificationGroup = function(pClassificationType)
{
- var groups = ClassificationUtils.getAllGroups(pClassificationType, false)
-
- if (groups.indexOf(pNewName, 0) == -1)
- {
- newWhere("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", pOldName)
- .updateData(true, "CLASSIFICATIONTYPE", ["CLASSIFICATIONGROUP"], null, [pNewName]);
- }
+ var classificationGroupId = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID")
+ .from("CLASSIFICATIONTYPE")
+ .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", pClassificationType)
+ .groupBy("CLASSIFICATIONGROUP_ID")
+ .cell()
+ return classificationGroupId;
+}
+
+/**
+ * Get all classification type ids for a score using it's unique classification score id.<br>
+ *
+ * @param {String} pClassificationScoreId <p>
+ * The classification score id
+* @return {String} <p>
+* The resulting classification type.<br>
+ */
+ClassificationUtils.getClassificationType = function(pClassificationScoreId)
+{
+ var classificationType = newSelect("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID")
+ .from("CLASSIFICATIONSCORE")
+ .where("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", pClassificationScoreId)
+ .arrayColumn();
+ return classificationType;
}
/**
- * Get the classificationType for the current classification (either vom parameter or selection-variable)
+ * Gets the Grading of a score for a group using an object that contains all the gradings.<br>
*
- * @param {String} pParamField <p>
- * The parameter field name. (e.g.: "$param.ClassificationType_param")<br>
- * @param {String} pSelectionField <p>
- * The parameter field name. (e.g.: "$sys.selectionRows")<br>
- * @return {String} <p>
- * The type (or undefined).<br>
+ * @param {String} pGradingObject <p>
+ * The classification grading object
+ * @param {String} pGroupId <p>
+ * The classification group id
+ * @param {String} pScore <p>
+ * The score
+* @return {String} <p>
+* The resulting classification grading.<br>
*/
-ClassificationUtils.getUsageType = function(pParamField, pSelectionField)
+ClassificationUtils.getGradingFromObject = function(pGradingObject, pGroupId, pScore)
{
- if (vars.exists(pParamField) && vars.get(pParamField))
- classificationType = vars.get(pParamField);
- else if (vars.exists(pSelectionField) && vars.get(pSelectionField))
+ var gradingObject = pGradingObject;
+ var groupId = pGroupId;
+ var score = pScore;
+ var grading = "-";
+ for (var index in gradingObject[groupId])
{
- var selection = vars.get(pSelectionField);
- if (selection.length > 0 && selection[0]["CLASSIFICATIONTYPE"])
+ if(Number(score) <= Number(gradingObject[groupId][index][0]) && score != 0)
{
- classificationType = selection[0]["CLASSIFICATIONTYPE"];
+ grading = gradingObject[groupId][index][1];
+ break;
}
}
-
- return classificationType;
+ return grading;
}
/**
- * Update the coreName of a type.<br>
+ * Inserts a empty classification data set into Classificationstorage, since every dataset of a classifiable module has to have an entry
+ * because the updateClassifications_serverProcess is only updating instead of inserting.<br>
*
- * @param {String} pNewScoreName <p>
- * The new score name.<br>
- * @param {String} pClassificationTypeId <p>
- * The id of the classification type.<br>
+ * @param {String|Array} pUids <p/>The unique uid('s) of the inserted record, string for one element, array for several elements
+ * @param {String} pObjectType <p>contextId for the passed uids that shall be initialized
*/
-ClassificationUtils.changeScoreName = function(pNewScoreName, pClassificationTypeId)
+ClassificationUtils.insertEmptyClassification = function(pUids, pObjectType)
{
- newWhere("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", pClassificationTypeId)
- .updateData(true, "CLASSIFICATIONTYPE", ["SCORETYPE"], null, [pNewScoreName]);
+ var classificationCount = newSelect("count(distinct CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID)")
+ .from("CLASSIFICATIONTYPE")
+ .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pObjectType)
+ .cell();
+ var classificationvalue = "-".repeat(classificationCount);
+
+ if(Utils.isString(pUids))
+ pUids = [pUids];
+
+ var columns = ["CLASSIFICATIONSTORAGEID",
+ "CLASSIFICATIONVALUE",
+ "OBJECT_ROWID",
+ "OBJECT_TYPE"
+ ];
+ var types = db.getColumnTypes("CLASSIFICATIONSTORAGE", columns);
+ var inserts = [];
+ var values;
+ for (var i = 0; i < pUids.length; i++)
+ {
+ values = [util.getNewUUID(),
+ classificationvalue,
+ pUids[i],
+ pObjectType];
+ inserts.push(["CLASSIFICATIONSTORAGE", columns, types, values]);
+ }
+ db.inserts(inserts);
}
/**
- * Set a value for a classification type
+ * Gets the maximum score for one group depending on the pClassificationGroupId param.
*
- * @param {String} pObjectType
- * @param {String} pObjectId
- * @param {String} pClassificationTypeId
- * @param {String} pClassificationScoreId
+ * @param {String} pClassificationGroupId <p>
+ * The classification groupname.<br>
+ * @param {String} pClassificationType <p>
+ * The classification type id.<br>
+ * @return {String} <p>
+ * Returns the maximum possible score of the chosen group.<br>
+ *
*/
-ClassificationUtils.setClassificationValue = function(pObjectType, pObjectId, pClassificationTypeId, pClassificationScoreId)
-{
- var newId = util.getNewUUID();
- db.insertData("CLASSIFICATION", ["CLASSIFICATIONID", "OBJECT_TYPE", "OBJECT_ROWID", "CLASSIFICATIONTYPE_ID", "CLASSIFICATIONSCORE_ID"], null, [
- newId,
- pObjectType,
- pObjectId,
- pClassificationTypeId,
- pClassificationScoreId,
- ]);
+ClassificationUtils.getMaxScoreExcludeType = function(pClassificationGroupId, pClassificationType)
+{
+ var classificationGroupId = pClassificationGroupId;
+ var classificationType = pClassificationType;
+ var maxScore = 0;
+ scores = newSelect("max(CLASSIFICATIONSCORE.SCORE)")
+ .from("CLASSIFICATIONTYPE")
+ .join("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
+ .where("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", classificationGroupId)
+ .and("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationType, SqlBuilder.NOT_EQUAL())
+ .groupBy("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
+ .arrayColumn();
+
+ for (let i = 0; i < scores.length; i++)
+ maxScore = eMath.addInt(maxScore, parseInt(scores[i]));
+
+ return maxScore;
}
+
+/**
+ * decodes a string that was encoded with AttributeSearchNameCoder.encode
+ *
+ *
+ * @param {String} pEncodedString <p/> string that shall be decoded; the origin of the name has to be a filter-object
+ *
+ * @return {Object} <p/> an object that contains all keys and values that have been encoded with AttributeSearchNameCoder.encode
+ * @static
+ */
+ClassificationUtils.decode = function (pEncodedString)
+{
+ var value = pEncodedString;
+ if(value == undefined)
+ res = $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE;
+ else if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
+ res = $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP();
+ else
+ {
+ var decodedIdvalues = text.decodeMS(value);
+ if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
+ res = $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE();
+ }
+ if(res)
+ result.string(res);
+ return res
+};
+
+/*this is right now (2020-08-15) the only way to get something like a constant with
+ - a prober name
+ - autocomplete support within the ADITO Designer
+ - and proper packageing all constants together
+This may change in the future, if there is something better feel free to improve this */
+function $ClassificationRecordCategories(){}
+$ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE = function(){return "ClassificationObject_Type"};
+$ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP = function(){return "ClassificationGroup"};
+$ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE = function(){return "ClassificationType"};
+$ClassificationRecordCategories.CLASSIFICATION_GROUP_EXISTS = function(){return "ClassificationGroupExists"};
+$ClassificationRecordCategories.CLASSIFICATION_GROUP_DOESNT_EXIST = function(){return "ClassificationGroupDoesntExist"};
+
+function $ClassificationPlaceholder(){}
+$ClassificationPlaceholder.TOPSECRETPLACEHOLDER = function(){return "T0PS3CR3TPL4CEH0LD3R"};
\ No newline at end of file
diff --git a/process/Communication_lib/process.js b/process/Communication_lib/process.js
index c9f1422579317ca168f8bd4c641258a9143fcba1..055813cf362081fd583c1d8d2cd33fb0b4c0c4c4 100644
--- a/process/Communication_lib/process.js
+++ b/process/Communication_lib/process.js
@@ -70,14 +70,13 @@ CommUtil.setStandardForCategory = function(pAffectedRowId, pNewStandardCommId, p
var statements = [];
var cols = ["ISSTANDARD"];
- var types = db.getColumnTypes("COMMUNICATION", cols);
//set current standard comm-record as non-standard
var cond = newWhere("ISSTANDARD = 1")
.and("COMMUNICATION.CONTACT_ID", pAffectedRowId)
.and("COMMUNICATION.MEDIUM_ID", mediumIds, SqlBuilder.IN());
- statements.push(["COMMUNICATION", cols, types, ["0"], cond.build()]);
+ statements.push(["COMMUNICATION", cols, null, ["0"], cond.build()]);
//pNewStandardCommId can be an empty string if the standard has to only be removed
if (pNewStandardCommId != "")
@@ -88,7 +87,7 @@ CommUtil.setStandardForCategory = function(pAffectedRowId, pNewStandardCommId, p
.and("COMMUNICATION.CONTACT_ID", pAffectedRowId)
.and("COMMUNICATION.MEDIUM_ID", mediumIds, SqlBuilder.IN());
- statements.push(["COMMUNICATION", cols, types, ["1"], cond.build()]);
+ statements.push(["COMMUNICATION", cols, null, ["1"], cond.build()]);
}
count = db.updates(statements);
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 83ad817a1b9487b240e512d26d127e7f2b6a74e8..2c8d2229d6ed3b2beba6e7db64b2d2d48c4eea31 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -401,7 +401,7 @@ ContextSelector.prototype.getSubContexts = function(pParentRowId)
if (this.subContexts)
{
var sqls = {};
- for (contextId in this.subContexts)
+ for (let contextId in this.subContexts)
{
// Copy the builder to prevent modifying the builder in this.subContexts
var select = this.subContexts[contextId][0].copy();
@@ -593,20 +593,6 @@ ContextUtils.getSelectMap = function()
$KeywordRegistry.taskStatus$customerChecks(),
])
.setCreationDateField("TASK.START_DATE")
- ,"SupportTicket": ContextSelector.create("TICKET", "TICKETID", "TASK.SUBJECT")
- .setJoinExpression("left join TASK on TASK.TASKID = TICKET.TASK_ID left join TASKLINK on TASKLINK.TASK_ID = TASK.TASKID")
- .setCondition(newWhere("TICKET.TICKETTYPE", $KeywordRegistry.ticketType$supportTicket()))
- .setContactIdField("TASKLINK.OBJECT_ROWID")
- .setStateField("TASK.STATUS")
- .setActiveStates([
- $KeywordRegistry.taskStatus$new(),
- $KeywordRegistry.taskStatus$unassigned(),
- $KeywordRegistry.taskStatus$assigned(),
- $KeywordRegistry.taskStatus$inProgress(),
- $KeywordRegistry.taskStatus$waiting(),
- $KeywordRegistry.taskStatus$customerChecks(),
- ])
- .setCreationDateField("TASK.START_DATE")
,"BulkMail" : ContextSelector.create("BULKMAIL", "BULKMAILID", "NAME")
,"SerialLetter" : ContextSelector.create("SERIALLETTER", "SERIALLETTERID", "TITLE")
,"Leadimport": ContextSelector.create("LEADIMPORT", "LEADIMPORTID")
@@ -646,7 +632,7 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
return newSelect(selectMap[pContextId].titleExpression)
.from(selectMap[pContextId].getFullFromClause())
.whereIfSet(selectMap[pContextId].getFullIdField(), pRowId)
- .build("1=2");
+ .build(SqlBuilder.NORESULT_CONDITION());
}
else
return "select 1 from person where 1=2";
diff --git a/process/CountryInfoData_lib/process.js b/process/CountryInfoData_lib/process.js
index dbd7ab94a65f4e6544ed0169000a73664548ce86..d071f7d6016513c1aa96e57e17c7c32399f3080c 100644
--- a/process/CountryInfoData_lib/process.js
+++ b/process/CountryInfoData_lib/process.js
@@ -1,38 +1,42 @@
import("system.entities");
import("system.translate");
-import("system.db");
-import("DataCaching_lib");
-import("Sql_lib");
-
-/*
-This is a experimental library.
-The code will definetly change in the future while not keeping the same functionparameters and calls. You should not use this except you excatly know what you're doing.
-Since the functions will change, comments are written for the future functions.
-
-The idea behind this is to maintain data in cached form (client-context-side)) for various keyword-constructs.
-*/
+/**
+ * provides functions for retrieving common forms of countrydata
+ * Do not create an instance of this!
+ *
+ * @class
+ * @static
+ */
function CountryInfoData(){}
-CountryInfoData.getMainData = function (pLocale)
-{
- var cache = new CachedData("CountryInfoData.getMainData", true, pLocale);
- return cache.load(function (pTranslationNecessary, pLocale){
- var loadingConfig = entities.createConfigForLoadingRows().entity("Countries_Entity").fields(["ISO2", "NAME_TRANSLATED"]);//TODO: into cachedDatalib
- var countryData = entities.getRows(loadingConfig);//TODO: ignore grants?
- return countryData;
- });
-};
-
+/**
+* loads the ISO2 code and name of the countries_entity
+*
+* @param {String} [pLocale=current language] <p/>specifies the locale for translating the name, if not given the locale of the current image-context
+* (server or client) is used
+*
+* @return {Array} 2D array where each row is an array of: [<<iso2-code>>, <<country-name>>]
+*
+*/
CountryInfoData.getIso2NameData = function (pLocale)
{
- var cache = new CachedData("CountryInfoData.getIso2NameData", true, pLocale);
- return cache.load(function (pTranslationNecessary, pLocale){
- var countryData = CountryInfoData.getMainData(pLocale);
- countryData = countryData.map(function (row){
- return [row["ISO2"], row["NAME_TRANSLATED"]];
- });
- return countryData;
+ var fieldsToLoad = ["ISO2"];
+ if (pLocale)
+ fieldsToLoad.push("NAME");
+ else
+ fieldsToLoad.push("NAME_TRANSLATED");
+
+ var loadingConfig = entities.createConfigForLoadingRows()
+ .ignorePermissions(true)
+ .entity("Countries_Entity")//default record container is cached
+ .fields(fieldsToLoad);
+ var countryData = entities.getRows(loadingConfig);
+
+ var res = countryData.map(function (entityRow){
+ var name = pLocale ? translate.text(entityRow["NAME"], pLocale) : entityRow["NAME_TRANSLATED"];
+ return [entityRow["ISO2"], name];
});
+ return res;
};
-
+
\ No newline at end of file
diff --git a/process/CountryInfo_lib/process.js b/process/CountryInfo_lib/process.js
index 999d00d5d2021c5e16d9550d0a9493e5343bd83e..2db23f676ca40081d6ee0fa6d5d682ab6ab486cd 100644
--- a/process/CountryInfo_lib/process.js
+++ b/process/CountryInfo_lib/process.js
@@ -34,8 +34,6 @@ CountryUtils.getLatinNameByIso2 = function(pIso2, pLocale)
return countryName;
};
-//SqlUtils.getResolvingCaseWhen(keywordData, pDbFieldName, pLocale);
-
/**
* resolves ISO2 codes of countries to the translated name
*
diff --git a/process/CreateActivity_workflowService/serviceTaskParameterProcess.js b/process/CreateActivity_workflowService/serviceTaskParameterProcess.js
index 65519e25d8c8029aceff507a1913031e3f764402..3760d48ad7a642697ea1c5fce527e5d3a669f53f 100644
--- a/process/CreateActivity_workflowService/serviceTaskParameterProcess.js
+++ b/process/CreateActivity_workflowService/serviceTaskParameterProcess.js
@@ -25,7 +25,7 @@ result.object([
new WorkflowServiceTaskParameter("activityResponsible", "Responsible", WorkflowServiceTaskParameter.ENUM(), users),
new WorkflowServiceTaskParameter("activityDirection", "Direction", WorkflowServiceTaskParameter.ENUM(), _getKeywords($KeywordRegistry.activityDirection())),
new WorkflowServiceTaskParameter("activityCategory", "Category", WorkflowServiceTaskParameter.ENUM(), _getKeywords($KeywordRegistry.activityCategory())),
- new WorkflowServiceTaskParameter("activityEntryDate", "Entry date", WorkflowServiceTaskParameter.DATE()),
+ new WorkflowServiceTaskParameter("activityEntryDate", "Date", WorkflowServiceTaskParameter.DATE()),
new WorkflowServiceTaskParameter("activityContent", "Content", WorkflowServiceTaskParameter.STRING()),
new WorkflowServiceTaskParameter("activityTitle", "Title", WorkflowServiceTaskParameter.STRING())
]);
diff --git a/process/DataPrivacy_lib/process.js b/process/DataPrivacy_lib/process.js
index 2072800d57a9bd07337d6bb3c1314da94e09dfee..da986784dd28531ee4e18bfb071b17937fc31e4f 100644
--- a/process/DataPrivacy_lib/process.js
+++ b/process/DataPrivacy_lib/process.js
@@ -357,7 +357,7 @@ DataPrivacyUtils.collectAll = function(pContactId, pFilterCond)
var currentUser = vars.getString("$sys.user");
var now = vars.getString("$sys.date");
- for (dsgvotype in DataPrivacyType.get())
+ for (let dsgvotype in DataPrivacyType.get())
{
// get dsgvotype object for current dsgvotype
var dsgvotype = DataPrivacyType.get(dsgvotype);
@@ -373,7 +373,7 @@ DataPrivacyUtils.collectAll = function(pContactId, pFilterCond)
return;
// search if it is already in DSGVO table
var found = false;
- for (dat in contactDSGVO)
+ for (let dat in contactDSGVO)
{
if (contactDSGVO[dat][2].trim() == dsgvotype.key && contactDSGVO[dat][3] == pRow.id)
{
@@ -564,7 +564,7 @@ DataPrivacyUtils.openReport = function(pContactId, pReportName, pDSGVOInfo, pLoc
{
neon.openContext("DSGVOReport", "DSGVOReport_view", [], neon.OPERATINGSTATE_VIEW, {
"param.ReportName_param": pReportName,
- "param.ContactID_param": pContactId,
+ "param.ContactId_param": pContactId,
"param.DSGVOInfo_param": JSON.stringify(pDSGVOInfo)
});
}
diff --git a/process/Date_lib/process.js b/process/Date_lib/process.js
index 998f823f49c227b6f178a3de4261e386b4343c74..bb454d912a881007811c2ddc2badc19bfd5612fd 100644
--- a/process/Date_lib/process.js
+++ b/process/Date_lib/process.js
@@ -170,6 +170,75 @@ DateUtils.getCurrentYear = function ()
}
+
+/**
+ * Provides methods for interactions with time
+ * Do not create an instance of this
+ *
+ * @class
+ */
+function TimeUtils() {}
+
+/**
+ * Validates if a given string is a valid time representation
+ *
+ * @param pTime {String}
+ *
+ * @result {Boolean} True if pTime has the format "HH:mm"
+ */
+TimeUtils.validateTimeFormat = function(pTime)
+{
+ const expr = /^\d{2}:\d{2}$/;
+
+ return expr.test(pTime);
+}
+
+/**
+ * Validates if a given value is a valid hour representation
+ *
+ * @param pHours {String|Number}
+ *
+ * @result {Boolean} True if value is between 0 and 23
+ */
+TimeUtils.validateHours = function(pHours)
+{
+ let hours = pHours;
+
+ if (typeof pHours === 'string' || pHours instanceof String) {
+ if(isNaN(parseFloat(pHours)) || !isFinite(pHours)) {
+ return false;
+ }
+
+ hours = parseInt(pHours);
+ }
+
+ return hours >= 0 && hours < 24;
+}
+
+/**
+ * Validates if a given value is a valid minute representation
+ *
+ * @param pMinutes {String|Number}
+ *
+ * @result {Boolean} True if value is between 0 and 59
+ */
+TimeUtils.validateMinutes = function(pMinutes)
+{
+ let minutes = pMinutes;
+
+ if (typeof pMinutes === 'string' || pMinutes instanceof String) {
+ if(isNaN(parseFloat(pMinutes)) || !isFinite(pMinutes)) {
+ return false;
+ }
+
+ minutes = parseInt(pMinutes);
+ }
+
+ return minutes >= 0 && minutes < 60;
+}
+
+
+
/**
* Object for handling durations. It consists of months (a year = 12 months), days and milliseconds. Because hours, minutes and seconds have fixed
* lengths, these are all added to the milliseconds part, but months can have different amounts of days, so they are stored separately.
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index 4ced5f9f03a66cdd93fd5b3836ab474107fa8017..9d6c7fd07c3c38edd2ca29a196b7ed2ea00fddbf 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -550,7 +550,7 @@ DocumentTemplate.prototype.getReplacedEmailsByContactIds = function (pContactIds
this.setOptions({base64 : isEML});
var emailContents = this.getReplacedContentByContactIds(pContactIds, pAdditionalPlaceholders);
- for (contactId in emailContents)
+ for (let contactId in emailContents)
{
if (isEML)
{
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index ed3ef2cce6bc01136003468b6c39ac2781c38cd4..cd84a6b26488dc1d96b6c3c83e459184fcaeaf24 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -349,7 +349,7 @@ DuplicateScannerUtils.ScanRecords = function(pTargetEntity, pTargetRecordsData,
//First it gets checked if the current id has already been identified. If that's the case it'll continue with the next.
//Otherwise an object gets build in the form of ["FilterFieldName" = "FilterFieldValueFromQuery"] with which a scan for possible duplicates get's started
var duplicatesToInsertQueries = [];
- for (b = 0; b < pTargetRecordsData.length; b++)
+ for (let b = 0; b < pTargetRecordsData.length; b++)
{
let entityFieldValuesRay = DuplicateScannerUtils.BuildEntityFieldConfigValueRays(pEntityFieldConfigs, pTargetRecordsData[b]);
@@ -748,9 +748,9 @@ DuplicateScannerUtils.BuildEntityFieldConfigValueRays = function(pDuplicateField
* an array which contains records in the style of ["FilterFieldName", "FilterFieldValueFromQuery"] gets created.
* This is mandatory to run the scan for this record.
*/
- for (a = 0; a < pDuplicateFieldsConfig.length; a++)
+ for (let i = 0; i < pDuplicateFieldsConfig.length; i++)
{
- let fieldConfig = JSON.parse("{" + pDuplicateFieldsConfig[a] + "}");
+ let fieldConfig = JSON.parse("{" + pDuplicateFieldsConfig[i] + "}");
let entityField = fieldConfig.entityfield;
let entityFieldValue = pTargetRecordData[entityField];
if(entityFieldValue == null)
@@ -777,7 +777,7 @@ DuplicateScannerUtils.BuildEntityFieldConfigValueRays = function(pDuplicateField
entityFieldValue = "*";
entityFieldValue = entityFieldValue.trim();
- entityFieldConfigValuesRay.push([pDuplicateFieldsConfig[a], entityFieldValue]);
+ entityFieldConfigValuesRay.push([pDuplicateFieldsConfig[i], entityFieldValue]);
}
return entityFieldConfigValuesRay.length > 0 ? entityFieldConfigValuesRay : [["", ""]];
}
@@ -859,7 +859,7 @@ function _DuplicateScannerUtils() {}
_DuplicateScannerUtils._loadEntityFieldsFromFieldConfigs = function(pEntityFieldConfigs)
{
let fieldNames = [];
- for (i = 0; i < pEntityFieldConfigs.length; i++)
+ for (let i = 0; i < pEntityFieldConfigs.length; i++)
{
let fieldConfig = JSON.parse("{" + pEntityFieldConfigs[i] + "}");
let entityField = fieldConfig.entityfield;
@@ -883,15 +883,58 @@ _DuplicateScannerUtils._buildUpdateResetStandardCommunications = function(pSourc
*/
_DuplicateScannerUtils._loadIndexPattern = function(pScannerName, pTargetEntity)
{
- let scanPattern = newSelect("SCAN_PATTERN")
+ let scanPattern = _DuplicateScannerUtils._filterToScanPattern( newSelect("SCAN_PATTERN")
.from("DUPLICATESCANNER")
.where("DUPLICATESCANNER.FILTER_NAME", pScannerName)
.and("DUPLICATESCANNER.ENTITY_TO_SCAN_NAME", pTargetEntity)
- .cell();
+ .cell());
scanPattern = scanPattern.trim();
return scanPattern;
}
+
+_DuplicateScannerUtils._filterToScanPattern = function(filterString) {
+ if (filterString == "")
+ return "";
+ try
+ {
+ var filter = JSON.parse(filterString);
+ }
+ catch (err)
+ {
+ return "";
+ }
+ return _DuplicateScannerUtils._filterChildsToScanPattern(filter.filter.childs, filter.filter.operator);
+}
+
+_DuplicateScannerUtils._filterChildsToScanPattern = function(childs, operator) {
+ let group = "";
+ for (let i = 0; i < childs.length; i++) {
+ if (group != ""){
+ group = group + " " + operator+ " ";
+ }
+ if (childs[i].type == "row"){
+ group = group + _DuplicateScannerUtils._filterChildsRowToScanPattern(childs[i].name, childs[i].operator, childs[i].value);
+ } else if (childs[i].type == "group") {
+ group = group + "(" + _DuplicateScannerUtils._filterChildsToScanPattern(childs[i].childs, childs[i].operator) + ")";
+ }
+ }
+ return group;
+}
+
+_DuplicateScannerUtils._filterChildsRowToScanPattern = function (name, operator, value) {
+ let row = "";
+ row = row + name.toLowerCase() + ':({"entityfield":"' + name + '"';
+ switch (operator){
+ case 'NOT_EQUAL':
+ row = row + ', "exclude":' + JSON.parse(value);
+ case 'ISNOTNULL':
+ row = row + ', "empty":' + false;
+ }
+ row = row + '})';
+ return row;
+}
+
_DuplicateScannerUtils._loadEntityFieldConfigsFromPattern = function(indexPattern)
{
return indexPattern.match(/[^{}]+(?=\})/g);
@@ -980,7 +1023,7 @@ _DuplicateScannerUtils._isUseExternalWebservice = function(pFilterName, pTargetE
*/
_DuplicateScannerUtils._callIndexSearch = function(pTargetEntity, pIndexPatternWithValues, pIdFilter, pResultFields, pResultSetRows)
{
- logging.log(pIndexPatternWithValues)
+ //logging.log(pIndexPatternWithValues)
//The indexPattern can't be null because it is required to run the search.
if(pIndexPatternWithValues == null || pIndexPatternWithValues == "")
return null;
@@ -1062,7 +1105,7 @@ _DuplicateScannerUtils._createInsertDuplicatesClusterQuery = function (pDuplicat
if(pClusterId == undefined || pClusterId == null || pClusterId == "")
pClusterId = util.getNewUUID();
- for (i = 0; i < pDuplicatesRay.length; i++)
+ for (let i = 0; i < pDuplicatesRay.length; i++)
{
let newId = util.getNewUUID();
let valuesToInsert = [newId, pClusterId, pDuplicatesRay[i], pTargetEntity];
diff --git a/process/EmailUtil_lib/process.js b/process/EmailUtil_lib/process.js
index 8e1269bf616fa353c04235520f88279cba7a9996..c0e72cad976ae925f3bf5c38284d2206c1cf044c 100644
--- a/process/EmailUtil_lib/process.js
+++ b/process/EmailUtil_lib/process.js
@@ -20,6 +20,8 @@ EmailUtils.extractAddress = function (pFullMailAddress)
{
//special treatment for crazy illegal addresses which can be sent in Outlook
var mailAddress = pFullMailAddress.replace("<'", "<").replace("'>", ">").replace(/^'|'$/g, "");
- mailAddress = mail.extractAddress(mailAddress);
+ //in some strange cases this address may be suddenly empty after the replaces => extractAddress would raise an exception in these cases
+ if (mailAddress != "")
+ mailAddress = mail.extractAddress(mailAddress);
return mailAddress;
};
\ No newline at end of file
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index a8645c40d5c729a1546a105048f48020e1369931..0a29f110ada7eebcdb36af5aaf40e2bd35a55994 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -28,6 +28,7 @@ function EmailWritingUtils () {}
* @param {Array} [pAttachments] attachments in a array (base64 encoded).
* @param {String} pSubject an optional subject.
* @param {String} [pEmailFilename] filename of the email.
+ * @param {Placeholder[]} [pAdditionalPlaceholders] additional placeholders
* @return {Array} the eml document as array with [filename, base64]
*/
EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId, pTemplateId, pRecipientContactId, pBindata, pAttachments, pSubject, pEmailFilename, pAdditionalPlaceholders)
@@ -67,6 +68,8 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
return email.downloadEML(pEmailFilename);
}
+
+
/**
* opens a view where a new mail can be sent. In the view the use CAN select a DocumentTemplate if needed
*
@@ -77,8 +80,9 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
* @param {String} pComingFrom source from where you started (e.g. "Person", "Organisation" )
* @param {String} pEmailFilename optional file name of the email.
* @param {String} [pAdditionalPlaceholders] additional placeholders for the email
+ * @param {Array[]} [pUpdateStatements] an array with update statements which will be executed after email is downloaded/sent.
*/
-EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders)
+EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pUpdateStatements)
{
var params = {
"ContactId_param" : pToContactId,
@@ -86,7 +90,8 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComing
"ComingFrom_param" : pComingFrom,
"NotificationMsg_param" : pNotificationMsg,
"EmailFilename" : pEmailFilename,
- "AdditionalPlaceholders_param" : JSON.stringify(pAdditionalPlaceholders)
+ "AdditionalPlaceholders_param" : JSON.stringify(pAdditionalPlaceholders),
+ "UpdateStatements_param" : JSON.stringify(pUpdateStatements)
};
if (pToEmailAddress)
@@ -95,6 +100,7 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComing
neon.openContext("Email", "EmailEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
}
+
EmailWritingUtils.getMailbridgeAddress = function ()
{
return "mailbridge@domain.local"; //TODO: not hardcoded
@@ -110,14 +116,22 @@ EmailWritingUtils.getMailbridgeAddress = function ()
* @param {String} pNotificationMsg message which will be shown after the operation is done.
* @param {String} pEmailFilename optional file name of the email.
* @param {String} [pAdditionalPlaceholders] additional placeholders for the email
+ * @param {String} [pOfferId] optional needed for the offerEmails, to change the status of the offer
* Report have to be a object with these attrs: content (base64 encoded report), contentType (mimeType of the report), filename (complete filename with filending)
*/
-EmailWritingUtils.sendReportAsMail = function (pRecipient, pReportArray, pComingFrom, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders)
+EmailWritingUtils.sendReportAsMail = function (pRecipient, pReportArray, pComingFrom, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId)
{
- var pRecpientEmail = newSelect("COMMUNICATION.ADDR").from("COMMUNICATION")
- .where("COMMUNICATION.CONTACT_ID", pRecipient).and("COMMUNICATION.MEDIUM_ID", "COMMEMAIL").cell();
-
- EmailWritingUtils.openNewMail(pRecipient, pRecpientEmail, pComingFrom, pReportArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders);
+ var pRecpientEmail;
+
+ if (pRecipient)
+ {
+ pRecpientEmail = newSelect("COMMUNICATION.ADDR").from("COMMUNICATION")
+ .where("COMMUNICATION.CONTACT_ID", pRecipient).and("COMMUNICATION.MEDIUM_ID", "COMMEMAIL").cell();
+ } else{
+ pRecpientEmail = null;
+ }
+
+ EmailWritingUtils.openNewMail(pRecipient, pRecpientEmail, pComingFrom, pReportArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId);
}
/**
@@ -169,6 +183,7 @@ Email.fromRFC = function (pBase64RFC)
* @param {String} [pTemplateId] UUID of the explicit template which shall used. (optional)
* @param {String} [pContactId] (required)
* @param {String} [pBindata] (required)
+ * @param {Placeholder[]} [pAdditionalPlaceholders] additional placeholders
* @return {Email} a new Email object
*/
Email.fromTemplate = function (pTemplateId, pContactId, pBindata, pAdditionalPlaceholders)
diff --git a/process/Employee_lib/process.js b/process/Employee_lib/process.js
index ee52c6b5765c167394862422b32125255a076a40..08e721040c3f40476757133d2b7d449f2f132c9f 100644
--- a/process/Employee_lib/process.js
+++ b/process/Employee_lib/process.js
@@ -1,7 +1,8 @@
+import("system.tools");
import("system.vars");
import("system.db");
+import("Attribute_lib");
import("Sql_lib");
-import("system.tools");
/**
* Provides functions for employees and users.j
@@ -149,4 +150,24 @@ EmployeeUtils.isUser = function (pContactId)
EmployeeUtils.getUserByContactId = function (pContactId)
{
return tools.getUserByAttribute(tools.CONTACTID, pContactId);
+}
+
+/**
+ * Returns users department as corresponding attribute id.
+ *
+ * @param {String} pContactId the contactId from the employee, from which you want the department back.
+ * @param {String} pDepartmentAsDisplayable the department as displayable value.
+ * @return {String} the department as corresponding attribute id or as displayable departmentname (e.g.: "Marketing", "Human Ressources").
+ */
+EmployeeUtils.getUsersDepartment = function(pContactId, pDepartmentAsDisplayable){
+
+ var user = tools.getUsersByAttribute(tools.CONTACTID, [pContactId]);
+ var department = user[0][tools.PARAMS].department;
+
+ if (pDepartmentAsDisplayable)
+ {
+ department = AttributeUtil.getSimpleAttributeName(department, true)
+ }
+
+ return department;
}
\ No newline at end of file
diff --git a/process/Entity_lib/process.js b/process/Entity_lib/process.js
index 81364bced0d0a03ea8e6ffda671553848672633d..afdfbfaa023b96d119e17ac92fa64920562076db 100644
--- a/process/Entity_lib/process.js
+++ b/process/Entity_lib/process.js
@@ -30,6 +30,67 @@ EntityUtils.parseUidColumn = function(pFullUidName)
};
};
+
+/**
+* provides static methods for handling of entity parameters
+* do not create an instance of this
+*
+* @class
+*/
+function ParameterUtils(){}
+
+/**
+ * will check if a parameter exists and if it is not empty (null, undefined, emtpy string) a callback function is called </br>
+ * this is usefull for simple checks of a single parameter
+ *
+ * @param {String} pParameterName <p>Full name of the paramter that is handled
+ * @param {function} pCallbackFn <p>a callback function that is called when the parameter is staded okay</br>
+ * The following parameters are passed to the function:
+ * <ul>
+ * <li>String:parameter value</li>
+ * <li>String:parameter name</li>
+ * </ul>
+ * The this-reference is null
+ *
+ * @return {Object} returns null if the parameter was empty or does not exist, otherwise the return-value of the callback-function is returned
+ */
+ParameterUtils.handleNotEmptyEntityParam = function(pParameterName, pCallbackFn)
+{
+ if (vars.exists(pParameterName))
+ {
+ var paramValue = vars.get(pParameterName);
+ if (paramValue != null && paramValue != "")
+ return pCallbackFn.call(null, paramValue, pParameterName);
+ }
+ return null;
+};
+
+
+/**
+ * will check if a parameter exists and calls a given callback function </br>
+ * this is usefull for simple checks of a single parameter
+ *
+ * @param {String} pParameterName <p>Full name of the paramter that is handled
+ * @param {function} pCallbackFn <p>a callback function that is called when the parameter is staded okay</br>
+ * The following parameters are passed to the function:
+ * <ul>
+ * <li>String:parameter value</li>
+ * <li>String:parameter name</li>
+ * </ul>
+ * The this-reference is null
+ *
+ * @return {Object} returns null if the parameter does not exist, otherwise the return-value of the callback-function is returned
+ */
+ParameterUtils.handleAnyEntityParam = function(pParameterName, pCallbackFn)
+{
+ if (vars.exists(pParameterName))
+ {
+ var paramValue = vars.get(pParameterName);
+ return pCallbackFn.call(null, paramValue, pParameterName);
+ }
+ return null;
+};
+
/**
* provides static methods for special handling of entities in JDito-Processes
* do not create an instance of this
@@ -233,7 +294,7 @@ HasLinkedObjectTester._testForConsumer = function ()
*/
HasLinkedObjectTester._testForCallback = function ()
{
- fnResult = this.callbackFn();
+ var fnResult = this.callbackFn();
return this.failValue
? fnResult != this.failValue
: fnResult;
diff --git a/process/EwsClient_lib/process.js b/process/EwsClient_lib/process.js
index 41e53a9c9a5c655caa888aedc765eaaef4535c98..2de3addde44d76ac3ad80c4f264e837fc6d90e45 100644
--- a/process/EwsClient_lib/process.js
+++ b/process/EwsClient_lib/process.js
@@ -290,10 +290,8 @@ EwsClientCalendarPermissionUtils.writePermissions = function(pExchangeAliasName)
var dbChangeUser = "server";//vars.get("$sys.user") does not work on the serverside (executing from the manager) //todo: check if this is a bug
var updateCalCols = new Array("USER_EDIT", "DATE_EDIT", "PERMISSION");
- var updateCalTypes = db.getColumnTypes("AB_PERMISSIONCALENDAR", updateCalCols);
var insertCalCols = new Array("AB_PERMISSIONCALENDARID", "DATE_NEW","USER_NEW",
"PERMISSIONPROCURER_ROWID", "PERMISSIONPROCURER_TYPE", "PERMISSIONDEALER_ROWID", "PERMISSIONDEALER_TYPE", "PERMISSION");
- var insertCalTypes = db.getColumnTypes("AB_PERMISSIONCALENDAR", insertCalCols);
var vals;
var right;
@@ -332,14 +330,14 @@ EwsClientCalendarPermissionUtils.writePermissions = function(pExchangeAliasName)
{
vals = [dbChangeUser, datetime.date(), right];
newWhere("AB_PERMISSIONCALENDAR.AB_PERMISSIONCALENDARID", existingPermission[0])
- .updateData(true, "AB_PERMISSIONCALENDAR", updateCalCols, updateCalTypes, vals);
+ .updateData(true, "AB_PERMISSIONCALENDAR", updateCalCols, null, vals);
}
}
else
{
vals = [util.getNewUUID(), datetime.date(), dbChangeUser, exchangeUserMap[qualified], $KeywordRegistry.permissionCalendarType$user(),
exchangeUserMap[owner], $KeywordRegistry.permissionCalendarType$user(), right];
- db.insertData("AB_PERMISSIONCALENDAR", insertCalCols, insertCalTypes, vals);
+ db.insertData("AB_PERMISSIONCALENDAR", insertCalCols, null, vals);
}
}
}
diff --git a/process/ExportTemplate_lib/process.js b/process/ExportTemplate_lib/process.js
index a8c09911551c8dfd933e082febebfac8d3a25dd3..07ed68ab7557f351d24df31578bb97187cc7544d 100644
--- a/process/ExportTemplate_lib/process.js
+++ b/process/ExportTemplate_lib/process.js
@@ -1,3 +1,5 @@
+import("system.neon");
+import("system.vars");
import("Address_lib");
import("Keyword_lib");
import("KeywordRegistry_basic");
@@ -51,17 +53,7 @@ ExportTemplateUtils.buildExport = function (pExportTemplateId, pSelection, pComi
selection = [];
selection = JSON.parse(pSelection); //makes an array of the ContactIds/OrganisationIds of the selected data
}
- else
- {
- filteredIdcondition = JSON.parse(selection).condition;
- if(comingFrom == "Person")
- selection = ExportTemplateUtils.contactIdsFilter(filteredIdcondition); //selects all ContactIds of the filtered data
- else if(comingFrom == "Organisation")
- selection = ExportTemplateUtils.contactIdsOrganisationFilter(filteredIdcondition); //selects all OrganisationIds of the filtered data
- else
- throw new Error(translate.text("pComingFrom is not defined. 'ExportTemplateUtils.buildExport:66'"));
- }
-
+
if(filename == null || filename == undefined || filename.trim() == "") //if the user didn't choose a filename => generate one automatically
filename = ExportTemplateUtils.getExportFileName(templateTitle, "UTC");
filename += ".csv";
@@ -69,7 +61,7 @@ ExportTemplateUtils.buildExport = function (pExportTemplateId, pSelection, pComi
//selects all the placeholders needed in the correct order
var placeholders = PlaceholderUtils.getPlaceholders(language); //selects all placeholders
var affectedPlaceholders = [];
- for (var i = 0; i < fields.length; i++) {
+ for (let i = 0; i < fields.length; i++) {
var placeholderField = placeholders.find(function(placeholder){
return placeholder.getFormattedName() == fields[i];
})
@@ -81,7 +73,7 @@ ExportTemplateUtils.buildExport = function (pExportTemplateId, pSelection, pComi
var replaced = getAddressesData(selection, affectedPlaceholders, null, null); //replaces all the placeholders with values
replaced = replaced.slice(1,replaced.length); //needed in order to remove the weird first line of the Array
- for (i = 0; i < affectedPlaceholders.length; i++)
+ for (let i = 0; i < affectedPlaceholders.length; i++)
{
fieldtitles[i] = affectedPlaceholders[i].title; //gets the translations for the Labelling
}
@@ -94,7 +86,7 @@ ExportTemplateUtils.buildExport = function (pExportTemplateId, pSelection, pComi
return {content : csvTable,
filename : filename
};
-}
+};
/**
* Gets an Array of all the Fields of a ExportTemplate using it's unique exportTemplateId.
@@ -111,7 +103,7 @@ ExportTemplateUtils.getTemplateFields = function (pExportTemplateId)
.where("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", pExportTemplateId)
.orderBy("EXPORTTEMPLATEFIELD.SORTING")
.arrayColumn();
-}
+};
/**
* Generates a practical filename, with the templateName, and the date + time of the download, using it's unique exportTemplateId.
@@ -128,45 +120,7 @@ ExportTemplateUtils.getExportFileName = function (pTemplateTitle, pTimeZone)
var exportFileName = pTemplateTitle + "_" + datetime.toDate(datetime.date(), "dd.MM.yyyy.HH:mm:ss", pTimeZone);
return exportFileName;
-}
-
-/**
- * Generates an Array of all the contactIds using the filtercondition
- *
- * @param {String} pCondition the condition of the filter
- *
- * @return {Array} all the contactids limited by the filtercondition
- */
-ExportTemplateUtils.contactIdsFilter = function (pCondition)
-{
- let query = newSelect("CONTACT.CONTACTID").from("CONTACT");
-
- query.join("PERSON", "CONTACT.PERSON_ID = PERSON.PERSONID")
- .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
- .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
- .where(pCondition);
-
- return query.arrayColumn();
-}
-
-/**
- * Generates an Array of all the organisationIds (=contactIds of the organisations) using the filtercondition
- *
- * @param {String} pCondition the condition of the filter
- *
- * @return {Array} all the organisationids (=contactIds of the organisations) limited by the filtercondition
- */
-ExportTemplateUtils.contactIdsOrganisationFilter = function (pCondition)
-{
- let query = newSelect("ORGANISATION.ORGANISATIONID").from("ORGANISATION");
-
- query.leftJoin("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
- .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
- .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
- .where(pCondition);
-
- return query.arrayColumn();
-}
+};
/**
* Gets the title, language, sentenceseparator, fieldseparator and fielddelimiter of an export template using it's unique Id
@@ -184,7 +138,7 @@ ExportTemplateUtils.getTemplateData = function (pExportTemplateId)
.arrayRow();
data[1] = LanguageKeywordUtils.Iso2FromIso3(data[1]) //needed to get the language in the right format
return data;
-}
+};
/**
* Converts the sentence separator in the correct character if one of the keys is being used
@@ -202,7 +156,7 @@ ExportTemplateUtils.getSentenceSeparator = function (pSentenceSeparator)
return "\r\n";
else
return pSentenceSeparator;
-}
+};
/**
* Converts the field separator in the correct character if one of the keys is being used
@@ -224,7 +178,7 @@ ExportTemplateUtils.getFieldSeparator = function (pFieldSeparator)
return ";";
else
return pFieldSeparator;
-}
+};
/**
* Converts the field delimiter in the correct character if one of the keys is being used
@@ -242,7 +196,7 @@ ExportTemplateUtils.getFieldDeLimiter = function (pFieldDeLimiter)
return "\"";
else
return pFieldDeLimiter;
-}
+};
/**
* Gets the Title of a Template
@@ -257,4 +211,36 @@ ExportTemplateUtils.getExportTemplateTitle = function (pExportTemplateId)
.from("EXPORTTEMPLATE")
.where("EXPORTTEMPLATE.EXPORTTEMPLATEID", pExportTemplateId)
.cell(true);
-}
\ No newline at end of file
+};
+
+/**
+ * Export contacts or organistaions by contactIds.<br>
+ *
+ * @param {String} pRowIds <p>
+ * The contact ids as JSON array.<br>
+ * @param {String} pSourceTableName <p>
+ * The source table.<br>
+ */
+ExportTemplateUtils.addParticipantsByRowIds = function (pRowIds, pSourceTableName)
+{
+ var params = {
+ "selectedData_param" : pRowIds,
+ "comingFrom_param" : pSourceTableName}
+ neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+};
+
+/**
+ * Export contacts or organistaions by condition (filter).<br>
+ *
+ * @param {String} pCondition <p>
+ * Contact ids.
+ * @param {String} pSourceTableName <p>
+ * The source table.<br>
+ */
+ExportTemplateUtils.addParticipantsByCondition = function (pCondition, pSourceTableName)
+{
+ var params = {
+ "selectedData_param" : pCondition,
+ "comingFrom_param" : pSourceTableName}
+ neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+};
\ No newline at end of file
diff --git a/process/FilterCondition_lib/process.js b/process/FilterCondition_lib/process.js
index c49e3c2374d743883fdbd2659e0971eb9b4d7fe6..abb1cee432a5968d6390b3bc2789d7fbc8870b17 100644
--- a/process/FilterCondition_lib/process.js
+++ b/process/FilterCondition_lib/process.js
@@ -1,3 +1,5 @@
+import("system.neon");
+import("Sql_lib");
/**
* Methods to help build filterCondition statements.
* Do not create an instance of this!
diff --git a/process/FilterviewMenuAction_lib/FilterviewMenuAction_lib.aod b/process/FilterviewMenuAction_lib/FilterviewMenuAction_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3162cdadf0282fcd2b3e418c1b3727179a745ff7
--- /dev/null
+++ b/process/FilterviewMenuAction_lib/FilterviewMenuAction_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>FilterviewMenuAction_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/FilterviewMenuAction_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/FilterviewMenuAction_lib/process.js b/process/FilterviewMenuAction_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..9dbcc8e25b9011540ed67392deab8b6d6488654d
--- /dev/null
+++ b/process/FilterviewMenuAction_lib/process.js
@@ -0,0 +1,63 @@
+import("system.neon");
+import("Sql_lib");
+/**
+ * Methods for the menu actions in the filterview.
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function FilterviewMenuActionUtils() {}
+
+/**
+ * Generates an Array of all the contactIds using the filtercondition
+ *
+ * @param {Condition} pCondition the condition of the filter
+ *
+ * @return {Array} all the contactids limited by the filtercondition
+ */
+FilterviewMenuActionUtils.contactIdsFilter = function (pCondition)
+{
+ let query = newSelect("distinct CONTACT.CONTACTID").from("CONTACT");
+
+ query.join("PERSON", "CONTACT.PERSON_ID = PERSON.PERSONID")
+ .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+ .where(pCondition);
+
+ return query.arrayColumn();
+};
+
+/**
+ * Generates an Array of all the organisationIds using the filtercondition
+ *
+ * @param {String} pCondition the condition of the filter
+ *
+ * @return {Array} all the organisationids (=contactIds of the organisations) limited by the filtercondition
+ */
+FilterviewMenuActionUtils.organisationIdsFilter = function (pCondition)
+{
+ let query = newSelect("distinct ORGANISATION.ORGANISATIONID").from("ORGANISATION");
+
+ query.leftJoin("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
+ .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+ .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+ .where(pCondition);
+
+ return query.arrayColumn();
+};
+
+/**
+ * Retuns the componentstate using the rowcount.
+ * (used for the menu actions)
+ *
+ * @param {pDataRowCount} pDataRowCount data row count (vars.get("$sys.datarowcount");)
+ *
+ * @return {String} componentstate
+ */
+FilterviewMenuActionUtils.getComponentStateByRowCount = function(pDataRowCount)
+{
+ if(pDataRowCount > 0)
+ return neon.COMPONENTSTATE_EDITABLE;
+ else
+ return neon.COMPONENTSTATE_DISABLED;
+};
\ No newline at end of file
diff --git a/process/ImporterCustomMappingFunctions_lib/documentation.adoc b/process/ImporterCustomMappingFunctions_lib/documentation.adoc
index d7b37a3ee864c754d0e95bef5eb16b05c1be0c4c..79b5fa0c4b922278597493db352141aa7f1a1314 100644
--- a/process/ImporterCustomMappingFunctions_lib/documentation.adoc
+++ b/process/ImporterCustomMappingFunctions_lib/documentation.adoc
@@ -94,11 +94,10 @@ function iUpdateContact(pObject)
{
var alias = this.Config.AliasTo; //this gets the selected alias
var columns = ["STATUS"];
- var types = db.getColumnTypes("CONTACT", columns, alias);
var values = ["CONTACTSTATREVIEW "];
var condition = "CONTACTID = '" + pObject.contactID + "'";
- this.updateData("CONTACT", columns, types, values, condition, alias);
+ this.updateData("CONTACT", columns, null, values, condition, alias);
}
catch(ex) //If it fails it will not update but continue the rest
{
diff --git a/process/Importer_lib/documentation.adoc b/process/Importer_lib/documentation.adoc
index d02ea9aed6efd5e6dcf97b4362ebd71a34323051..f12700b132a52fb687a38908342ceba15ded4444 100644
--- a/process/Importer_lib/documentation.adoc
+++ b/process/Importer_lib/documentation.adoc
@@ -311,10 +311,110 @@ imp.process();
<<<
+== Advanced features
+
+=== ProgressCallback
+Sometimes, it's necessary to react on every input row that has been processed.
+This is what the `ProgressCallback` is for: It is a callback function that is called *after* an input row has been processed (whether successfully or not)
+
+The following parameters are passed onto the callback function:
+
+* Boolean value if the import row was skipped (`true`) or not (`false`). A row is skipped for example when an error occurred while importing the row.
+* Number value with the current batch run (starts at zero)
+* Object value with the following properties:
+** `exception`: Array with several exception messages and/or error hints
+** `sourceDataSet`: Array with the current processed source row (this is basically the same as accessing `this.InputRecord`
+ Be careful: This is a reference and therefore you are able to modify the data of the source row
+** `insertData`: Object with the following properties (this sums up the insert efforts):
+*** `successful`: Boolean if the insert was successfull or not
+*** `array`: Array of the requested inserts that were sent to the database as accepted by `db.inserts`
+** `updateData`: Object with the following properties (this sums up the update efforts):
+*** `successful`: Boolean if the update was successfull or not
+*** `array`: Array of the requested updates that were sent to the database as accepted by `db.updates`
+
+You have full access to the whole `Importer`-object via the `this` reference.
+Via the reference it's possible to access for example the Importer-configuration or the input data row.
+See the following examples (which is *not* a complete list):
+
+[source,javascript]
+--
+this.Config //the whole configuration object
+
+this.Config.AliasFrom //the name of the alias that was specified in the config as data source
+
+this.Config.AliasTo //the name of the alias that was specified in the config as target alias
+
+this.Config.ImportCommand //the configured ImportCommand, e.g "insert", "update", "insert+update"
+
+this.recordCounts //object with the amount of the already processed records
+
+this.getConfiguredTimeout(pTimeoutType) //function that returns the configured db timeout time (see the function description for more details)
+
+this.LogLevels //an object with all possible loglevels
+
+this.LogLevels.Error //constant like value for the error log level
+
+this.writeLog(pLevel, pMessage) //function that writes into the configured log output (see the function description for more details)
+--
+
+CAUTION: There is no write protection in changing the properties of the `Importer`-object. Modifying the properties may cause errors and results in unwanted behavior.
+
+The ProgressCallback property can be set in the instance of an Importer:
+[source,javascript]
+--
+var imp = new Importer(yourConfig);
+imp.Log = "CONSOLE";
+imp.ImportUser = "IMPORT";
+imp.Preview = false;
+imp.Debug = true;
+imp.ProgressCallback = function(pSkipped, pBatchIndex, pRecordStack){
+ //do sth here
+};
+imp.skipEmptyValue = false;
+imp.BatchSize = 100;
+imp.process();
+--
+
+Here is an example:
+
+[source,javascript]
+--
+var progressCallbackFn = function (pSkipped, pBatchIndex, pRecordStack)
+{
+ /*
+ if importing a source row was successful we have to notify the source-database
+ by setting a "PROCESSED"-column which may have a value of 1 or 0 (this is basically a flag)
+ */
+
+ if (pSkipped)
+ return;
+
+ //The "Callback" property in the importer config object was added to provide additional information for different callbacks like the ProgressCallback
+
+ var sourceTableName = this.Config.Callback.sourceTable;//get the source tablename so that we know which table needs to be updated
+ var idPosistion = this.Config.Callback.idPosistion;
+ var sourceNumericId = this.InputRecord[idPosistion];
+
+ var cols = ["PROCESSED"];
+ var vals = ["1"];
+
+ var cond = "ID = " + sourceNumericId;
+ db.updateData(sourceTableName, cols, null, vals, cond, this.AliasFrom);
+}
+
+var organisationImporter = new Importer(organisationImportConfig);
+organisationImporter.Log = "CONSOLE";
+organisationImporter.Preview = false;
+organisationImporter.ProgressCallback = progressCallbackFn;
+organisationImporter.LogLevel = imp.LogLevels.Info;
+organisationImporter.TableCase = imp.Cases.Upper;
+
+organisationImporter.process();//actual starting the import here
+--
== FAQ
-- Q: How can set my own timeout?
+- Q: How can I configure the timeout-time-limit for database queries triggered by the Importer?
A: Use setTimeout in your configuration (E.g., imp.setTimeout(123))
[source,javascript]
diff --git a/process/Importer_lib/process.js b/process/Importer_lib/process.js
index bf55280364bd354a92e30fc2471468d76dcfcd49..d1b033012d0f351cb92a7e2cb3e7154c12d2bcb3 100644
--- a/process/Importer_lib/process.js
+++ b/process/Importer_lib/process.js
@@ -354,7 +354,7 @@ function Importer(pConfig)
// import each row of the current batch
for(var bi=0; bi < daten.length; bi++)
{
- recordStack.exception ="";
+ recordStack.exception = [];
recordStack.sourceDataSet = daten[bi];
recordStack.insertData = {
successful: true,
@@ -411,7 +411,7 @@ function Importer(pConfig)
if(mapresult == false)
{
this.writeLog(this.LogLevels.Error, "Mapping function " + fname + " failed for row " + this.recordCounts.total);
- recordStack.exception = "Fehler Zeile: " + this.recordCounts.total + " - Info: Mapping function " + fname + " failed for row " + this.recordCounts.total + " Column: " + this.Config.Mapping[i][1]["Target"];
+ recordStack.exception.push("Error at row: " + this.recordCounts.total + " - Info: Mapping function " + fname + " failed for row " + this.recordCounts.total + " Column: " + this.Config.Mapping[i][1]["Target"]);
skip = true;
}
}
@@ -419,9 +419,8 @@ function Importer(pConfig)
{
logging.log(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex)
this.writeLog(this.LogLevels.Error, "Exception in mapping function [" + fname + "] for input row " + this.recordCounts.total+ " - " + this.Config.Mapping[i][1]["Target"]);
- recordStack.exception = logging.toLogString(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex, true) + " - Column: " + this.Config.Mapping[i][1]["Target"];
+ recordStack.exception.push(logging.toLogString(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex, true) + " - Column: " + this.Config.Mapping[i][1]["Target"]);
skip = true;
-
}
}
exectimer.mapPerRecordTime += datetime.date() - mapRecordMapTimeStart;
@@ -667,7 +666,7 @@ function Importer(pConfig)
this.writeLog(this.LogLevels.Error, "Error at " + (insertSuccessfull ? "" : "Insert") + (updateSuccessfull ? "": "Update") + ":" + logging.toLogString(ex));
logging.log(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex)
this.recordCounts.skip++;
- recordStack.exception = logging.toLogString(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex, true);
+ recordStack.exception.push(logging.toLogString(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex, true));
if(this.insertArray.length > 0 && !insertSuccessfull) {
this.writeLog(this.LogLevels.Info, "Insert array: " + JSON.stringify(this.insertArray, null, " "));
@@ -694,7 +693,7 @@ function Importer(pConfig)
// if a progress callback function has been defined, call it
if(this.ProgressCallback != null && typeof(this.ProgressCallback) == "function")
{
- this.ProgressCallback(skip, bi, recordStack, this.Config.AliasFrom, this.Config.Callback.TableFrom, this.Config.Callback.IDColumn, this.Config.Callback.IDColumnIndex);
+ this.ProgressCallback.call(this, skip, bi, recordStack);
}
if(this.MaxRows > 0 && this.recordCounts.total >= this.MaxRows)
diff --git a/process/IncomingCallExecutor_lib/process.js b/process/IncomingCallExecutor_lib/process.js
index 6ba61f39cb5e73c4ea40f77e830cc0e2c5119da6..9f6eb5534de86e24db2b5ecb56b9c0f4e42027c8 100644
--- a/process/IncomingCallExecutor_lib/process.js
+++ b/process/IncomingCallExecutor_lib/process.js
@@ -379,7 +379,7 @@ IncomingCallExecutor._getContactsFromNumber = function(pNumber, pContactIds)
contactIds.
*/
var patternConfig = indexsearch.createPatternConfig();
- var searchTerm = indexsearch.createTerm(pNumber).setIndexField("phone");
+ var searchTerm = indexsearch.createTerm(pNumber).setIndexField("phone");//phone contains right now the standard phone number
patternConfig.plus(searchTerm);
var pattern = indexsearch.buildPattern(patternConfig);
var indexQuery = indexsearch.createIndexQuery().setPattern(pattern)
@@ -408,6 +408,8 @@ IncomingCallExecutor._getContactsFromNumber = function(pNumber, pContactIds)
.leftJoin("PERSON", "CONTACT.PERSON_ID = PERSON.PERSONID")
.where("CONTACT.STATUS", $KeywordRegistry.contactStatus$active())
.and("CONTACT.CONTACTID", contactIds, SqlBuilder.IN())
+ //order by import if more than one record would be returned to give a statement: the first created, active contact is used
+ .orderBy("CONTACT.DATE_NEW asc")
.table();
//map to the result how the entities-methods would return it to have less effort later when the mentioned ticket is done
diff --git a/process/IncomingEmailExecutor_lib/process.js b/process/IncomingEmailExecutor_lib/process.js
index a43fbc1f56043c6699cdfb335d50981fba6f24f0..555f4f161b3e60e782158c1a1aa1a632a5733c50 100644
--- a/process/IncomingEmailExecutor_lib/process.js
+++ b/process/IncomingEmailExecutor_lib/process.js
@@ -28,6 +28,7 @@ function IncomingEmailExecutor(pMail)
this.mailSubject = this.rawMail[mail.MAIL_SUBJECT] || "";
this.mailSender = this.rawMail[mail.MAIL_SENDER];
this.mailSentDate = this.rawMail[mail.MAIL_SENTDATE];
+ this.filename = this.rawMail.filename;
var mailRecipientsTo = this.rawMail[mail.RECIPIENT_TO].split(";");
var mailRecipientsCc = this.rawMail[mail.RECIPIENT_CC].split(";");
@@ -194,14 +195,20 @@ IncomingEmailExecutor.prototype.createActivity = function(pAdditionalLinks)
subject: this.mailSubject,
content: this.getMailtextAsHtml(),
categoryKeywordId: $KeywordRegistry.activityCategory$mail(),
- directionKeywordId: this.activityData.direction || this.failbackActivityData.direction,
- responsibleContactId: this.activityData.employeeContactId || this.failbackActivityData.employeeContactId
+ directionKeywordId: this.activityData.direction || this.failbackActivityData.direction
};
+
+ if (vars.get("$sys.isclient")){
+ activityDataForInsert.responsibleContactId = EmployeeUtils.getCurrentContactId();
+ } else {
+ activityDataForInsert.responsibleContactId = this.activityData.employeeContactId || this.failbackActivityData.employeeContactId;
+ }
+
var activityLinks = this.activityData.links || this.failbackActivityData.links;
if (pAdditionalLinks)
activityLinks = activityLinks.concat(pAdditionalLinks);
activityLinks = ArrayUtils.distinct2d(activityLinks);//TODO: better check before adding the elements into the array if it already exists there
- var activityDocs = [["mail.eml", util.encodeBase64String(mail.toRFC(this.rawMail)), true]];
+ var activityDocs = [[this.filename || "mail.eml", util.encodeBase64String(mail.toRFC(this.rawMail)), true]];
var activityRes = ActivityUtils.insertNewActivity(activityDataForInsert, activityLinks, activityDocs, this._alias, this.mailSentDate);
return activityRes;
diff --git a/process/JditoFilter_lib/process.js b/process/JditoFilter_lib/process.js
index b318e287639603ed313d77088be28239a1b7a6e1..4df4da2819ab541d1690481239bcfb4e96539c2b 100644
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
@@ -306,7 +306,7 @@ FilterSqlTranslator.prototype.table = function (pTable, pTableAlias)
* Adds a special database field mapping for the given field that will be used for the sql condition
*
* @param {String} pFieldName the field name
- * @param {String|String[]} the database field ("TABLE.COLUMN" or ["TABLE", "COLUMN", "alias"])
+ * @param {String|String[]} pDBField the database field ("TABLE.COLUMN" or ["TABLE", "COLUMN", "alias"])
* @return {FilterSqlTranslator} current object
*/
FilterSqlTranslator.prototype.addSqlFieldMapping = function (pFieldName, pDBField)
@@ -397,7 +397,7 @@ FilterSqlTranslator.prototype.getSqlCondition = function ()
if (pFilter.name in sqlFieldMappings)
{
- sqlField = sqlFieldMappings[sqlField];
+ sqlField = sqlFieldMappings[pFilter.name];
//possibility to explicitly set the value to null/false so that the field is ignored
if (sqlField === null || sqlField === false)
diff --git a/process/KeywordData_lib/process.js b/process/KeywordData_lib/process.js
index 9997efa52934025c8d61e7cd6eb8414737af9fe8..a4fbd6bd4e44b0b1068e110f60e27107bceb47ee 100644
--- a/process/KeywordData_lib/process.js
+++ b/process/KeywordData_lib/process.js
@@ -20,7 +20,7 @@ KeywordData.getSimpleData = function (pKeywordContainer, pLocale, pOnlyActives)
var identifier = "KeywordSimpleData_" + pKeywordContainer + flags;
var cache = new CachedData(identifier, true, pLocale);
return cache.load(function (pTranslationNecessary, pLocale){
- var keywordEntrySelect = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE")
+ var keywordEntrySelect = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE", "Data_alias")
.from("AB_KEYWORD_ENTRY")
.orderBy("AB_KEYWORD_ENTRY.SORTING asc, AB_KEYWORD_ENTRY.TITLE asc")
.where("AB_KEYWORD_ENTRY.CONTAINER", pKeywordContainer);
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 2ae7c40b6e90dc3d207d4441cbeb3abeadfd128c..41a3be1f1b4a04a93089fe4234af94e4a53ff88d 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -16,11 +16,14 @@
* $KeywordRegistry.activityDirection()
*/
function $KeywordRegistry(){}
-// this function can also be found as StringUtils.pad36() in Util_lib and is just here to avoid an import because this registry is heavily used.
-$KeywordRegistry._autoPad = function(pKey){return (pKey + " ").slice(0, 36)};
$KeywordRegistry.attributeType = function(){return "AttributeType";};
$KeywordRegistry.keywordAttributeType = function(){return "KeywordAttributeType";};
+$KeywordRegistry.keywordAttributeType$char = function(){return "CHAR";};
+$KeywordRegistry.keywordAttributeType$number = function(){return "NUMBER";};
+$KeywordRegistry.keywordAttributeType$bool = function(){return "BOOLEAN";};
+$KeywordRegistry.keywordAttributeType$longChar = function(){return "LONGCHAR";};
+
$KeywordRegistry.contractPayment = function(){return "ContractPayment";};
$KeywordRegistry.contractStatus = function(){return "ContractStatus";};
@@ -167,7 +170,8 @@ $KeywordRegistry.documentTemplateTypeCategory$serial = function(){return "2";};
$KeywordRegistry.documentTemplateTypeCategory$htmlTemplate = function(){return "7";};
$KeywordRegistry.classificationType = function(){return "ClassificationType";};
-$KeywordRegistry.classificationType$salesproject = function(){return "SALESPROJ";};
+$KeywordRegistry.classificationType$salesproject = function(){return "Salesproject";};
+$KeywordRegistry.classificationType$organisation = function(){return "Organisation";};
$KeywordRegistry.personGender = function(){return "PersonGender";};
$KeywordRegistry.personGender$other = function(){return "o";};
@@ -270,20 +274,22 @@ $KeywordRegistry.workflowActivityType$intermediateCatchEvent = function(){return
$KeywordRegistry.workflowActivityType$intermediateThrowEvent = function(){return "intermediateThrowEvent";};
$KeywordRegistry.exportTemplateSeparator$tab = function(){return "TAB";};
-$KeywordRegistry.visitRecommendationPriority = function(){return $KeywordRegistry._autoPad("VisitRecommendationPriority");};
-$KeywordRegistry.visitRecommendationPriority$critical = function(){return $KeywordRegistry._autoPad("VISITPRIOCRITICAL");};
-$KeywordRegistry.visitRecommendationPriority$veryHigh = function(){return $KeywordRegistry._autoPad("VISITPRIOCVERYHIGH");};
-$KeywordRegistry.visitRecommendationPriority$high = function(){return $KeywordRegistry._autoPad("VISITPRIOHIGH");};
-$KeywordRegistry.visitRecommendationPriority$medium = function(){return $KeywordRegistry._autoPad("VISITPRIOMEDIUM");};
-$KeywordRegistry.visitRecommendationPriority$low = function(){return $KeywordRegistry._autoPad("VISITPRIOLOW");};
+$KeywordRegistry.visitRecommendationPriority = function(){return "VisitRecommendationPriority";};
+$KeywordRegistry.visitRecommendationPriority$critical = function(){return "VISITPRIOCRITICAL";};
+$KeywordRegistry.visitRecommendationPriority$veryHigh = function(){return "VISITPRIOCVERYHIGH";};
+$KeywordRegistry.visitRecommendationPriority$high = function(){return "VISITPRIOHIGH";};
+$KeywordRegistry.visitRecommendationPriority$medium = function(){return "VISITPRIOMEDIUM";};
+$KeywordRegistry.visitRecommendationPriority$low = function(){return "VISITPRIOLOW";};
+
+$KeywordRegistry.visitPlanEntryStatus = function(){return "VisitPlanEntryStatus";};
+$KeywordRegistry.visitPlanEntryStatus$planned = function(){return "VISITSTATUSPLANNED";};
+$KeywordRegistry.visitPlanEntryStatus$Appointmentarranged = function(){return "VISITSTATUSAPPPLANED";};
+$KeywordRegistry.visitPlanEntryStatus$Visitreportcreated = function(){return "VISITSTATUSREPORTCREATED";};
-$KeywordRegistry.visitPlanEntryStatus = function(){return $KeywordRegistry._autoPad("VisitPlanEntryStatus");};
-$KeywordRegistry.visitPlanEntryStatus$planned = function(){return $KeywordRegistry._autoPad("VISITSTATUSPLANNED");};
-$KeywordRegistry.visitPlanEntryStatus$Appointmentarranged = function(){return $KeywordRegistry._autoPad("VISITSTATUSAPPPLANED");};
-$KeywordRegistry.visitPlanEntryStatus$Visitreportcreated = function(){return $KeywordRegistry._autoPad("VISITSTATUSREPORTCREATED");};
+$KeywordRegistry.visitRecommendationPrioSource = function(){return "VisitRecommendationPrioSource";};
+$KeywordRegistry.visitRecommendationPrioSource$visitFrequency = function(){return "VISITFREQUENCY";};
+$KeywordRegistry.visitRecommendationPrioSource$manual = function(){return "MANUAL";};
-$KeywordRegistry.visitRecommendationPrioSource = function(){return $KeywordRegistry._autoPad("VisitRecommendationPrioSource");};
-$KeywordRegistry.visitRecommendationPrioSource$visitFrequency = function(){return $KeywordRegistry._autoPad("VISITFREQUENCY");};
-$KeywordRegistry.visitRecommendationPrioSource$manual = function(){return $KeywordRegistry._autoPad("MANUAL");};
+$KeywordRegistry.workflowCategory = function(){return "WorkflowCategory";};
-$KeywordRegistry.workflowCategory = function(){return "WorkflowCategory";};
\ No newline at end of file
+$KeywordRegistry.notificationState = function () { return "NotificationState";};
diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index bfc4a50283b447f3395af80a3ad50b0d4eaabd5f..9258ca92a7a1803f4abe5a162acc5859de100f29 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -92,7 +92,6 @@ LeadImportUtils.loadImportFile = function(pBinId, pFieldSep, pFieldLimit, pRecor
var toInsert = [];
var insertTable = "IMPORTFIELD";
var insertCols = ["IMPORTFIELDID", "FIELDNAME", "LEADIMPORT_ID", "DATE_NEW", "USER_NEW", "FIELDNUMBER"];
- var insertTypes = db.getColumnTypes(insertTable, insertCols);
var insertVals = [];
var sentenceSeparator = ExportTemplateUtils.getSentenceSeparator(pRecordSep);
var fieldSeparator = ExportTemplateUtils.getFieldSeparator(pFieldSep);
@@ -114,10 +113,10 @@ LeadImportUtils.loadImportFile = function(pBinId, pFieldSep, pFieldLimit, pRecor
db.deleteData("IMPORTFIELD", newWhere("IMPORTFIELD.LEADIMPORT_ID", pLeadImportId).build());
}
//insert the importfields
- for (i = 0; i < table[0].length; i++)
+ for (let i = 0; i < table[0].length; i++)
{
insertVals = [util.getNewUUID(), table[0][i], pLeadImportId, vars.getString("$sys.date"), vars.getString("$sys.user"), i.toString()];
- toInsert.push([insertTable, insertCols, insertTypes, insertVals]);
+ toInsert.push([insertTable, insertCols, null, insertVals]);
}
db.inserts(toInsert);
}
@@ -153,6 +152,9 @@ LeadImportUtils.loadImportFile = function(pBinId, pFieldSep, pFieldLimit, pRecor
*/
LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pFieldValues, pImportDefID, pAttrObject, pSource, pUser, pDate)
{
+ // set the mappings
+ LeadImportUtils.mapping = LeadImportUtils.getMapping(pImportDefID);
+
var LeadValues = LeadImportUtils.setValues(pDataFields["LEAD"], pFieldDef, pFieldValues); // set the Lead values
var orgid = "";
@@ -220,6 +222,29 @@ LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pField
return [leadId, persForDubCheck, orgsForDubCheck];
}
+
+/**
+ * get all Mapping to a Leadimport
+ *
+ * @param {String} pleadimportId the ID of a Leadimport
+ *
+ * @return {Object} an associative array in format arr[fieldname][inputvalue] --> outputvalue
+ */
+LeadImportUtils.getMapping = function(pleadimportId)
+{
+ let tempData = {};
+ newSelect(["LEADIMPORTMAPPINGASSISTANT.FIELDNAME", "LEADIMPORTMAPPINGASSISTANT.INPUTVALUE", "LEADIMPORTMAPPINGASSISTANT.OUTPUTVALUE"])
+ .from("LEADIMPORTMAPPINGASSISTANT")
+ .where("LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID", pleadimportId)
+ .table().forEach(function (d) {
+ if (tempData[d[0]] == undefined )
+ tempData[d[0]] = {}
+ tempData[d[0]][d[1]] = d[2];
+ });
+ return tempData;
+
+}
+
/**
* adds two arrays
*
@@ -290,27 +315,36 @@ LeadImportUtils.getDataTypes = function(pDataFields, pDataTables)
*/
LeadImportUtils.setValues = function(pFields, pFieldDef, pFieldValues)
{
- var DataValues = new Object();
- var i;
+ var dataValues = {};
// preset values
- for (i = 0; i < pFields.length; i++)
+ for (let i = 0; i < pFields.length; i++)
{
- DataValues[pFields[i]] = "";
+ dataValues[pFields[i]] = "";
}
// set values
- for (i = 0; i < pFieldDef.length; i++)
+ for (let i = 0; i < pFieldDef.length; i++)
{
try
{
- if (pFieldValues[ pFieldDef[i][0]] != undefined)
- DataValues[pFieldDef[i][1]] = pFieldValues[pFieldDef[i][0]];
+ if (pFieldValues[ pFieldDef[i][0]] != undefined)
+ {
+ if (LeadImportUtils.mapping != undefined &&
+ LeadImportUtils.mapping[pFieldDef[i][1]] != undefined &&
+ LeadImportUtils.mapping[pFieldDef[i][1]][pFieldValues[pFieldDef[i][0]]] != undefined)
+ {
+ // mapping is available and is set
+ pFieldValues[pFieldDef[i][0]] = LeadImportUtils.mapping[pFieldDef[i][1]][pFieldValues[pFieldDef[i][0]]];
+ }
+
+ dataValues[pFieldDef[i][1]] = pFieldValues[pFieldDef[i][0]];
+ }
}
catch(ex)
{
logging.log(ex, logging.WARNING);
}
}
- return DataValues;
+ return dataValues;
}
/**
@@ -382,8 +416,14 @@ LeadImportUtils.insertAttr = function(pDataFields, pDataTypes, pFieldDef, pLeadV
if (pFieldDef[i][1].substr(0, 9) == "ATTRIBUTE" && pFieldDef[i][2] != undefined)//if Attribute
{
var attrdata = pFieldDef[i][2];
+
+ let countAttributes = newSelect("count(*)")
+ .from("AB_ATTRIBUTERELATION")
+ .where("AB_ATTRIBUTERELATION.OBJECT_ROWID", pContactId)
+ .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", attrdata[1][0])
+ .cell();
- if (attrdata[2][pObjectID] != undefined)//e. g. if attrdata[2]["Organisation"] != undefined
+ if (attrdata[2][pObjectID] != undefined && countAttributes == 0)//e. g. if attrdata[2]["Organisation"] != undefined
{
var DataValues = new Object();
var value = pLeadValues[pFieldDef[i][1]];
@@ -695,7 +735,15 @@ LeadImportUtils.sqlInsertAttr = function(pAttrObject, pAttrValues, pUser, pDate)
pAttrValues[9] = pUser;
pAttrValues[10] = pDate;
- db.insertData("AB_ATTRIBUTERELATION", pAttrObject["Fields"] , pAttrObject["Types"], pAttrValues);
+ let countAttributes = newSelect("count(*)")
+ .from("AB_ATTRIBUTERELATION")
+ .where("AB_ATTRIBUTERELATION.OBJECT_ROWID", AttrValues[7])
+ .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", attrdata[1][0])
+ .cell();
+ if (countAttributes == 0) {
+ db.insertData("AB_ATTRIBUTERELATION", pAttrObject["Fields"] , pAttrObject["Types"], pAttrValues);
+ }
+
}
/**
diff --git a/process/Location_lib/process.js b/process/Location_lib/process.js
index 5c24f993ced1f9e5df6705430247784ea0ee6680..e57ae643c77ee9f3672899b0780fda0626ec4b3e 100644
--- a/process/Location_lib/process.js
+++ b/process/Location_lib/process.js
@@ -1,5 +1,8 @@
+import("system.logging");
+import("Address_lib");
import("Util_lib");
import("system.eMath");
+import("WsValidation_lib");
function GeoLocationUtils () {}
@@ -160,28 +163,127 @@ GeoLocationUtils.degreeToRadians = function (pAngle)
return pAngle * Math.PI / 180;
}
-function AreaSearchUtils () {}
+/**
+ * Object for searching the geolocation of adresses.
+ */
+function LocationFinder ()
+{
+ this._minAccuracy = AddressParts.ZIPCODE();
+ this._accuracyOrder = [
+ AddressParts.BUILDINGNO(),
+ AddressParts.ADDRESS(),
+ AddressParts.ZIPCODE(),
+ AddressParts.CITY(),
+ AddressParts.STATE(),
+ AddressParts.COUNTRY()
+ ];
+ this._getLocationFn = LocationFinder._getLocationWithNominatim;
+ this._isServiceAvailable = WsValidationUtils.isWsEnabled("TYPE_FULLADDRESS_NOMINATIM");
+}
/**
- * WIP
- * @ignore
+ * Function for loading the location data via nominatim
+ *
+ * @param {AddressObject} pAddress
*/
-AreaSearchUtils.findOrganisationsInArea = function (pLatitude, pLongitude, pMaxDistance)
+LocationFinder._getLocationWithNominatim = function (pAddress)
{
- var locationData = [];
- var locations = [];
-
- for (let i = 0, l = locationData.length; i < l; i++)
+ var parameters = {};
+ if (pAddress.address)
+ {
+ if (pAddress.buildingNo)
+ parameters.street = pAddress.buildingNo + " " + pAddress.address;
+ else
+ parameters.street = pAddress.address;
+ }
+ if (pAddress.city)
+ parameters.city = pAddress.city;
+ if (pAddress.zipCode)
+ parameters.postalcode = pAddress.zipCode;
+ if (pAddress.state)
+ parameters.state = pAddress.state;
+ if (pAddress.country)
{
- let distance = GeoLocationUtils.distanceVincenty(pLatitude, pLongitude, locationData[i][0], locationData[i][1]);
- if (distace <= pMaxDistance)
- locations.push(locationData[i]);
+ parameters.country = pAddress.country;
+ parameters.countrycodes = pAddress.country;
}
- return locations.sort(distanceSortFn);
+ return WsValidationUtils.validate(null, "TYPE_FULLADDRESS_NOMINATIM", parameters);
+}
+
+/**
+ * Sets a custom function for getting the location of an address. The provided function must take an AddressObject as parameter
+ * and return an object containing the properties "lat" and "lon".
+ *
+ * @param {Function} pLocationFn function that finds the location of an address
+ * @return {LocationFinder} current object
+ */
+LocationFinder.prototype.setLocationFindingFn = function (pLocationFn)
+{
+ if (!Utils.isFunction(pLocationFn))
+ throw new TypeError("LocationFinder: expected function, but got " + (typeof pLocationFn));
+ this._getLocationFn = pLocationFn;
+ this._isServiceAvailable = true; //if a custom function is set, assume that it works
+ return this;
+}
+
+/**
+ * Sets the lowest accuracy of the location search before it gives up the search.
+ *
+ * @param {String} pAccuracy the accuracy, use AddressParts constants
+ * @return {LocationFinder} current object
+ */
+LocationFinder.prototype.setMinAccuracy = function (pAccuracy)
+{
+ this._minAccuracy = pAccuracy;
+ return this;
+}
+
+/**
+ * Tells if the LocationFinder is able to perform the location search. This can be false if the used service is not enabled.
+ *
+ * @return {Boolean} true, if the LocationFinder can be used
+ */
+LocationFinder.prototype.isEnabled = function ()
+{
+ return this._isServiceAvailable;
+}
+
+/**
+ * Performs the location search for the given address. The LocationFinder tries to find addresses with decreasing accuracy until it gets a result
+ * or the min accuracy has been exceeded (the default min accuracy is zipCode).
+ *
+ * @param {AddressObject} pAddress an object containing the address data
+ * @return {Object} object with the properties "lat", "lon" and "accuracy", or null if the address could not be found
+ */
+LocationFinder.prototype.getGeoLocation = function (pAddress)
+{
+ if (!this._isServiceAvailable)
+ return null;
+
+ //copy address, so the searchAddress can be modified without changing the given address
+ var searchAddress = Utils.clone(pAddress);
- function distanceSortFn (a, b)
- {
- return a[3] - b[3];
+ var minAccuracyIndex = this._minAccuracy ? this._accuracyOrder.indexOf(this._minAccuracy) : this._accuracyOrder.length - 1;
+
+ for (let i = 0; i < this._accuracyOrder.length && i <= minAccuracyIndex; i++)
+ {
+ var mostAccurateField = this._accuracyOrder[i];
+ if (searchAddress[mostAccurateField])
+ {
+ var location = this._getLocationFn.call(this, searchAddress);
+ if (location === false)
+ return null;
+ if (location != null || !this._minAccuracy) //if no minAccuracy is set, only try once
+ {
+ return {
+ lat: location.lat,
+ lon: location.lon,
+ accuracy: mostAccurateField
+ };
+ }
+ }
+ searchAddress[mostAccurateField] = null;
}
+ return null;
}
\ No newline at end of file
diff --git a/process/Loghistory_lib/process.js b/process/Loghistory_lib/process.js
index 0f88ed09dad643c6204a9fd30a67d2caff2e07fb..93375b4ee77b833c60aae891fece0bf0f84bca00 100644
--- a/process/Loghistory_lib/process.js
+++ b/process/Loghistory_lib/process.js
@@ -117,7 +117,7 @@ LogHistoryExecutor.prototype.execute = function ()
{
var conf = extra[this.affectedTable];
- for(i = 0; i < this.columns.length; i++ )
+ for(let i = 0; i < this.columns.length; i++ )
{
if (this.sqlAction == 'D' || this.sqlAction == 'U') oldvalues[this.columns[i]] = this.oldValues[i];
if (this.sqlAction == 'I' || this.sqlAction == 'U') newvalues[this.columns[i]] = this.newValues[i];
@@ -165,7 +165,7 @@ LogHistoryExecutor.prototype.execute = function ()
return null;
}
- for (var i = 0; i < this.columns.length; i++)
+ for (let i = 0; i < this.columns.length; i++)
{
if (this.affectedTable == "ASYS_CALENDARBACKEND" && this.columns[i] == "VCOMPONENT")
this._getCalendarDescription(i);
@@ -205,7 +205,7 @@ LogHistoryExecutor.prototype.execute = function ()
}
if (this.sqlAction == "U")
{
- for (var index in references) references[index].id = newSelect(index).from(this.affectedTable).where([this.affectedTable, primaryKey], this.idValue).cell();
+ for (let index in references) references[index].id = newSelect(index).from(this.affectedTable).where([this.affectedTable, primaryKey], this.idValue).cell();
}
}
@@ -214,7 +214,7 @@ LogHistoryExecutor.prototype.execute = function ()
if (this.sqlAction == 'I') description = translate.withArguments("%0 added.", [description.join(",\n")], this.translationLanguage);
else if (this.sqlAction == 'U') description = translate.withArguments("%0 modified.", [description.join(",\n")], this.translationLanguage);
else if (this.sqlAction == 'D') description = translate.withArguments("%0 deleted.", [description.join(",\n")], this.translationLanguage);
- for (index in references)
+ for (let index in references)
{
if (references[index].id != "")
{
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index fe3e80e78fe3ccc0625b8e5cdfb68b02141f8624..f33eba68fa16f14af4e88b25b3102a64e3da4d04 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -75,7 +75,6 @@ function ItemUtils(pOfferOrderId, pTableName) {
this._updateReOrgItemChangesInDB = function(compTree) {
var statements = [];
var cols = ["ITEMSORT", "ITEMPOSITION"];
- var colTypes = db.getColumnTypes(this.tableName + "ITEM", cols);
var oiTree = this.ItemTree;
for (var oiid in compTree) {
@@ -83,7 +82,7 @@ function ItemUtils(pOfferOrderId, pTableName) {
//check if itemsort/pos has been changed
if (oiTree[oiid].itemsort != compTree[oiid].itemsort || oiTree[oiid].pos != compTree[oiid].pos) {
var vals = [compTree[oiid].itemsort, compTree[oiid].pos];
- statements.push([this.tableName + "ITEM", cols, colTypes, vals, newWhere([this.tableName + "ITEM", this.tableName + "ITEMID"], oiid).build()]);
+ statements.push([this.tableName + "ITEM", cols, null, vals, newWhere([this.tableName + "ITEM", this.tableName + "ITEMID"], oiid).build()]);
}
}
}
@@ -221,7 +220,6 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
columns = columns.concat(additionalProductInfo.map(function(item) {return item[0][1]}));
- var colTypes = db.getColumnTypes(table, columns);
if (partsList.root != undefined) // if product has a parts list
{
@@ -273,7 +271,7 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
// add aditional details
.concat(additionalProductInfo.map(function(item) {return ProductDetails[item[1][0]]}));
- statements.push([table, columns, colTypes, vals]);
+ statements.push([table, columns, null, vals]);
insertedItemIds.push(newid);
__itemInsertStatement(partsList[p2pid], newid);
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 8b12e56fdbc6913c720f06ef108364e70115939e..3ba48d7e1d7ddd87f6e07038e6601034abac295e 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -356,7 +356,7 @@ OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
{
var InputMapping = {
"OFFERITEM": {
- condition: newWhereIfSet("OFFERITEM.OFFER_ID", pSourceOfferId).orderBy("ITEMSORT").toString("1=2", true),
+ condition: newWhereIfSet("OFFERITEM.OFFER_ID", pSourceOfferId).orderBy("ITEMSORT").toString(SqlBuilder.NORESULT_CONDITION(), true),
ValueMapping: {
"OFFER_ID" : pTargetOfferId
}
@@ -387,18 +387,24 @@ OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
* @param pHeader {String} [header=""]
*/
OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLanguage, pCurrency, pAddress, pHeader)
-{
- var params = {
- "ContactId_param" : pContactId,
- "ObjectRowId_param" : pRowId,
- "ObjectType_param" : pContextId,
- "OrderLanguage_param" : pLanguage,
- "OfferId_param" : pOfferId,
- "OrderCurrency_param" : pCurrency || "",
- "OrderPaymentAddress_param" : pAddress || "",
- "OrderHeader_param" : pHeader || ""
- };
- neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
+{
+ var fieldparams =
+ {
+ "$field.CONTACT_ID" : pContactId,
+ "$field.ISOLANGUAGE" : pLanguage,
+ "$field.OFFER_ID" : pOfferId,
+ "$field.CURRENCY" : pCurrency || "",
+ "$field.HEADER" : pHeader || "",
+ "$field.PAYMENTADDRESS" : pAddress || "",
+ "$field.OBJECT_TYPE" : pContextId || "",
+ "$field.OBJECT_ROWID" : pRowId || ""
+ };
+
+ var params = {};
+ params["Copy_param"] = JSON.stringify(fieldparams);
+ params["OfferId_param"] = pOfferId;
+
+ neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
}
/**
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index b9d4815ae0586e19b95da36fc8c7c8d6825db17a..d6938458c59687ef679f1d437661ec456e01f2e8 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -39,7 +39,7 @@ OrderUtils.getNextOrderNumber = function() {
* @return {String} orderCode next valid order version number
*/
OrderUtils.getNextOrderVersionNumber = function(orderCode) {
- return NumberSequencingUtils.getNextUniqueNumber("VERSNR", "SALESORDER", 1, "SALESORDERCODE = " + orderCode);
+ return NumberSequencingUtils.getNextUniqueNumber("SALESORDERCODE", "SALESORDER", 1, "SALESORDERCODE = " + orderCode);
}
/**
@@ -79,41 +79,51 @@ OrderUtils.isDeletable = function(status) {
OrderUtils.createNewOrder = function(pContextId, pRowId, pRelationId)
{
var params = {};
+ var fieldparams = {};
if (pRowId && pContextId)
{
- params["ObjectRowId_param"] = pRowId;
- params["ObjectType_param"] = pContextId;
+ fieldparams["$field.OBJECT_TYPE"] = pContextId || "";
+ fieldparams["$field.OBJECT_ROWID"] = pRowId || "";
}
if (pRelationId)
+ {
+ fieldparams["$field.CONTACT_ID"] = pRelationId;
params["ContactId_param"] = pRelationId;
+ }
+ params["Copy_param"] = JSON.stringify(fieldparams);
neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
}
-//TODO refactor function to minimize the params and only give an object that contains the data
OrderUtils.copyOrder = function (pSourceOfferId, pContactId, pOrderType, pLanguage, pCurrency, pHeader, pFooter, pDeliveryTerm, pPaymentTerm, pPaymentAddress, pDeliveryAddress, pObjectType, pRowId, pDunningDate, pDunningLevel, pCancellation, pOrderStatus)
{
- var params = {
- "ContactId_param" : pContactId,
- "OrderType_param" : pOrderType,
- "OrderLanguage_param" : pLanguage,
- "OfferId_param" : pSourceOfferId,
- "OrderCurrency_param" : pCurrency || "",
- "OrderHeader_param" : pHeader || "",
- "OrderFooter_param" : pFooter || "",
- "OrderDeliveryTerm_param" : pDeliveryTerm || "",
- "OrderPaymentTerm_param" : pPaymentTerm || "",
- "OrderPaymentAddress_param" : pPaymentAddress || "",
- "OrderDeliveryAddress_param" : pDeliveryAddress || "",
- "ObjectType_param" : pObjectType || "",
- "ObjectRowId_param" : pRowId || "",
- "OrderDunningDate_param" : pDunningDate || "",
- "OrderDunningLevel_param" : pDunningLevel || "",
- "OrderCancellation_param" : pCancellation || "",
- "OrderStatus_param" : pOrderStatus || ""
+
+ var fieldparams = {
+ "$field.CONTACT_ID" : pContactId,
+ "$field.ORDERTYPE" : pOrderType,
+ "$field.ISOLANGUAGE" : pLanguage,
+ "$field.OFFER_ID" : pSourceOfferId,
+ "$field.CURRENCY" : pCurrency || "",
+ "$field.HEADER" : pHeader || "",
+ "$field.FOOTER" : pFooter || "",
+ "$field.DELIVERYTERMS" : pDeliveryTerm || "",
+ "$field.PAYMENTTERMS" : pPaymentTerm || "",
+ "$field.PAYMENTADDRESS" : pPaymentAddress || "",
+ "$field.DELIVERYADDRESS" : pDeliveryAddress || "",
+ "$field.OBJECT_TYPE" : pObjectType || "",
+ "$field.OBJECT_ROWID" : pRowId || "",
+ "$field.DUNNINGDATE" : pDunningDate || "",
+ "$field.DUNNINGLEVEL" : pDunningLevel || "",
+ "$field.CANCELLATION" : pCancellation || "",
+ "$field.ORDERSTATUS" : pOrderStatus || ""
};
+
+ var params = {};
+ params["Copy_param"] = JSON.stringify(fieldparams);
+ params["OfferId_param"] = pSourceOfferId;
+
neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
}
@@ -146,7 +156,7 @@ OrderUtils.copyOfferItemsToOrder = function (pSourceOfferId, pOrderId)
"INFO" : "INFO",
"VAT" : "VAT"
},
- condition: newWhereIfSet("OFFERITEM.OFFER_ID", pSourceOfferId).orderBy("ITEMSORT").toString("1=2", true),
+ condition: newWhereIfSet("OFFERITEM.OFFER_ID", pSourceOfferId).orderBy("ITEMSORT").toString(SqlBuilder.NORESULT_CONDITION(), true),
ValueMapping: {
"OFFER_ID" : pOrderId
}
@@ -187,7 +197,6 @@ OrderUtils.buildOrderReport = function (pOrderID)
"SALESORDERDATE",
"HEADER", //8
"VAT",
- sqlUtil.isNull("VERSNR", "0"),
sqlUtil.isNull("SALESORDERCODE", "0"),
"OBJECT_TYPE", //12
"OBJECT_ROWID", //13
@@ -278,11 +287,10 @@ OrderUtils.buildOrderReport = function (pOrderID)
item[5], //itemposition
item[6], //productcode
orderData[8], //header
- orderData[14], //footer
+ orderData[13], //footer
text.formatDouble(item[9], "#,##0", true), //quantity
text.formatDouble(item[10], "#,##0.00", true), //price
text.formatDouble(item[11], "0.00", true), //discount
- orderData[10], //versnr
orderData[5], //offercode
text.formatDouble(orderData[9], "#,##0.00", true), //vat
text.formatDouble(itemSum, "#,##0.00", true), //itemsum
@@ -362,7 +370,6 @@ OrderUtils.buildOrderReport = function (pOrderID)
"QUANTITY",
"PRICE",
"ORDERITEM.DISCOUNT", //13
- "SALESORDER_VERSNR",
"ORDERCODE",
"SALESORDER.VAT",
"ITEMSUM", // 17
@@ -411,7 +418,6 @@ OrderUtils.buildReminderReport = function (pOrderID)
"SALESORDERDATE",
"HEADER", //8
"VAT",
- sqlUtil.isNull("VERSNR", "0"),
sqlUtil.isNull("SALESORDERCODE", "0"),
"OBJECT_TYPE", //12
"OBJECT_ROWID", //13
@@ -435,7 +441,8 @@ OrderUtils.buildReminderReport = function (pOrderID)
.cell();
orderData[7] = datetime.toDate(orderData[7], translate.text("dd.MM.yyyy", language));
- orderData[18] = datetime.toDate(orderData[18], translate.text("dd.MM.yyyy", language));
+ orderData[17] = datetime.toDate(orderData[17], translate.text("dd.MM.yyyy", language));
+ orderData[18] = KeywordUtils.getViewValue("DunningLevel", orderData[18]);
var orderItemFields = [
"SALESORDERITEM.INFO",
@@ -473,8 +480,8 @@ OrderUtils.buildReminderReport = function (pOrderID)
var sums = [];
var vatsum = 0;
var printDiscount = false;
- var brutto=eMath.addDec(orderData[17], orderData[9]);
- var offen=eMath.subDec(brutto, orderData[16]);
+ var grossPrice=eMath.addDec(orderData[16], orderData[9]);
+ var open=eMath.subDec(grossPrice, orderData[15]);
itemData = itemData.map(function (item)
{
//quantity * price
@@ -498,18 +505,18 @@ OrderUtils.buildReminderReport = function (pOrderID)
printDiscount = true;
return [
- orderData[16], //payed
+ orderData[15], //payed
pOrderID, //relationid
orderData[6], //currency
orderData[7], //orderdate
text.formatDouble(orderData[9], "#,##0.00", true), //vat
- orderData[11], //ordercode
- orderData[17], //net
- text.formatDouble(brutto, "#,##0.00", true),//brutto
- text.formatDouble(offen, "#,##0.00", true),//offen
- orderData[18], //due date
- orderData[20], //dunning text
- orderData[19] //dunninglevel
+ orderData[10], //ordercode
+ orderData[16], //net
+ text.formatDouble(grossPrice, "#,##0.00", true),//grossPrice
+ text.formatDouble(open, "#,##0.00", true),//open
+ orderData[17], //due date
+ orderData[19], //dunning text
+ orderData[18] //dunninglevel
];
});
diff --git a/process/PermissionCalendar_lib/process.js b/process/PermissionCalendar_lib/process.js
index 453eced12825a0e4bd825fec36a58c1e98080896..56c7388c901a63a865403ecd30e0e4cf736debac 100644
--- a/process/PermissionCalendar_lib/process.js
+++ b/process/PermissionCalendar_lib/process.js
@@ -259,8 +259,9 @@ PermissionCalendar.getTree = function(pCurrentUser)
let user = PermissionCalendar._getUser();
let root = PermissionCalendar._getDepartment($AttributeRegistry.departments(), permissions, resultArr);
- // Rekursion aufrufen
- PermissionCalendar._getDataRecursive(root[0], pCurrentUser, permissions, user, resultArr);
+ // is empty if no entry exists in the permission calendar table
+ if (root.length > 0)
+ PermissionCalendar._getDataRecursive(root[0], pCurrentUser, permissions, user, resultArr);
return resultArr;
resultArr = [];
@@ -415,6 +416,7 @@ PermissionCalendar.getPermissions = function(pCurrentUser)
.select("AB_PERMISSIONCALENDARID, PERMISSIONDEALER_ROWID, PERMISSIONDEALER_TYPE, PERMISSIONPROCURER_ROWID, PERMISSION")
.from("AB_PERMISSIONCALENDAR")
.where("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", pCurrentUser)
+ .orIfSet("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", PermissionCalendar.getAllParents(EmployeeUtils.prefixUserId(pCurrentUser)) , SqlBuilder.IN())
.orderBy("PERMISSIONDEALER_ROWID ASC")
.table();
};
diff --git a/process/Placeholder_lib/process.js b/process/Placeholder_lib/process.js
index 4f271fa114efc53ff3bb909ea0d4692436e8cead..2c1cb9d8214a5b5ca9d0698a3d7dc14d345cdf64 100644
--- a/process/Placeholder_lib/process.js
+++ b/process/Placeholder_lib/process.js
@@ -106,8 +106,6 @@ PlaceholderUtils.getPlaceholders = function (pLocale, pIsExportTemplateField)
/**
* Returns the placeholder with the required prefix and postfix added.
- *
- * @deprecated
*/
PlaceholderUtils.formatPlaceholder = function (pPlaceholder)
{
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index d49860b7ac46e5f1f8d093310260d8406de9b0e0..ee03a52bec3a0052633d48aace52aeb834a107da 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -283,8 +283,21 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
return priceLists[list];
}
//customer deposited price list (defined by Attribute)
- if (priceListFilter.priceList != "" && priceListFilter.priceList == priceLists[list].priceList) {
- return priceLists[list];
+ if (priceListFilter.priceList != "") {
+ var res;
+ var escape;
+ // runs trough the possible pricelists to find the one with the correct pricelist ("-type").
+ // e.g: PRICELISTSERVICE, PRICELISTSPECIAL, PRICELISTKEY, PRICELISTDEFAULT
+ for(var index in priceLists)
+ {
+
+ if (priceLists[index]["priceList"] == priceListFilter.priceList)
+ {
+ res = priceLists[index]; //The first time the condition is true the correct pricelist is found.
+ break; // The object is ordered by fromQuantity descending so we have to stop after the condition is true
+ }
+ }
+ return res;
}
//default price list
if (priceLists[list].priceList == $KeywordRegistry.productPricelist$standardList()) {
diff --git a/process/Sql_lib/documentation.adoc b/process/Sql_lib/documentation.adoc
index 4330b3af2166a38f050685d472b18d5b0a8daab3..8b903c2155e9d54f160b06ef6fa80a586a8335e6 100644
--- a/process/Sql_lib/documentation.adoc
+++ b/process/Sql_lib/documentation.adoc
@@ -170,7 +170,12 @@ If used as pField, you can provide the table and column in different ways.
* *pValue*
This is the value of the condition: If, e.g., you need the SQL condition "FIRSTNAME = 'John'" then this parameter is "John")
* *pCondition*
-This parameter defines what condition is used. You can use any SQL. # will be replaced by the pFieldOrCond and ? is used for the pValue (default is "# = ?"). If, e.g., you need the SQL condition "FIRSTNAME <> 'John'" then this parameter is "# <> ?" (or SqlBuilder.NOT_EQUAL()). You can use SqlBuilder constants here (for example SqlBuilder.NOT_EQUAL(), SqlBuilder.EXISTS())
+This parameter defines what condition is used. You can use any SQL. `#` will be replaced by the pFieldOrCond and `?` is used for the pValue (default is `# = ?`).
+If, e.g., you need the SQL condition `FIRSTNAME <> 'John'` then this parameter is `# <> ?` (or `SqlBuilder.NOT_EQUAL()`).
+You can use SqlBuilder constants here (for example `SqlBuilder.NOT_EQUAL()`, `SqlBuilder.EXISTS()`)
+For better useability, it is also possible to give the value without the bracets like this: `SqlBuilder.NOT_EQUAL`
+It is possible to escape the # symbol with a backslash, note that to write a backslash in a string it needs to be escaped itself.
+Example: `cond.and("MYTABLE.MYCOLUMN", "XYZ", "\\## = ?");` results in _( #MYTABLE.MYCOLUMN = 'XYZ' )_
* *pFieldType*
This parameter is for specifying the SQLTYPE explicitly. In most cases, you won't need it, as the type is loaded from the db by the table name and the column name you specified in pFieldOrCond.
@@ -552,7 +557,7 @@ var cond = newWhere("TABLE.FIELD", aSqlBuilderContainingFullSelect);
=== IN statement with array of values
pValue can also be an array of values which is automatically transfered into a SQL prepared statement SQL like this:
- ["(?, ?, ?)", [["Peter", SQLTYPES.VARCHAR], ["Paul", SQLTYPES.VARCHAR], ["Mary", SQLTYPES.VARCHAR]]]
+ `["(?, ?, ?)", [["Peter", SQLTYPES.VARCHAR], ["Paul", SQLTYPES.VARCHAR], ["Mary", SQLTYPES.VARCHAR]]]`
With this it is very easy to create a in-statement:
[source,js]
@@ -560,7 +565,10 @@ With this it is very easy to create a in-statement:
var cond = newWhere("PERSON.FIRSTNAME", ["Peter", "Paul", "Mary"], SqlBuilder.IN()) // SqlBuilder.IN() == "in ?"
// Note that also SqlBuilder.NOT_IN() is possible here
----
-Note that an empty array is threated like null or undefined: using .where throws an error, using .whereIfSet ignores the whole condition.
+Note that an empty array is treated like null or undefined: using .where throws an error, using .whereIfSet ignores the whole condition.
+
+TIP: Passing nothing as condition will result in an SqlBuilder.IN when the values are an array.
+For example `myCondition.and("PERSON.FIRSTNAME", ["Peter", "Paul", "Mary"])`
=== IN statement with subquery
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index e59d4ba8b1b9c632b255ebc34c3f761a297bb583..7956b754546212a264c96fda217a3ecc8fb8dbeb 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -621,9 +621,11 @@ SqlCondition.prototype._init = function() {
* @param {String} [pAlias=the current alias] the database alias where the condition shall be executed later (important for column types of preparedStatements)
*
* @return {Array[][][]} Prepared condition with [condition, [[field, type]]]
+ *
+ * @deprecated
*/
SqlCondition.equals = function(pField, pValue, pAlternativeCond, pAlias) {
- return SqlCondition.begin(pAlias).andPrepare(pField, pValue).build(pAlternativeCond);
+ return SqlCondition["begin"](pAlias).andPrepare(pField, pValue).build(pAlternativeCond);
}
/**
@@ -634,9 +636,11 @@ SqlCondition.equals = function(pField, pValue, pAlternativeCond, pAlias) {
* @param {String} [pAlias=the current alias] the database alias where the condition shall be executed later (important for column types of preparedStatements)
*
* @return {Array[][][]} Prepared condition with [condition, [[field, type]]]
+ *
+ * @deprecated
*/
SqlCondition.equalsNot = function(pField, pValue, pAlternativeCond, pAlias) {
- return SqlCondition.begin(pAlias).andPrepare(pField, pValue, "# <> ?").build(pAlternativeCond);
+ return SqlCondition["begin"](pAlias).andPrepare(pField, pValue, "# <> ?").build(pAlternativeCond);
}
// see Documentation property of this lib for further explanation
@@ -818,7 +822,7 @@ SqlBuilder.prototype.copy = function()
// set the props of the new object to the deepCopied ones.
// without this all functions would be lost
- for (prop in deepCopied)
+ for (let prop in deepCopied)
{
pNewObject[prop] = deepCopied[prop]
}
@@ -1441,6 +1445,8 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon
{
//In a special case, pCondition can be a function. It will be called with the alias as argument and
//must return an array of the condition string and (optionally) the required sql field type.
+ //alternatively the function may return a string only to make the usage more bulletproof and convenient, so both SqlBuilder.EQUAL()
+ //and SqlBuilder.EQUAL work equally
if (pCondition && typeof pCondition === "function")
{
var resCond = pCondition(this.alias);
@@ -1449,6 +1455,10 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon
pCondition = resCond[0];
pFieldType = pFieldType || resCond[1];
}
+ else if(Utils.isString(pCondition))
+ {
+ pCondition = resCond;
+ }
}
if (pCondition && !SqlUtils.checkConditionFormat(pCondition))
@@ -1539,7 +1549,9 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon
if (pFieldType === undefined || pFieldType === null)
pFieldType = SqlUtils.getSingleColumnType(parsedField, undefined, this.alias);
}
-
+ //overwrite condition to set a default behaviour
+ if (pCondition == undefined)
+ pCondition = SqlBuilder.IN();
// value-array -> convert it to a prepared statement ["(?, ?, ?)", [[val1, type1], [val2, type2], [val3, type3]]]
this._whereCondition(this._prepare(field, SqlUtils.getSqlInStatement(undefined, pValue, undefined, true, pFieldType), pCondition, pFieldType, false), undefined, pAddPreparedConditionCallback, true);
return this;
@@ -1825,13 +1837,23 @@ SqlBuilder.GREATER_OR_EQUAL = function ()
/**
* Constant-like function which provides a value for pCondition if you need a "# <= ?" statement.
*
- * @return {String}
+ * @return {String}
*/
SqlBuilder.LESS_OR_EQUAL = function ()
{
return "# <= ?";
}
+/**
+ * Constant-like function which returns an impossible condition ("1 = 2").
+ *
+ * @return {String}
+ */
+SqlBuilder.NORESULT_CONDITION = function ()
+{
+ return "1 = 2";
+}
+
/**
* Object providing constant-like functions for sql-any-conditions.
*/
@@ -2866,8 +2888,21 @@ SqlBuilder.prototype.forEachPage = function (pCallBackFn, pExecuteOnlyIfConditio
throw SqlBuilder._ERROR_NOT_A_FUNCTION();
var run = true;
+ var idx = 0;
while (run && this.hasMoreRows())
- run = pCallBackFn.call(null, this.nextTablePage(pExecuteOnlyIfConditionExists, pTimeout)) != false;
+ {
+ run = pCallBackFn.call(null, this.nextTablePage(pExecuteOnlyIfConditionExists, pTimeout), idx++) != false;
+ }
+}
+
+/**
+ * Sets an impossible where-condition, so that the query won't return any rows.
+ *
+ * @return {SqlBuilder} current object
+ */
+SqlBuilder.prototype.noResult = function ()
+{
+ return this.clearWhere().where(SqlBuilder.NORESULT_CONDITION());
}
/**
@@ -3414,7 +3449,7 @@ SqlMaskingUtils.prototype.substring = function(field, start, length) {
* @return {String} part of SQL-querey
*/
SqlMaskingUtils.prototype.concat = function(fields, separatorCharacter, autoTrimFields) {
- var i, concatSql, retSql, isNotEmptyStrSql, isNotNullSql, separatorSql, _isNotEmpty, _trimIfAutoTrimEnabled;
+ var concatSql, retSql, isNotEmptyStrSql, isNotNullSql, separatorSql, _isNotEmpty, _trimIfAutoTrimEnabled;
if (fields.length == 0)
return "''";
else if (fields.length == 1)
@@ -3433,7 +3468,7 @@ SqlMaskingUtils.prototype.concat = function(fields, separatorCharacter, autoTrim
case db.DBTYPE_MARIADB10:
case db.DBTYPE_POSTGRESQL8:
retSql = " concat_ws( '" + separatorSql + "'";
- for (i = 0; i < fields.length; i++) {
+ for (let i = 0; i < fields.length; i++) {
retSql += ", " + fields[i];
}
return retSql + ") ";
@@ -3465,7 +3500,7 @@ SqlMaskingUtils.prototype.concat = function(fields, separatorCharacter, autoTrim
}
_isNotEmpty = _isNotEmpty.bind(this);
- for (i = 0; i < fields.length; i++) {
+ for (let i = 0; i < fields.length; i++) {
if (retSql != "")
retSql += concatSql;
retSql += "case when " + _isNotEmpty(fields[i]) + " then ";
@@ -4012,6 +4047,56 @@ SqlUtils.getResolvingCaseWhen = function(pKeyValueArray, pDbFieldName, pLocale)
return resSql;
};
+/**
+* resolves an array of key-value pairs (of strings) into a sql case when expression<br/>
+* This is useful for results of entities.getRows for example.
+*
+* @param {Array} pKeyValueObject <p/>you've to pass a 2D-Array where each element has to be an object with at least one key: value-pair, e.g.:
+* <br/>[{uid: "uid1", value: "value1"}, {uid: "uidN", value: "valueN"}]
+* @param {String} pUid <p/>name of the key where the rawvalue (the uid) is located in the object
+* @param {String} pTranslatedValue <p/>name of the key where the already translated value is located in the object
+* @param {String} pDbFieldName <p/>name fo the database field where the KEY-value is stored
+*
+* @return {String} <p/>a SQL-expression (case-when-statement) that resolves the KEYID into the title -> as
+* preparedSatement-elements
+* <br/>The else-value is "unassigned".
+*
+* @example
+* var exampleDataStack = [
+* {keyVal: "PHONE", titleOriginal: "Phone", titleTranslated: "Telefon", origin: "MetaImporter"},
+* {keyVal: "EMAIL", titleOriginal: "email", titleTranslated: "E-Mail", origin: "MetaImporter"}
+* ];
+*
+* var sqlExpr = SqlUtils.getResolvingCaseWhenFromObject(exampleDataStack, "keyVal", "titleTranslated", "FORM.COMMUNICATION");
+* //results in a sql case when as prepared statement that is resolvedas following:
+* //case when FORM.COMMUNICATION = 'PHONE' then 'Telefon' when FORM.COMMUNICATION = 'EMAIL' then 'E-Mail' else 'nicht zugeordnet' end
+*/
+SqlUtils.getResolvingCaseWhenFromObject = function(pKeyValueObject, pUid, pTranslatedValue, pDbFieldName)
+{
+ var keyData = pKeyValueObject;
+ if (keyData.length == 0)
+ return ["''", []];
+
+ var translateValue = pTranslatedValue;
+ var uid = pUid;
+ var unassigned = translate.text("unassigned")
+
+ var resSql = "case ", preparedValues = [];
+ var colTypeKeyId = SQLTYPES.CHAR;
+ var colTypeTitle = SQLTYPES.NVARCHAR;
+ for (var i = 0, l = keyData.length; i < l; i++)
+ {
+ var translatedTitle = keyData[i][translateValue];
+ resSql += " when " + pDbFieldName + " = ? then ? "
+ preparedValues.push([keyData[i][pUid], colTypeKeyId]);
+ preparedValues.push([translatedTitle, colTypeTitle]);
+
+ }
+ resSql += " else '"+ unassigned +"' end ";
+ resSql = [resSql, preparedValues];
+ return resSql;
+};
+
/**
* Will quote all prepared statement values from the given statement.
*
@@ -4125,7 +4210,7 @@ SqlUtils.replaceConditionTemplate = function(pCondition, pPlaceholder, pReplacem
---------------------
*/
//use replaceAll because it's faster and supports negative lookbehinds
- replacements = {};
+ var replacements = {};
//manually readd the replaced backslashes by using a group reference, because they a part of the match and therefore replaced by "replaceAll"
//since the field COULD contain already a group reference (I think this is extremely uncommon;
//probably that never happens but better stay save): escape that references within the fieldname
diff --git a/process/StandardObject_lib/process.js b/process/StandardObject_lib/process.js
index 6eaf4aa07bd1023fd90e769f333f6034cf5f7893..59729e43a414845f43e95e3e5c8c5a0e98d6e11d 100644
--- a/process/StandardObject_lib/process.js
+++ b/process/StandardObject_lib/process.js
@@ -219,7 +219,7 @@ StandardObject.prototype._setContactStandardAddress = function (pAddressID, pCon
db.updateData(
"CONTACT",
["ADDRESS_ID"],
- db.getColumnTypes("CONTACT", ["ADDRESS_ID"]),
+ null,
[pAddressID],
newWhere("CONTACT.CONTACTID", pContactID).build());
}
@@ -288,7 +288,7 @@ StandardObject.prototype._setStandardCommunication = function (pCommunicationID,
db.updateData(
"COMMUNICATION",
["ISSTANDARD"],
- db.getColumnTypes("COMMUNICATION", ["ISSTANDARD"]),
+ null,
[pValue],
newWhere("COMMUNICATION.COMMUNICATIONID", pCommunicationID).build());
}
diff --git a/process/UserSettings_lib/UserSettings_lib.aod b/process/UserSettings_lib/UserSettings_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..41d85657ed0bcbfa6492589ee6a7238af2859f05
--- /dev/null
+++ b/process/UserSettings_lib/UserSettings_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>UserSettings_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/UserSettings_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/UserSettings_lib/process.js b/process/UserSettings_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..69c4108c4dd233d621da6a7a40e9f51abf2aed5e
--- /dev/null
+++ b/process/UserSettings_lib/process.js
@@ -0,0 +1,146 @@
+import("system.logging");
+import("system.neon");
+import("system.tools");
+import("system.vars");
+
+
+/**
+ * Provides functionality to handle UserSettings
+ *
+ * @class
+ */
+function UserSettingUtil () {}
+
+
+{ //block where variables declared with let are available to avoid unexpected side-effects
+
+ let _currentSettings = {};
+ let allowedSettings = [
+ tools.PASSWORD,
+ ];
+ let paramSettings = [
+ /*
+ "calHourdivider",
+ "calMaintimeEnd",
+ "calMaintimeStart",
+ "selectionIgnoreCase",
+ "selectionPlaceholder",
+ */
+ ];
+
+
+ /**
+ * Initializes the entity fields with the current settings
+ *
+ * @result {void}
+ */
+ UserSettingUtil.initSettings = function ()
+ {
+ UserSettingUtil.getLoadCurrentSettings();
+
+ for(let i = 0; i < paramSettings.length; i++) {
+ let key = paramSettings[i];
+ neon.setFieldValue("$field." + key, UserSettingUtil.getValue(key));
+ }
+ for(let i = 0; i < allowedSettings.length; i++) {
+ let key = allowedSettings[i];
+ neon.setFieldValue("$field." + key, UserSettingUtil.getValue(key));
+ }
+ }
+
+
+ /**
+ * (Re-)Loads the current user settings
+ *
+ * @result {Object}
+ */
+ UserSettingUtil.getLoadCurrentSettings = function ()
+ {
+ const user = tools.getCurrentUser();
+
+ _currentSettings = Object.assign({}, user.params);
+ delete user.params;
+ _currentSettings = Object.assign(_currentSettings, user);
+
+ return _currentSettings;
+ }
+
+ /**
+ * Returns the setting value by a given key
+ *
+ * @param {String} pKey name of the setting key
+ *
+ * @result {String|undefined} the value of a setting or undefined if it dies not exist
+ */
+ UserSettingUtil.getValue = function (pKey)
+ {
+ if(Object.keys(_currentSettings).length === 0) {
+ UserSettingUtil.getLoadCurrentSettings();
+ }
+
+ if(_currentSettings.hasOwnProperty(pKey)) {
+ return _currentSettings[pKey];
+ }
+
+ return undefined;
+ }
+
+
+ /**
+ * Updates the changed settings of the current user
+ *
+ * @result {void}
+ */
+ UserSettingUtil.updateSettings = function ()
+ {
+ let data = {"title":vars.get("$sys.user")};
+ let paramData = [];
+ let changedFields = UserSettingUtil.getChangedFields();
+
+ if(Object.keys(changedFields).length < 1) {
+ logging.log("No user settings changed");
+ return;
+ }
+
+ for(let key in changedFields) {
+ if(paramSettings.indexOf(key) != -1) {
+ paramData.push([key, changedFields[key]]);
+ } else if(allowedSettings.indexOf(key) != -1) {
+ data[key] = changedFields[key];
+ }
+ }
+
+ let fullObj = Object.assign({"params": paramData}, data);
+
+ tools.updateUser(fullObj);
+ tools.refreshCurrentUser();
+
+ UserSettingUtil.getLoadCurrentSettings();
+ }
+
+ /**
+ * Returns an array with all changed fields and their values
+ *
+ * @result {Object} the changed fields
+ */
+ UserSettingUtil.getChangedFields = function ()
+ {
+ const currentSettings = UserSettingUtil.getLoadCurrentSettings();
+ const rowData = vars.get("$local.rowdata");
+ let changedFields = {};
+
+ for(let rawKey in rowData) {
+ let key = rawKey.split(".")[0];
+ let value = UserSettingUtil.getValue(key);
+
+ if(paramSettings.indexOf(key) != -1 || allowedSettings.indexOf(key) != -1) {
+ if(value !== undefined && value !== rowData[rawKey]) {
+ changedFields[key] = rowData[rawKey];
+ }
+ }
+ }
+
+ return changedFields;
+ }
+
+} //end of block
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index 30e6b6b27aac5415eadfcaa53db1fcfc88a9ad5a..2c687d66a4dda42890909aa061ac311e69be5ef9 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -15,6 +15,194 @@ import("system.datetime");
import("Offer_lib");
import("Date_lib");
+
+/**
+ * Provides static utility functions that work for more than a single data type.
+ * Don't instanciate it.
+ */
+function Utils () {}
+
+/**
+ * Checks if the given object, array or string is empty.
+ *
+ * @param {Object|Array|String} pObject the object to check
+ * @return {Boolean} true if the object is empty
+ */
+Utils.isEmpty = function (pObject)
+{
+ if (Utils.isString(pObject) || Array.isArray(pObject))
+ return pObject.length === 0;
+ for (let key in pObject)
+ {
+ return false;
+ }
+ return true;
+}
+
+/**
+ * Checks if the given value is null, undefined or empty.
+ *
+ * @param {Object|Array|String} pObject the object to check
+ * @return {Boolean} true if the object is null, undefined or empty
+ */
+Utils.isNullOrEmpty = function (pObject)
+{
+ return pObject === null || pObject === undefined || Utils.isEmpty(pObject);
+}
+
+/**
+ * Creates a deep copy of the given object. Also works with arrays.
+ *
+ * @param {Object} pObject the object to create a copy of
+ * @return {Object} the cloned object
+ * @example
+ *
+ * var original = new MyObject();
+ * original.name = "Jotaro";
+ *
+ * var copy = ObjectUtils.clone(original);
+ * copy.name = "Josuke";
+ *
+ * logging.log(original.name != copy.name); //true
+ * logging.log(copy instanceof MyObject()); //true (prototypes are set correctly)
+ */
+Utils.clone = function (pObject)
+{
+ if (!Utils.isObject(pObject) || pObject === null)
+ return pObject; //Return the value if inObject is not an object
+
+ var clonedObject = Array.isArray(pObject)
+ ? []
+ : Object.create(Object.getPrototypeOf(pObject)); //set the prototype of the given object
+
+ for (let key in pObject)
+ {
+ var value = pObject[key];
+ clonedObject[key] = Utils.clone(value); //Recursively (deep) copy for nested objects, including arrays
+ }
+
+ return clonedObject;
+}
+
+/**
+ * Checks two values or objects for deep equality. The following rules apply:
+ * <ul>
+ * <li>primitive values are tested for strict equality (===)</li>
+ * <li>NaN and NaN are treated as equal</li>
+ * <li>objects are checked if they have exactly the same properties and values</li>
+ * <li>arrays are checked if they are equal</li>
+ * <li>an array is never equal to an object</li>
+ * </ul>
+ *
+ * @param {Object} pFirstObject the first value
+ * @param {Object} pSecondObject the second value
+ * @return {Boolean} true, if both values are equal
+ */
+Utils.isEqual = function (pFirstObject, pSecondObject)
+{
+ var firstType = typeof pFirstObject;
+ var secondType = typeof pSecondObject;
+ if (firstType !== secondType)
+ return false;
+ if (firstType === "object" && pFirstObject !== null && pSecondObject !== null) //check for null because typeof null is also "object"
+ {
+ var isFirstArray = Array.isArray(pFirstObject);
+ var isSecondArray = Array.isArray(pSecondObject);
+ if (isFirstArray !== isSecondArray) //return false if only one object is an array
+ return false;
+ if (isFirstArray && pFirstObject.length !== pSecondObject.length)
+ return false;
+
+ for (let key in pSecondObject)
+ {
+ if (!(key in pFirstObject))
+ return false;
+ }
+ for (let key in pFirstObject)
+ {
+ if (!(key in pSecondObject) || !Utils.isEqual(pFirstObject[key], pSecondObject[key]))
+ return false;
+ }
+ return true;
+ }
+ if (firstType === "number" && Number.isNaN(pFirstObject) && Number.isNaN(pSecondObject)) //NaN should be equal to NaN
+ return true;
+
+ return pFirstObject === pSecondObject;
+}
+
+/**
+ * Checks if the given value is a function.
+ *
+ * @param {Object} pValue the value to check
+ * @return {Boolean} true if the value is a function
+ */
+Utils.isFunction = function (pValue)
+{
+ return typeof pValue === "function";
+}
+
+/**
+ * Checks if the given value is a string.
+ *
+ * @param {Object} pValue the value to check
+ * @return {Boolean} true if the value is a string
+ */
+Utils.isString = function (pValue)
+{
+ return typeof pValue === "string";
+}
+
+/**
+ * Checks if the given value is a number.
+ *
+ * @param {Object} pValue the value to check
+ * @return {Boolean} true if the value is a number
+ */
+Utils.isNumber = function (pValue)
+{
+ return typeof pValue === "number";
+}
+
+/**
+ * Checks if the given value is an object. Be careful, null is also considered "object".
+ *
+ * @param {Object} pValue the value to check
+ * @return {Boolean} true if the value is an object
+ */
+Utils.isObject = function (pValue)
+{
+ return typeof pValue === "object";
+}
+
+/**
+ * Checks if the given value is a boolean.
+ *
+ * @param {Object} pValue the value to check
+ * @return {Boolean} true if the value is a boolean
+ */
+Utils.isBoolean = function (pValue)
+{
+ return typeof pValue === "boolean";
+}
+
+/**
+ * Parses the given value to Boolean, this can be used to check for stringified Booleans. These rules apply:
+ * <ul>
+ * <li>If the value is falsy, false is returned</li>
+ * <li>The strings "0", "false", "null" and "undefined" will result in false</li>
+ * <li>If the valueOf method of the value returns a falsy value, false is returned
+ * (this is to make sure the function returns false for weird stuff like 'new Boolean(false)')</li>
+ * <li>Every other value results in true</li>
+ *
+ * @param {String|Object} pValue the value to parse
+ * @return {Boolean} a real boolean
+ */
+Utils.toBoolean = function (pValue)
+{
+ return !(!pValue || pValue === "0" || pValue === "false" || pValue === "null" || pValue === "undefined" || !(pValue.valueOf()));
+}
+
/**
* Class containing static utility functions for regular expression objects (RegExp)
* Do not create an instance of this
@@ -284,7 +472,7 @@ ArrayUtils.distinct2d = function(p2dArray)
* sorts a two dimensional array by the given index
*
* @param {Array} targetArray the Array to be sorted
- * @param {String} index the index of the field to sort by
+ * @param {Number} index the indexposistion of the field to sort by
* @param {Boolean} [sortAsc=false] TRUE sorts ascending, FALSE sorts decending
* @param {Boolean} [isNumber=false] TRUE sorts numerical, FALSE or undefined sorts alphanumerical
*
@@ -300,6 +488,25 @@ ArrayUtils.sort2d = function(targetArray, index, sortAsc, isNumber) {
if (index >= targetArray[0].length)
throw new RangeError("Index Out Of Bounds: " + index + " >= " + targetArray[0].length);
+ var res = ArrayUtils.sortArrayOfObjects(targetArray, index, sortAsc, isNumber);
+ return res;
+};
+
+
+/**
+ * sorts an array of boject the given name index
+ *
+ * @param {Array} targetArray the Array to be sorted
+ * @param {String} key the key (index) of the field to sort by
+ * @param {Boolean} [sortAsc=false] TRUE sorts ascending, FALSE sorts decending
+ * @param {Boolean} [isNumber=false] TRUE sorts numerical, FALSE or undefined sorts alphanumerical
+ *
+ * @return targetArray
+ *
+ * @throws {RangeError} if index was not found
+ */
+ArrayUtils.sortArrayOfObjects = function(targetArray, key, sortAsc, isNumber) {
+ var index = key;
var sortFn = function (x, y) {
if ( isNumber ) {
xx = Number(x[index]);
@@ -308,6 +515,11 @@ ArrayUtils.sort2d = function(targetArray, index, sortAsc, isNumber) {
else {
xx = x[index];
yy = y[index];
+
+ if (xx == undefined)
+ throw new RangeError("Index Out Of Bounds: The index " + index + " was not found while sorting.");
+ if (yy == undefined)
+ throw new RangeError("Index Out Of Bounds: The index " + index + " was not found while sorting.");
xx = xx.toLowerCase();
xx = xx.replace(/ä/g,"ae");
@@ -330,7 +542,7 @@ ArrayUtils.sort2d = function(targetArray, index, sortAsc, isNumber) {
targetArray.sort(sortFn);
return targetArray
-}
+};
/**
* sorts an array with columns
@@ -394,6 +606,8 @@ ArrayUtils.sortMulti = function(targetArray, sortOrder) {
}
/**
+* @deprecated just use Array.prototype.splice
+*
* removes an specific element from an array
*
* @param {Array} targetArray Array from which the element should be removed
@@ -641,12 +855,12 @@ NumberSequencingUtils.validateUniqueNumber = function(pNumber, pColumn, pTable,
*
* @result {String} hightest number
*/
-NumberSequencingUtils.getMaxUniqueNumber = function(pColumn, pTable, pCondition) {
- var condition = "";
- if(pCondition != undefined)
- condition += " where " + pCondition;
- var maxNum = db.cell("select max(" + pColumn + ") from " + pTable + condition);
- return maxNum == "" ? "0" : maxNum;
+NumberSequencingUtils.getMaxUniqueNumber = function(pColumn, pTable, pCondition)
+{
+ return newSelect(new SqlMaskingUtils().max(pColumn))
+ .from(pTable)
+ .whereIfSet(pCondition)
+ .cell() || "0";
}
/**
diff --git a/process/Workflow_lib/process.js b/process/Workflow_lib/process.js
index 2387f13ee8f9bf28e21f6c0d5123178a7d14518e..6bea1c6a4d8262beb8400e58754aca2c88a19468 100644
--- a/process/Workflow_lib/process.js
+++ b/process/Workflow_lib/process.js
@@ -22,15 +22,13 @@ function WorkflowUtils () {}
* selects all process definition keys that can be started in a context according to the workflow start config
*
* @param {String} pContext context for the process
- * @param {String} pAction trigger action
* @return {Array} array of all possible process definition keys
*/
-WorkflowUtils.getPossibleWorkflowDefinitions = function (pContext, pAction)
+WorkflowUtils.getPossibleWorkflowDefinitions = function (pContext)
{
return newSelect("PROCESSDEFINITION_KEY")
.from("WORKFLOWSTARTCONFIG")
.where("WORKFLOWSTARTCONFIG.OBJECT_TYPE", pContext)
- .and("WORKFLOWSTARTCONFIG.TRIGGER_EVENT", pAction)
.arrayColumn();
}
@@ -97,57 +95,6 @@ WorkflowUtils.getModelerUrl = function (pModelId, pIsEditor)
return modelerUrl;
}
-/**
- * obsolete, use signals
- */
-function WorkflowStarter () {}
-
-WorkflowStarter.TRIGGER_INSERT = function ()
-{
- return $KeywordRegistry.workflowTrigger$create();
-}
-
-WorkflowStarter.TRIGGER_UPDATE = function ()
-{
- return $KeywordRegistry.workflowTrigger$update();
-}
-
-WorkflowStarter.TRIGGER_DELETE = function ()
-{
- return $KeywordRegistry.workflowTrigger$delete();
-}
-
-WorkflowStarter.inserted = function (pVariables, pTargetId, pTargetContext)
-{
- WorkflowStarter._startProcessByAction(WorkflowStarter.TRIGGER_INSERT(), pVariables, pTargetId, pTargetContext);
-}
-
-WorkflowStarter.updated = function (pVariables, pTargetId, pTargetContext)
-{
- WorkflowStarter._startProcessByAction(WorkflowStarter.TRIGGER_UPDATE(), pVariables, pTargetId, pTargetContext);
-}
-
-WorkflowStarter.deleted = function (pVariables, pTargetId, pTargetContext)
-{
- WorkflowStarter._startProcessByAction(WorkflowStarter.TRIGGER_DELETE(), pVariables, pTargetId, pTargetContext);
-}
-
-WorkflowStarter._startProcessByAction = function (pAction, pVariables, pTargetId, pTargetContext)
-{
- if (!pVariables)
- pVariables = {};
-
- Object.assign(pVariables, WorkflowVariables.getTargetVariables(pTargetId, pTargetContext));
-
- var context = pVariables.targetContext;
- WorkflowUtils.getPossibleWorkflowDefinitions(context, pAction).forEach(function (processKey)
- {
- try {
- workflow.startProcessByKey(processKey, pVariables);
- } catch (err) {}
- });
-}
-
/**
* provides functions for working with workflow signals
*/
diff --git a/process/WsValidation_lib/documentation.adoc b/process/WsValidation_lib/documentation.adoc
index a47408f2eda03e4053709939fcb9deb4d48ae12e..cebc9f7afd9c70630bc2e4c2f301a3c6cefe343a 100644
--- a/process/WsValidation_lib/documentation.adoc
+++ b/process/WsValidation_lib/documentation.adoc
@@ -1 +1,65 @@
-See beginning of Lib. (TODO: move here??)
\ No newline at end of file
+= WsValidation_lib
+
+To enable the nominatim webservice: go to Preferences -> _____PREFERENCES_PROJECT -> _____PREFERENCES_PROJECT
+and enable the nominatim.enable checkbox
+
+== How to add a new Webservice type
+
+- Scroll down to WsValidationType.get
+- add a new Type into the cache like the other ones
+- IMPORTANT: use the same name for the key as for the first parameter of the new WsValidationType!
+- the second param, pWebserviceName defines which webservice should be used. This name is used for the custom project preferences
+ e.g. nominatim webservice has the custom preference nominatim.enable which is checked by WsValidationUtils.isWsEnabled
+ all other project preferences can contain the url, useername, password, etc. and are used by the function you create in the next step:
+- WS-Request function: (pProcessRequestCallback)
+ This callback defines a function which is called if a Request is triggered.
+ the following params are available (if you need more you have to add them to WsValidationUtils.validate(...)
+ pValue, pCountry, pCity
+
+ You can base your callback on the function _nominatimRequest(pValue, pCountry, pCity)
+
+ Your callback has to call the processResultCallback (created as next step) for example like this:
+ return this.processResultCallback.call(this, ret, pValue);
+
+- WS-Result function: (pProcessResultCallback)
+ This callback defines a function which is called on receiving an answer from the webservice.
+
+ Base it on function _processNominatimAddressLookup(pWsResult, pValue) below.
+
+- create a new provider, which presets the Type_param with the new Type (you should not expose the parameter on this provider):
+import("WsValidation_lib");
+import("system.result");
+
+result.string(WsValidationType.get().TYPE_ADDRESS_NOMINATIM.key);
+
+
+
+== How to add a new lookup using the webservice (like e.g. ZIP)
+
+Address_entity-specific!
+
+In the following Text I use "main field" when referencing the field which is directly connected with the db and contains the actual data (e.g. $field.ZIP)
+The main field is only displayed if the webservice is disabled.
+In the following Text I use "ws field" when referencing the new field which is displayed when the webservice is enabled. It "uses" the data provided by the main field.
+
+- create new ws field:
+ e.g. Zip_ws
+- Set the following properties:
+ * textInputAllowed: true
+ * onValueChangeTypes: Mask (only)
+ * title
+- add the following processes by using the functions from WsValidationFieldUtils (see the already existing Zip_ws field for reference)
+ * valueProcess
+ * displayValueProcess
+ * onValueChange
+ * stateProcess
+ * mandatoryProcess
+- if your main field has a onValidationProcess, copy it from the main field and wrap it with a check for ENABLÖED webservice (see Zip_ws)
+ and maybe modify it (note that the onValidationProcess may get the Request answer as value. You have to deal with it!
+ Also wrap the onValidationProcess of your main field with a check for DISABLED webservice (see ZIP field)
+- create a new Consumer (e.g. ZipValidation_entity) and point it to the AddressValidation_entity.
+ Use the corresponding provider which is created for the type you need (see documentation 1. above)
+ You may have to fill the parameters. if they are needed by your webservice
+- You HAVE TO fill the param "currentValueParam" by the value of your main field.
+- set the consumer of your ws field to the newly created consumer
+- Add your new ws field to the views: AddressList_view and AddressMultiEdit_view (right above the mainField)See beginning of Lib. (TODO: move here??)
\ No newline at end of file
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 53fd37c61484e06d74992b9c93ca88c17ca7d832..d7387dcc3df1b261445bbaf1fbac122a1e1be983 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -9,77 +9,7 @@ import("system.util");
import("system.auth");
import("DataCaching_lib");
import("AddressEntity_lib");
-
-/******************************************************************************/
-/******************************************************************************/
-/********************************DOCUMENTATION*********************************/
-/******************************************************************************/
-/******************************************************************************/
-/*
-
-To enable the nominatim webservice: go to Preferences -> _____PREFERENCES_PROJECT -> _____PREFERENCES_PROJECT
-and enable the nominatim.enable checkbox
-
-1. How to add a new Webservice type
------------------------------------
-- Scroll down to WsValidationType.get
-- add a new Type into the cache like the other ones
-- IMPORTANT: use the same name for the key as for the first parameter of the new WsValidationType!
-- the second param, pWebserviceName defines which webservice should be used. This name is used for the custom project preferences
- e.g. nominatim webservice has the custom preference nominatim.enable which is checked by WsValidationUtils.isWsEnabled
- all other project preferences can contain the url, useername, password, etc. and are used by the function you create in the next step:
-- WS-Request function: (pProcessRequestCallback)
- This callback defines a function which is called if a Request is triggered.
- the following params are available (if you need more you have to add them to WsValidationUtils.validate(...)
- pValue, pCountry, pCity
-
- You can base your callback on the function _nominatimRequest(pValue, pCountry, pCity)
-
- Your callback has to call the processResultCallback (created as next step) for example like this:
- return this.processResultCallback.call(this, ret, pValue);
-
-- WS-Result function: (pProcessResultCallback)
- This callback defines a function which is called on receiving an answer from the webservice.
-
- Base it on function _processNominatimAddressLookup(pWsResult, pValue) below.
-
-- create a new provider, which presets the Type_param with the new Type (you should not expose the parameter on this provider):
-import("WsValidation_lib");
-import("system.result");
-
-result.string(WsValidationType.get().TYPE_ADDRESS_NOMINATIM.key);
-
-
-2. Address_entity-specific!
-How to add a new lookup using the webservice (like e.g. ZIP)
-------------------------------------------------------------
-
-In the following Text I use "main field" when referencing the field which is directly connected with the db and contains the actual data (e.g. $field.ZIP)
-The main field is only displayed if the webservice is disabled.
-In the following Text I use "ws field" when referencing the new field which is displayed when the webservice is enabled. It "uses" the data provided by the main field.
-
-- create new ws field:
- e.g. Zip_ws
-- Set the following properties:
- * textInputAllowed: true
- * onValueChangeTypes: Mask (only)
- * title
-- add the following processes by using the functions from WsValidationFieldUtils (see the already existing Zip_ws field for reference)
- * valueProcess
- * displayValueProcess
- * onValueChange
- * stateProcess
- * mandatoryProcess
-- if your main field has a onValidationProcess, copy it from the main field and wrap it with a check for ENABLÖED webservice (see Zip_ws)
- and maybe modify it (note that the onValidationProcess may get the Request answer as value. You have to deal with it!
- Also wrap the onValidationProcess of your main field with a check for DISABLED webservice (see ZIP field)
-- create a new Consumer (e.g. ZipValidation_entity) and point it to the AddressValidation_entity.
- Use the corresponding provider which is created for the type you need (see documentation 1. above)
- You may have to fill the parameters. if they are needed by your webservice
-- You HAVE TO fill the param "currentValueParam" by the value of your main field.
-- set the consumer of your ws field to the newly created consumer
-- Add your new ws field to the views: AddressList_view and AddressMultiEdit_view (right above the mainField)
-*/
+import("Util_lib");
/**
* Class used for the webservice validation types.
@@ -112,10 +42,20 @@ WsValidationType.get = function(pKey)
if (!this._cache)
this._cache = {
// Address lookups
- TYPE_ADDRESS_NOMINATIM: new WsValidationType("TYPE_ADDRESS_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, "q"),
- TYPE_ZIP_NOMINATIM: new WsValidationType("TYPE_ZIP_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, "postalcode"),
- TYPE_CITY_NOMINATIM: new WsValidationType("TYPE_CITY_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, "city"),
- TYPE_STREET_NOMINATIM: new WsValidationType("TYPE_STREET_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, "street"),
+ TYPE_ADDRESS_NOMINATIM: new WsValidationType("TYPE_ADDRESS_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, {
+ valueParameter: "q"
+ }),
+ TYPE_ZIP_NOMINATIM: new WsValidationType("TYPE_ZIP_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, {
+ valueParameter: "postalcode"
+ }),
+ TYPE_CITY_NOMINATIM: new WsValidationType("TYPE_CITY_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, {
+ valueParameter: "city"
+ }),
+ TYPE_STREET_NOMINATIM: new WsValidationType("TYPE_STREET_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, {
+ valueParameter: "street"
+ }),
+
+ TYPE_FULLADDRESS_NOMINATIM: new WsValidationType("TYPE_FULLADDRESS_NOMINATIM", "nominatim", _nominatimLocationRequest, _processNominatimAddressLocation, {}),
// Communication validation (Not used anymore, as it's done via system functions now. Left here for reference.)
TYPE_PHONE: new WsValidationType("TYPE_PHONE", "phoneValidation", _customRequest, _processCommunicationValidation, "Number")
@@ -140,52 +80,58 @@ WsValidationType.get = function(pKey)
function _processNominatimAddressLookup(pWsResult, pValue)
{
- var resultAddresses = [];
-
if (pWsResult != null)
{
- pWsResult.forEach(function(pPlaceData) {
+ return pWsResult.map(function(pPlaceData)
+ {
if (pPlaceData.address == undefined)
pPlaceData.address = {};
- var city = pPlaceData.address.town;
- if (!city)
- city = pPlaceData.address.city;
- if (!city)
- city = pPlaceData.address.village;
- if (!city)
- city = pPlaceData.address.hamlet;
+ var city = pPlaceData.address.town
+ || pPlaceData.address.city
+ || pPlaceData.address.village
+ || pPlaceData.address.hamlet;
- var cityext = pPlaceData.address.suburb;
- if (!cityext)
- cityext = pPlaceData.address.city_district;
+ var cityext = pPlaceData.address.suburb
+ || pPlaceData.address.city_district;
- var addrData = [
- pPlaceData.display_name,
- pPlaceData.address.postcode,
- city,
- cityext,
- pPlaceData.address.country_code.toUpperCase(),
- pPlaceData.address.district,
- pPlaceData.address.state_district,
- pPlaceData.address.state,
- pPlaceData.address.road,
- pPlaceData.address.house_number,
- pPlaceData.lon,
- pPlaceData.lat
- ];
-
- resultAddresses.push([JSON.stringify(addrData.concat([pValue, pPlaceData.place_id]))].concat(addrData));
- })
+ return {
+ placeId: pPlaceData.place_id,
+ value: pValue,
+ displayName: pPlaceData.display_name,
+ zipCode: pPlaceData.address.postcode,
+ city: city,
+ cityExt: cityext,
+ country: pPlaceData.address.country_code.toUpperCase(), //4
+ district: pPlaceData.address.district,
+ region: pPlaceData.address.state_district,
+ state: pPlaceData.address.state,
+ road: pPlaceData.address.road, //8
+ buildingNo: pPlaceData.address.house_number,
+ lat: pPlaceData.lat,
+ lon: pPlaceData.lon
+ };
+ });
}
- return resultAddresses;
+ return [];
+ }
+
+ function _processNominatimAddressLocation (pWsResult)
+ {
+ if (pWsResult == null || pWsResult.length === 0)
+ return null;
+
+ return {
+ lat: pWsResult[0].lat,
+ lon: pWsResult[0].lon
+ };
}
/**
* request using a custom webservice
*/
- function _customRequest(pValue, pCountry)
+ function _customRequest(pValue, pParameters)
{
if (WsValidationUtils.isWsEnabled(this))
{
@@ -197,7 +143,7 @@ WsValidationType.get = function(pKey)
if (!userName || !pw || !url || !countryParamName)
{
- throw new Error("if the webservice " + this.key + " is enabled, you have to provide also userName, pw, url and countryParamName")
+ throw new Error("if the webservice " + this.key + " is enabled, you have to provide also userName, pw, url and countryParamName");
}
var actionType = "GET";
@@ -206,9 +152,9 @@ WsValidationType.get = function(pKey)
{
// fill params
var parameters = {};
- if (pCountry)
+ if (pParameters && pParameters.country)
{
- parameters[countryParamName] = pCountry;
+ parameters[countryParamName] = pParameters.country;
}
parameters[parameterName] = pValue;
@@ -229,100 +175,118 @@ WsValidationType.get = function(pKey)
return this.processResultCallback.call(this, null, pValue);
}
- function _nominatimRequest(pValue, pCountry, pCity)
+ function _nominatimRequest(pValue, pParameters)
{
+ if (!pParameters)
+ pParameters = {};
var nominatimCache;
if (WsValidationUtils.isWsEnabled(this))
{
- var parameterName = this.additionalInfo;
+ if (pValue && this.additionalInfo.valueParameter)
+ pParameters[this.additionalInfo.valueParameter] = pValue;
+
+ var cacheKey = Object.keys(pParameters).sort().map(function (parameterName)
+ {
+ return parameterName + "=" + pParameters[parameterName];
+ }).join("&");
if (!vars.exists("$context.nominatim"))
{
nominatimCache = {
last: ""
- }
+ };
}
else
{
nominatimCache = JSON.parse(vars.getString("$context.nominatim"));
}
- if (nominatimCache.last == parameterName + pValue + (pCountry ? pCountry : "") + (pCity ? pCity : "") )
+ if (nominatimCache.last == cacheKey)
{
return nominatimCache.data;
}
else
{
- nominatimCache.last = parameterName + pValue + (pCountry ? pCountry : "") + (pCity ? pCity : "")
-
- var url = project.getPreferenceValue("custom." + this.webserviceName + ".url");
- var pw = project.getPreferenceValue("custom." + this.webserviceName + ".pw");
- var user = project.getPreferenceValue("custom." + this.webserviceName + ".user");
-
-
- if (!url)
- {
- throw new Error("if the webservice " + this.key + " is enabled, you have to provide also the url")
- }
-
- if (pValue)
+ nominatimCache.last = cacheKey;
+
+ if (!this.additionalInfo.url)
+ this.additionalInfo.url = project.getPreferenceValue("custom." + this.webserviceName + ".url");
+ if (!this.additionalInfo.user)
+ this.additionalInfo.user = project.getPreferenceValue("custom." + this.webserviceName + ".user");
+ if (!this.additionalInfo.password)
+ this.additionalInfo.password = project.getPreferenceValue("custom." + this.webserviceName + ".pw");
+ if (this.additionalInfo.resultLimit === undefined) //can be explicitly null
+ this.additionalInfo.resultLimit = project.getPreferenceValue("custom." + this.webserviceName + ".resultLimit");
+
+ if (!this.additionalInfo.url)
+ throw new Error("if the webservice '" + this.key + "' is enabled, you have to provide the url");
+
+ if (!Utils.isEmpty(pParameters))
{
- var restConf = net.createConfigForRestWebserviceCall()
- .url(url)
- .actionType("GET")
- .dataTypeAccept("application/json")
- .dataTypeJDitoAccept(util.DATA_TEXT)
- .dataTypeJDitoSend(util.DATA_TEXT)
- .addQueryParameter("format", "json")
- .addQueryParameter("addressdetails", "1");
+ var nominatimRequest = new NominatimRequest(this.additionalInfo.url)
+ .includeAddressDetails()
+ .setParameters(pParameters);
+
+ if (this.additionalInfo.user && this.additionalInfo.password)
+ nominatimRequest.setUser(this.additionalInfo.user, this.additionalInfo.password);
- var authConf;
- if (user && pw)
- {
- authConf = auth.createConfigForBasicAuth()
- .userName(user)
- .password(pw);
- }
- else
- {
- authConf = auth.createConfigForNoAuth()
- }
-
- // add user input params
- if (pCountry)
- {
- restConf.addQueryParameter("countrycodes", pCountry)
- }
- if (pCity)
- {
- restConf.addQueryParameter("city", pCity)
- }
-
- restConf.addQueryParameter(parameterName, pValue)
-
+ if (this.additionalInfo.resultLimit)
+ nominatimRequest.setResultLimit(this.additionalInfo.resultLimit);
// call webservice
- var ret = JSON.parse(net.callRestWebservice(restConf, authConf));
+ var ret = nominatimRequest.get();
// if error, log the error. But also process the result and let the callback generate the correct default value
if (ret == null)
{
- logging.log("error")
+ logging.log("error");
logging.log(translate.withArguments("${WEBSERVICE_ERROR} url:%0 status:%1", [url, (ret.hasHttpSuccessStatusCode ? " StatusCode: " + ret.httpStatusCode : "")]));
}
// different handling of the result per type
nominatimCache.data = this.processResultCallback.call(this, ret, pValue);
- vars.set("$context.nominatim", JSON.stringify(nominatimCache))
+ vars.set("$context.nominatim", JSON.stringify(nominatimCache));
return nominatimCache.data;
}
}
}
- nominatimCache = {}
+ nominatimCache = {};
nominatimCache.data = this.processResultCallback.call(this, null, pValue);
- vars.set("$context.nominatim", JSON.stringify(nominatimCache))
+ vars.set("$context.nominatim", JSON.stringify(nominatimCache));
return nominatimCache.data;
}
+
+ function _nominatimLocationRequest (pValue, pParameters)
+ {
+ if (!this.additionalInfo.url)
+ this.additionalInfo.url = project.getPreferenceValue("custom." + this.webserviceName + ".url");
+ if (!this.additionalInfo.user)
+ this.additionalInfo.user = project.getPreferenceValue("custom." + this.webserviceName + ".user");
+ if (!this.additionalInfo.password)
+ this.additionalInfo.password = project.getPreferenceValue("custom." + this.webserviceName + ".pw");
+
+ var url = this.additionalInfo.url;
+ var user = this.additionalInfo.user;
+ var password = this.additionalInfo.password;
+
+ if (!url)
+ throw new Error("if the webservice '" + this.key + "' is enabled, you have to provide the url");
+
+ if (!Utils.isNullOrEmpty(pParameters))
+ {
+ var nominatimRequest = new NominatimRequest(url)
+ .setResultLimit(1)
+ .setParameters(pParameters);
+
+ if (user && password)
+ nominatimRequest.setUser(user, password);
+
+ var ret = nominatimRequest.get();
+
+ return this.processResultCallback.call(this, ret);
+ }
+ return null;
+ }
}
/**
@@ -338,18 +302,17 @@ function WsValidationUtils() {}
* validate the value with the webservice
* @param {String} pValue to search for
* @param {WsValidationType|String} pType type used for the search. Can be an WsValidationType or the key of the WsValidationType
- * @param {String} pCountry needed by some webservices e.g. "DE"
- * @param {String} pCity needed by some webservices e.g. "Landshut"
+ * @param {Object} pParameters extra parameters for the webservice, the possible parameters may differ depending on the WsValidationType
*
* @return {object} this is different, based on which webservice-type is used
*/
-WsValidationUtils.validate = function(pValue, pType, pCountry, pCity)
+WsValidationUtils.validate = function(pValue, pType, pParameters)
{
// get WsValidationType-Object if it is only the key
if (typeof pType == "string")
pType = WsValidationType.get(pType);
- return pType.processRequestCallback.call(pType, pValue, pCountry, pCity)
+ return pType.processRequestCallback.call(pType, pValue, pParameters);
}
/**
@@ -358,20 +321,20 @@ WsValidationUtils.validate = function(pValue, pType, pCountry, pCity)
*
* @return {Array|null} the parsed data as array or null if it was no array
*/
-WsValidationUtils.parseJSONArray = function(pJSON) {
+WsValidationUtils.parseJSONArray = function(pJSON)
+{
try
{
var data = JSON.parse(pJSON);
- } catch (ex) {
- // if no valid json, it is a direct user input and not a uuid.
- // ignore error
- return null
+ }
+ catch (ex)
+ {
+ // if no valid json, it is a direct user input and not a uuid, ignore error
+ return null;
}
- var type = typeof data;
- // Only an array can be returned by the ws. V-- this check is slow -> check if not object before as its faster
- if (type != "object" || Object.prototype.toString.call(data) !== '[object Array]')
- return null
+ if (typeof data !== "object")
+ return null;
return data;
}
@@ -389,22 +352,21 @@ WsValidationUtils.setAddressFields = function(pJSON)
return false;
var toSet = {
- "$field.ZIP": data[1],
- "$field.CITY": data[2],
- "$field.COUNTRY": data[4],
- //"$field.DISTRICT": data[5], not needed currently
- "$field.REGION": data[6],
- "$field.STATE": data[7],
- "$field.ADDRESS": data[8]
+ "$field.ZIP": data.zipCode,
+ "$field.CITY": data.city,
+ "$field.COUNTRY": data.country,
+ //"$field.DISTRICT": data.district, not needed currently
+ "$field.REGION": data.region,
+ "$field.STATE": data.state,
+ "$field.ADDRESS": data.road,
+ "$field.BUILDINGNO": data.buildingNo
}
- for (field in toSet)
+ for (let field in toSet)
{
let value = toSet[field];
- if (!value)
- value = ""
-
- neon.setFieldValue(field, value);
+ if (value)
+ neon.setFieldValue(field, value);
}
return true;
@@ -420,9 +382,9 @@ WsValidationUtils.valueFromJSON = function(pJSON)
{
var data = WsValidationUtils.parseJSONArray(pJSON);
if (data == null)
- return null
+ return null;
- return data[12];
+ return data.value;
}
/**
* check if the Webservice is enabled in the project preferences
@@ -466,9 +428,9 @@ function WsValidationFieldUtils() {}
WsValidationFieldUtils.mainFieldStateProcess = function(pWsType)
{
if (WsValidationUtils.isWsEnabled(pWsType))
- return neon.COMPONENTSTATE_INVISIBLE
+ return neon.COMPONENTSTATE_INVISIBLE;
else
- return neon.COMPONENTSTATE_AUTO
+ return neon.COMPONENTSTATE_AUTO;
}
/**
@@ -478,9 +440,9 @@ WsValidationFieldUtils.mainFieldStateProcess = function(pWsType)
WsValidationFieldUtils.wsFieldStateProcess = function(pWsType)
{
if (!WsValidationUtils.isWsEnabled(pWsType))
- return neon.COMPONENTSTATE_INVISIBLE
+ return neon.COMPONENTSTATE_INVISIBLE;
else
- return neon.COMPONENTSTATE_AUTO
+ return neon.COMPONENTSTATE_AUTO;
}
/**
@@ -548,4 +510,102 @@ WsValidationFieldUtils.wsOnValueChangeProcess = function(pWsType, pMainField)
if (!newCurrentValue)
neon.setFieldValue(pMainField, vars.get("$local.value"));
}
+}
+
+/**
+ * Object for handling nominatim requests
+ */
+function NominatimRequest (pUrl)
+{
+ this.url = pUrl;
+ this.user = null;
+ this.password = null;
+ this.parameters = {
+ format: "json"
+ };
+}
+
+/**
+ * Changes if additional address details should be loaded.
+ *
+ * @param {boolean} [pInclude=true] if the details should be included
+ * @return {NominatimRequest} current object
+ */
+NominatimRequest.prototype.includeAddressDetails = function (pInclude)
+{
+ if (pInclude === false)
+ this.parameters.addressdetails = "0";
+ else
+ this.parameters.addressdetails = "1";
+ return this;
+}
+
+/**
+ * Changes the user for the webservice auth.
+ *
+ * @param {String} pUser the username
+ * @param {String} pPassword the password of the user
+ * @return {NominatimRequest} current object
+ */
+NominatimRequest.prototype.setUser = function (pUser, pPassword)
+{
+ this.user = pUser;
+ this.password = pPassword;
+ return this;
+}
+
+/**
+ * Adds parameters to the request.
+ *
+ * @param {Object} pParameters object containing the parameters that should be set
+ * @return {NominatimRequest} current object
+ */
+NominatimRequest.prototype.setParameters = function (pParameters)
+{
+ Object.assign(this.parameters, pParameters);
+ return this;
+}
+
+/**
+ * Sets the result limit of the request.
+ *
+ * @param {Number} pLimit the max amount of rows the webservice should return (default is 10, max is 50)
+ * @return {NominatimRequest} current object
+ */
+NominatimRequest.prototype.setResultLimit = function (pLimit)
+{
+ this.parameters.limit = pLimit.toString();
+ return this;
+}
+
+/**
+ * Calls the webservice and returns the result.
+ *
+ * @return {Object} webservice result
+ */
+NominatimRequest.prototype.get = function ()
+{
+ var restConf = net.createConfigForRestWebserviceCall()
+ .url(this.url)
+ .actionType("GET")
+ .dataTypeAccept("application/json")
+ .dataTypeJDitoAccept(util.DATA_TEXT)
+ .dataTypeJDitoSend(util.DATA_TEXT);
+
+ var authConf;
+ if (this.user && this.password)
+ {
+ authConf = auth.createConfigForBasicAuth()
+ .userName(this.user)
+ .password(this.password);
+ }
+ else
+ authConf = auth.createConfigForNoAuth();
+
+ for (let parameterName in this.parameters)
+ {
+ restConf.addQueryParameter(parameterName, this.parameters[parameterName]);
+ }
+
+ return JSON.parse(net.callRestWebservice(restConf, authConf));
}
\ No newline at end of file
diff --git a/process/ctiServerEvents/process.js b/process/ctiServerEvents/process.js
index ecb4f7e36158f19b8473870b9b5c2f280934b8dd..e0df2b323d8dc904b125b3c44fc12db5a50a5fe2 100644
--- a/process/ctiServerEvents/process.js
+++ b/process/ctiServerEvents/process.js
@@ -62,6 +62,8 @@ var ringingHandlerFn = function()
var affectedContext = this.contactsCall[0].PERSON_ID.trim() == "" ? "Organisation" : "Person";
notificationConfig.linkInfo(text.encodeMS([affectedContext, affectedContactId]));
}
+
+ notificationConfig.initialState(notification.STATE_CONFIRMED);
notification.addNotificationWith(notificationConfig);
diff --git a/process/importLead_serverProcess/process.js b/process/importLead_serverProcess/process.js
index b32a49225e188d6a89230857199280aa14b9c65e..c572bd5191e75ca1271e77b855cda357108de6b5 100644
--- a/process/importLead_serverProcess/process.js
+++ b/process/importLead_serverProcess/process.js
@@ -181,7 +181,7 @@ function getFieldPos (pFieldDef, pFieldName)
{
var multi = false;
var pos = new Array();
- for (i = 0; i < pFieldDef.length; i++)
+ for (let i = 0; i < pFieldDef.length; i++)
{
if (pFieldDef[i][1] == pFieldName)
{
diff --git a/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod b/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod
new file mode 100644
index 0000000000000000000000000000000000000000..cfd92c97942fb960b69e71317d82e75f4f013e0f
--- /dev/null
+++ b/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod
@@ -0,0 +1,11 @@
+<?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>mark_cachedrecordcontainers_invalid_serverProcess</name>
+ <title>Mark all cached record containers as invalid</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:RECYCLE</icon>
+ <process>%aditoprj%/process/mark_cachedrecordcontainers_invalid_serverProcess/process.js</process>
+ <variants>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/process/mark_cachedrecordcontainers_invalid_serverProcess/process.js b/process/mark_cachedrecordcontainers_invalid_serverProcess/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..402e201144084d4b01593dafbe040bd9416bad6b
--- /dev/null
+++ b/process/mark_cachedrecordcontainers_invalid_serverProcess/process.js
@@ -0,0 +1,3 @@
+import("system.entities");
+
+entities.invalidateCache();
\ No newline at end of file
diff --git a/process/setMissingAddressLocations_serverProcess/process.js b/process/setMissingAddressLocations_serverProcess/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..38efd070554dc6d17d40bef2e82496faa433ad38
--- /dev/null
+++ b/process/setMissingAddressLocations_serverProcess/process.js
@@ -0,0 +1,31 @@
+import("system.db");
+import("Sql_lib");
+import("Address_lib");
+import("Location_lib");
+
+var locationSearch = new LocationFinder();
+
+if (locationSearch.isEnabled())
+{
+ newSelect("ADDRESSID, ADDRESS, BUILDINGNO, ZIP, CITY, COUNTRY, PROVINCE")
+ .from("ADDRESS")
+ .where("ADDRESS.LAT is null")
+ .or("ADDRESS.LON is null")
+ .pageSize(400)
+ .forEachPage(function (addresses)
+ {
+ var locationUpdates = [];
+ addresses.forEach(function ([addressId, address, buildingno, zip, city, country, state])
+ {
+ var addressData = new AddressObject(address, buildingno, zip, city, country, state);
+ var location = locationSearch.getGeoLocation(addressData);
+ if (location)
+ {
+ locationUpdates.push(["ADDRESS", ["LAT", "LON"], null, [location.lat, location.lon],
+ newWhere("ADDRESS.ADDRESSID", addressId).buildCondition()]);
+ }
+ });
+ if (locationUpdates.length > 0)
+ db.updates(locationUpdates);
+ });
+}
\ No newline at end of file
diff --git a/process/setMissingAddressLocations_serverProcess/setMissingAddressLocations_serverProcess.aod b/process/setMissingAddressLocations_serverProcess/setMissingAddressLocations_serverProcess.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3752f6718de29b5a4b07e3c29bae7416d6860164
--- /dev/null
+++ b/process/setMissingAddressLocations_serverProcess/setMissingAddressLocations_serverProcess.aod
@@ -0,0 +1,11 @@
+<?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>setMissingAddressLocations_serverProcess</name>
+ <title>Set missing address locations</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/setMissingAddressLocations_serverProcess/process.js</process>
+ <alias>Data_alias</alias>
+ <variants>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/process/updateAllAddressLocations_serverProcess/process.js b/process/updateAllAddressLocations_serverProcess/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..5341f47ddfb539cbd4af47400db6a154cb50ea2a
--- /dev/null
+++ b/process/updateAllAddressLocations_serverProcess/process.js
@@ -0,0 +1,29 @@
+import("system.db");
+import("Sql_lib");
+import("Address_lib");
+import("Location_lib");
+
+var locationSearch = new LocationFinder();
+
+if (locationSearch.isEnabled())
+{
+ newSelect("ADDRESSID, ADDRESS, BUILDINGNO, ZIP, CITY, COUNTRY, PROVINCE")
+ .from("ADDRESS")
+ .pageSize(400)
+ .forEachPage(function (addresses)
+ {
+ var locationUpdates = [];
+ addresses.forEach(function ([addressId, address, buildingno, zip, city, country, state])
+ {
+ var addressData = new AddressObject(address, buildingno, zip, city, country, state);
+ var location = locationSearch.getGeoLocation(addressData);
+ if (location)
+ {
+ locationUpdates.push(["ADDRESS", ["LAT", "LON"], null, [location.lat, location.lon],
+ newWhere("ADDRESS.ADDRESSID", addressId).buildCondition()]);
+ }
+ });
+ if (locationUpdates.length > 0)
+ db.updates(locationUpdates);
+ });
+}
\ No newline at end of file
diff --git a/process/updateAllAddressLocations_serverProcess/updateAllAddressLocations_serverProcess.aod b/process/updateAllAddressLocations_serverProcess/updateAllAddressLocations_serverProcess.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e0b953cac1c1f40620c0510daec96d89a844955d
--- /dev/null
+++ b/process/updateAllAddressLocations_serverProcess/updateAllAddressLocations_serverProcess.aod
@@ -0,0 +1,11 @@
+<?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>updateAllAddressLocations_serverProcess</name>
+ <title>Set all address locations</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/updateAllAddressLocations_serverProcess/process.js</process>
+ <alias>Data_alias</alias>
+ <variants>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/process/updateClassifications_serverProcess/process.js b/process/updateClassifications_serverProcess/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..22f452a82db5f2ffe695ad1e24a5ca85f01a9c78
--- /dev/null
+++ b/process/updateClassifications_serverProcess/process.js
@@ -0,0 +1,222 @@
+import("system.logging");
+import("Classification_lib");
+import("Sql_lib");
+import("Organisation_lib");
+import("system.db");
+import("system.eMath");
+
+var outputInformation = {};//information how much data has been modified
+var gradingObject = {};
+var helperObject = {}; //Used to check whether or not the data has already been added
+var scoreObject = {};
+var archievedScoresObject = {};
+var objectTypes = [];
+var orderedGroups = [];
+var object_type, classificationGroupId, classificationTypeId, classificationScoreId, classificationScore, classificationGradingId, score, cond,
+classificationGradingMaxScore, classificationGrading, chainedGrading, currentObjectColumn, currentObjectTable, isOrganisation, idsWithoutStoredClassification;
+var groupString ={}
+var table = "CLASSIFICATIONSTORAGE";
+var column = ["CLASSIFICATIONVALUE"];
+
+//All the possible scores of the classification types
+var scoreArray = newSelect("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID, CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID, CLASSIFICATIONSCORE.SCORE")
+ .from("CLASSIFICATIONGROUP")
+ .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+ .join("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
+ .orderBy("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONGROUP.TITLE, CLASSIFICATIONGROUP.SORTING, CLASSIFICATIONTYPE.SCORETYPE, CLASSIFICATIONSCORE.SORT")
+ .table();
+
+//build scoreObject out of scoreArray
+for (var i = 0; i < scoreArray.length; i++)
+{
+ for (var ii = 0; ii < scoreArray[ii].length; ii++)
+ {
+ [object_type, classificationGroupId, classificationTypeId, classificationScoreId, classificationScore] = scoreArray[i];
+
+ if(!helperObject.hasOwnProperty(scoreArray[i][0])) //objectType
+ {
+ scoreObject[scoreArray[i][0]] = {}; //puts objectType in scoreObject and already initializes the object that later get's filled with the groups and their types
+ helperObject[scoreArray[i][0]] = "";
+ objectTypes.push(scoreArray[i][0]); //also push all the objectTypes in an Array for later (the updating happens one objectType at a time)
+ }
+ if(!helperObject.hasOwnProperty(scoreArray[i][1])) //classificationGroup
+ {
+ scoreObject[scoreArray[i][0]][scoreArray[i][1]] = {}; //same logic as before
+ helperObject[scoreArray[i][1]] = "";
+ }
+ if(!helperObject.hasOwnProperty(scoreArray[i][2])) //classificationType
+ {
+ scoreObject[scoreArray[i][0]][scoreArray[i][1]][scoreArray[i][2]] = {}; //same logic as before
+ helperObject[scoreArray[i][2]] = "";
+ }
+ if(!helperObject.hasOwnProperty(scoreArray[i][3])) //classificationScore
+ {
+ scoreObject[scoreArray[i][0]][scoreArray[i][1]][scoreArray[i][2]][scoreArray[i][3]] = scoreArray[i][4]; //score
+ helperObject[scoreArray[i][3]] = "";
+ }
+ }
+}
+
+helperObject = {}; //resets the helper object
+
+//All the gradings of the classification groups
+var gradingArray = newSelect("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, \n\
+ CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID, CLASSIFICATIONGRADING.MAXGRADEFORSCORE, CLASSIFICATIONGRADING.GRADING")
+ .from("CLASSIFICATIONGROUP")
+ .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+ .join("CLASSIFICATIONGRADING", "CLASSIFICATIONGRADING.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+ .orderBy("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONGROUP.TITLE, CLASSIFICATIONGROUP.SORTING, \n\
+ CLASSIFICATIONTYPE.SCORETYPE, CLASSIFICATIONGRADING.MAXGRADEFORSCORE asc")
+ .table();
+
+//logic from above applies here aswell
+for (i = 0; i < gradingArray.length; i++)
+{
+ [object_type, classificationGroupId, classificationTypeId, classificationGradingId, classificationGradingMaxScore, classificationGrading] = gradingArray[i];
+
+ if(!helperObject.hasOwnProperty(gradingArray[i][0])) //objectType
+ {
+ gradingObject[gradingArray[i][0]] = {};
+ helperObject[gradingArray[i][0]] = "";
+ }
+ if(!helperObject.hasOwnProperty(gradingArray[i][1])) //classificationGroup
+ {
+ gradingObject[gradingArray[i][0]][gradingArray[i][1]] = {};
+ helperObject[gradingArray[i][1]] = "";
+ }
+ if(!helperObject.hasOwnProperty(gradingArray[i][2])) //classificationGrading
+ {
+ gradingObject[gradingArray[i][0]][gradingArray[i][1]][gradingArray[i][2]] = [gradingArray[i][3], gradingArray[i][4]]; //maxGradeForScore
+ helperObject[gradingArray[i][2]] = "";
+ }
+}
+
+for (i = 0; i < objectTypes.length; i++) //update for each object_type
+{
+ outputInformation[objectTypes[i]] = {
+ updatedElements: 0,
+ nonChangedElements: 0
+ };
+ isOrganisation = false;
+ if(objectTypes[i] == "Organisation")
+ {
+ currentObjectTable = "CONTACT";
+ currentObjectColumn = "CONTACT.CONTACTID";
+ isOrganisation = true;
+ }
+ else
+ {
+ currentObjectTable = objectTypes[i];
+ currentObjectColumn = objectTypes[i] + "." + objectTypes[i] +"ID";
+ }
+
+ //this is the "upgrade" part of this process:
+ //first: insert default values into the records that have no entries
+ idsWithoutStoredClassification = newSelect(currentObjectColumn)
+ .from(currentObjectTable)
+ .where(currentObjectColumn, newSelect("CLASSIFICATIONSTORAGE.OBJECT_ROWID").from("CLASSIFICATIONSTORAGE").where("CLASSIFICATIONSTORAGE.OBJECT_TYPE", objectTypes[i]), SqlBuilder.NOT_IN())
+
+ if(isOrganisation)
+ {
+ idsWithoutStoredClassification.and("CONTACT.PERSON_ID is null")
+ .and("CONTACT.ORGANISATION_ID", OrgUtils.getPrivateOrganisationId(), SqlBuilder.NOT_EQUAL());
+ }
+
+ idsWithoutStoredClassification = idsWithoutStoredClassification.arrayColumn();
+
+ if(idsWithoutStoredClassification)
+ ClassificationUtils.insertEmptyClassification(idsWithoutStoredClassification, objectTypes[i]);
+
+ //second: update all entries with correct classificaiton values
+
+ //all groups of the objectType in the correct order, needed later to also add the "-" gradings if no classificationType has been set under that group
+ orderedGroups = newSelect("distinct CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, CLASSIFICATIONGROUP.SORTING")
+ .from("CLASSIFICATIONGROUP")
+ .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+ .where("CLASSIFICATIONTYPE.OBJECT_TYPE", objectTypes[i])
+ .orderBy("CLASSIFICATIONGROUP.SORTING")
+ .table();
+
+ //private callback function that processes the achieved scores per object type
+ function _processAchievedScoresBatchFn(pBatchData, pBatchNum)
+ {
+ //logic from above applies here aswell
+ for (ii = 0; ii < pBatchData.length; ii++)
+ {
+ [uid, classificationGroupId, classificationTypeId, classificationScore] = pBatchData[ii];
+
+ if(!helperObject.hasOwnProperty(pBatchData[ii][0])) //uid
+ {
+ archievedScoresObject[pBatchData[ii][0]] = {};
+ helperObject[pBatchData[ii][0]] = "";
+ groupString[pBatchData[ii][0]] = ""; //groupString is another helper object to store all the groupIds
+ }
+ if(!helperObject.hasOwnProperty(pBatchData[ii][0] + pBatchData[ii][1])) //classificationGroup
+ {
+ groupString[pBatchData[ii][0]] = groupString[pBatchData[ii][0]].toString() + pBatchData[ii][1].toString() +" ";
+ archievedScoresObject[pBatchData[ii][0]][pBatchData[ii][1]] = {};
+ helperObject[pBatchData[ii][0] + pBatchData[ii][1]] = "";
+ }
+ if(!helperObject.hasOwnProperty(pBatchData[ii][0] + pBatchData[ii][2])) //classificationType
+ {
+ if(archievedScoresObject[pBatchData[ii][0]][pBatchData[ii][1]]["Score"] == undefined)
+ archievedScoresObject[pBatchData[ii][0]][pBatchData[ii][1]]["Score"] = 0;
+ score = eMath.addDec(parseFloat(archievedScoresObject[pBatchData[ii][0]][pBatchData[ii][1]]["Score"]), parseFloat(pBatchData[ii][3]));
+ archievedScoresObject[pBatchData[ii][0]][pBatchData[ii][1]]["Score"] = score;
+ archievedScoresObject[pBatchData[ii][0]][pBatchData[ii][1]]["Grade"] = ClassificationUtils.getGradingFromObject(gradingObject[objectTypes[i]], pBatchData[ii][1], score);
+ helperObject[pBatchData[ii][0] + pBatchData[ii][2]] = "";
+ }
+ }
+ }
+
+ var achievedScoresStmt = newSelect(currentObjectColumn + ", CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID, \n\
+ CLASSIFICATION.CLASSIFICATIONTYPE_ID, CLASSIFICATIONSCORE.SCORE")
+ .from(currentObjectTable)
+ .join("CLASSIFICATION", "CLASSIFICATION.OBJECT_ROWID = " + currentObjectColumn)
+ .join("CLASSIFICATIONSCORE", "CLASSIFICATION.CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID")
+ .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID = CLASSIFICATION.CLASSIFICATIONTYPE_ID");
+
+ if(isOrganisation)
+ achievedScoresStmt.where("CONTACT.PERSON_ID is null");
+
+ achievedScoresStmt.orderBy(currentObjectColumn + ", CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID, CLASSIFICATIONSCORE.SCORE asc");
+ achievedScoresStmt.pageSize(100)
+ .forEachPage(_processAchievedScoresBatchFn);
+
+ //do this after all the data is collected since the achievedScoresStmt returns several records for each rowId.
+ //If this would be done in the batch function it would result in false classificationstorage-results because not all records for a rowId are used
+ for (var row_Id in archievedScoresObject)
+ {
+ chainedGrading = "";
+ //chain all the Classifications together
+ for (var row_IdI in archievedScoresObject[row_Id])
+ {
+ chainedGrading += archievedScoresObject[row_Id][row_IdI]["Grade"]
+ }
+
+ for (var iii = 0; iii < orderedGroups.length; iii++) //the empty gradings have been ignored, but should be filled with "-"
+ {
+ if(!groupString[row_Id].toString().includes(orderedGroups[iii][0].toString())) //check which ones aren't included and add "-" for those at correct the position
+ {
+ chainedGrading = chainedGrading.substring(0, iii) + "-" + chainedGrading.substring(iii, chainedGrading.length);
+ }
+ }
+
+ //update the specified dataset if the already stored ClassificatioNValue differs from the freshly calculated one
+ cond = newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID", row_Id)
+ .and("CLASSIFICATIONSTORAGE.OBJECT_TYPE", objectTypes[i])
+ .and("CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE", chainedGrading, SqlBuilder.NOT_EQUAL());
+ var count = Number(cond.updateData(true, table, column, null, [chainedGrading]));
+ if (count > 0)
+ {
+ outputInformation[objectTypes[i]].updatedElements += count;
+ }
+ else
+ {
+ outputInformation[objectTypes[i]].nonChangedElements++;
+ }
+ }
+}
+
+var outputInfo = "updateClassifications_serverProcess output is:\n" + JSON.stringify(outputInformation);
+logging.log(outputInfo);
\ No newline at end of file
diff --git a/process/updateClassifications_serverProcess/updateClassifications_serverProcess.aod b/process/updateClassifications_serverProcess/updateClassifications_serverProcess.aod
new file mode 100644
index 0000000000000000000000000000000000000000..52e9c03b7cf5d4c0792dd5f4ea13a6676520a729
--- /dev/null
+++ b/process/updateClassifications_serverProcess/updateClassifications_serverProcess.aod
@@ -0,0 +1,11 @@
+<?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>updateClassifications_serverProcess</name>
+ <title>Update all Classification entries in the system</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/updateClassifications_serverProcess/process.js</process>
+ <alias>Data_alias</alias>
+ <variants>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/report/Offer_report/reportData.jrxml b/report/Offer_report/reportData.jrxml
index 54ef644c16b90f8066509a2fedf6ca135c56cebd..f2afe8275137822933e3b91b78f69ef96e2879dd 100644
--- a/report/Offer_report/reportData.jrxml
+++ b/report/Offer_report/reportData.jrxml
@@ -52,7 +52,6 @@
<field name="PRODUCT_PRODUCTCODE" class="java.lang.String"/>
<field name="OFFER_HEADER" class="java.lang.String"/>
<field name="ITEMSUM" class="java.lang.String"/>
- <field name="OFFER_VERSNR" class="java.lang.String"/>
<field name="OFFER_FOOTER" class="java.lang.String"/>
<sortField name="OFFER_OFFERID"/>
<group name="OFFERID" isStartNewPage="true">
@@ -106,7 +105,7 @@
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
- <textFieldExpression><![CDATA[$F{OFFER_OFFERCODE} + "-" + $F{OFFER_VERSNR}]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$F{OFFER_OFFERCODE}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="372" y="35" width="183" height="15" uuid="9f7aeac2-3844-43ee-bc8b-b11f8701b83e">
diff --git a/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js b/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
index 4572bef869ba742cdabc5155acd3fc3ecf76fe13..354885d3893c22e85f81c745e62614f8b636523b 100644
--- a/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
+++ b/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
@@ -5,6 +5,8 @@ import("system.question");
import("system.vars");
import("system.db");
+//@TODO: remove
+
var details = vars.get("$global.RptOfferOrderDetails");
var orgid = db.cell("select ORGANISATION_ID from CONTACT where CONTACTID = '" + details[1] + "'");
if (orgid.substr(0, 2) == '0 ') // Privatperson
diff --git a/report/Salesorder_report/reportData.jrxml b/report/Salesorder_report/reportData.jrxml
index 028bf1f2db672eb55be61e6d6c3888b3caddb7f5..496fcde2e9eb86deb652b4884531c1b77c2a40fb 100644
--- a/report/Salesorder_report/reportData.jrxml
+++ b/report/Salesorder_report/reportData.jrxml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Beleg" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
- <property name="ireport.zoom" value="1.5"/>
+ <property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
- <property name="ireport.y" value="63"/>
+ <property name="ireport.y" value="0"/>
<parameter name="myAddr" class="java.lang.String"/>
<parameter name="Artikelbezeichnung" class="java.lang.String"/>
<parameter name="Artikel-Nr" class="java.lang.String"/>
diff --git a/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js b/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
index 48fc7c800cd7d466c6f45973516ee02832f837da..dad46b278aff6020f827b7cc76b00dd4dac82d27 100644
--- a/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
+++ b/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
@@ -5,6 +5,8 @@ import("system.swing");
import("system.vars");
import("system.db");
+//@TODO: remove
+
var details = vars.get("$global.RptOfferOrderDetails");
var orgid = db.array(db.ROW, "select ORG_ID, LANG from RELATION where RELATIONID = '" + details[1] + "'");
if (orgid[0].substr(0, 2) == '0 ') // Privatperson
diff --git a/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.adoc b/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.adoc
deleted file mode 100644
index 43131cb4155b08bb47613120451f1a23a9f7039b..0000000000000000000000000000000000000000
--- a/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.adoc
+++ /dev/null
@@ -1 +0,0 @@
-Berechtigungen, die ich auf die Kalendar habe
\ No newline at end of file
diff --git a/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.aod b/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.aod
deleted file mode 100644
index 1ddc712ce4574145ffd72a4c558c76724eba58bf..0000000000000000000000000000000000000000
--- a/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.aod
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.0.0">
- <name>PermissionCalendarFilterReverse__view_de__DE</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <reference>%aditoprj%/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.adoc</reference>
-</userhelp>
diff --git a/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.adoc b/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.adoc
deleted file mode 100644
index bf4e8234a25d3875a006f4e47f701edf4c8f3b60..0000000000000000000000000000000000000000
--- a/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.adoc
+++ /dev/null
@@ -1 +0,0 @@
-Berechtigungen, die andere Mitarbeiter auf meinen Kalender haben
\ No newline at end of file
diff --git a/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.aod b/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.aod
deleted file mode 100644
index 92371c4cff3f782cf98043036e1def3eda11533e..0000000000000000000000000000000000000000
--- a/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.aod
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.0.0">
- <name>PermissionCalendarFilter__view_de__DE</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <reference>%aditoprj%/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.adoc</reference>
-</userhelp>