diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index 946948d880ac976d7a2a13818e023d4e8d35b0a0..3709e37ff5c78d48fb269518b1224eaf6998a8b4 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -59,14 +59,13 @@
</entityField>
<entityProvider>
<name>DistrictResponsibles</name>
- <lookupIdfield>DISTRICTRESPONSIBLEID</lookupIdfield>
<documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc</documentation>
<titlePlural>Responsibles</titlePlural>
<dependencies>
<entityDependency>
- <name>ef26fdb6-5fcf-416e-bcc8-380b5751b523</name>
+ <name>ae1dcbbe-b302-44df-ab4c-f7937d197cd5</name>
<entityName>District_entity</entityName>
- <fieldName>DistrictResponsibles</fieldName>
+ <fieldName>DistrictResponsibleUIDs</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -176,6 +175,12 @@
<entityName>Person_entity</entityName>
<fieldName>Contacts</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityField>
<name>ADVISERROLE</name>
@@ -244,14 +249,14 @@
<cacheKeyProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
<linkInformation>
<linkInformation>
- <name>d24296ec-5040-4b40-ad5b-668d3e02b4aa</name>
+ <name>d0fee359-92fb-4d5e-b50c-3e74251440d8</name>
<tableName>DISTRICTRESPONSIBLE</tableName>
<primaryKey>DISTRICTRESPONSIBLEID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>86f9ab94-0d69-4a3a-9a04-615f61be2c23</name>
+ <name>33f6c941-5245-4847-a8a3-3cbddc30a104</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
diff --git a/entity/DistrictResponsible_entity/contentTitleProcess.js b/entity/DistrictResponsible_entity/contentTitleProcess.js
index e8b700739f12ffb3da419b93cb7b7bab3514cf4c..1c40177f5576799fcf75787dac078c03a8553756 100644
--- a/entity/DistrictResponsible_entity/contentTitleProcess.js
+++ b/entity/DistrictResponsible_entity/contentTitleProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("system.result");
import("Contact_lib");
@@ -7,6 +6,6 @@ var contactId = vars.get("$field.EMPLOYEE_CONTACT_ID");
var res = "";
if(contactId)
- res = ContactUtils.getFullTitleByContactId(contactId, true);
+ res = ContactUtils.getFullTitleByContactId(contactId, false);
result.string(res)
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7be95ea8db7b04c1066e434552da5ab2d93a2545
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.db");
+import("Sql_lib");
+
+result.object(newSelect("EMPLOYEE_CONTACT_ID")
+ .from("DISTRICTRESPONSIBLE")
+ .where("DISTRICTRESPONSIBLE.DISTRICT_ID", "$param.DistrictId_param")
+ .arrayColumn(true));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/adviser_status.displayvalue/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/adviser_status.displayvalue/expression.js
deleted file mode 100644
index 343f7b775af7f89d40afd021578f0663b5c94e79..0000000000000000000000000000000000000000
--- a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/adviser_status.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), vars.get("$field.ADVISERSTATUS")));
\ No newline at end of file
diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
index 0a8525ba461798300dfa247362f7c7c6fa4f2e50..af933bec89499843a6e3be6df85e45e57328d026 100644
--- a/entity/District_entity/District_entity.aod
+++ b/entity/District_entity/District_entity.aod
@@ -97,7 +97,6 @@
</entityParameter>
<entityParameter>
<name>DistrictsByContactId_param</name>
- <valueProcess>%aditoprj%/entity/District_entity/entityfields/responsibledistricts/children/districtsbycontactid_param/valueProcess.js</valueProcess>
<mandatory v="true" />
</entityParameter>
</children>
@@ -110,20 +109,6 @@
<fieldName>ISO3Name</fieldName>
</dependency>
</entityConsumer>
- <entityConsumer>
- <name>DistrictResponsibles</name>
- <dependency>
- <name>dependency</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>DistrictResponsibles</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>DistrictId_param</name>
- <valueProcess>%aditoprj%/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
<entityField>
<name>USER_NEW</name>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/user_new/valueProcess.js</valueProcess>
@@ -252,6 +237,20 @@
<name>ExcludedDistrictIds_param</name>
<expose v="true" />
</entityParameter>
+ <entityConsumer>
+ <name>DistrictResponsibleUIDs</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>DistrictResponsibles</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DistrictId_param</name>
+ <valueProcess>%aditoprj%/entity/District_entity/entityfields/districtresponsibleuids/children/districtid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/District_entity/entityfields/customercounting/valueProcess.js b/entity/District_entity/entityfields/customercounting/valueProcess.js
index ccecd79603fe711a4705cd3fe0a6081a800986cc..e237bbef745d6c90b0c5b4e7bd58a592a28cca2d 100644
--- a/entity/District_entity/entityfields/customercounting/valueProcess.js
+++ b/entity/District_entity/entityfields/customercounting/valueProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("system.result");
import("system.entities");
@@ -20,5 +19,4 @@ if (appliedFilter)
rowCount = entities.getRowCount(conf);
}
-
result.string(rowCount);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_number/displayValueProcess.js b/entity/District_entity/entityfields/district_number/displayValueProcess.js
index 95a9d9d10972827b4d89b9f4ad7aa68161204049..af1a50e6fb3106b647f68b45106741f32ee4f494 100644
--- a/entity/District_entity/entityfields/district_number/displayValueProcess.js
+++ b/entity/District_entity/entityfields/district_number/displayValueProcess.js
@@ -1,10 +1,8 @@
import("system.vars");
-import("system.logging");
import("system.result");
import("system.neon");
import("Sql_lib");
-
var districtNo = vars.get("$field.DISTRICT_NUMBER");
-result.string(districtNo.padStart(4, '0'));
+result.string(districtNo.padStart(4, '0'));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js b/entity/District_entity/entityfields/districtresponsibleuids/children/districtid_param/valueProcess.js
similarity index 98%
rename from entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js
rename to entity/District_entity/entityfields/districtresponsibleuids/children/districtid_param/valueProcess.js
index d3d1d4b6cb94a84199fdc7783e0194a1a7255152..44ec9627c5e51edbe27130ba82db39ca269d2c07 100644
--- a/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js
+++ b/entity/District_entity/entityfields/districtresponsibleuids/children/districtid_param/valueProcess.js
@@ -1,5 +1,4 @@
import("system.result");
import("system.vars");
-
result.string(vars.get("$field.DISTRICTID"));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/responsibledistricts/children/districtsbycontactid_param/valueProcess.js b/entity/District_entity/entityfields/responsibledistricts/children/districtsbycontactid_param/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/District_entity/entityfields/totalturnover/valueProcess.js b/entity/District_entity/entityfields/totalturnover/valueProcess.js
index 40d9732b34a8c3e73b89f860524abb9f55fd77ef..ced08cd465f6508f0641e4bcafa0872957d95865 100644
--- a/entity/District_entity/entityfields/totalturnover/valueProcess.js
+++ b/entity/District_entity/entityfields/totalturnover/valueProcess.js
@@ -2,7 +2,6 @@ import("system.text");
import("Sql_lib");
import("system.SQLTYPES");
import("Date_lib");
-import("system.logging");
import("system.vars");
import("system.result");
import("system.entities");
diff --git a/neonView/DistrictEdit_view/DistrictEdit_view.aod b/neonView/DistrictEdit_view/DistrictEdit_view.aod
index ef598ae5665601c0ec565416dd283b994c2c4db6..e3d68b0179b10b0ffc3bf9ab51937f1a27468cdb 100644
--- a/neonView/DistrictEdit_view/DistrictEdit_view.aod
+++ b/neonView/DistrictEdit_view/DistrictEdit_view.aod
@@ -48,10 +48,5 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
- <neonViewReference>
- <name>f1dddbee-5718-46b8-b682-ba4e707bf529</name>
- <entityField>DistrictResponsibles</entityField>
- <view>DistrictResponsibleMultiEdit_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/DistrictMain_view/DistrictMain_view.aod b/neonView/DistrictMain_view/DistrictMain_view.aod
index 65a404e9bb25888d04d42919e0184b914e02e4ae..43da613e9cfb55bd09af2d7a0ea4df1b1c2561e3 100644
--- a/neonView/DistrictMain_view/DistrictMain_view.aod
+++ b/neonView/DistrictMain_view/DistrictMain_view.aod
@@ -15,8 +15,8 @@
<view>DistrictPreview_view</view>
</neonViewReference>
<neonViewReference>
- <name>a260fdae-7820-4997-8548-774a589a8e19</name>
- <entityField>DistrictResponsibles</entityField>
+ <name>a725b1a4-6c00-41e7-8577-922718e72938</name>
+ <entityField>DistrictResponsibleUIDs</entityField>
<view>DistrictResponsibleFilter_view</view>
</neonViewReference>
<neonViewReference>
diff --git a/neonView/DistrictPreview_view/DistrictPreview_view.aod b/neonView/DistrictPreview_view/DistrictPreview_view.aod
index 4f778e75402704706fecfd07dcc094377db9573c..d2274329dc826ecda496d64241c89b3f4b7d0da3 100644
--- a/neonView/DistrictPreview_view/DistrictPreview_view.aod
+++ b/neonView/DistrictPreview_view/DistrictPreview_view.aod
@@ -18,11 +18,6 @@
<descriptionField>DISTRICT_NUMBER_fieldGroup</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
- <neonViewReference>
- <name>a7a731e8-f93e-4d90-8459-d249a13ecf0d</name>
- <entityField>DistrictResponsibles</entityField>
- <view>DistrictResponsiblePreviewList_view</view>
- </neonViewReference>
<genericViewTemplate>
<name>furtherInfosGenericViewTemplate</name>
<showDrawer v="true" />
diff --git a/neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod b/neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod
index 344e6d0762623e1bbdd8f2246bae6e781eedca14..3af81ba83908ef92d05e219f9c41063752e8b760 100644
--- a/neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod
+++ b/neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod
@@ -5,17 +5,22 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
- <groupLayout>
+ <boxLayout>
<name>layout</name>
- </groupLayout>
+ </boxLayout>
</layout>
<children>
<tableViewTemplate>
<name>Supervisors</name>
<entityField>#ENTITY</entityField>
+ <maxDBRow v="400" />
<columns>
<neonTableColumn>
- <name>57a8ac3c-4dfc-44ed-b786-e347855dc134</name>
+ <name>892cf211-1d55-4976-acba-9d70a925fd26</name>
+ <entityField>#ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5821447b-a15a-49f8-97d8-cc7411afed0c</name>
<entityField>EMPLOYEE_CONTACT_ID</entityField>
</neonTableColumn>
<neonTableColumn>