diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/alter_districtContact_1066036.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/alter_districtContact_1066036.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b389c64e723131b3531d7d5a503f2bd102662e10
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/alter_districtContact_1066036.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="Pierre Suchacek" id="9aace074-1b61-4577-ad27-bee6a498134c">
+ <addColumn tableName="DISTRICTCONTACT">
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
index d8ccdd4c8a999c5f983ed3ae28a3803bfaf761e8..76bc7b7962c4e58f58146a1976b1000850a8767a 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
@@ -11,4 +11,5 @@
<include relativeToChangelogFile="true" file="insert_KeywordsAdviserRoles.xml"/>
<include relativeToChangelogFile="true" file="update_ContactResponsible_consistent.xml"/>
<include relativeToChangelogFile="true" file="alter_district_1066187.xml"/>
+ <include relativeToChangelogFile="true" file="alter_districtContact_1066036.xml"/>
</databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 0673fab6659afbf5bfe6e886f9b9de938cdb928f..b9c1f90e12a6ada2d0345725fcb88818e3528091 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -15924,6 +15924,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
</entities>
diff --git a/entity/DistrictContact_entity/DistrictContact_entity.aod b/entity/DistrictContact_entity/DistrictContact_entity.aod
index 0a8b606d3ed9df33784cbe4dadc298ea29c621ab..477c91f73aa325b27167d9f86f9cd836f82fdf67 100644
--- a/entity/DistrictContact_entity/DistrictContact_entity.aod
+++ b/entity/DistrictContact_entity/DistrictContact_entity.aod
@@ -26,7 +26,7 @@
</entityProvider>
<entityField>
<name>CONTACT_ID</name>
- <title>Contact</title>
+ <title>Company</title>
<consumer>Persons</consumer>
<groupable v="true" />
<linkedContext>Person</linkedContext>
@@ -62,7 +62,6 @@
<consumer>KeywordContactStates</consumer>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/status/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>VALID_FROM</name>
@@ -102,6 +101,10 @@
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>ExcludedKeyIdsSubquery_param</name>
+ <valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/excludedkeyidssubquery_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
@@ -136,8 +139,8 @@
<name>Persons</name>
<dependency>
<name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>Contacts</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Organisations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -150,15 +153,9 @@
<name>Advisers</name>
<dependency>
<name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>Contacts</fieldName>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>DistrictResponsibles</fieldName>
</dependency>
- <children>
- <entityParameter>
- <name>ExcludedContactIds_param</name>
- <valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/advisers/children/excludedcontactids_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
</entityConsumer>
<entityConsumer>
<name>Districts</name>
@@ -258,6 +255,10 @@
<name>DISTRICT_ID.displayValue</name>
<expression>%aditoprj%/entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATUS.displayValue</name>
+ <expression>%aditoprj%/entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/DistrictContact_entity/entityfields/advisers/children/excludedcontactids_param/valueProcess.js b/entity/DistrictContact_entity/entityfields/advisers/children/excludedcontactids_param/valueProcess.js
deleted file mode 100644
index aab936bb3ba84874435d3086f0efef95ab4102bc..0000000000000000000000000000000000000000
--- a/entity/DistrictContact_entity/entityfields/advisers/children/excludedcontactids_param/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-//import("system.result");
-//import("system.db");
-//import("Sql_lib");
-//
-//result.object(newSelect("ADVISER_CONTACT_ID")
-// .from("DISTRICTCONTACT")
-// .where("DISTRICTCONTACT.DISTRICT_ID", "$field.DISTRICT_ID")
-// .arrayColumn(true));
\ No newline at end of file
diff --git a/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/excludedkeyidssubquery_param/valueProcess.js b/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/excludedkeyidssubquery_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..105fc4cc77daa44a2afedbd4539cb305313781cf
--- /dev/null
+++ b/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/excludedkeyidssubquery_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+
+var cond = newSelect("AB_KEYWORD_ENTRY.KEYID")
+.from("AB_KEYWORD_ENTRY")
+.where("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.contactStatus())
+.and("AB_KEYWORD_ENTRY.KEYID", $KeywordRegistry.contactStatus$reviewed(), SqlBuilder.LIKE());
+
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/DistrictContact_entity/entityfields/status/displayValueProcess.js b/entity/DistrictContact_entity/entityfields/status/displayValueProcess.js
deleted file mode 100644
index f2373da2bb3860422f15e71699dee051eb928b89..0000000000000000000000000000000000000000
--- a/entity/DistrictContact_entity/entityfields/status/displayValueProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.result");
-import("system.vars");
-import("KeywordRegistry_basic");
-import("Keyword_lib");
-
-var key = vars.get("$field.STATUS");
-if (key)
-{
- var res = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), key);
- result.string(res);
-}
\ No newline at end of file
diff --git a/entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..22b1e68d7238c6315da8b21edbb1fdae45744855
--- /dev/null
+++ b/entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contactStatus(), "DISTRICTCONTACT.STATUS");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index 2b2c789377e288ee6f32bde04c4767a3097c0b98..747c218d53b18fc7f5e7df5079ad82d649dff4ab 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -68,6 +68,12 @@
<fieldName>DistrictResponsibleUIDs</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>7c71a3ee-2b48-4d21-ae66-b53b9a1ff28c</name>
+ <entityName>DistrictContact_entity</entityName>
+ <fieldName>Advisers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 18afded566ce57071923d5fba788acd839f3507d..472f0c52c52e9e84b006a14620028814b30c4e79 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -151,6 +151,12 @@
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>b64b29e6-59c5-4250-9bc7-b08c85976e7e</name>
+ <entityName>DistrictContact_entity</entityName>
+ <fieldName>Persons</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 1da8d17dc13e89227123bf9f7145cb7ea21bd73f..93b1185272e49a1303b200c26fb5ba202940c0e5 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -725,18 +725,6 @@
<fieldName>Persons</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>46a8c52b-ffa4-4ff4-8fff-73f951e9e1aa</name>
- <entityName>DistrictContact_entity</entityName>
- <fieldName>Persons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bb94fe7a-09d0-4809-aeaf-b06e1eff82af</name>
- <entityName>DistrictContact_entity</entityName>
- <fieldName>Advisers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/neonContext/DistrictResponsible/DistrictResponsible.aod b/neonContext/DistrictResponsible/DistrictResponsible.aod
index ac58a2451f7d4246be83b672e5ff3e909aa77351..1a7fdf7c9c460ca3d629a372a4ffba1cf1aa8cc3 100644
--- a/neonContext/DistrictResponsible/DistrictResponsible.aod
+++ b/neonContext/DistrictResponsible/DistrictResponsible.aod
@@ -7,6 +7,7 @@
<filterView>DistrictResponsibleFilter_view</filterView>
<editView>DistrictResponsibleEdit_view</editView>
<previewView>DistrictResponsiblePreviewList_view</previewView>
+ <lookupView>DistrictResponsibleLookup_view</lookupView>
<devices>
<element>MOBILE</element>
<element>TABLET</element>
@@ -34,5 +35,9 @@
<name>bf0655aa-60e7-47b8-a3e7-eb7ba8b37cac</name>
<view>DistrictResponsibleEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>30960bbf-184a-4e4e-8058-983d4c150d89</name>
+ <view>DistrictResponsibleLookup_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/DistrictContactFilter_view/DistrictContactFilter_view.aod b/neonView/DistrictContactFilter_view/DistrictContactFilter_view.aod
index 6d7fac95145f14b083472d0f93b47299dbb1f286..681c4fb4db196aa39f7f2d7b6706f8935023a3a3 100644
--- a/neonView/DistrictContactFilter_view/DistrictContactFilter_view.aod
+++ b/neonView/DistrictContactFilter_view/DistrictContactFilter_view.aod
@@ -21,6 +21,10 @@
<name>b2b3fd8c-2d93-4059-b4e4-24ca24874018</name>
<entityField>CONTACT_ID</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>a5b6ac69-712c-45e1-97ff-cf1101da4b95</name>
+ <entityField>ADVISER_CONTACT_ID</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>06c6fc84-5025-4bb2-906a-3de1bbeafbdd</name>
<entityField>ADVISER_ROLE</entityField>
diff --git a/neonView/DistrictResponsibleLookup_view/DistrictResponsibleLookup_view.aod b/neonView/DistrictResponsibleLookup_view/DistrictResponsibleLookup_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..20ab3ef6c626ce76ec30e576581213ab04633c02
--- /dev/null
+++ b/neonView/DistrictResponsibleLookup_view/DistrictResponsibleLookup_view.aod
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DistrictResponsibleLookup_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>ResponsibleLookup</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>b1180c08-6e1f-459f-868f-2842d034806f</name>
+ <entityField>#ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>e5b2fbc0-174d-4d0e-88d1-a798e65cd773</name>
+ <entityField>EMPLOYEE_CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>db77b7a3-80bf-4dc7-9691-8d6aa7422756</name>
+ <entityField>ADVISER_ROLE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index ba80197cd05d9f6c4c66c1c0a95cf557e578fe54..f0f7bc74dcd6c88e148390fc2b28eefc38416b8b 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -41,6 +41,7 @@ $KeywordRegistry.activityDirection$internal = function(){return "x";};
$KeywordRegistry.contactStatus = function(){return "ContactStatus";};
$KeywordRegistry.contactStatus$active = function(){return "CONTACTSTATACTIVE";};
$KeywordRegistry.contactStatus$inactive = function(){return "CONTACTSTATINACTIVE";};
+$KeywordRegistry.contactStatus$reviewed = function(){return "CONTACTSTATREVIEW";};
$KeywordRegistry.currency = function(){return "Currency";};
$KeywordRegistry.currency$eur = function(){return "EUR";};