merged origin/2020.2.0_Betreuung_HamaDSG into District_merge

.gitignore

@@ -5,4 +5,5 @@
 /others/db_changes/liqui_update.bat
 /others/db_changes/liqui_reset.ps1
 /others/jsdocOut
-/userhelp
\ No newline at end of file
+/userhelp
+/system/dev_local
\ No newline at end of file

.liquibase/Data_alias/basic/2020.2.0/Districts/alter_districtContact_1066036.xml

+<?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

.liquibase/Data_alias/basic/2020.2.0/Districts/alter_districtResponsibleDatatypes.xml

+<?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="6feb15fd-c517-4bf9-be88-59993908b9ed">
+        <addColumn tableName="DISTRICTRESPONSIBLE">
+            <column name="ADVISERSTATUS"    type="VARCHAR(36)" />
+            <column name="ADVISERROLE"      type="VARCHAR(36)" />
+            <column name="VALIDFROM"        type="DATETIME" />
+            <column name="VALIDTO"          type="DATETIME" />
+        </addColumn>
+    </changeSet>
+</databaseChangeLog> 
\ No newline at end of file

.liquibase/Data_alias/basic/2020.2.0/Districts/alter_district_1066187.xml

+<?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="Gerhard Bachmaier" id="3a1bb059-c040-435b-8978-bfddb1a6e2d4">
+        <addColumn tableName="DISTRICT">
+            <column name="DISTRICT_AUTOADD"    type="SMALLINT(5)" />
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml

@@ -5,4 +5,11 @@
     <include relativeToChangelogFile="true" file="create_districtresponsible.xml"/>
     <include relativeToChangelogFile="true" file="create_districtResponsibleKeyword.xml"/>
     <include relativeToChangelogFile="true" file="create_indizes.xml"/>
+    <include relativeToChangelogFile="true" file="create_districtContact.xml"/>
+    <include relativeToChangelogFile="true" file="insert_KeywordsDistrictOrigin.xml"/>
+    <include relativeToChangelogFile="true" file="alter_districtResponsibleDatatypes.xml"/>
+    <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>

.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtContact.xml

+<?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="c17cc078-3d3d-4988-9dda-789a59aad814">
+        <createTable tableName="DISTRICTCONTACT">
+            <column name="DISTRICTCONTACTID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_DISTRICTCONTACT_DISTRICTCONTACTID"/>
+            </column>
+            <column name="CONTACT_ID" type="VARCHAR(36)"/>
+            <column name="DISTRICT_ID" type="VARCHAR(36)"/>
+            <column name="ADVISER_CONTACT_ID" type="VARCHAR(36)"/>
+            <column name="ADVISER_ROLE" type="VARCHAR(36)"/>
+            <column name="STATUS" type="CHAR(36)"/>
+            <column name="VALID_FROM" type="DATETIME"/>
+            <column name="VALID_UNTIL" type="DATETIME"/>
+            <column name="ORIGIN" type="NVARCHAR(36)"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2020.2.0/Districts/insert_KeywordsAdviserRoles.xml

+<?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="d5737f12-5e86-4d6c-bcc7-7d7bed2d993f">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="97c73c26-c90e-410b-8732-47cbeaf986df"/>
+            <column name="KEYID" value="ADVISERROLE_SalesManager"/>
+            <column name="TITLE" value="Sales Manager"/>
+            <column name="CONTAINER" value="ADVISER_ROLE"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="8d853c34-0896-45db-989d-131a15bd0c6a"/>
+            <column name="KEYID" value="ADVISERROLE_OfficeDuty"/>
+            <column name="TITLE" value="Office Duty"/>
+            <column name="CONTAINER" value="ADVISER_ROLE"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="40212bc7-df71-4131-965b-344e6baf7c57"/>
+            <column name="KEYID" value="ADVISERROLE_RegionManager"/>
+            <column name="TITLE" value="Region Manager"/>
+            <column name="CONTAINER" value="ADVISER_ROLE"/>
+            <column name="SORTING" valueNumeric="2"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="df052065-a32d-4c17-a229-60abcaf2736f"/>
+            <column name="KEYID" value="ADVISERROLE_AccountManager"/>
+            <column name="TITLE" value="Account Manager"/>
+            <column name="CONTAINER" value="ADVISER_ROLE"/>
+            <column name="SORTING" valueNumeric="3"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="3b080d0e-9301-47f2-9ead-10f2b5aaf701"/>
+            <column name="KEYID" value="ADVISERROLE_AreaManager"/>
+            <column name="TITLE" value="Area Manager"/>
+            <column name="CONTAINER" value="ADVISER_ROLE"/>
+            <column name="SORTING" valueNumeric="4"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="a343cbe0-af9c-464c-861e-65f00eab392f"/>
+            <column name="KEYID" value="ADVISERROLE_FieldService"/>
+            <column name="TITLE" value="Field Service"/>
+            <column name="CONTAINER" value="ADVISER_ROLE"/>
+            <column name="SORTING" valueNumeric="5"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2020.2.0/Districts/insert_KeywordsDistrictOrigin.xml

