From a59ebf8d081d88efe273cfe10900b541356b67a0 Mon Sep 17 00:00:00 2001
From: dsg03695 <dsg03695@N170.hama.de>
Date: Mon, 19 Oct 2020 11:40:50 +0200
Subject: [PATCH] Ticket #1066036: Adjusted filter view with all correct
references on consumers.
---
.../DistrictContact_entity.aod | 15 ++++-----------
.../contact_id/displayValueProcess.js | 2 +-
.../district_id/displayValueProcess.js | 0
.../excludedcontactids_param/valueProcess.js | 8 --------
.../DistrictResponsible_entity.aod | 18 ++++++++++++------
.../Organisation_entity.aod | 2 +-
.../DistrictContactFilter_view.aod | 2 ++
.../PrivatePersonPreview_view.aod | 2 +-
8 files changed, 21 insertions(+), 28 deletions(-)
delete mode 100644 entity/DistrictContact_entity/entityfields/district_id/displayValueProcess.js
delete mode 100644 entity/DistrictContact_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
diff --git a/entity/DistrictContact_entity/DistrictContact_entity.aod b/entity/DistrictContact_entity/DistrictContact_entity.aod
index 477c91f73a..d72ef1ce9a 100644
--- a/entity/DistrictContact_entity/DistrictContact_entity.aod
+++ b/entity/DistrictContact_entity/DistrictContact_entity.aod
@@ -27,7 +27,7 @@
<entityField>
<name>CONTACT_ID</name>
<title>Company</title>
- <consumer>Persons</consumer>
+ <consumer>Organisations</consumer>
<groupable v="true" />
<linkedContext>Person</linkedContext>
<displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
@@ -38,7 +38,6 @@
<consumer>Districts</consumer>
<groupable v="true" />
<linkedContext>District</linkedContext>
- <displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/district_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ADVISER_CONTACT_ID</name>
@@ -136,25 +135,19 @@
</children>
</entityConsumer>
<entityConsumer>
- <name>Persons</name>
+ <name>Organisations</name>
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
<fieldName>Organisations</fieldName>
</dependency>
- <children>
- <entityParameter>
- <name>ExcludedContactIds_param</name>
- <valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
</entityConsumer>
<entityConsumer>
<name>Advisers</name>
<dependency>
<name>dependency</name>
<entityName>DistrictResponsible_entity</entityName>
- <fieldName>DistrictResponsibles</fieldName>
+ <fieldName>DistrictResponsibleAdvisers</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
@@ -205,7 +198,7 @@
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ADVISER_CONTACT_ID.value</name>
- <recordfield>DISTRICTCONTACT.CONTACT_ID</recordfield>
+ <recordfield>DISTRICTCONTACT.ADVISER_CONTACT_ID</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
diff --git a/entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js b/entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js
index 8fd798c175..0398a93e92 100644
--- a/entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js
+++ b/entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("system.vars");
import("Contact_lib");
-result.string(ContactUtils.getFullTitleByContactId(vars.get("$field.CONTACT_ID"), false));
\ No newline at end of file
+result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/DistrictContact_entity/entityfields/district_id/displayValueProcess.js b/entity/DistrictContact_entity/entityfields/district_id/displayValueProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/DistrictContact_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js b/entity/DistrictContact_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
deleted file mode 100644
index dea824d504..0000000000
--- a/entity/DistrictContact_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-//import("system.result");
-//import("system.db");
-//import("Sql_lib");
-//
-//result.object(newSelect("CONTACT_ID")
-// .from("DISTRICTCONTACT")
-// .where("DISTRICTCONTACT.DISTRICT_ID", "$field.DISTRICT_ID")
-// .arrayColumn(true));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index 747c218d53..ad1bbffb6b 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -68,12 +68,6 @@
<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>
@@ -243,6 +237,18 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>DistrictResponsibleAdvisers</name>
+ <lookupIdfield>EMPLOYEE_CONTACT_ID</lookupIdfield>
+ <dependencies>
+ <entityDependency>
+ <name>ac067a2d-e313-44b7-b219-f834ef4a7629</name>
+ <entityName>DistrictContact_entity</entityName>
+ <fieldName>Advisers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 472f0c52c5..a42f2bfc79 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -154,7 +154,7 @@
<entityDependency>
<name>b64b29e6-59c5-4250-9bc7-b08c85976e7e</name>
<entityName>DistrictContact_entity</entityName>
- <fieldName>Persons</fieldName>
+ <fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/neonView/DistrictContactFilter_view/DistrictContactFilter_view.aod b/neonView/DistrictContactFilter_view/DistrictContactFilter_view.aod
index 681c4fb4db..fe94c71586 100644
--- a/neonView/DistrictContactFilter_view/DistrictContactFilter_view.aod
+++ b/neonView/DistrictContactFilter_view/DistrictContactFilter_view.aod
@@ -12,6 +12,8 @@
<tableViewTemplate>
<name>districtContacts</name>
<entityField>#ENTITY</entityField>
+ <linkedColumns />
+ <fixedFilterFields />
<columns>
<neonTableColumn>
<name>b9295685-3242-4e15-af62-72f4adb758a3</name>
diff --git a/neonView/PrivatePersonPreview_view/PrivatePersonPreview_view.aod b/neonView/PrivatePersonPreview_view/PrivatePersonPreview_view.aod
index 13f2b9fd01..a294c41097 100644
--- a/neonView/PrivatePersonPreview_view/PrivatePersonPreview_view.aod
+++ b/neonView/PrivatePersonPreview_view/PrivatePersonPreview_view.aod
@@ -10,7 +10,7 @@
<children>
<neonViewReference>
<name>0a66aea5-bf81-47e4-941d-9158ff8f4f51</name>
- <entityField>Persons</entityField>
+ <entityField>Organisations</entityField>
<view>ContactTitledList_view</view>
</neonViewReference>
</children>
--
GitLab