Merge branch 'sales_pn_1078539_turnoverfilteraddress' into '2021.1'

[Projekt: xRM-Sales][TicketNr.: 1078539][Umsatzauswertung Filter Lookup für Gebiet und Kreis]

See merge request xrm/basic!891

entity/Address_entity/Address_entity.aod

@@ -67,10 +67,14 @@
     <entityField>
       <name>DISTRICT</name>
       <title>District</title>
+      <dropDownProcess>%aditoprj%/entity/Address_entity/entityfields/district/dropDownProcess.js</dropDownProcess>
+      <textInputAllowed v="true" />
     </entityField>
     <entityField>
       <name>REGION</name>
       <title>Region</title>
+      <dropDownProcess>%aditoprj%/entity/Address_entity/entityfields/region/dropDownProcess.js</dropDownProcess>
+      <textInputAllowed v="true" />
       <state>INVISIBLE</state>
       <stateProcess>%aditoprj%/entity/Address_entity/entityfields/region/stateProcess.js</stateProcess>
     </entityField>

entity/Address_entity/entityfields/district/dropDownProcess.js

+import("system.result");
+import("Sql_lib");
+
+result.object(
+    newSelect("distinct DISTRICT, DISTRICT")
+    .where("ADDRESS.DISTRICT is not null")
+    .from("ADDRESS").table()
+);

entity/Address_entity/entityfields/region/dropDownProcess.js

+import("system.result");
+import("Sql_lib");
+
+result.object(
+    newSelect("distinct REGION, REGION")
+    .where("ADDRESS.REGION is not null")
+    .from("ADDRESS").table()
+);

entity/Turnover_entity/Turnover_entity.aod

@@ -334,6 +334,7 @@
           <name>OrgDistrict_filter</name>
           <title>Organisation District</title>
           <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Turnover_entity/recordcontainers/jditodynamicmultidatachart/filterextensions/orgdistrict_filter/filterValuesProcess.js</filterValuesProcess>
           <filtertype>BASIC</filtertype>
         </filterExtension>
         <filterExtension>
@@ -358,6 +359,7 @@
           <name>OrgRegion_filter</name>
           <title>Organisation Region</title>
           <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Turnover_entity/recordcontainers/jditodynamicmultidatachart/filterextensions/orgregion_filter/filterValuesProcess.js</filterValuesProcess>
           <filtertype>BASIC</filtertype>
         </filterExtension>
         <filterExtension>
@@ -394,6 +396,19 @@
           <filterValuesProcess>%aditoprj%/entity/Turnover_entity/recordcontainers/jditodynamicmultidatachart/filterextensions/salesproject_filter/filterValuesProcess.js</filterValuesProcess>
           <filtertype>BASIC</filtertype>
         </filterExtension>
+        <filterExtension>
+          <name>DistrictName_filter</name>
+          <title>District: Name</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Turnover_entity/recordcontainers/jditodynamicmultidatachart/filterextensions/districtname_filter/filterValuesProcess.js</filterValuesProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+        <filterExtension>
+          <name>DistrictDistrictnumber_filter</name>
+          <title>District: Number</title>
+          <contentType>NUMBER</contentType>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
       </filterExtensions>
     </jDitoRecordContainer>
   </recordContainers>

entity/Turnover_entity/recordcontainers/jditodynamicmultidatachart/filterextensions/districtname_filter/filterValuesProcess.js

+import("system.result");
+import("Sql_lib");
+
+result.object(
+    newSelect(["DISTRICT_NAME", "DISTRICT_NAME"])
+    .from("DISTRICT").table()
+);

entity/Turnover_entity/recordcontainers/jditodynamicmultidatachart/filterextensions/orgdistrict_filter/filterValuesProcess.js

+import("system.result");
+import("Sql_lib");
+
+result.object(
+    newSelect("distinct DISTRICT, DISTRICT")
+    .where("ADDRESS.DISTRICT is not null")
+    .from("ADDRESS").table()
+);

entity/Turnover_entity/recordcontainers/jditodynamicmultidatachart/filterextensions/orgregion_filter/filterValuesProcess.js

+import("system.result");
+import("Sql_lib");
+
+result.object(
+    newSelect("distinct REGION, REGION")
+    .where("ADDRESS.REGION is not null")
+    .from("ADDRESS").table()
+);

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -11348,6 +11348,14 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Global Cases </key>
     </entry>
+    <entry>
+      <key>District: Name</key>
+      <value>Gebiet: Name</value>
+    </entry>
+    <entry>
+      <key>District: Number</key>
+      <value>Gebiet: Nummer</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

process/Turnover_lib/process.js

@@ -459,6 +459,32 @@ TurnoverDynamicChart.getFilterMapping = function (pKind)
                     }
     };
     
+    for(var key in filterMapping)
+    {
+        filterMapping[key]["#EXTENSION.DistrictName_filter.DistrictName_filter#TEXT"]
+        = function (pValue, pOperator) {
+            var districtFilter = newSelect("DISTRICT_FILTER").from("DISTRICT")
+                .where("DISTRICT.DISTRICT_NAME", pValue).cell();
+            if(!districtFilter)
+            {
+                return "0=1";
+            }
+            var filterJson = JSON.stringify(JSON.parse(districtFilter).filter);
+            return db.toFilterCondition(filterJson, "Organisation_entity");
+        };
+        filterMapping[key]["#EXTENSION.DistrictDistrictnumber_filter.DistrictDistrictnumber_filter#NUMBER"]
+        = function (pValue, pOperator) {
+            var districtFilter = newSelect("DISTRICT_FILTER").from("DISTRICT")
+                .where("DISTRICT.DISTRICT_NUMBER", pValue).cell();
+            if(!districtFilter)
+            {
+                return "0=1";
+            }
+            var filterJson = JSON.stringify(JSON.parse(districtFilter).filter);
+            return db.toFilterCondition(filterJson, "Organisation_entity");
+        };
+    }
+    
     filterMapping = TurnoverDynamicChart.addOrganisationFiltersToFilterMapping(filterMapping);
     filterMapping = TurnoverDynamicChart.addClassificationGroupFilterToFilterMapping(filterMapping);
     filterMapping = TurnoverDynamicChart.addClassificationTypeFilterToFilterMapping(filterMapping);