+<?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="a2067d42-75a1-4799-8c03-e5ec13f29b7a">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="9531f6ba-dbbc-43c2-ba7a-761c6e44ca3b"/>
+            <column name="KEYID" value="DistrictOrigin_auto"/>
+            <column name="TITLE" value="auto"/>
+            <column name="CONTAINER" value="DISTRICT_ORIGIN"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="b063bd18-0f60-4e5f-b153-62acb984a4b2"/>
+            <column name="KEYID" value="DistrictOrigin_manual"/>
+            <column name="TITLE" value="manual"/>
+            <column name="CONTAINER" value="DISTRICT_ORIGIN"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2020.2.0/Districts/update_ContactResponsible_consistent.xml

+<?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="610e5b84-2428-4294-b513-b4a0c7493e0a">
+        <renameColumn
+            columnDataType="VARCHAR(36)"  
+            newColumnName="ADVISER_STATUS"  
+            oldColumnName="ADVISERSTATUS"   
+            tableName="DISTRICTRESPONSIBLE"/>
+        
+        <renameColumn
+            columnDataType="VARCHAR(36)"  
+            newColumnName="ADVISER_ROLE"  
+            oldColumnName="ADVISERROLE"   
+            tableName="DISTRICTRESPONSIBLE"/>
+                
+        <renameColumn
+            columnDataType="VARCHAR(36)"  
+            newColumnName="VALID_FROM"  
+            oldColumnName="VALIDFROM"   
+            tableName="DISTRICTRESPONSIBLE"/>
+                        
+        <renameColumn
+            columnDataType="VARCHAR(36)"  
+            newColumnName="VALID_UNTIL"  
+            oldColumnName="VALIDTO"   
+            tableName="DISTRICTRESPONSIBLE"/>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2020.2.0/changelog.xml

@@ -6,7 +6,7 @@
     <include relativeToChangelogFile="true" file="ImportFields/changelog.xml"/>
     <include relativeToChangelogFile="true" file="LeadimportMappingAssistant/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Lead/changelog.xml"/>
-    <include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>
+    <!--<include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>-->
     <include relativeToChangelogFile="true" file="addNotificationStateKeywords/addNotificationStateKeyword.xml"/>
     <include relativeToChangelogFile="true" file="alter_ComunicationMedium_IdDatatype.xml"/>
     <include relativeToChangelogFile="true" file="ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml"/>

