From e025b9f76c9abed32cf9594f5fde498f827031d4 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Fri, 11 Jun 2021 08:15:57 +0200
Subject: [PATCH] [Projekt: xRM-Sales][TicketNr.: 1065539][Vertriebsprojekt:
Mitglieder: Filter funktionieren ]
---
entity/Competition_entity/Competition_entity.aod | 15 +++++++++++++++
entity/Member_entity/Member_entity.aod | 4 ++++
.../entityfields/contact_id/dropDownProcess.js | 11 +++++++++++
.../entityfields/contactrole/dropDownProcess.js | 11 +++++++++++
.../entityfields/department/dropDownProcess.js | 11 +++++++++++
.../entityfields/position/dropDownProcess.js | 11 +++++++++++
.../CompetitionDrawer_view.aod | 1 +
7 files changed, 64 insertions(+)
create mode 100644 entity/Member_entity/entityfields/contact_id/dropDownProcess.js
create mode 100644 entity/Member_entity/entityfields/contactrole/dropDownProcess.js
create mode 100644 entity/Member_entity/entityfields/department/dropDownProcess.js
create mode 100644 entity/Member_entity/entityfields/position/dropDownProcess.js
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index 1fe54675aa..27776d9100 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -296,10 +296,12 @@
<dbRecordFieldMapping>
<name>DATE_CANCELLED.value</name>
<recordfield>COMPETITION.DATE_CANCELLED</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>INFO.value</name>
<recordfield>COMPETITION.INFO</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORGANISATION_NAME.value</name>
@@ -312,14 +314,17 @@
<dbRecordFieldMapping>
<name>REASON.value</name>
<recordfield>COMPETITION.REASON</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
<recordfield>COMPETITION.CONTACT_ID</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.value</name>
<recordfield>COMPETITION.STATUS</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.displayValue</name>
@@ -344,11 +349,20 @@
<dbRecordFieldMapping>
<name>PHASE.value</name>
<recordfield>COMPETITION.PHASE</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>COMPETITIONID.value</name>
<recordfield>COMPETITION.COMPETITIONID</recordfield>
</dbRecordFieldMapping>
+ <consumerMapping>
+ <name>Organisations</name>
+ </consumerMapping>
+ <consumerMapping>
+ <name>Organisation</name>
+ <isFilterable v="true" />
+ <filtertype>BASIC</filtertype>
+ </consumerMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
@@ -372,6 +386,7 @@
<filterFieldsProcess>%aditoprj%/entity/Competition_entity/recordcontainers/db/filterextensions/attribute_filter/filterFieldsProcess.js</filterFieldsProcess>
<filterValuesProcess>%aditoprj%/entity/Competition_entity/recordcontainers/db/filterextensions/attribute_filter/filterValuesProcess.js</filterValuesProcess>
<filterConditionProcess>%aditoprj%/entity/Competition_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
+ <isFilterable v="true" />
<filtertype>BASIC</filtertype>
</filterExtensionSet>
</filterExtensions>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 97b8ff6f21..726c0a44ed 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -24,6 +24,7 @@
<consumer>Contacts</consumer>
<linkedContext>Person</linkedContext>
<mandatory v="true" />
+ <dropDownProcess>%aditoprj%/entity/Member_entity/entityfields/contact_id/dropDownProcess.js</dropDownProcess>
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
@@ -127,16 +128,19 @@
<entityField>
<name>CONTACTROLE</name>
<title>Function</title>
+ <dropDownProcess>%aditoprj%/entity/Member_entity/entityfields/contactrole/dropDownProcess.js</dropDownProcess>
<state>READONLY</state>
</entityField>
<entityField>
<name>DEPARTMENT</name>
<title>Department</title>
+ <dropDownProcess>%aditoprj%/entity/Member_entity/entityfields/department/dropDownProcess.js</dropDownProcess>
<state>READONLY</state>
</entityField>
<entityField>
<name>POSITION</name>
<title>Position</title>
+ <dropDownProcess>%aditoprj%/entity/Member_entity/entityfields/position/dropDownProcess.js</dropDownProcess>
<state>READONLY</state>
</entityField>
<entityField>
diff --git a/entity/Member_entity/entityfields/contact_id/dropDownProcess.js b/entity/Member_entity/entityfields/contact_id/dropDownProcess.js
new file mode 100644
index 0000000000..e04712f996
--- /dev/null
+++ b/entity/Member_entity/entityfields/contact_id/dropDownProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+//This dropDownProcess exists, even though the fieldState is READONLY.
+//-->So we can use it when using the filter
+var res = KeywordUtils.getEntryNamesByContainer($KeywordRegistry.contactPosition()).map(function (e){
+ return [e, e]; //currently the first column is ID, second view value - which is the same because there is no ID for keyword-containers
+});
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/contactrole/dropDownProcess.js b/entity/Member_entity/entityfields/contactrole/dropDownProcess.js
new file mode 100644
index 0000000000..c7f69406b8
--- /dev/null
+++ b/entity/Member_entity/entityfields/contactrole/dropDownProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+//This dropDownProcess exists, even though the fieldState is READONLY.
+//-->So we can use it when using the filter
+var res = KeywordUtils.getEntryNamesByContainer($KeywordRegistry.contactContactrole()).map(function (e){
+ return [e, e]; //currently the first column is ID, second view value - which is the same because there is no ID for keyword-containers
+});
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/department/dropDownProcess.js b/entity/Member_entity/entityfields/department/dropDownProcess.js
new file mode 100644
index 0000000000..e2e2b59d7a
--- /dev/null
+++ b/entity/Member_entity/entityfields/department/dropDownProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+//This dropDownProcess exists, even though the fieldState is READONLY.
+//-->So we can use it when using the filter
+var res = KeywordUtils.getEntryNamesByContainer($KeywordRegistry.contactDepartment()).map(function (e){
+ return [e, e]; //currently the first column is ID, second view value - which is the same because there is no ID for keyword-containers
+});
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/position/dropDownProcess.js b/entity/Member_entity/entityfields/position/dropDownProcess.js
new file mode 100644
index 0000000000..e04712f996
--- /dev/null
+++ b/entity/Member_entity/entityfields/position/dropDownProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+//This dropDownProcess exists, even though the fieldState is READONLY.
+//-->So we can use it when using the filter
+var res = KeywordUtils.getEntryNamesByContainer($KeywordRegistry.contactPosition()).map(function (e){
+ return [e, e]; //currently the first column is ID, second view value - which is the same because there is no ID for keyword-containers
+});
+
+result.object(res);
\ No newline at end of file
diff --git a/neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod b/neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod
index e6325607e2..9bdc00cf13 100644
--- a/neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod
+++ b/neonView/CompetitionDrawer_view/CompetitionDrawer_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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
<name>CompetitionDrawer_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<drawerLayout>
<name>layout</name>
--
GitLab