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 0da4b818b701679e7f1c71fe2e4e8cc4dd19210f..5e6ed2f5634b199feca92f4c2ed9e56d145e8769 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
@@ -9,4 +9,5 @@
<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"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/update_ContactResponsible_consistent.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/update_ContactResponsible_consistent.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9aaa38da63024a5b8d0d662bbef91b9459e09440
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/update_ContactResponsible_consistent.xml
@@ -0,0 +1,30 @@
+<?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
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index aa3002b1df535108316233d4b0a0ff3873471758..8c9c568e436a0eec63a9147a6980c071978f89d8 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -15615,8 +15615,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" />
@@ -15671,8 +15671,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" />
@@ -15709,11 +15709,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>VALIDFROM</name>
+ <name>ADVISER_STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="19" />
+ <columnType v="12" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -15723,11 +15723,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>VALIDTO</name>
+ <name>ADVISER_ROLE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="19" />
+ <columnType v="12" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -15737,7 +15737,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>ADVISERROLE</name>
+ <name>VALID_FROM</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
@@ -15751,7 +15751,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>ADVISERSTATUS</name>
+ <name>VALID_UNTIL</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index 093b691e229e542f9da2911b98838631b23e06f1..f4d433988ded22881b368034876ccaaa85e017ad 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -218,7 +218,7 @@
<resolution>DAY</resolution>
</entityField>
<entityField>
- <name>VALID_TO</name>
+ <name>VALID_UNTIL</name>
<title>Valid to</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
@@ -317,24 +317,24 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADVISER_ROLE.value</name>
- <recordfield>DISTRICTRESPONSIBLE.ADVISERROLE</recordfield>
+ <recordfield>DISTRICTRESPONSIBLE.ADVISER_ROLE</recordfield>
<isFilterable v="true" />
<isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADVISER_STATUS.value</name>
- <recordfield>DISTRICTRESPONSIBLE.ADVISERSTATUS</recordfield>
+ <recordfield>DISTRICTRESPONSIBLE.ADVISER_STATUS</recordfield>
<isFilterable v="true" />
<isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>VALID_FROM.value</name>
- <recordfield>DISTRICTRESPONSIBLE.VALIDFROM</recordfield>
+ <recordfield>DISTRICTRESPONSIBLE.VALID_FROM</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>VALID_TO.value</name>
- <recordfield>DISTRICTRESPONSIBLE.VALIDTO</recordfield>
+ <name>VALID_UNTIL.value</name>
+ <recordfield>DISTRICTRESPONSIBLE.VALID_UNTIL</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
diff --git a/neonView/DistrictResponsibleEdit_view/DistrictResponsibleEdit_view.aod b/neonView/DistrictResponsibleEdit_view/DistrictResponsibleEdit_view.aod
index 4605998d712634afe9306b5dcfd579868819ac3a..9b8447b0808da17e5b14c21487c23be065db0812 100644
--- a/neonView/DistrictResponsibleEdit_view/DistrictResponsibleEdit_view.aod
+++ b/neonView/DistrictResponsibleEdit_view/DistrictResponsibleEdit_view.aod
@@ -31,7 +31,7 @@
</entityFieldLink>
<entityFieldLink>
<name>4bdb4191-6452-44b2-b0b2-54fc00d445cb</name>
- <entityField>VALID_TO</entityField>
+ <entityField>VALID_UNTIL</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod b/neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod
index 01b6300a4b4f891470c8d5ed066a18da8960cd37..422383ea0f7572907d41c6ac8d7edf383a82d68f 100644
--- a/neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod
+++ b/neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod
@@ -13,6 +13,8 @@
<tableViewTemplate>
<name>Supervisors</name>
<entityField>#ENTITY</entityField>
+ <linkedColumns />
+ <fixedFilterFields />
<maxDBRow v="400" />
<columns>
<neonTableColumn>
@@ -37,7 +39,7 @@
</neonTableColumn>
<neonTableColumn>
<name>0ff668e7-8e9a-483d-973a-d74a7a919a5a</name>
- <entityField>VALID_TO</entityField>
+ <entityField>VALID_UNTIL</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>