.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_PERMISSION.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.luginger" id="1110a814-62e1-4c54-9e8d-03e2feb27760">
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONID" value="f53f7071-c0ad-4af4-b3c0-4a02bb8f27b5"/>
+      <column name="ASYS_PERMISSIONSET_ID" value="8cc1bee8-0092-4e52-a439-f647eed55441"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;DistrictContact_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONID" value="3cbc4523-6d24-44aa-bc05-ef044b13d3fb"/>
+      <column name="ASYS_PERMISSIONSET_ID" value="295cd7b4-7ffd-4249-919f-daa908dab7ec"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;DistrictContact_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONID" value="ddfb3a26-8be1-4773-9cd6-73675603201e"/>
+      <column name="ASYS_PERMISSIONSET_ID" value="295cd7b4-7ffd-4249-919f-daa908dab7ec"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;DistrictContact_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;ORIGIN&quot;,&quot;operator&quot;:&quot;EQUAL&quot;,&quot;value&quot;:&quot;manual&quot;,&quot;key&quot;:&quot;DistrictOrigin_manual&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}"/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_PERMISSIONACTION.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.luginger" id="a6e86404-38ec-419f-9fe8-25327a6b3ac6">
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ACTION" value="view"/>
+      <column name="ASYS_PERMISSION_ID" value="f53f7071-c0ad-4af4-b3c0-4a02bb8f27b5"/>
+      <column name="ASYS_PERMISSIONACTIONID" value="8cae79d8-e8bf-4d9a-9353-e0dd7df1f667"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ACTION" value="create"/>
+      <column name="ASYS_PERMISSION_ID" value="f53f7071-c0ad-4af4-b3c0-4a02bb8f27b5"/>
+      <column name="ASYS_PERMISSIONACTIONID" value="3a7a7322-ac8b-49dc-b185-a5acab4fb6dc"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ACTION" value="read"/>
+      <column name="ASYS_PERMISSION_ID" value="3cbc4523-6d24-44aa-bc05-ef044b13d3fb"/>
+      <column name="ASYS_PERMISSIONACTIONID" value="1686674d-7343-4d00-8a92-290c0263991b"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ACTION" value="delete"/>
+      <column name="ASYS_PERMISSION_ID" value="ddfb3a26-8be1-4773-9cd6-73675603201e"/>
+      <column name="ASYS_PERMISSIONACTIONID" value="a60eb350-12a5-444c-8d1a-3f5a7d57d8f3"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ACTION" value="update"/>
+      <column name="ASYS_PERMISSION_ID" value="ddfb3a26-8be1-4773-9cd6-73675603201e"/>
+      <column name="ASYS_PERMISSIONACTIONID" value="63668e61-664b-48d3-8ba8-fea974271438"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_PERMISSIONSET.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.luginger" id="c83eadc7-c360-411a-8a83-da85eff5e945">
+    <insert tableName="ASYS_PERMISSIONSET">
+      <column name="ACCESSTYPE" value="E"/>
+      <column name="ASYS_PERMISSIONSETID" value="8cc1bee8-0092-4e52-a439-f647eed55441"/>
+      <column name="ENTITY_ID" value="DistrictContact_entity"/>
+      <column name="ROLE_ID" value="INTERNAL_EVERYONE"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONSET">
+      <column name="ACCESSTYPE" value="R"/>
+      <column name="ASYS_PERMISSIONSET_ID" value="8cc1bee8-0092-4e52-a439-f647eed55441"/>
+      <column name="ASYS_PERMISSIONSETID" value="295cd7b4-7ffd-4249-919f-daa908dab7ec"/>
+      <column name="ENTITY_ID" value="DistrictContact_entity"/>
+      <column name="ROLE_ID" value="INTERNAL_EVERYONE"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/changelog.xml

 <?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">
     <include relativeToChangelogFile="true" file="ASYS_BINARIES.xml"/>
-	<include relativeToChangelogFile="true" file="ASYS_RECORD.xml"/>
-	<include relativeToChangelogFile="true" file="ASYS_RECORDGROUP.xml"/>
+    <include relativeToChangelogFile="true" file="ASYS_RECORD.xml"/>
+    <include relativeToChangelogFile="true" file="ASYS_RECORDGROUP.xml"/>
+    <include relativeToChangelogFile="true" file="ASYS_PERMISSION.xml"/>
+    <include relativeToChangelogFile="true" file="ASYS_PERMISSIONACTION.xml"/>
+    <include relativeToChangelogFile="true" file="ASYS_PERMISSIONSET.xml"/>
 </databaseChangeLog>
\ No newline at end of file

aliasDefinition/Data_alias/Data_alias.aod

