diff --git a/.liquibase/Data_alias/basic/2019.1.4/update_Salesproject_Member.xml b/.liquibase/Data_alias/basic/2019.1.4/update_Salesproject_Member.xml
index 4a958c3462f3596926a6a45fffaf1f733082cee4..4dee0499105ed07d33b6daa77edef114038b0527 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/update_Salesproject_Member.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/update_Salesproject_Member.xml
@@ -5,9 +5,6 @@
<addColumn tableName="SALESPROJECT_MEMBER">
<column name="OBJECT_TYPE" type="NVARCHAR(63)"/>
<!-- Booleans in basic are always TINYINT with 1 = true, 0 = false see others/guide/whichDatatype.adoc -->
- <column name="DECIDER" type="TINYINT" defaultValueNumeric="0">
- <constraints nullable="false"/>
- </column>
</addColumn>
<renameColumn newColumnName="OBJECT_ROWID" oldColumnName="SALESPROJECT_ID" tableName="SALESPROJECT_MEMBER" columnDataType="CHAR(36)"/>
<renameColumn newColumnName="OBJECTMEMBERID" oldColumnName="SALESPROJECT_MEMBERID" tableName="SALESPROJECT_MEMBER" columnDataType="CHAR(36)"/>
diff --git a/.liquibase/Data_alias/basic/2020.0.2/Memberroles/alter_member.xml b/.liquibase/Data_alias/basic/2020.0.2/Memberroles/alter_member.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d3dac713b4650952e08b611d697963e946adfb08
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.0.2/Memberroles/alter_member.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">
+ <changeSet author="s.pongratz" id="28627941-6c9b-46e8-922a-b4660b33723c">
+ <dropColumn tableName="OBJECTMEMBER" columnName="DECIDER"/>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.0.2/Memberroles/changelog.xml b/.liquibase/Data_alias/basic/2020.0.2/Memberroles/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eebbf6268a6147847bfbeabe8e8384a9f00f4642
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.0.2/Memberroles/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="extend_keword_memberroles.xml"/>
+ <include relativeToChangelogFile="true" file="alter_member.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.0.2/Memberroles/extend_keword_memberroles.xml b/.liquibase/Data_alias/basic/2020.0.2/Memberroles/extend_keword_memberroles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..83e825733c4970c00e13f6f072a06b263a858869
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.0.2/Memberroles/extend_keword_memberroles.xml
@@ -0,0 +1,82 @@
+<?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="28627941-6c9b-46e8-922a-b4660b33723c">
+ <!--Atribute-->
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="08fcb5db-531d-4a83-8c6e-b9c9c95dcb16"/>
+
+ <column name="NAME" value="Campaign"/>
+ <column name="CONTAINER" value="MemberRole"/>
+ <column name="KIND" value="BOOL_VALUE"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="605be9b3-1fe7-4bcc-9a06-8e8651655985"/>
+
+ <column name="NAME" value="Salesproject"/>
+ <column name="CONTAINER" value="MemberRole"/>
+ <column name="KIND" value="BOOL_VALUE"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="08a8a0fe-9268-42b2-9e29-10f64522d922"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="9c421b0b-8529-4e07-9463-28d59fd027b6"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="08fcb5db-531d-4a83-8c6e-b9c9c95dcb16"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="25ebff34-ef8a-4d3c-9b81-3eeca9acf451"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="f78f229f-f809-4bd2-aca8-24e2f82fa220"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="08fcb5db-531d-4a83-8c6e-b9c9c95dcb16"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="69883095-a8d0-459e-8f9f-bbe48b82db47"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="b72294cd-3a46-4f71-ab93-72824f63f7f4"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="08fcb5db-531d-4a83-8c6e-b9c9c95dcb16"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="6cdfb4b1-1c7d-4af6-b415-e320ed81fcfc"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="8cb1b843-713a-4193-aa50-9f5ca06820f8"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="08fcb5db-531d-4a83-8c6e-b9c9c95dcb16"/>
+ <column name="BOOL_VALUE" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="28569ef7-0282-4289-9c19-3ecd439511d2"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="039fd6ae-b4ad-431e-86bf-59ed2f4df0a9"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="08fcb5db-531d-4a83-8c6e-b9c9c95dcb16"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+
+
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="50bdd8ec-2eb7-46bf-9c24-28dbd48e2b5a"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="9c421b0b-8529-4e07-9463-28d59fd027b6"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="605be9b3-1fe7-4bcc-9a06-8e8651655985"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="dceb32b7-7ab6-4578-a9a9-3a82d3ffbab0"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="f78f229f-f809-4bd2-aca8-24e2f82fa220"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="605be9b3-1fe7-4bcc-9a06-8e8651655985"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="5b5faeb8-c11b-4a11-b344-16431e723022"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="b72294cd-3a46-4f71-ab93-72824f63f7f4"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="605be9b3-1fe7-4bcc-9a06-8e8651655985"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="3fb25c74-9fea-446f-8c3a-6943ae0ea0df"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="8cb1b843-713a-4193-aa50-9f5ca06820f8"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="605be9b3-1fe7-4bcc-9a06-8e8651655985"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="ec7fc07d-a320-4e13-8b58-c8b2fd03afac"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="039fd6ae-b4ad-431e-86bf-59ed2f4df0a9"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="605be9b3-1fe7-4bcc-9a06-8e8651655985"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.0.2/changelog.xml b/.liquibase/Data_alias/basic/2020.0.2/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9fe9a9b7a01290b0cd7438630d063b2aa54f33ba
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.0.2/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 relativeToChangelogFile="true" file="Memberroles/changelog.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/activity/INFO/clobFiles/efe9f361ec5970ad019a0dd191e88d1e.txt b/.liquibase/Data_alias/basic/_demoData/generatedData/activity/INFO/clobFiles/efe9f361ec5970ad019a0dd191e88d1e.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ed03740997fc4fc1e20bc306f533fa1150446237
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/activity/INFO/clobFiles/efe9f361ec5970ad019a0dd191e88d1e.txt
@@ -0,0 +1,10 @@
+<html>
+ <body>
+ <h1>Headertest</h1>
+ <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p>
+ </body>
+</html>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/objectmember.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/objectmember.xml
index b6823608adc137148610034a085594d6bc04b9ad..ae2735e5c2cb9bab001992f25aaa272109530c56 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/objectmember.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/objectmember.xml
@@ -4,7 +4,6 @@
<delete tableName="objectmember"/>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="MEMBERROLE" value="MEMROLEADVISE"/>
<column name="OBJECTMEMBERID" value="094fa52f-28ee-4988-9169-c4fcf0fd58e7"/>
<column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
@@ -12,7 +11,6 @@
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="MEMBERROLE" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
<column name="OBJECTMEMBERID" value="100e2d29-2d34-4a5d-adc9-c09f9949d136"/>
<column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
@@ -20,14 +18,12 @@
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="OBJECTMEMBERID" value="1133f149-e2d4-41b6-a4a1-1fb852104635"/>
<column name="OBJECT_ROWID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
<column name="OBJECT_TYPE" value="Campaign"/>
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="MEMBERROLE" value="MEMROLEPROJMANAG"/>
<column name="OBJECTMEMBERID" value="336e8c10-376c-422e-afd9-1faef77c6f0c"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
@@ -35,7 +31,6 @@
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="MEMBERROLE" value="MEMROLEADVISE"/>
<column name="OBJECTMEMBERID" value="3bd6db09-063c-43a5-828d-9fe6e958d142"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
@@ -43,14 +38,12 @@
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="OBJECTMEMBERID" value="57c66172-4480-4925-a3e5-c506551563e1"/>
<column name="OBJECT_ROWID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
<column name="OBJECT_TYPE" value="Campaign"/>
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="MEMBERROLE" value="MEMROLEPROJMANAG"/>
<column name="OBJECTMEMBERID" value="685666f6-6545-4a51-8340-d98115b3d710"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
@@ -58,14 +51,12 @@
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="OBJECTMEMBERID" value="84eb003b-c333-48a2-9679-8a135dbbc02c"/>
<column name="OBJECT_ROWID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
<column name="OBJECT_TYPE" value="Campaign"/>
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="MEMBERROLE" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
<column name="OBJECTMEMBERID" value="8d69dc7e-ae24-46e8-b0a0-3217b208c564"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
@@ -73,21 +64,18 @@
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="OBJECTMEMBERID" value="a0a9d509-d613-471b-a972-da5de4475688"/>
<column name="OBJECT_ROWID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
<column name="OBJECT_TYPE" value="Campaign"/>
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
- <column name="DECIDER" valueNumeric="1"/>
<column name="OBJECTMEMBERID" value="b576c100-af39-43b2-ba64-d2ce05c62a9b"/>
<column name="OBJECT_ROWID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
<column name="OBJECT_TYPE" value="Campaign"/>
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="MEMBERROLE" value="MEMROLEEXSALEMANAG"/>
<column name="OBJECTMEMBERID" value="b91e741e-6e23-4a0a-a3de-06b9be398ed6"/>
<column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
@@ -95,7 +83,6 @@
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="MEMBERROLE" value="MEMROLEPROJASSIST"/>
<column name="OBJECTMEMBERID" value="c3b8a835-e9b2-40d1-aa4d-83838c5714ba"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
@@ -103,28 +90,24 @@
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="OBJECTMEMBERID" value="cd84d91a-f8fc-413b-8649-f53a7f8f3b88"/>
<column name="OBJECT_ROWID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
<column name="OBJECT_TYPE" value="Campaign"/>
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="OBJECTMEMBERID" value="d5c0fef8-1a11-4c76-8683-479ca4b99804"/>
<column name="OBJECT_ROWID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
<column name="OBJECT_TYPE" value="Campaign"/>
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
- <column name="DECIDER" valueNumeric="0"/>
<column name="OBJECTMEMBERID" value="e81a6bf2-bf1b-45f6-a4e5-f99db96af0ed"/>
<column name="OBJECT_ROWID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
<column name="OBJECT_TYPE" value="Campaign"/>
</insert>
<insert tableName="objectmember">
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
- <column name="DECIDER" valueNumeric="1"/>
<column name="OBJECTMEMBERID" value="e8a497ce-e0d4-4a5d-9c36-618c36343d23"/>
<column name="OBJECT_ROWID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
<column name="OBJECT_TYPE" value="Campaign"/>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index cc2f1fb471786b8918923569570fca173bbf091f..f10636d5f687e9e806718e71ce1da4209be9525b 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -9,6 +9,7 @@
<include relativeToChangelogFile="true" file="basic/2019.3.3/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.0.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.0.1/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="basic/2020.0.2/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"/>-->
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 0db510492caf395ba443a3fa0d89468ad2d7d2eb..174d1c8fb07cfe35c6906811afe60703d3542102 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -11053,7 +11053,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -11072,20 +11072,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>DECIDER</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
<dbName></dbName>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 396ea385f48bc930ee1c514056a489690cf93835..c3a59408200b7569d0601c10b5e353f2b457c4b9 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -42,26 +42,6 @@
</entityNode>
</childNodes>
</entityNode>
- <entityNode>
- <name>Quick Entry</name>
- <kind v="123" />
- <title>Quick Entry</title>
- <documentation>%aditoprj%/application/_____SYSTEM_APPLICATION_NEON/entitynode/childnodes/group12/documentation.adoc</documentation>
- <childNodes>
- <entityNode>
- <name>Group13</name>
- <kind v="123" />
- <title></title>
- <childNodes>
- <entityNode>
- <name>QuickEntry</name>
- <kind v="10077" />
- <title></title>
- </entityNode>
- </childNodes>
- </entityNode>
- </childNodes>
- </entityNode>
<entityNode>
<name>Sales</name>
<kind v="123" />
diff --git a/entity/360Degree_entity/documentation.adoc b/entity/360Degree_entity/documentation.adoc
index 8e7c8f36286a41ba018d8bcccc7a9e52efc0ae55..d14c31a7c939c89fb3ace5ae20758bb83cb2f522 100644
--- a/entity/360Degree_entity/documentation.adoc
+++ b/entity/360Degree_entity/documentation.adoc
@@ -1,7 +1,7 @@
= 360Degree_entity
-The 360Degree_entity shows the Connection between datenmodells.
-The entity has two providers for persons and organisations.
+The 360Degree_entity shows the Connection between data models.
+The entity has two providers for persons and organizations.
The 360Degree_entity shows direct connections, don´t be confused with the ObjectRelation_entity.
diff --git a/entity/ActivityLink_entity/documentation.adoc b/entity/ActivityLink_entity/documentation.adoc
index 3e28df342973c142ffe04e8d56ea197fed9c0c71..cb4137378110b52f84a678bc91f1db77f9302c03 100644
--- a/entity/ActivityLink_entity/documentation.adoc
+++ b/entity/ActivityLink_entity/documentation.adoc
@@ -1,3 +1,3 @@
= ActivityLink_entity
-Displays the connection between Activity and another module (for example Person).
\ No newline at end of file
+Displays the connection between an Activity and another module (for example Person).
\ No newline at end of file
diff --git a/entity/AddressType_entity/documentation.adoc b/entity/AddressType_entity/documentation.adoc
index 1a4a9012a6231a43ccefd5eb46270153d3baa324..cdc15711abba089c5ece2e52f271e8f724c4f4fc 100644
--- a/entity/AddressType_entity/documentation.adoc
+++ b/entity/AddressType_entity/documentation.adoc
@@ -3,5 +3,5 @@
Displays the AdressType Keyword ($KeywordRegistry.addressType()).
In the condition of the recordcontainer the entity differs between organisation and contact.
-You need a own entty for this case because the KeywordEntry_entity
+You need an own entity for this case because the KeywordEntry_entity
provides all information without checking conditions for KeywordAttribute.
\ No newline at end of file
diff --git a/entity/Address_entity/documentation.adoc b/entity/Address_entity/documentation.adoc
index e50f759d6ac0cc4e9633c6e52571914239f2fc68..cf8e996b119771023af89237c8daa4649ef76456 100644
--- a/entity/Address_entity/documentation.adoc
+++ b/entity/Address_entity/documentation.adoc
@@ -1,12 +1,12 @@
= Address_entity
----
-an entity for logic behind a postal address
+an entity for the 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.
+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 cannot be deleted.
Webservice Validation: See WsValidation_lib
To enable the nominatim webservice: go to Preferences -> _____PREFERENCES_PROJECT -> _____PREFERENCES_PROJECT
diff --git a/entity/AdminViewRow_entity/documentation.adoc b/entity/AdminViewRow_entity/documentation.adoc
index a01f76066b9f89f526b61259333631610fc188dc..c0bfa18f95416167fce0d483901db8c50c38f9f6 100644
--- a/entity/AdminViewRow_entity/documentation.adoc
+++ b/entity/AdminViewRow_entity/documentation.adoc
@@ -1,4 +1,4 @@
= AdminViewRow_entity
-Displays the rows of administrative information of a entity.
-The entity "DefaultAdminView_entity" uses the data for display the rows (for example Person-ID, Contact-ID)
\ No newline at end of file
+Displays the rows of administrative information of an entity.
+The entity "DefaultAdminView_entity" uses the data for displaying the rows (for example Person-ID, Contact-ID)
\ No newline at end of file
diff --git a/entity/Analyses_entity/documentation.adoc b/entity/Analyses_entity/documentation.adoc
index 936ca160d91be72a00d119f4cf802b5df19fb3b6..8ad642fc2a74ac35eb3ba1e39cd35c91c5959cf0 100644
--- a/entity/Analyses_entity/documentation.adoc
+++ b/entity/Analyses_entity/documentation.adoc
@@ -1,3 +1,3 @@
= Analyses_entity
-Logic and information for the ScoreCard displays openTasks, apointments, ... for the logged in user
\ No newline at end of file
+Logic and information for the ScoreCard displays open tasks, appointments, etc. for the logged in user
\ No newline at end of file
diff --git a/entity/AnyContact_entity/documentation.adoc b/entity/AnyContact_entity/documentation.adoc
index 1d42f60ff4d56e68fc7f6d882656008181437c5e..11727ab23bef189ca76520d9364a4dc658d99815 100644
--- a/entity/AnyContact_entity/documentation.adoc
+++ b/entity/AnyContact_entity/documentation.adoc
@@ -1,3 +1,3 @@
= AnyContact_entity
-Displays both a contact and organisation in one entity with the common denominator
\ No newline at end of file
+Displays both a contact and an organisation in one entity with the common denominator
\ No newline at end of file
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index a47748cb98e929e6eb14e6cb05b9a220680579da..f63a8013b1c7c652570265c3393b39673ea28046 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -233,6 +233,15 @@
<entityField>
<name>CHECKUP</name>
</entityField>
+ <entityActionField>
+ <name>newActivity</name>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:HOURGLASS</iconId>
+ <stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/newactivity/stateProcess.js</stateProcess>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Appointment_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Appointment_entity/entityfields/allday/valueProcess.js b/entity/Appointment_entity/entityfields/allday/valueProcess.js
index 955e531fbed12b5f25a97577c52729781b7cc595..5823e2d7d7d6a1a68e59e900efb34a36c8ad70bc 100644
--- a/entity/Appointment_entity/entityfields/allday/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/allday/valueProcess.js
@@ -6,10 +6,12 @@ import("system.result");
/**
* Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
*/
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param") && vars.get("$this.value") == null)
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event["X-ADITO-ISALLDAYEVENT"])
result.string(event["X-ADITO-ISALLDAYEVENT"]);
-}
\ No newline at end of file
+}
+else
+ result.string(vars.get("$this.value"));
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/classification/valueProcess.js b/entity/Appointment_entity/entityfields/classification/valueProcess.js
index a4056b88346388dc049b7dbcf191192c0ce66b57..105ba28ae202d048d9d97e22f924706636e87032 100644
--- a/entity/Appointment_entity/entityfields/classification/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/classification/valueProcess.js
@@ -6,10 +6,12 @@ import("system.result");
/**
* Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
*/
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param") && vars.get("$this.value") == null)
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event[calendars.CLASSIFICATION])
result.string(event[calendars.CLASSIFICATION]);
-}
\ No newline at end of file
+}
+else
+ result.string(vars.get("$this.value"));
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/newactivity/onActionProcess.js b/entity/Appointment_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dee096dc42852294e12d6b87c3e77ac60c2689f5
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,23 @@
+import("system.db");
+import("KeywordRegistry_basic");
+import("Contact_lib");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+import("Sql_lib");
+
+var uid = vars.get("$field.UID");
+
+var objectdata = newSelect("OBJECT_TYPE, OBJECT_ROWID")
+ .from("AB_APPOINTMENTLINK")
+ .where("AB_APPOINTMENTLINK.APPOINTMENT_ID", "$field.UID")
+ .arrayRow();
+
+var links = [];
+
+if (objectdata.length > 0)
+{
+ links.push(objectdata);
+}
+
+ActivityUtils.createNewActivity(undefined, links, ContextUtils.getCurrentContextId(), vars.get("$field.UID"), vars.get("$field.SUMMARY"), vars.get("$field.DESCRIPTION"), $KeywordRegistry.activityDirection$outgoing());
diff --git a/entity/Appointment_entity/entityfields/newactivity/stateProcess.js b/entity/Appointment_entity/entityfields/newactivity/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Appointment_entity/entityfields/startend/valueProcess.js b/entity/Appointment_entity/entityfields/startend/valueProcess.js
index 4a4abfd9cee8bcbba821850fe4ddf343eec9b571..acf5f27c3566e1142126c931be2814e0a61d7441 100644
--- a/entity/Appointment_entity/entityfields/startend/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/startend/valueProcess.js
@@ -45,9 +45,9 @@ if(startLong != null && endLong != null)
datebegin = startdate;
if(datetime.isToday(endLong))
- dateend = ranslate.text("today");
+ dateend = translate.text("today");
else if(datetime.isTomorrow(endLong))
- dateend = ranslate.text("tomorrow");
+ dateend = translate.text("tomorrow");
else
dateend = enddate;
diff --git a/entity/Appointment_entity/entityfields/transparency/valueProcess.js b/entity/Appointment_entity/entityfields/transparency/valueProcess.js
index 774f704312ccb614d774153b95e867a49ac1b952..b403cf735c7af712392d8b538ca9a2ba489714e8 100644
--- a/entity/Appointment_entity/entityfields/transparency/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/transparency/valueProcess.js
@@ -6,10 +6,12 @@ import("system.result");
/**
* Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
*/
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param") && vars.get("$this.value") == null)
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event[calendars.TRANSPARENCY])
result.string(event[calendars.TRANSPARENCY]);
-}
\ No newline at end of file
+}
+else
+ result.string(vars.get("$this.value"));
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/documentation.adoc b/entity/AttributeUsage_entity/documentation.adoc
index 798df3873b89b7fa113913b963a1586703307dd7..749cefc6f8ccf5f501b1793e70f5706bae213670 100644
--- a/entity/AttributeUsage_entity/documentation.adoc
+++ b/entity/AttributeUsage_entity/documentation.adoc
@@ -1,5 +1,5 @@
= AttributeUsage_entity
----
-an entity for defining in what contexts an attribute can be used
+an entity for defining in which contexts an attribute can be used
----
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/documentation.adoc b/entity/BulkMailAddRecipients_entity/documentation.adoc
index 4742e061e147f07aff326def02037e5ddc681a41..85adf2726ce4aafb76875de54ee73514fc66b404 100644
--- a/entity/BulkMailAddRecipients_entity/documentation.adoc
+++ b/entity/BulkMailAddRecipients_entity/documentation.adoc
@@ -1,4 +1,4 @@
= BulkMailAddRecipients_entity
-This entity handling the serial action to add more than one organisation / person to a bulkmail.
+This entity handles the serial action to add more than one organisation / person to a bulkmail.
This action can´t be done with the BulkMailRecipient_entity, because a entity displays always one dataset.
\ No newline at end of file
diff --git a/entity/BulkMailTesting_entity/documentation.adoc b/entity/BulkMailTesting_entity/documentation.adoc
index 00d4d58764bccd6658380c60c0aee376dca954b4..44029d885c95ba13e4a847ec05b6f42fef3babfc 100644
--- a/entity/BulkMailTesting_entity/documentation.adoc
+++ b/entity/BulkMailTesting_entity/documentation.adoc
@@ -1,3 +1,3 @@
= BulkMailStatusChart_entity
-This entity handling the testing of an bulk mail (test sending to a contact)
\ No newline at end of file
+This entity is responsible for the testing of a bulk mail (test sending to a contact)
\ No newline at end of file
diff --git a/entity/CampaignAnalysis_entity/entityfields/totalcosts/valueProcess.js b/entity/CampaignAnalysis_entity/entityfields/totalcosts/valueProcess.js
index 26b2be044d8065779987338666b74271cbd6038b..147e9cfd5bc06e8e9b5d1fb94754a90d4a79c177 100644
--- a/entity/CampaignAnalysis_entity/entityfields/totalcosts/valueProcess.js
+++ b/entity/CampaignAnalysis_entity/entityfields/totalcosts/valueProcess.js
@@ -1,4 +1,5 @@
import("system.vars");
import("system.result");
+import("system.eMath");
-result.string(parseFloat(vars.get("$field.VariableCosts")) + parseFloat(vars.get("$field.FixCosts")));
\ No newline at end of file
+result.string(eMath.addDec(vars.get("$field.VariableCosts"), vars.get("$field.FixCosts")));
\ No newline at end of file
diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index c2182e7c9559d9718722dbf8f6e164e4013a2bc4..6d85322e51b170f9c257636a153a665129529412 100644
--- a/entity/CampaignCost_entity/CampaignCost_entity.aod
+++ b/entity/CampaignCost_entity/CampaignCost_entity.aod
@@ -239,6 +239,9 @@
</entityParameter>
<entityField>
<name>CURRENCY</name>
+ <title>Currency</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/CampaignCost_entity/entityfields/currency/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
diff --git a/entity/CampaignCost_entity/documentation.adoc b/entity/CampaignCost_entity/documentation.adoc
index 49e8f28a87e2fc67f8cb400408a35a83ca2effd3..d063e1dad8e17f53b217314d8b571da51c376f89 100644
--- a/entity/CampaignCost_entity/documentation.adoc
+++ b/entity/CampaignCost_entity/documentation.adoc
@@ -1,6 +1,6 @@
= CampaignCost_entity
-Calculates all the information for the costs of an campaign.
-There is also a entity "CampaignCostChart_entity" to display this information via charts.
+Calculates all the information for the costs of a campaign.
+There is also an entity "CampaignCostChart_entity" to display this information via charts.
There are different providers for costs of the campaign itself and for costs of campaignsteps.
\ No newline at end of file
diff --git a/entity/CampaignCost_entity/entityfields/currency/valueProcess.js b/entity/CampaignCost_entity/entityfields/currency/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..89367d1a49842ea91cc6b7036acf63e0c900b388
--- /dev/null
+++ b/entity/CampaignCost_entity/entityfields/currency/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+ var campaignId = vars.get("$field.CAMPAIGN_ID");
+ if (campaignId)
+ {
+ var currency = newSelect("CAMPAIGN.CURRENCY").from("CAMPAIGN").where("CAMPAIGN.CAMPAIGNID", campaignId).cell();
+ result.string(currency);
+ }
+}
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 3723efe444e99f25d4bf7e83568fa03c4f0aa53a..99019821d99d4e534c1a2365444d3c26ae8fcb50 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -115,6 +115,12 @@
<entityField>
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/CampaignStep_entity/entityfields/date_edit/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
</entityField>
<entityProvider>
<name>CampaignSteps</name>
@@ -329,7 +335,9 @@
<consumer>CampaignStepsConsumer</consumer>
<textInputAllowed v="true" />
<stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/predecessorstep_id/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/predecessorstep_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/predecessorstep_id/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/CampaignStep_entity/entityfields/predecessorstep_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
@@ -395,6 +403,17 @@
<name>maxSort_param</name>
<expose v="true" />
</entityParameter>
+ <entityActionField>
+ <name>newCampaignStep</name>
+ <title>New step</title>
+ <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess>
+ <iconId>NEON:GROUP_APPOINTMENT</iconId>
+ </entityActionField>
+ <entityParameter>
+ <name>predecessorstepId_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/CampaignStep_entity/entityfields/predecessorstepid_param/documentation.adoc</documentation>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CampaignStep_entity/entityfields/date_edit/onValueChange.js b/entity/CampaignStep_entity/entityfields/date_edit/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/CampaignStep_entity/entityfields/newcampaignstep/onActionProcess.js b/entity/CampaignStep_entity/entityfields/newcampaignstep/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0c0f7ed6eae7bfa476f1bc34efa2cbf3bc0c2644
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/newcampaignstep/onActionProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.neon");
+
+neon.openContext("CampaignStep", "CampaignStepEdit_view", null, neon.OPERATINGSTATE_NEW, {
+ campaignId_param: vars.get("$param.campaignId_param"),
+ predecessorstepId_param: vars.get("$field.CAMPAIGNSTEPID")
+});
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/predecessorstep_id/onValueChange.js b/entity/CampaignStep_entity/entityfields/predecessorstep_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..25cd7233af76fe0d4266ce618a97408b0fd90eab
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/predecessorstep_id/onValueChange.js
@@ -0,0 +1,25 @@
+import("system.eMath");
+import("system.db");
+import("system.datetime");
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Sql_lib")
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW )
+{
+ var predecessorStepId = vars.get("$local.value");
+ if (predecessorStepId)
+ {
+ var predecessorEndDate = newSelect("CAMPAIGNSTEP.DATE_END")
+ .from("CAMPAIGNSTEP")
+ .where("CAMPAIGNSTEP.CAMPAIGNSTEPID", predecessorStepId)
+ .cell();
+
+ if (predecessorEndDate) {
+ vars.set("$field.DATE_START", predecessorEndDate);
+ //special requirement was defined here: whenever the date comes from an predecessor the interval shall be 1 week (and may differ from the intial interval)
+ vars.set("$field.DATE_END", eMath.addInt(predecessorEndDate, datetime.ONE_WEEK));
+ }
+ }
+}
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/predecessorstep_id/valueProcess.js b/entity/CampaignStep_entity/entityfields/predecessorstep_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..db810fb207600871122ec9f8969de384ee89d8b3
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/predecessorstep_id/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.predecessorstepId_param"))
+ result.string(vars.get("$param.predecessorstepId_param"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/predecessorstepid_param/documentation.adoc b/entity/CampaignStep_entity/entityfields/predecessorstepid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..ebcd2606b5895da2c2ad6351aac93f11d46e490b
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/predecessorstepid_param/documentation.adoc
@@ -0,0 +1 @@
+An optional CAMPAIGNSTEP.PREDECESSOR_ID which is used as presetValue for the predecessor-step-field.
\ No newline at end of file
diff --git a/entity/Campaign_entity/documentation.adoc b/entity/Campaign_entity/documentation.adoc
index 07e81d7dd25d7e2b39c95b4a95cf8dde4ee41344..a7ee675a7e99a7fc8ba3b0fc604d8f48a832537a 100644
--- a/entity/Campaign_entity/documentation.adoc
+++ b/entity/Campaign_entity/documentation.adoc
@@ -1,4 +1,4 @@
= Campaign_entity
Provides the main-function for working with campaigns.
-The campaign itself consumes other entitys for participants, costs an the standard entities like activity, task, ...
\ No newline at end of file
+The campaign itself consumes other entities for participants, costs and the standard entities like activity, task, ...
\ No newline at end of file
diff --git a/entity/DSGVO_entity/documentation.adoc b/entity/DSGVO_entity/documentation.adoc
index f9d086c2576e5633040cbe6b7c58b605e5cff768..c6340d0bb062aeab222b99507a3ce6c9c57cd537 100644
--- a/entity/DSGVO_entity/documentation.adoc
+++ b/entity/DSGVO_entity/documentation.adoc
@@ -1,3 +1,10 @@
= DSGVO_entity
-Entity for mapping the logic for DSGVO
\ No newline at end of file
+Entity for mapping the logic for DSGVO.
+It syncs the DSGVO-tables with the avalailable data of a person always when opened.
+
+To enable the DSGVO functionality: go to Preferences -> _____PREFERENCES_PROJECT -> _____PREFERENCES_PROJECT
+and enable the dsgvo.active checkbox.
+
+For more technical docu see the comments in the DataPrivacy_lib
+
diff --git a/entity/KeywordAttribute_entity/documentation.adoc b/entity/KeywordAttribute_entity/documentation.adoc
index d94e9dab140dfb4cd226e6318ffc8ea6cd5a2378..eb686dae215434d5a062ee2b5729f81d259dc28c 100644
--- a/entity/KeywordAttribute_entity/documentation.adoc
+++ b/entity/KeywordAttribute_entity/documentation.adoc
@@ -22,5 +22,5 @@ You might ask:
> Why are there no essential Keyword-Attributes?
-The reason therefore is: Currently the Keyword-Attributes can only be used by a developer within JDito-Code.
+The reason for this is that currently the Keyword-Attributes can only be used by a developer within JDito-Code.
So there is no need to add, modify, etc. the Keyword-Attributes for an administrator/power-user.
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 126ed926b5fa3f0e51831332e07401bd60d68439..ac8b92004d8de9a65a8bd9af3a14d25eed1fc569 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -217,12 +217,6 @@
<fieldName>KeywordQuantityUnits</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>026021cd-cd64-400d-8bd5-f6d044af1ad8</name>
- <entityName>Member_entity</entityName>
- <fieldName>KeywordMemberRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>356e23f9-eb05-4e18-b0b5-cbc7c8716dba</name>
<entityName>SalesprojectSource_entity</entityName>
diff --git a/entity/KeywordEntry_entity/documentation.adoc b/entity/KeywordEntry_entity/documentation.adoc
index 304f400b5ad5a95182afd964120473fa6b145fb8..aef0ab515a606c4fd919b03accc4fb1c8c86634e 100644
--- a/entity/KeywordEntry_entity/documentation.adoc
+++ b/entity/KeywordEntry_entity/documentation.adoc
@@ -82,7 +82,7 @@ And, to clarify an example:
=== Extended Key-Value lists with special Attributes ===
-Basically this is a extension of the <<Simple Key-Value lists>>.
+Basically this is an extension of the <<Simple Key-Value lists>>.
Sometimes it's necessary to have some more properties within a keyword-entry.
Example:
@@ -100,6 +100,6 @@ If you want to add a general type of information like "PHONE", "MAIL", "WEB" you
Sometimes you've a special case where the keyword entity cannot provide all the functionality.
-In that case you can always define you own entity and create your own database structure to represent all the information and provide all the functions you need.
+In that case you can always define your own entity and create your own database structure to represent all the information and provide all the functions you need.
As an example, this could be the `Country_Entity`
\ No newline at end of file
diff --git a/entity/MemberRoles_entity/MemberRoles_entity.aod b/entity/MemberRoles_entity/MemberRoles_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..798e68accbe6b59e48ae6a95827804eed3e66ab6
--- /dev/null
+++ b/entity/MemberRoles_entity/MemberRoles_entity.aod
@@ -0,0 +1,69 @@
+<?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.13" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.13">
+ <name>MemberRoles_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/MemberRoles_entity/documentation.adoc</documentation>
+ <contentTitleProcess>%aditoprj%/entity/MemberRoles_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>AB_KEYWORD_ENTRID</name>
+ </entityField>
+ <entityField>
+ <name>KEYID</name>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ </entityField>
+ <entityProvider>
+ <name>ByCategory</name>
+ <lookupIdfield>KEYID</lookupIdfield>
+ <dependencies>
+ <entityDependency>
+ <name>94956ddd-5ad8-47a9-8709-cf66da8e497d</name>
+ <entityName>Member_entity</entityName>
+ <fieldName>KeywordMemberRoles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>UsageFilter_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/MemberRoles_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>26c8ba40-981a-400b-9502-b561e8007b17</name>
+ <tableName>AB_KEYWORD_ENTRY</tableName>
+ <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>AB_KEYWORD_ENTRID.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>KEYID.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TITLE.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/MemberRoles_entity/contentTitleProcess.js b/entity/MemberRoles_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cdb5d2367c9e46074b268b96b200fa347b9c5ecf
--- /dev/null
+++ b/entity/MemberRoles_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/MemberRoles_entity/documentation.adoc b/entity/MemberRoles_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..f08d741cf7ddfa642618a5c9de43b9fbd02fe03f
--- /dev/null
+++ b/entity/MemberRoles_entity/documentation.adoc
@@ -0,0 +1,7 @@
+= MemberRoles_entity
+
+Displays the MemberRoles Keyword ($KeywordRegistry.MemberRoles()).
+In the condition of the recordcontainer the entity differs between the KewordAttributeRelations which are exists.
+
+You need an own entity for this case because the KeywordEntry_entity
+provides all information without checking conditions for KeywordAttribute.
\ No newline at end of file
diff --git a/entity/MemberRoles_entity/recordcontainers/db/conditionProcess.js b/entity/MemberRoles_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b0f946ee1d5c070f85e8fb962a46326ad613a162
--- /dev/null
+++ b/entity/MemberRoles_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,21 @@
+import("system.db");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+import("Keyword_lib");
+
+var cond = newWhere("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.MemberRole());
+
+
+var usageFilter = vars.get("$param.UsageFilter_param");
+if (usageFilter)
+{
+ var keywordAttribute = new KeywordAttribute($KeywordRegistry.MemberRole(), usageFilter);
+
+ cond.and("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID",
+ keywordAttribute.getSqlBuilderSelect().and(["AB_KEYWORD_ATTRIBUTERELATION", keywordAttribute.dbField], "1"),
+ SqlBuilder.IN())
+}
+
+result.object(cond.toString());
\ No newline at end of file
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 2af5cdcf525ab883831882247b9c873488f87dff..c09945506ed4ee53942870e33b703b6789d50a48 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -33,6 +33,7 @@
<name>MEMBERROLE</name>
<title>Role</title>
<consumer>KeywordMemberRoles</consumer>
+ <mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Member_entity/entityfields/memberrole/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
@@ -93,14 +94,13 @@
<name>KeywordMemberRoles</name>
<dependency>
<name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
+ <entityName>MemberRoles_entity</entityName>
+ <fieldName>ByCategory</fieldName>
</dependency>
<children>
<entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Member_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
+ <name>UsageFilter_param</name>
+ <valueProcess>%aditoprj%/entity/Member_entity/entityfields/keywordmemberroles/children/usagefilter_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -137,6 +137,7 @@
<entityParameter>
<name>ObjectType_param</name>
<expose v="true" />
+ <mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
@@ -189,14 +190,6 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Member_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>DECIDER</name>
- <title>Decision maker</title>
- <contentType>BOOLEAN</contentType>
- <mandatory v="true" />
- <dropDownProcess>%aditoprj%/entity/Member_entity/entityfields/decider/dropDownProcess.js</dropDownProcess>
- <valueProcess>%aditoprj%/entity/Member_entity/entityfields/decider/valueProcess.js</valueProcess>
- </entityField>
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
@@ -312,12 +305,6 @@
<name>OBJECT_ROWID.displayValue</name>
<expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DECIDER.value</name>
- <recordfield>OBJECTMEMBER.DECIDER</recordfield>
- <isFilterable v="true" />
- <isLookupFilter v="true" />
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>MEMBERROLE.displayValue</name>
<expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/memberrole.displayvalue/expression.js</expression>
diff --git a/entity/Member_entity/entityfields/decider/dropDownProcess.js b/entity/Member_entity/entityfields/decider/dropDownProcess.js
deleted file mode 100644
index 7f3d9f988e894e6c32dfd414376030fb969d6ddb..0000000000000000000000000000000000000000
--- a/entity/Member_entity/entityfields/decider/dropDownProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.translate");
-import("system.result");
-
-result.object([
- ["1", translate.text("Yes")]
- ,["0", translate.text("No")]
-]);
diff --git a/entity/Member_entity/entityfields/decider/valueProcess.js b/entity/Member_entity/entityfields/decider/valueProcess.js
deleted file mode 100644
index 0c7813ac64d6597ae9dd37694b9c1dc8784b6284..0000000000000000000000000000000000000000
--- a/entity/Member_entity/entityfields/decider/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-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/Member_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js b/entity/Member_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js
deleted file mode 100644
index f20e0079a619c5d9f637f91901c51bdbc946b754..0000000000000000000000000000000000000000
--- a/entity/Member_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.MemberRole());
diff --git a/entity/Member_entity/entityfields/keywordmemberroles/children/usagefilter_param/valueProcess.js b/entity/Member_entity/entityfields/keywordmemberroles/children/usagefilter_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4f2d49e8d0a17592e78c969ca30ed64a0bda93db
--- /dev/null
+++ b/entity/Member_entity/entityfields/keywordmemberroles/children/usagefilter_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.object(vars.get("$param.ObjectType_param"));
\ No newline at end of file
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index d01ab19eee2539330e637e496accb7c9710dd65e..350794d7be9fa05a0e8eb7d99213a62286229a16 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -88,14 +88,14 @@
<name>setNotificationState</name>
<children>
<entityActionField>
- <name>archieve</name>
- <title>archieve</title>
+ <name>archive</name>
+ <title>archive</title>
<description></description>
- <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js</onActionProcess>
<isSelectionAction v="true" />
<iconId>VAADIN:ARCHIVE</iconId>
<tooltip></tooltip>
- <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js</tooltipProcess>
+ <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archive/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>setRead</name>
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js
similarity index 100%
rename from entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js
rename to entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/archive/tooltipProcess.js
similarity index 56%
rename from entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js
rename to entity/Notification_entity/entityfields/setnotificationstate/children/archive/tooltipProcess.js
index 3aa94ad62826d8f05824f78874cd2e2fe739ea56..8cd5edfe7e24360cdd90559ee6de8178765b2957 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/archive/tooltipProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.translate");
-result.string(translate.text("archieve"));
\ No newline at end of file
+result.string(translate.text("archive"));
\ No newline at end of file
diff --git a/entity/ObjectProxy_entity/entityfields/filteredobjects/targetConsumerProcess.js b/entity/ObjectProxy_entity/entityfields/filteredobjects/targetConsumerProcess.js
index d56fbfaaa305350a643aed0a8852adb3bf12c875..2953f4d031ef183a08c871c2a2fe0357584f2ea7 100644
--- a/entity/ObjectProxy_entity/entityfields/filteredobjects/targetConsumerProcess.js
+++ b/entity/ObjectProxy_entity/entityfields/filteredobjects/targetConsumerProcess.js
@@ -1,5 +1,5 @@
import("system.result");
import("system.vars");
-if (vars.get("$field.CONSUMER"))
+if (vars.get("$param.Entity_param") && vars.get("$field.CONSUMER"))
result.string(vars.get("$field.CONSUMER"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/footer/valueProcess.js b/entity/Offer_entity/entityfields/footer/valueProcess.js
index aa61a8823153ed22edf1c3351dcb0ab56079e924..d87d0711fe4fbf1df6d49ee67cf6b9a0a9522e56 100644
--- a/entity/Offer_entity/entityfields/footer/valueProcess.js
+++ b/entity/Offer_entity/entityfields/footer/valueProcess.js
@@ -12,4 +12,4 @@ else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string("Vielen Dank!"); //TODO: translate
\ No newline at end of file
+ result.string("Vielen Dank!"); //TODO: translate
diff --git a/entity/Offer_entity/entityfields/header/valueProcess.js b/entity/Offer_entity/entityfields/header/valueProcess.js
index 09e8e181f08509528e6a24305f9fb31a815af221..d627690978c16d2a589f96f2893b6e888c45f165 100644
--- a/entity/Offer_entity/entityfields/header/valueProcess.js
+++ b/entity/Offer_entity/entityfields/header/valueProcess.js
@@ -12,4 +12,4 @@ else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string("Gerne bieten wir Ihnen wie folgt an:"); //TODO: translate
\ No newline at end of file
+ result.string("Gerne bieten wir Ihnen wie folgt an:"); //TODO: translate
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index e27931c27462e8374e6fd3412a15c642e5d653c2..20e23fc7fe10a2860c7b160ee30e5fedcbeef6a4 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1277,10 +1277,12 @@
<indexRecordFieldMapping>
<name>ORGANISATIONID.value</name>
<indexFieldType>STRING</indexFieldType>
+ <isGlobalSearchField v="false" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>CONTACTID.value</name>
<indexFieldType>STRING</indexFieldType>
+ <isGlobalSearchField v="false" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>CUSTOMERCODE.value</name>
@@ -1312,7 +1314,7 @@
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexCity.value</name>
+ <name>STANDARD_CITY.value</name>
<indexFieldType>ADDRESS</indexFieldType>
<additionalFieldNameAliases>
<element>city</element>
@@ -1320,15 +1322,15 @@
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexCommunication.value</name>
+ <name>STANDARD_EMAIL_COMMUNICATION.value</name>
<indexFieldType>COMMUNICATION</indexFieldType>
<additionalFieldNameAliases>
- <element>comm</element>
+ <element>email</element>
</additionalFieldNameAliases>
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexCommPhone.value</name>
+ <name>STANDARD_PHONE_COMMUNICATION.value</name>
<indexFieldType>TELEPHONE</indexFieldType>
<additionalFieldNameAliases>
<element>phone</element>
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
index f17ef01bdde97defb85b512fc778df3cb61bae4e..b40a056ac00e3fec5cff3d5b2f52df957c0a5584 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
@@ -2,8 +2,9 @@ import("Workflow_lib");
import("system.vars");
import("DuplicateScanner_lib");
+// TODO: enable when duplicate-module is finalized
let contactId = vars.get("$field.CONTACTID");
DuplicateScannerUtils.DeleteCachedDuplicate(contactId);
-WorkflowStarter.deleted();
-WorkflowSignalSender.deleted();
\ No newline at end of file
+//WorkflowStarter.deleted();
+//WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index 3632b9d776b812d266b6a665bfdd528330e8a776..e623beadccb7a5363e7a1b371647116e3ae889d1 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -92,6 +92,7 @@
<jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
<isPageable v="false" />
<isFilterable v="true" />
+ <isSortable v="true" />
<contentProcess>%aditoprj%/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<recordFieldMappings>
<jDitoRecordFieldMapping>
diff --git a/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js
index 88ebe7191307eca9c722e78e99c00a77bf3e52aa..0b415b767e292de18d6e094b9d6073adf8010107 100644
--- a/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.vars");
import("system.result");
import("system.project");
@@ -17,4 +18,23 @@ if (selectedEntity == null) {
res.push([entity[0], entity[1], entity[2], entity[6]]);
}
-result.object(res.sort());
\ No newline at end of file
+var order = vars.get("$local.order");
+var columnOrder = {
+ "UID.value" : 1,
+ "TITLE.value" : 2
+};
+var sortOrder = [];
+for (let field in order)
+{
+ if (field in columnOrder)
+ {
+ sortOrder.push(columnOrder[field]);
+ sortOrder.push(order[field] == "DOWN");
+ }
+}
+if (!sortOrder.length) //sort by entity name by default
+ sortOrder = [1, false];
+
+ArrayUtils.sortMulti(res, sortOrder);
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index 7e36c18e23e3091f2fe7412083520bb0a49aad77..e2166430192b985f5348d1d62df152fae3b8ef7f 100644
--- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod
+++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
@@ -86,6 +86,7 @@
<name>jDito</name>
<jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
<isFilterable v="false" />
+ <isSortable v="true" />
<contentProcess>%aditoprj%/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<recordFieldMappings>
<jDitoRecordFieldMapping>
diff --git a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
index b5e82bed169c69ba5290485c9481fd95dcbf8078..0a21aef128bcefe95904d2fbed4bfd44cf0bccc8 100644
--- a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,4 @@
-import("system.logging");
+import("Util_lib");
import("Sql_lib");
import("system.project");
import("system.vars");
@@ -91,6 +91,30 @@ for each (var entry in rolesOrEntities) { // entry contains either a role or an
res.push(currOverview);
}
}
+
+var order = vars.get("$local.order");
+var columnOrder = {
+ "ENTITY.value" : 1,
+ "ACTION_VIEW.value" : 2,
+ "ACTION_CREATE.value" : 3,
+ "ACTION_READ.value" : 4,
+ "ACTION_UPDATE.value" : 5,
+ "ACTION_DELETE.value" : 6
+};
+var sortOrder = [];
+for (let field in order)
+{
+ if (field in columnOrder)
+ {
+ sortOrder.push(columnOrder[field]);
+ sortOrder.push(order[field] == "DOWN");
+ }
+}
+if (!sortOrder.length) //sort by entity or role by default
+ sortOrder = [1, false];
+
+ArrayUtils.sortMulti(res, sortOrder);
+
result.object(res);
function prepareOverview(pPermSetId, pCurrOverview, pMode) {
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 94e33a816d47817fdac006a0a9f02e40e6baee15..d8d91904ade265bb4c7c735a4f5ac97bd870f211 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -849,28 +849,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_contactid/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Person_entity/entityfields/organisation_contactid/onValidation.js</onValidation>
</entityField>
- <entityParameter>
- <name>OnlyShowContactIds_param</name>
- <expose v="true" />
- </entityParameter>
- <entityProvider>
- <name>SelfDuplicatesProvider</name>
- <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>
- <mandatory v="true" />
- </entityParameter>
- </children>
- </entityProvider>
<entityParameter>
<name>DuplicateCurrentContactId_param</name>
<expose v="true" />
@@ -885,10 +863,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<title>Country</title>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/standard_country/valueProcess.js</valueProcess>
</entityField>
- <entityParameter>
- <name>OnlyOwnSupervised_param</name>
- <expose v="true" />
- </entityParameter>
<entityConsumer>
<name>SelfDuplicatesUncached</name>
<dependency>
@@ -1114,6 +1088,121 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityConsumer>
+ <name>PersonDuplicates</name>
+ <dependency>
+ <name>dependency</name>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>targetEntity_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/targetentity_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>filterName_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/filtername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>resultFields_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/resultfields_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>valuesToScan_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/valuestoscan_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>resultFieldsIdFieldName_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/resultfieldsidfieldname_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>recordIdToIgnore_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/recordidtoignore_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>targetContext_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/targetcontext_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>sourceContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/sourcecontactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>contactIdToCheckForCachedDuplicates_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/contactidtocheckforcachedduplicates_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>OnlyShowContactIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>SelfDuplicates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>SelfDuplicatesProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>OnlyShowContactIds_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/selfduplicates/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>DuplicateCurrentContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/selfduplicates/children/duplicatecurrentcontactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>DuplicateActionsControl_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/selfduplicates/children/duplicateactionscontrol_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>SelfDuplicatesProvider</name>
+ <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>
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>IndexCommunication</name>
+ </entityField>
+ <entityField>
+ <name>IndexAddress</name>
+ </entityField>
+ <entityField>
+ <name>IndexCountry</name>
+ </entityField>
+ <entityField>
+ <name>IndexZIP</name>
+ </entityField>
+ <entityField>
+ <name>IndexCity</name>
+ </entityField>
+ <entityParameter>
+ <name>OnlyOwnSupervised_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>IndexPhoneticLastname</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/indexphoneticlastname/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>IndexPhoneticFirstname</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/indexphoneticfirstname/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1380,15 +1469,15 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/commrestrictions_active.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>STANDRAD_ADDRESS.value</name>
+ <name>STANDARD_ADDRESS.value</name>
<recordfield>ADDRESS.ADDRESS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>STANDRAD_CITY.value</name>
+ <name>STANDARD_CITY.value</name>
<recordfield>ADDRESS.CITY</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>STANDRAD_ZIP.value</name>
+ <name>STANDARD_ZIP.value</name>
<recordfield>ADDRESS.ZIP</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
@@ -1423,10 +1512,12 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<indexRecordFieldMapping>
<name>CONTACTID.value</name>
<indexFieldType>STRING</indexFieldType>
+ <isGlobalSearchField v="false" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>PERSON_ID.value</name>
<indexFieldType>STRING</indexFieldType>
+ <isGlobalSearchField v="false" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>FIRSTNAME.value</name>
@@ -1445,6 +1536,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<indexRecordFieldMapping>
<name>ORGANISATION_ID.value</name>
<indexFieldType>STRING</indexFieldType>
+ <isGlobalSearchField v="false" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>ORGANISATION_NAME.value</name>
@@ -1454,7 +1546,12 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</additionalFieldNameAliases>
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>STANDARD_ADDRESS.displayValue</name>
+ <name>STANDARD_ADDRESS.value</name>
+ <indexFieldType>ADDRESS</indexFieldType>
+ <additionalFieldNameAliases>
+ <element>address</element>
+ </additionalFieldNameAliases>
+ <isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>STANDARD_COUNTRY.value</name>
@@ -1466,9 +1563,19 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>STANDARD_ZIP.value</name>
+ <indexFieldType>ADDRESS</indexFieldType>
+ <additionalFieldNameAliases>
+ <element>zip</element>
+ </additionalFieldNameAliases>
+ <isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>STANDARD_CITY.value</name>
+ <indexFieldType>ADDRESS</indexFieldType>
+ <additionalFieldNameAliases>
+ <element>city</element>
+ </additionalFieldNameAliases>
+ <isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>STANDARD_EMAIL_COMMUNICATION.value</name>
diff --git a/entity/Person_entity/recordcontainers/db/onDBDelete.js b/entity/Person_entity/recordcontainers/db/onDBDelete.js
index f17ef01bdde97defb85b512fc778df3cb61bae4e..961f7f520c417062146000eefd6a1f684683568d 100644
--- a/entity/Person_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Person_entity/recordcontainers/db/onDBDelete.js
@@ -1,9 +1,9 @@
import("Workflow_lib");
import("system.vars");
import("DuplicateScanner_lib");
-
+// TODO: enable when duplicate-module is finalized
let contactId = vars.get("$field.CONTACTID");
DuplicateScannerUtils.DeleteCachedDuplicate(contactId);
-WorkflowStarter.deleted();
-WorkflowSignalSender.deleted();
\ No newline at end of file
+//WorkflowStarter.deleted();
+//WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js
index c1b50e3da94468e2382abbc28ab9b56a464dbe97..58155b84d17f2216b8d6d66dec19287ff34fa5e7 100644
--- a/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js
@@ -1,6 +1,9 @@
import("system.vars");
import("system.result");
-var from = "CONTACT join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID)";
+//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 = "CONTACT PersonContact\n\
+ join ORGANISATION on (ORGANISATION.ORGANISATIONID = PersonContact.ORGANISATION_ID)\n\
+ join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)";
-result.string("PERSONID in (select CONTACT.PERSON_ID from " + from + " where " + vars.get("$local.condition")+ ")");
\ No newline at end of file
+result.string("PERSONID in (select PersonContact.PERSON_ID from " + from + " where " + vars.get("$local.condition")+ ")");
\ No newline at end of file
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index c7e47f5368f0859123af2509ec8707b9d26a96cf..5a068896ab8baf86702e15f8537324b65f2352b7 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_entity.aod
@@ -30,10 +30,6 @@
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/adresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
- <entityParameter>
- <name>ContactType_param</name>
- <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/adresses/children/contacttype_param/valueProcess.js</valueProcess>
- </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index 57a20f634775b73314799a6573e7612d88fdd734..4454af9e841af20c404492da77540d4c6f2318e3 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -176,6 +176,7 @@
<name>jDito</name>
<jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
<isFilterable v="true" />
+ <isSortable v="true" />
<contentProcess>%aditoprj%/entity/Role_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/Role_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/Role_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
diff --git a/entity/Role_entity/documentation.adoc b/entity/Role_entity/documentation.adoc
index 0e10050d3cc7dcf60d48f63658b9e27ab3dc9950..4651bec49085f5c8ed160c7b652eb55ee7702bbf 100644
--- a/entity/Role_entity/documentation.adoc
+++ b/entity/Role_entity/documentation.adoc
@@ -1,3 +1,3 @@
= Role_entity
-Link the roles to the users. Also used in the authorization concept
\ No newline at end of file
+Links the roles to the users. Also used in the authorization concept
\ No newline at end of file
diff --git a/entity/Role_entity/recordcontainers/jdito/contentProcess.js b/entity/Role_entity/recordcontainers/jdito/contentProcess.js
index 9ebefcd24295fe15fac6ad9bde259395bf31d6b4..0f67d474c580225d5785b8ebfdde880267506a75 100644
--- a/entity/Role_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Role_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.translate");
import("system.vars");
import("system.result");
@@ -38,4 +39,25 @@ if (selectedRole != null) {
});
}
-result.object(res.sort());
\ No newline at end of file
+var order = vars.get("$local.order");
+var columnOrder = {
+ "ROLENAME.value" : 1,
+ "ROLETITLE.value" : 2,
+ "ROLETYPE.value" : 3,
+ "USERCOUNT.value" : 5
+};
+var sortOrder = [];
+for (let field in order)
+{
+ if (field in columnOrder)
+ {
+ sortOrder.push(columnOrder[field]);
+ sortOrder.push(order[field] == "DOWN");
+ }
+}
+if (!sortOrder.length) //sort by role name by default
+ sortOrder = [1, false];
+
+ArrayUtils.sortMulti(res, sortOrder);
+
+result.object(res);
\ 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 53cd0f2efc974ca5f2c81914c7c653ccaf83198b..98ee6c1d37d0602d24647a54c6c46497854029d6 100644
--- a/entity/Task_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Task_entity/recordcontainers/db/conditionProcess.js
@@ -8,10 +8,10 @@ import("KeywordRegistry_basic");
var cond = newWhere("TASK.KIND", $KeywordRegistry.taskType$task())
var loadNothing = false;
+var ownContactId = EmployeeUtils.getCurrentContactId();
if (vars.getString("$param.FilterOnlyOwnTask_param") == "true")
{
- var ownContactId = EmployeeUtils.getCurrentContactId();
if (ownContactId)
cond.andIfSet("TASK.EDITOR_CONTACT_ID", ownContactId);
else
diff --git a/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js b/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js
index 187f4a3f604b09f1b1ab3e0c0d4166865cfd5d8e..958be5716236ef7cd77321a1cd61ca0e15d31be5 100644
--- a/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js
@@ -6,4 +6,4 @@ import("Sql_lib");
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(newWhereIfSet("TIMETRACKING.OBJECT_ID", "$param.ObjectId_param")
.andIfSet("TIMETRACKING.ROW_ID", "$param.RowId_param")
- .toString());
\ No newline at end of file
+ .toString());
diff --git a/entity/TurnoverTree_entity/documentation.adoc b/entity/TurnoverTree_entity/documentation.adoc
index b137bbb78e5378b6a3c2adf7716cb31f56cff507..19eb397554e86a2c4f71efcaaa8765e8f5de1149 100644
--- a/entity/TurnoverTree_entity/documentation.adoc
+++ b/entity/TurnoverTree_entity/documentation.adoc
@@ -2,4 +2,4 @@
For technical docu see the contentProcess of the jdito-record container of this entity
-This entity provides information to display the Turnover via tree.
\ No newline at end of file
+This entity provides information to display the turnover via tree.
\ No newline at end of file
diff --git a/entity/UnlinkedMail_entity/documentation.adoc b/entity/UnlinkedMail_entity/documentation.adoc
index 83e8716e7258d5bae6e80efca46dba9a61c4ffd1..bc6b5ab7c05945cb6fe27ab7e8e7fe957f402dc0 100644
--- a/entity/UnlinkedMail_entity/documentation.adoc
+++ b/entity/UnlinkedMail_entity/documentation.adoc
@@ -1,3 +1,3 @@
= UnlinkedMail_entity
-Entity for displaying and managing unlinked mails. This is also provided as Dashlet
\ No newline at end of file
+Entity for displaying and managing unlinked mails. This is also provided as a Dashlet
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 6093732e1705466d0ca1f65b544b39e06dd50ef7..ebf1d27fa0d3618e99816708ee3e88cd9be8f100 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -3226,7 +3226,7 @@
<key>Scoretype</key>
</entry>
<entry>
- <key>archieve</key>
+ <key>archive</key>
</entry>
<entry>
<key>setUnread</key>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod.orig b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod.orig
index b33c4cbcc91ecd3faa0d6b0f3c540ee6ea1c22b5..43e9e5efe9c3ea18adca80ad06195c581c779930 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod.orig
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod.orig
@@ -3406,7 +3406,7 @@
<key>Scoretype</key>
</entry>
<entry>
- <key>archieve</key>
+ <key>archive</key>
</entry>
<entry>
<key>setUnread</key>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod.orig b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod.orig
index 76a4241422b637833b2b9bcf8319c335bfc73e2b..50cb8cf7b5b03e605d82a43db073d5019421336f 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod.orig
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod.orig
@@ -665,7 +665,7 @@
<value>Kontaktpunkte</value>
</entry>
<entry>
- <key>archieve</key>
+ <key>archive</key>
<value>Archivieren</value>
</entry>
<entry>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index ab6c1b0e984c9c78fdefeb4217854c8aff9c35b2..703a87b398aff5601af9e96c2dec60b8f02d697d 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -3279,7 +3279,7 @@
<key>Scoretype</key>
</entry>
<entry>
- <key>archieve</key>
+ <key>archive</key>
</entry>
<entry>
<key>setUnread</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod.orig b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod.orig
index 47005365bad03a1745c922ccc8f5d84a31208241..8ec4fc23e9630b8275296e508bb81cf4b25d947f 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod.orig
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod.orig
@@ -3454,7 +3454,7 @@
<key>Scoretype</key>
</entry>
<entry>
- <key>archieve</key>
+ <key>archive</key>
</entry>
<entry>
<key>setUnread</key>
diff --git a/neonContext/MemberRoles/MemberRoles.aod b/neonContext/MemberRoles/MemberRoles.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1d6ac8864769248cd2496ab99ec7bbdbeca2df69
--- /dev/null
+++ b/neonContext/MemberRoles/MemberRoles.aod
@@ -0,0 +1,6 @@
+<?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>MemberRoles</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>MemberRoles_entity</entity>
+</neonContext>
diff --git a/neonView/CampaignCostEdit_view/CampaignCostEdit_view.aod b/neonView/CampaignCostEdit_view/CampaignCostEdit_view.aod
index 8c8fa21be7e3040c32dfe02c081844d998e9ec10..e8ad3f89a31c86f76b70cb35e974e163144cea0d 100644
--- a/neonView/CampaignCostEdit_view/CampaignCostEdit_view.aod
+++ b/neonView/CampaignCostEdit_view/CampaignCostEdit_view.aod
@@ -26,6 +26,10 @@
<name>23f1ec3b-91b3-44b6-bf2b-a976da6e3778</name>
<entityField>NET</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>f60b4663-592f-4ddf-ad78-9478289086c2</name>
+ <entityField>CURRENCY</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod b/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
index c19276fd5599232c4df946d0add164d551fd5d74..a9e88e8ef60e101b705ef60a614f9860deb8a919 100644
--- a/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
+++ b/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
@@ -28,6 +28,10 @@
<name>e16e3f66-7e80-4796-acca-6018e86e1b88</name>
<entityField>EMPLOYEE_CONTACT_ID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>568fd355-f13f-4b40-801e-614790091fc5</name>
+ <entityField>PREDECESSORSTEP_ID</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>ea21096b-5885-4f5e-8bd6-c45275b25036</name>
<entityField>DATE_START</entityField>
@@ -48,10 +52,6 @@
<name>981cf207-6e9b-428e-bd81-0d76b4b2f180</name>
<entityField>DESCRIPTION</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>568fd355-f13f-4b40-801e-614790091fc5</name>
- <entityField>PREDECESSORSTEP_ID</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>eff370e3-6805-46ad-ab7f-03d8a6392420</name>
<entityField>STEPMEDIUM</entityField>
diff --git a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
index 332238919764e29332191e2efd8813d0b6bf42f4..9e793070d553cd4e4e10a0f05d815859af186314 100644
--- a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
+++ b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
@@ -20,7 +20,7 @@
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>CampaignStepInfosGeneric</name>
+ <name>Runtime</name>
<editMode v="false" />
<showDrawer v="true" />
<drawerCaption>Runtime</drawerCaption>
@@ -37,13 +37,19 @@
</fields>
</genericViewTemplate>
<genericViewTemplate>
- <name>Predecessor</name>
+ <name>StepDetails</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>c5c7eff5-da6d-4664-9bdc-1cae9dcec461</name>
+ <name>55a75b16-a80d-4f9c-b8ea-127302d1f913</name>
<entityField>PREDECESSORSTEP_ID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>f7ddecfb-60bc-4a94-8905-7da729b32acd</name>
+ <entityField>STEPMEDIUM</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
@@ -61,19 +67,6 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
- <genericViewTemplate>
- <name>Medium</name>
- <editMode v="false" />
- <showDrawer v="false" />
- <drawerCaption></drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>723c67c3-d92e-424e-9350-3caa881a5ef0</name>
- <entityField>STEPMEDIUM</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
<scoreCardViewTemplate>
<name>KeyScoreInfos</name>
<entityField>#ENTITY</entityField>
diff --git a/neonView/MemberEdit_view/MemberEdit_view.aod b/neonView/MemberEdit_view/MemberEdit_view.aod
index 875b6f3f23eda92b61591f9b86fb1348037188b0..aa52b14888b3f0f273e08ee9b26772a4af009148 100644
--- a/neonView/MemberEdit_view/MemberEdit_view.aod
+++ b/neonView/MemberEdit_view/MemberEdit_view.aod
@@ -12,6 +12,7 @@
<genericViewTemplate>
<name>Edit</name>
<editMode v="true" />
+ <hideEmptyFields v="false" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
@@ -19,12 +20,8 @@
<entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>b59bebf0-ea9b-4773-90cd-01adeb21814a</name>
- <entityField>ROLE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>188da6f5-4e65-4918-ba4c-379887d51449</name>
- <entityField>DECIDER</entityField>
+ <name>8de1b238-ed9b-4c44-a399-fd38dafdabd3</name>
+ <entityField>MEMBERROLE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/MemberFilter_view/MemberFilter_view.aod b/neonView/MemberFilter_view/MemberFilter_view.aod
index 5b6c609f1f3e0d44174b4f5a536c039623e986fd..53d343fb57c87046b57104e077184b18d3572542 100644
--- a/neonView/MemberFilter_view/MemberFilter_view.aod
+++ b/neonView/MemberFilter_view/MemberFilter_view.aod
@@ -29,10 +29,6 @@
<name>27e658bc-c134-4fef-a3a5-b172852d606e</name>
<entityField>ORGANISATION_NAME</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>bea82980-0639-405a-ab3f-92e45f97090e</name>
- <entityField>ROLE</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>a30a083a-be66-4690-a7b6-19860a9bc72e</name>
<entityField>DEPARTMENT</entityField>
@@ -46,8 +42,8 @@
<entityField>POSITION</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>ade2cdae-ad07-4797-9440-00eddda68ee5</name>
- <entityField>DECIDER</entityField>
+ <name>bea82980-0639-405a-ab3f-92e45f97090e</name>
+ <entityField>MEMBERROLE</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
index 66161d28c1ec369856c0ac64e7a40b70aa7ad8ba..3d0d2ba37f31481c2fa370695807a1c9a6ac7cec 100644
--- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -50,6 +50,10 @@
<name>e25386dc-a740-4f93-a1f0-32317cf5a36a</name>
<entityField>OPTIONAL</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>69948799-9ec2-4fba-843d-7b86f9e4585f</name>
+ <entityField>TotalPrice</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index da56d0d4cbbeddb35ba95b1d1892ba92d243d851..fc784e7d470dae9f948939bc696702bb78fdae2a 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -27,8 +27,8 @@
<name>SendOrdersDashlet</name>
<title>Sent receipts</title>
<description>Show all sent receipts</description>
- <fragment>Order/filter?search=W3sibmFtZSI6Ik9SREVSU1RBVFVTIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlS2V5IjoiMSIsInZhbHVlIjoiVmVyc2VuZGV0IiwiY29udGVudFR5cGUiOiJCT09MRUFOIn1d%253D%253D</fragment>
- <singleton v="true" />
+ <fragment>Order/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJPUkRFUlNUQVRVUyIsIm9wZXJhdG9yIjoiQ09OVEFJTlMiLCJ2YWx1ZSI6IkphIiwia2V5IjoiMSIsImNvbnRlbnR0eXBlIjoiQk9PTEVBTiJ9XX0%3D</fragment>
+ <singleton v="false" />
<requiresConfiguration v="false" />
<storeRoles>
<element>PROJECT_FieldStaff</element>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index f46ff0d8d63bb5a681d651244d03d751a8f8753d..39323b15706c3041032670628eeff03bde50b1e8 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -71,26 +71,6 @@
<name>d5cc98c9-9483-4c2d-b0f3-69e25a0474f3</name>
<entityField>POSITION</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>9b6c952f-f3bb-4db9-a8f2-eeccb5b6e640</name>
- <entityField>STANDARD_MAIL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0eacedd7-b948-43e6-a9f6-b6b6f820e2d3</name>
- <entityField>STANDARD_PHONE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>bf05778c-b65f-40a5-9b08-47298247456d</name>
- <entityField>STANDARD_STREET</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>a6701830-34e8-4028-8c23-d558369d4893</name>
- <entityField>STANDARD_ZIP</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>90ab0622-08a3-4eab-8c49-691cbb941e83</name>
- <entityField>STANDARD_CITY</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
<scoreCardViewTemplate>
diff --git a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
index 23fe8501890179f1cd5197d13c46313ad1f234f2..bd2a9bfb2657d91b5152bf9f07c0913aa2f9f15d 100644
--- a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
+++ b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
@@ -3,7 +3,7 @@
<name>QuickEntryEdit_view</name>
<title>Quick entry</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:BOLT</icon>
+ <icon>VAADIN:WORKPLACE</icon>
<quickEntry v="0" />
<layout>
<boxLayout>
diff --git a/process/AttributeFilter_lib/process.js b/process/AttributeFilter_lib/process.js
index 4579288ff93a54bd927db5e4f1365145f694fc41..0a4f4f7bb17fe2f394f45d0c647b3d5d670556ce 100644
--- a/process/AttributeFilter_lib/process.js
+++ b/process/AttributeFilter_lib/process.js
@@ -117,7 +117,7 @@ AttributeFilterExtensionMaker.getFilterCondition = function(pObjectType, pFilter
.and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", attributeId);
var cond = SqlBuilder.EQUAL();
- if (pOperatorName == "IS NOT NULL" || pRawValue == "1" && pOperatorName == "LIKE" || pRawValue == "0" && pOperatorName == "NOT LIKE")
+ if (pOperatorName == "IS NOT NULL" || pRawValue == "1" && pOperatorName == "=" || pRawValue == "0" && pOperatorName == "<>")
cond = SqlBuilder.GREATER();
resSql = newWhere(resSql, 0, cond, SQLTYPES.INTEGER).toString();
@@ -136,12 +136,13 @@ AttributeFilterExtensionMaker.getFilterCondition = function(pObjectType, pFilter
//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("AB_ATTRIBUTERELATION.OBJECT_ROWID")
- .from("AB_ATTRIBUTERELATION")
- .where("AB_ATTRIBUTERELATION.OBJECT_ROWID = " + pIdTableName + "." + pIdColumnName)
- .and("AB_ATTRIBUTERELATION.OBJECT_TYPE", pObjectType)
- .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", attributeId)
- .and(condition) + ")";
+ resSql = pIdTableName + "." + pIdColumnName + " in (" + newSelect(pIdTableName + "." + pIdColumnName)
+ .from(pIdTableName)
+ .leftJoin("AB_ATTRIBUTERELATION", newWhere("AB_ATTRIBUTERELATION.OBJECT_ROWID = " + pIdTableName + "." + pIdColumnName)
+ .and("AB_ATTRIBUTERELATION.OBJECT_TYPE", pObjectType)
+ .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", attributeId)
+ )
+ .where(condition) + ")";
}
return resSql;
};
@@ -158,4 +159,4 @@ AttributeFilterExtensionMaker.makeFilterConditionSql = function()
var res = AttributeFilterExtensionMaker.getFilterCondition(objectType, filterName, filterCond, filterRawValue, filterOpratorName,
uidInfo.table, uidInfo.column, columnPlaceholder);
return res;
-};
\ No newline at end of file
+};
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 1442c2565230f4982d7a7d741f7216c56be7691f..40ba6cd3b01d2456fdd3328a3de9e412454f5084 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1093,7 +1093,7 @@ AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
*/
AttributeUsageUtil.updateChildrenUsages = function (pAttributeId, pOldObjectType, pNewObjectType)
{
- if (!pNewObjectType || !pAttributeId)
+ if (!pNewObjectType || !pAttributeId || !pOldObjectType)
return;
var table = "AB_ATTRIBUTEUSAGE";
diff --git a/process/DataPrivacy_lib/process.js b/process/DataPrivacy_lib/process.js
index 5eed8a22d0d2bd15427f65dfafc343f3ea205f6e..2072800d57a9bd07337d6bb3c1314da94e09dfee 100644
--- a/process/DataPrivacy_lib/process.js
+++ b/process/DataPrivacy_lib/process.js
@@ -24,6 +24,9 @@ import("Address_lib");
******************READ CAREFULLY****************
************************************************
*
+ * How does it work:
+ * Each time you open the DSGVO-context (e.g. the DSGVO filter view) it searches for new DSGVO-relevant data and syncs the DSGVO table with it
+ *
* Steps for adding a privacy field:
* - create Keyword Containername: "DSGVOType"
* - Add to list in DataPrivacyType.get - function with the same name as the keyword keyid. (see DataPrivacyType for all possible parameters)
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 91239d93d19cb53e4fa9d19a08f67a8af4f285ce..f9aee147be23831b4334ba5fda0efe05bb8957ed 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -344,7 +344,7 @@ DuplicateScannerUtils.ScanRecords = function(pTargetEntity, pTargetRecordsData,
//If the contact id loading query has no results, stop.
//No ids should be deleted if an error has been made in this query.
if(pTargetRecordsData.length <= 0)
- return null;
+ return foundDuplicateIds;
//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
@@ -747,7 +747,7 @@ DuplicateScannerUtils.BuildEntityFieldConfigValueRays = function(pDuplicateField
if(entityFieldValue == null)
entityFieldValue = "";
else
- entityFieldValue = entityFieldValue.toLowerCase().replace(/[():\.\/!]/gi, "");
+ entityFieldValue = entityFieldValue.toLowerCase().replace(/[():\.\/!]/gi, "").trim();
let exclude = fieldConfig.exclude;
if ( exclude )
@@ -763,8 +763,8 @@ DuplicateScannerUtils.BuildEntityFieldConfigValueRays = function(pDuplicateField
if ( valuelength )
entityFieldValue = entityFieldValue.substr(0, parseInt(valuelength)) + "*";
- let emptyall = fieldConfig.emptyall;
- if ( fieldConfig.emptyall && entityFieldValue == "")
+ let empty = fieldConfig.empty;
+ if ( !empty && entityFieldValue == "")
entityFieldValue = "*";
entityFieldValue = entityFieldValue.trim();
@@ -953,6 +953,7 @@ _DuplicateScannerUtils._isUseExternalWebservice = function(pFilterName, pTargetE
*/
_DuplicateScannerUtils._callIndexSearch = function(pTargetEntity, pIndexPatternWithValues, pResultFields, pResultSetRows)
{
+ logging.log(pIndexPatternWithValues)
//The indexPattern can't be null because it is required to run the search.
if(pIndexPatternWithValues == null || pIndexPatternWithValues == "")
return null;
@@ -1190,7 +1191,8 @@ _DuplicateScannerUtils._getMergeUpdateTableInfosCurrentAlias = function()
tableInfos.push(["ACTIVITY", "RESPONSIBLE", ""]);
tableInfos.push(["DSGVO", "CONTACT_ID", ""]);
tableInfos.push(["DSGVOINFO", "CONTACT_ID", ""]);
- tableInfos.push(["TIMETRACKING", "CONTACT_ID", ""]);
+ tableInfos.push(["T\n\
+IMETRACKING", "CONTACT_ID", ""]);
tableInfos.push(["ACTIVITYLINK", "OBJECT_ROWID", ""]);
tableInfos.push(["AB_ATTRIBUTERELATION", "OBJECT_ROWID", ""]);
diff --git a/process/ImporterMappingFunctions_lib/process.js b/process/ImporterMappingFunctions_lib/process.js
index 47f80a6506c12ec6d36401548fef555824482957..496ae5c71a907dd73e1f0a41852e837d93f6c5b3 100644
--- a/process/ImporterMappingFunctions_lib/process.js
+++ b/process/ImporterMappingFunctions_lib/process.js
@@ -15,10 +15,10 @@ import("Importer_lib");
// TODO: use SqlBuilder
/*
-┌───────────────────────────────────────────────────────────────â”
-│ toolkit methods for the import handler │
-│ DO NOT TOUCH - use lib_importerCustomMappingFunctions │
-└───────────────────────────────────────────────────────────────┘
++---------------------------------------------------------------+
+¦ toolkit methods for the import handler ¦
+¦ DO NOT TOUCH - use lib_importerCustomMappingFunctions ¦
++---------------------------------------------------------------+
*/
/*
@@ -366,13 +366,13 @@ function iComm(pObject) {
if(!address || !medium || !contact) return true;
var sql = "select " + this.getColumnCase("communicationid") + " from " + this.getTableCase("communication")
- +" where " + this.getColumnCase("contact_id") + " = ? and " + this.getColumnCase("medium_id") + " = ? and "
- + this.getColumnCase("isstandard") + " = ? and " + this.getColumnCase("addr") + " = ?"
+ +" where " + this.getColumnCase("contact_id") + " = ? and " + this.getColumnCase("medium_id") + " = ? and "
+ + this.getColumnCase("isstandard") + " = ? and " + this.getColumnCase("addr") + " = ?"
var id = db.cell([sql, [[contact, SQLTYPES.CHAR], [medium, SQLTYPES.CHAR], //TODO: define types dynamically and not hardcoded
[standard, SQLTYPES.SMALLINT], [address, SQLTYPES.VARCHAR]]], this.Config.AliasTo);
if (id == "" || id == null) {
var columns = [this.getColumnCase("communicationid"), this.getColumnCase("addr"),
- this.getColumnCase("medium_id"), this.getColumnCase("contact_id"), this.getColumnCase("isstandard")];
+ this.getColumnCase("medium_id"), this.getColumnCase("contact_id"), this.getColumnCase("isstandard")];
this.insertData(this.getTableCase("communication"), columns, null, [util.getNewUUID(), address, medium, contact, standard], this.Config.AliasTo);
}
return true;
diff --git a/process/IncomingCallExecutor_lib/process.js b/process/IncomingCallExecutor_lib/process.js
index 307f4e456b1fb0fbb1d493dc15db8b9c86acdce5..6ba61f39cb5e73c4ea40f77e830cc0e2c5119da6 100644
--- a/process/IncomingCallExecutor_lib/process.js
+++ b/process/IncomingCallExecutor_lib/process.js
@@ -36,6 +36,32 @@ import("system.indexsearch");
* ic.setHandlerDisconnect(disconnectingHandlerFn);
* ic.execute();
*/
+/**
+ * object for processing cti-calls
+ * Within the constructor, data is collected but not further processed. To perform operations, different methods are provided.
+ *
+ * @class
+ * @param {Object} pCallData object with all the basic call information, the object needs the following parameters: <ul>
+ * <li>action:for example: vars.get("$local.action") </li>
+ * <li>callId:uid of the call, requried, for example: vars.get("$local.callID") </li>
+ * <li>localAddress:the target phone address, for example: vars.get("$local.localAddress") </li>
+ * <li>localId:id of the call target, for example: vars.get("$local.localID") </li>
+ * <li>callAddress:the source phone address, for example: vars.get("$local.callAddress") </li>
+ * <li>isIncomingCall:Boolean:is the call an incoming or outgoing call, for example: vars.getString("$local.callIsIncoming") == "true" </li>
+ * <li>state:Number:callstate-constant (Ringing, talking, etc.), for example: Number(vars.get("$local.callState")) </li>
+ * <li>privateData:Object: additional telephony data when the tapi does provide it, for example: vars.exists("$local.privateData2") ? vars.get("$local.privateData2") : null </li>
+ * <li>isConnectedCall:Boolean:specifies if the call was redirected ("connected") from somebody else</li>
+ * </ul>
+ *
+ * @example
+ *
+ * var ic = new IncomingCallExecutor(callData);
+ * //most of the logic happens in the handler-fuctions
+ * ic.setHandlerRinging(ringingHandlerFn);
+ * ic.setHandlerTalking(talkingHandlerFn);
+ * ic.setHandlerDisconnect(disconnectingHandlerFn);
+ * ic.execute();
+ */
function IncomingCallExecutor(pCallData)
{
this.callData = pCallData;
@@ -53,16 +79,34 @@ function IncomingCallExecutor(pCallData)
this.usersCall = null;
this.collectDataFromCallInfo();
- //key-value pairs of states-functions
+ //key-value pairs of callstates-functions
this._handlerFunctions = {};
this.notificationContentId = null;
}
+
+/**
+ * transform the whole object into string representation, good for debugging and logging purposes
+ * This will list the own properties of the object and it's values. will not resolve functions (so no callback-functions are resolved)
+ *
+ * @return {String} stringified object-instance
+ */
IncomingCallExecutor.prototype.toString = function()
{
return JSON.stringify(this, null, " ");
}
+/**
+ * method for processing the callData.privateData - if it has been specified
+ * Since the tapi privateData supplies additional informations about the call, additional assumptions can be made for questions like:
+ * "who is the calling number?", "is the call a connected (=redirected) call?", etc.
+ *
+ * The object will set properties within the callData-member of your object and not return any value.
+ *
+ * There is no need to call this function your own because it's done in the constructor automatically.
+ *
+ * @return undefined
+ */
IncomingCallExecutor.prototype.processPrivateData = function()
{
// handling tapi-drivers which support privateData: extending the call information
@@ -84,6 +128,15 @@ IncomingCallExecutor.prototype.processPrivateData = function()
}
};
+/**
+ * searches for additional information to the given local-phone address and stores them in the following property in the object:
+ * <ul>
+ * <li>contactsLocal</li>
+ * </ul>
+ *
+ * //TODO: describe what is set there exactly
+ * @return undefined
+ */
IncomingCallExecutor.prototype.collectDataFromLocalInfo = function()
{
this.usersLocal = [];
@@ -104,12 +157,29 @@ IncomingCallExecutor.prototype.collectDataFromLocalInfo = function()
this.contactsLocal = IncomingCallExecutor._getContactsFromNumber(null, userContactIds);
};
+/**
+ * searches for additional information to the given call-phone address and stores them in the following properties in the object:
+ * <ul>
+ * <li>contactsCall</li>
+ * <li>usersCall</li>
+ * </ul>
+ *
+ * //TODO: describe what is set there exactly
+ * @return undefined
+ */
IncomingCallExecutor.prototype.collectDataFromCallInfo = function()
{
this.contactsCall = IncomingCallExecutor._getContactsFromNumber(this.callData.callAddress);
this.usersCall = IncomingCallExecutor._getUsersFromContacts(this.contactsCall);
};
+/**
+ * helper function that will log different callData and collected data to standard-output
+ * The function does not specify any module, importance or else
+ * Needed for live-analytics of problems and errors.
+ *
+ * @return undefined
+ */
IncomingCallExecutor.prototype.logData = function()
{
logging.log("ctiServerEvents");
@@ -138,27 +208,67 @@ IncomingCallExecutor.prototype.getNotificationBaseConfig = function(pUserName)
return notificationConfig;
};
+/**
+ * sets a callback function for a given call state (for example the state ringing)
+ *
+ * @param {primitive} pCallState the state for the given function that will be executed whenver the state is reached
+ * @param {Function} pFunction the callback-function that will be executed; this function will get no parameter but has access to all object instance properties
+ *
+ * @private this function should not be called from outside
+ *
+ * @return undefined
+ */
IncomingCallExecutor.prototype._setHandlerFn = function(pCallState, pFunction)
{
this._handlerFunctions[pCallState] = pFunction;
}
+/**
+ * Sets a callback function which is called when an in- or outcoming call has has the state ringing/connection-rining.
+ * In the given function could be done some logging of the call for example.
+ *
+ * @param pFunction the callback-function that will be executed; this function will get no parameter but has access to all object instance properties
+ *
+ * @return undefined
+ */
IncomingCallExecutor.prototype.setHandlerRinging = function(pFunction)
{
this._setHandlerFn(cti.CALLSTATE_RINGING, pFunction);
this._setHandlerFn(cti.CALLSTATE_CONNECTION_RINGING, pFunction);
}
+/**
+ * Sets a callback function which is called when an in- or outcoming call has has the state talking
+ * In the given function could be done some logging of the call for example.
+ *
+ * @param pFunction the callback-function that will be executed; this function will get no parameter but has access to all object instance properties
+ *
+ * @return undefined
+ */
IncomingCallExecutor.prototype.setHandlerTalking = function(pFunction)
{
this._setHandlerFn(cti.CALLSTATE_TALKING, pFunction);
}
+/**
+ * Sets a callback function which is called when an in- or outcoming call has has the state disconnected.
+ * In the given function could be done some logging of the call for example.
+ *
+ * @param pFunction the callback-function that will be executed; this function will get no parameter but has access to all object instance properties
+ *
+ * @return undefined
+ */
IncomingCallExecutor.prototype.setHandlerDisconnect = function(pFunction)
{
this._setHandlerFn(cti.CALLSTATE_DISCONNECTED, pFunction);
}
+/**
+ * After all the data is initialized, collected and so on this method actually calls the correct handler depending on the callstate that is set
+ * If no handler function for that state is defined, nothing is done
+ *
+ * @return undefined
+ */
IncomingCallExecutor.prototype.execute = function()
{
var state = this.callData.state;
@@ -171,6 +281,15 @@ IncomingCallExecutor.prototype.execute = function()
}
}
+/**
+ * helper function that converts a callstate into easy read- and understandable text
+ *
+ * @param {cti.CALLSATE_***} pCallstate the callstate as number/constant that shall be converted
+ *
+ * @return {String} descriptive shorttext of the callstate
+ *
+ * @private
+ */
IncomingCallExecutor._callstateToText = function(pCallstate)
{
var callstateName;
@@ -282,7 +401,7 @@ IncomingCallExecutor._getContactsFromNumber = function(pNumber, pContactIds)
rows = entities.getRows(config);
return rows;
*/
- //load entities does not work here, so use instead a traditional sql-query:
+ //load entities does not work here, so instead use a traditional sql-query:
var contacts = newSelect("CONTACT.CONTACTID, CONTACT.ORGANISATION_ID, ORGANISATION.NAME, CONTACT.PERSON_ID, CONTACT.ISOLANGUAGE, PERSON.LASTNAME, PERSON.FIRSTNAME")
.from("CONTACT")
.join("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
@@ -354,17 +473,37 @@ IncomingCallExecutor.prototype.getLocaleFromUser = function(pUserObject)
return null;
};
+/**
+ * helper function to format the local address (source phone address)
+ * Will replace special cti-phone elements like the provider (e.g. SIP/203 is changed to 203)
+ *
+ * @return {String} the formatted local-address or the original replaced number when the nubmber could not be formatted
+ */
IncomingCallExecutor.prototype.getFormattedLocalAddress = function()
{
return IncomingCallExecutor.formatAddress(this.callData.localAddress);
}
-
+/**
+ * helper function to format the call address (target phone address)
+ * Will replace special cti-phone elements like the provider (e.g. SIP/203 is changed to 203)
+ *
+ * @return {String} the formatted call-address or the original replaced number when the nubmber could not be formatted
+ */
IncomingCallExecutor.prototype.getFormattedCallAddress = function()
{
return IncomingCallExecutor.formatAddress(this.callData.callAddress);
}
+/**
+ * helper function to format a cti-phone address
+ * Will replace special cti-phone elements like the provider (e.g. SIP/203 is changed to 203)
+ *
+ * @static
+ * @param {String} pAddress the cti phone address that shall be formatted
+ *
+ * @return {String} the formatted number or the original replaced number when the nubmber could not be formatted
+ */
IncomingCallExecutor.formatAddress = function (pAddress)
{
return cti.formatPhoneNumber(pAddress.replace(/P?J?SIP\//, ""), true, null);
diff --git a/process/Permission_lib/process.js b/process/Permission_lib/process.js
index 5a054df59deb6cdfe0d38df1f7fd57d54b00dacb..0fb21146bde3699e0f0e87140092346e38b41847 100644
--- a/process/Permission_lib/process.js
+++ b/process/Permission_lib/process.js
@@ -501,13 +501,14 @@ function PermissionUtil () {}
if (pActionId != null & pActionId != "" && pActionId != undefined && actionNotExists) {
actionId = pActionId;
} else {
- actionId = util.getNewUUID(); // if same id is already in db -> create new UID
+ newActionId = util.getNewUUID(); // if same id is already in db -> create new UID
}
- var vals = [actionId, pParentPermId, pAction];
+
+ var vals = [newActionId, pParentPermId, pAction];
if (db.insertData(table, cols, null, vals, alias) == 0) {
return null;
}
- return actionId;
+ return newActionId;
}
/**
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 99770a39bc0040c3aec3f71c32e90ac058e67ab8..5f110cfbef9daebb0456428c11aeed020ca86f0d 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -777,7 +777,7 @@ function newWhereIfSet(pFieldOrCond, pValue, pCondition, pFieldType, pAlias)
function SqlBuilder (pAlias)
{
if(!(this instanceof SqlBuilder))
- throw SqlBuilder._ERROR_INSTANCIATE_WITH_NEW();
+ throw SqlBuilder.ERROR_INSTANCIATE_WITH_NEW();
this._select = null;
this._from = null;
this._tableName = null; //for update/delete
@@ -1496,7 +1496,7 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon
if (pValue instanceof SqlBuilder || Array.isArray(pValue) || (typeofValue == "string" && (pFieldOrCond == undefined || pFieldOrCond == null)))
{
// check if the array is really a value-array for an in and not a prepared statement
- if (Array.isArray(pValue) && (pValue.lenght <= 1 || !Array.isArray(pValue[1])))
+ if (Array.isArray(pValue) && (pValue.length <= 1 || !Array.isArray(pValue[1])))
{
if (pValue.length == 0)
{
@@ -3444,7 +3444,6 @@ SqlUtils._parseFieldQualifier = function(pFieldOrTableName, pColumnName)
};
};
-
/**
* determines if given values match a full field qualifier (name of table and name of column)
*
diff --git a/process/UnitTest_lib/UnitTest_lib.aod b/process/UnitTest_lib/UnitTest_lib.aod
index 7e4e53c003a18b1526abd9381f3a4e5f4026ed90..225ac2303844a684c92ac95b0426318362598cb0 100644
--- a/process/UnitTest_lib/UnitTest_lib.aod
+++ b/process/UnitTest_lib/UnitTest_lib.aod
@@ -3,6 +3,7 @@
<name>UnitTest_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/UnitTest_lib/process.js</process>
+ <alias>Data_alias</alias>
<variants>
<element>LIBRARY</element>
</variants>
diff --git a/process/getDocxDocument_serverProcess/process.js b/process/getDocxDocument_serverProcess/process.js
index 15d8e584df5bff512fce07e3aae69331fbfbef5e..80f0a37b65861c40c52c05451875f6f38e69de94 100644
--- a/process/getDocxDocument_serverProcess/process.js
+++ b/process/getDocxDocument_serverProcess/process.js
@@ -4,6 +4,13 @@ import("system.swing");
import("system.fileIO");
import("system.util");
+/*
+ Override the definition of the IntegerArrays, because Rhino does not fully support these TypedArrays.
+ The zip- and tempalter- lib check if these TypedArrays are defined:
+ If not, other datatypes are used as an alternative way to achieve the goal. If the datatypes exist they are used due to better Performance.
+ Therefor make them not existant so that the alternative is used.
+ This should not cause any problems in other situations since this is a serverProcess and not code that is imported somewhere else.
+ */
Int8Array = undefined;
Uint8Array = undefined;
Uint8ClampedArray = undefined;