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 b4929b550cd68568758acdcba8add6ec74a32675..d8ccdd4c8a999c5f983ed3ae28a3803bfaf761e8 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
@@ -9,5 +9,6 @@
<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"/>
</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 d8a14d3d038ff715840573d334eb8ec5a57bf187..0673fab6659afbf5bfe6e886f9b9de938cdb928f 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -15629,8 +15629,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" />
@@ -15685,8 +15685,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" />
@@ -15723,11 +15723,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" />
@@ -15737,11 +15737,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" />
@@ -15751,7 +15751,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>ADVISERROLE</name>
+ <name>VALID_FROM</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
@@ -15765,7 +15765,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>ADVISERSTATUS</name>
+ <name>VALID_UNTIL</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
diff --git a/entity/DistrictContact_entity/DistrictContact_entity.aod b/entity/DistrictContact_entity/DistrictContact_entity.aod
index f405c6622865350c59f773275c838b9b35d037f1..5f6ebbb436c9a1b4becaeb67e961d188bc401679 100644
--- a/entity/DistrictContact_entity/DistrictContact_entity.aod
+++ b/entity/DistrictContact_entity/DistrictContact_entity.aod
@@ -11,6 +11,14 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>12f47cac-d968-4bac-9daa-c254e43bb7b4</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>DistrictContacts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -65,7 +73,8 @@
<title>Origin</title>
<consumer>KeywordDistrictOrigin</consumer>
<groupable v="true" />
- <state>AUTO</state>
+ <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>
@@ -187,6 +196,10 @@
<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>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/DistrictContact_entity/entityfields/origin/displayValueProcess.js b/entity/DistrictContact_entity/entityfields/origin/displayValueProcess.js
index 866308c821d1e92e4647adf1f8aa693acd058ba7..68465c76ce5c55e9f32ff20f8870c8a0e01b352c 100644
--- a/entity/DistrictContact_entity/entityfields/origin/displayValueProcess.js
+++ b/entity/DistrictContact_entity/entityfields/origin/displayValueProcess.js
@@ -1,6 +1,15 @@
-import("system.vars");
+import("system.neon");
import("system.result");
-import("Keyword_lib");
+import("system.vars");
import("KeywordRegistry_basic");
+import("Keyword_lib");
-result.string(KeywordUtils.getViewValue($KeywordRegistry.districtOrigin(), vars.get("$field.ORIGIN")));
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ var key = vars.get("$field.ORIGIN");
+ if (key)
+ {
+ var res = KeywordUtils.getViewValue($KeywordRegistry.districtOrigin(), key);
+ result.string(res);
+ }
+}
\ No newline at end of file
diff --git a/entity/DistrictContact_entity/entityfields/origin/valueProcess.js b/entity/DistrictContact_entity/entityfields/origin/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0f8bb663630e34a07f9d3738151c3093c2a57c1b
--- /dev/null
+++ b/entity/DistrictContact_entity/entityfields/origin/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string($KeywordRegistry.districtOrigin$manual());
+}
\ No newline at end of file
diff --git a/entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/origin.displayvalue/expression.js b/entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/origin.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..a6e2a3e719d894bde6e9e71623b20bfc33ac1cac
--- /dev/null
+++ b/entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/origin.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.districtOrigin(), "DISTRICTCONTACT.ORIGIN");
+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 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/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 4cb186b3427dc5395a326753ac1d276d4e3cd58b..18afded566ce57071923d5fba788acd839f3507d 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1397,6 +1397,14 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityConsumer>
+ <name>DistrictContacts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DistrictContact_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 4cd6f0330a6da368f0521b8db3a47dce57a28497..c2bbefa45612c5081d34a71766b95eb417fa94c2 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7281,6 +7281,36 @@
<entry>
<key>Probability in %</key>
</entry>
+ <entry>
+ <key>Adviser Contact</key>
+ </entry>
+ <entry>
+ <key>Office Duty</key>
+ </entry>
+ <entry>
+ <key>Adviser Role</key>
+ </entry>
+ <entry>
+ <key>District Contacts</key>
+ </entry>
+ <entry>
+ <key>Area Manager</key>
+ </entry>
+ <entry>
+ <key>Auto assignment</key>
+ </entry>
+ <entry>
+ <key>Field Service</key>
+ </entry>
+ <entry>
+ <key>Sales Manager</key>
+ </entry>
+ <entry>
+ <key>Region Manager</key>
+ </entry>
+ <entry>
+ <key>District Contact</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index cf7a3b049c7761f22b3cccabb5cec5e8102cfa04..6d98dae69885018047e86a3e21c7bcb6d3ab1026 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -9658,6 +9658,46 @@ Bitte Datumseingabe prüfen</value>
<key>Probability in %</key>
<value>Wahrscheinlichkeit in %</value>
</entry>
+ <entry>
+ <key>Auto assignment</key>
+ <value>Auto-Zuordnung</value>
+ </entry>
+ <entry>
+ <key>District Contact</key>
+ <value>Gebietsverantwortlicher</value>
+ </entry>
+ <entry>
+ <key>District Contacts</key>
+ <value>Gebietsverantwortlichen</value>
+ </entry>
+ <entry>
+ <key>Adviser Role</key>
+ <value>Rolle des Verantwortlichen</value>
+ </entry>
+ <entry>
+ <key>Adviser Contact</key>
+ <value>Verantwortlicher</value>
+ </entry>
+ <entry>
+ <key>Sales Manager</key>
+ <value>Verkaufsleiter</value>
+ </entry>
+ <entry>
+ <key>Office Duty</key>
+ <value>Innendienst</value>
+ </entry>
+ <entry>
+ <key>Region Manager</key>
+ <value>Regionsleiter</value>
+ </entry>
+ <entry>
+ <key>Area Manager</key>
+ <value>Gebietsleiter</value>
+ </entry>
+ <entry>
+ <key>Field Service</key>
+ <value>Außendienst</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index a15f9a2f09b016f687ddae5f8f253f86cbb97d14..df1116acba129c40db16a938231587461ed032af 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7362,6 +7362,36 @@
<entry>
<key>Probability in %</key>
</entry>
+ <entry>
+ <key>Adviser Contact</key>
+ </entry>
+ <entry>
+ <key>Office Duty</key>
+ </entry>
+ <entry>
+ <key>Adviser Role</key>
+ </entry>
+ <entry>
+ <key>District Contacts</key>
+ </entry>
+ <entry>
+ <key>Area Manager</key>
+ </entry>
+ <entry>
+ <key>Auto assignment</key>
+ </entry>
+ <entry>
+ <key>Field Service</key>
+ </entry>
+ <entry>
+ <key>Sales Manager</key>
+ </entry>
+ <entry>
+ <key>Region Manager</key>
+ </entry>
+ <entry>
+ <key>District Contact</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/DistrictContactEdit_view/DistrictContactEdit_view.aod b/neonView/DistrictContactEdit_view/DistrictContactEdit_view.aod
index 4da21c16907d2e89d094711f6aacf6facd08e48c..65aab89255d6af6e6945bf4277c352f64bda5deb 100644
--- a/neonView/DistrictContactEdit_view/DistrictContactEdit_view.aod
+++ b/neonView/DistrictContactEdit_view/DistrictContactEdit_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>DistrictContactEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <size>SMALL</size>
<layout>
<boxLayout>
<name>layout</name>
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>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index df9be823dfc7638ea6bb6f126911731ad6b90784..b734c5418d0b6e31f639c4122b13d2ff272cddb6 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -56,9 +56,9 @@
<view>OrganisationAttributeRestriction_view</view>
</neonViewReference>
<neonViewReference>
- <name>a806bf0f-6214-4aad-872b-74e6f7fd1ee5</name>
- <entityField>DistrictResponsibles</entityField>
- <view>DistrictResponsibleList_view</view>
+ <name>c2b37e4d-3b5e-4e23-8b7c-6da02b27ffc0</name>
+ <entityField>DistrictContacts</entityField>
+ <view>DistrictContactFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
diff --git a/others/language_DE.txt b/others/language_DE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..08910a399410e73a226c2703be4c1e89f45a345b
--- /dev/null
+++ b/others/language_DE.txt
@@ -0,0 +1,40 @@
+ <entry>
+ <key>Auto assignment</key>
+ <value>Auto-Zuordnung</value>
+ </entry>
+ <entry>
+ <key>District Contact</key>
+ <value>Gebietsverantwortlicher</value>
+ </entry>
+ <entry>
+ <key>District Contacts</key>
+ <value>Gebietsverantwortlichen</value>
+ </entry>
+ <entry>
+ <key>Adviser Role</key>
+ <value>Rolle des Verantwortlichen</value>
+ </entry>
+ <entry>
+ <key>Adviser Contact</key>
+ <value>Verantwortlicher</value>
+ </entry>
+ <entry>
+ <key>Sales Manager</key>
+ <value>Verkaufsleiter</value>
+ </entry>
+ <entry>
+ <key>Office Duty</key>
+ <value>Innendienst</value>
+ </entry>
+ <entry>
+ <key>Region Manager</key>
+ <value>Regionsleiter</value>
+ </entry>
+ <entry>
+ <key>Area Manager</key>
+ <value>Gebietsleiter</value>
+ </entry>
+ <entry>
+ <key>Field Service</key>
+ <value>Außendienst</value>
+ </entry>
\ No newline at end of file
diff --git a/others/language_EN.txt b/others/language_EN.txt
new file mode 100644
index 0000000000000000000000000000000000000000..651df12fdc8a3d948cb68b68178f5c4a1f871d59
--- /dev/null
+++ b/others/language_EN.txt
@@ -0,0 +1,30 @@
+ <entry>
+ <key>Auto assignment</key>
+ </entry>
+ <entry>
+ <key>District Contact</key>
+ </entry>
+ <entry>
+ <key>District Contacts</key>
+ </entry>
+ <entry>
+ <key>Adviser Role</key>
+ </entry>
+ <entry>
+ <key>Adviser Contact</key>
+ </entry>
+ <entry>
+ <key>Sales Manager</key>
+ </entry>
+ <entry>
+ <key>Office Duty</key>
+ </entry>
+ <entry>
+ <key>Region Manager</key>
+ </entry>
+ <entry>
+ <key>Area Manager</key>
+ </entry>
+ <entry>
+ <key>Field Service</key>
+ </entry>
\ No newline at end of file
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 37a8613a66feae0efe365a570f56bd31f432281f..ba80197cd05d9f6c4c66c1c0a95cf557e578fe54 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -300,3 +300,5 @@ $KeywordRegistry.notificationState$seen = function(){return "SEEN";};
$KeywordRegistry.adviserRole = function(){ return "ADVISER_ROLE";};
$KeywordRegistry.districtOrigin = function(){ return "DISTRICT_ORIGIN";};
+$KeywordRegistry.districtOrigin$manual = function(){ return "DistrictOrigin_manual";};
+$KeywordRegistry.districtOrigin$auto = function(){ return "DistrictOrigin_auto";};
\ No newline at end of file