Merge branch 'sales_1065539_FixSalesprojectFilters' into '2021.1'

[Projekt: xRM-Sales][TicketNr.: 1065539][Vertriebsprojekt: Mitglieder: Filter funktionieren ]

See merge request xrm/basic!1056

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>

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>

entity/Member_entity/entityfields/contact_id/dropDownProcess.js

+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

entity/Member_entity/entityfields/contactrole/dropDownProcess.js

+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

entity/Member_entity/entityfields/department/dropDownProcess.js

+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

entity/Member_entity/entityfields/position/dropDownProcess.js

+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

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>