@@ -15820,6 +15820,20 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_AUTOADD</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
@@ -15859,8 +15873,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15915,8 +15929,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15952,6 +15966,300 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>ADVISER_STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ADVISER_ROLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VALID_FROM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VALID_UNTIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DISTRICTCONTACT</name>
+            <dbName></dbName>
+            <idColumn>DISTRICTCONTACTID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="1" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ORIGIN</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title>District assignment status</title>
+                <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                  <customJDitoProperty>
+                    <name>translate4Log</name>
+                    <global v="false" />
+                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/districtcontact/entityfields/status/customproperties/translate4log/property.js</property>
+                  </customJDitoProperty>
+                </customProperties>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ADVISER_ROLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ADVISER_CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICTCONTACTID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title>District</title>
+                <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                  <customJDitoProperty>
+                    <name>translate4Log</name>
+                    <global v="false" />
+                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/districtcontact/entityfields/district_id/customproperties/translate4log/property.js</property>
+                  </customJDitoProperty>
+                </customProperties>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="false" />
+                  </customBooleanProperty>
+                  <customStringProperty>
+                    <name>tableRef</name>
+                    <global v="false" />
+                    <property>CONTACT</property>
+                  </customStringProperty>
+                </customProperties>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VALID_FROM</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>VALID_UNTIL</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>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>
           <entityDb>

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/districtcontact/entityfields/district_id/customproperties/translate4log/property.js

+import("system.translate");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("District_lib");
+import("system.result");
+import("Loghistory_lib");
+import("Contact_lib");
+
+var params = Translate4LogParams.load();
+
+if (params.action == 'I')
+{
+    //Gebiet und Betreur umschlüsseln
+    var arrDistrictContact = DistrictUtils.getDataFromDistrictContact(params.rowId);
+    var districtName = DistrictUtils.getDistrictName(arrDistrictContact[0]);
+    var adviserName = ContactUtils.getTitleByContactId(arrDistrictContact[1]);
+    result.string(districtName + " (" + params.value + "); " + translate.text("Adviser") + ": " + adviserName);
+}
+else if (params.action == 'D')
+{
+    result.string(params.value);
+}
\ No newline at end of file

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/districtcontact/entityfields/status/customproperties/translate4log/property.js

+import("system.translate");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("District_lib");
+import("system.result");
+import("Loghistory_lib");
+import("Contact_lib");
+
+var params = Translate4LogParams.load();
+
+//Statusänderung protokollieren
+if (params.action == 'U')
+{
+    //Keyword umschlüsseln
+    var keyname = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), params.value);
+
+    //Gebiet und Betreur umschlüsseln
+    var arrDistrictContact = DistrictUtils.getDataFromDistrictContact(params.rowId);
+    var districtName = DistrictUtils.getDistrictName(arrDistrictContact[0]);
+    //var adviserName = ContactUtils.getFullTitleByContactId(arrDistrictContact[1]);
+    var adviserName = ContactUtils.getTitleByContactId(arrDistrictContact[1]);
+    
+    result.string(keyname + " (" + translate.text("District") + ": " + districtName + "; " + translate.text("Adviser") + ": " + adviserName + ")");
+}
\ No newline at end of file

entity/Attribute_entity/Attribute_entity.aod

@@ -157,12 +157,6 @@
           <fieldName>Departments</fieldName>
           <isConsumer v="false" />
         </entityDependency>
-        <entityDependency>
-          <name>71cfeddd-a315-4692-8299-08813ca1dc19</name>
-          <entityName>DistrictResponsible_entity</entityName>
-          <fieldName>Departments</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>

entity/DistrictContact_entity/DistrictContact_entity.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+  <name>DistrictContact_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:GLOBE</icon>
+  <title>District Contact</title>
+  <iconIdProcess>%aditoprj%/entity/DistrictContact_entity/iconIdProcess.js</iconIdProcess>
+  <image>VAADIN:GLOBE</image>
+  <titlePlural>Supervisors</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <title>Company</title>
+      <consumer>Organisations</consumer>
+      <groupable v="true" />
+      <linkedContext>Organisation</linkedContext>
+      <state>EDITABLE</state>
+      <stateProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/contact_id/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>DISTRICT_ID</name>
+      <title>{$DISTRICT}</title>
+      <consumer>Districts</consumer>
+      <groupable v="true" />
+      <linkedContext>District</linkedContext>
+      <valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/district_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/district_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>ADVISER_CONTACT_ID</name>
+      <title>Adviser contact</title>
+      <consumer>Advisers</consumer>
+      <groupable v="true" />
+      <linkedContext>Person</linkedContext>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/adviser_contact_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>ADVISER_ROLE</name>
+      <title>Adviser role</title>
+      <consumer>KeywordAdviserRoles</consumer>
+      <groupable v="true" />
+      <displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/adviser_role/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <title>Status</title>
+      <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>
+      <title>Valid from</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <groupable v="true" />
+    </entityField>
+    <entityField>
+      <name>VALID_UNTIL</name>
+      <title>Valid until</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <groupable v="true" />
+    </entityField>
+    <entityField>
+      <name>ORIGIN</name>
+      <title>Origin</title>
+      <consumer>KeywordDistrictOrigin</consumer>
+      <groupable v="true" />
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/origin/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/origin/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>DISTRICTCONTACTID</name>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordContactStates</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <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>
+      <name>KeywordAdviserRoles</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/keywordadviserroles/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordDistrictOrigin</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/keyworddistrictorigin/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Organisations</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>Organisations</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Advisers</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DistrictResponsible_entity</entityName>
+        <fieldName>DistrictResponsibleAdvisers</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DistrictId_param</name>
+          <valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/advisers/children/districtid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Districts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>District_entity</entityName>
+        <fieldName>DistrictContacts</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>DistrictContacts</name>
+      <dependencies>
+        <entityDependency>
+          <name>6a15b92f-e0b6-459d-a106-615dcfac3dbd</name>
+          <entityName>District_entity</entityName>
+          <fieldName>DistrictContactUIDs</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>e33ae6f8-0a21-406c-950a-ab60f27026b3</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>DistrictContacts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityParameter>
+      <name>DistrictId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>currentOrganisationId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>RowId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityActionGroup>
+      <name>setStatus</name>
+      <children>
+        <entityActionField>
+          <name>setActive</name>
+          <title>Set active</title>
+          <onActionProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/setstatus/children/setactive/onActionProcess.js</onActionProcess>
+          <isSelectionAction v="true" />
+          <iconId>VAADIN:THUMBS_UP</iconId>
+          <tooltip>Set status to active</tooltip>
+        </entityActionField>
+        <entityActionField>
+          <name>setInactive</name>
+          <title>Set inactive</title>
+          <onActionProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/setstatus/children/setinactive/onActionProcess.js</onActionProcess>
+          <isSelectionAction v="true" />
+          <iconId>VAADIN:THUMBS_DOWN</iconId>
+          <tooltip>Set status to inactive</tooltip>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityParameter>
+      <name>isDashletView_param</name>
+      <expose v="true" />
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <isPageable v="true" />
+      <isRequireContainerFiltering v="false" />
+      <hasDependentRecords v="true" />
+      <fromClauseProcess>%aditoprj%/entity/DistrictContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/DistrictContact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>dc5cbebc-a947-4196-937a-f665ee80cc31</name>
+          <tableName>DISTRICTCONTACT</tableName>
+          <primaryKey>DISTRICTCONTACTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>058abbb3-d92f-4fe1-b326-1320cfee90df</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ADVISER_CONTACT_ID.value</name>
+          <recordfield>DISTRICTCONTACT.ADVISER_CONTACT_ID</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADVISER_ROLE.value</name>
+          <recordfield>DISTRICTCONTACT.ADVISER_ROLE</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>DISTRICTCONTACT.CONTACT_ID</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_ID.value</name>
+          <recordfield>DISTRICTCONTACT.DISTRICT_ID</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORIGIN.value</name>
+          <recordfield>DISTRICTCONTACT.ORIGIN</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>DISTRICTCONTACT.STATUS</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VALID_FROM.value</name>
+          <recordfield>DISTRICTCONTACT.VALID_FROM</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VALID_UNTIL.value</name>
+          <recordfield>DISTRICTCONTACT.VALID_UNTIL</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICTCONTACTID.value</name>
+          <recordfield>DISTRICTCONTACT.DISTRICTCONTACTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORIGIN.displayValue</name>
+          <expression>%aditoprj%/entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/origin.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <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>
+</entity>

entity/DistrictContact_entity/entityfields/adviser_contact_id/displayValueProcess.js

+import("system.result");
+import("system.vars");
+import("Contact_lib");
+
+result.string(ContactUtils.getFullTitleByContactId(vars.get("$field.ADVISER_CONTACT_ID"), false));
\ No newline at end of file