Merge branch '1066190_ps_gb_CockpitGebiete' into '2020.2.0_Betreuung_HamaDSG'

1066190 ps gb cockpit gebiete

See merge request xrm/basic!475

entity/DistrictContact_entity/DistrictContact_entity.aod

@@ -221,6 +221,7 @@
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
+      <isPageable v="true" />
       <isRequireContainerFiltering v="false" />
       <hasDependentRecords v="true" />
       <fromClauseProcess>%aditoprj%/entity/DistrictContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>

entity/DistrictContact_entity/entityfields/keywordcontactstates/children/excludedkeyidssubquery_param/valueProcess.js

+import("system.vars");
 import("system.result");
+import("system.neon");
 import("KeywordRegistry_basic");
 import("Sql_lib");
 
-var cond = newSelect("AB_KEYWORD_ENTRY.KEYID")
-.from("AB_KEYWORD_ENTRY")
-.where("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.contactStatus())
-.and("AB_KEYWORD_ENTRY.KEYID", $KeywordRegistry.contactStatus$inReview(), SqlBuilder.LIKE());
+if(vars.get("$sys.presentationmode") != neon.CONTEXT_PRESENTATIONMODE_FILTER){
+    var cond = newSelect("AB_KEYWORD_ENTRY.KEYID")
+    .from("AB_KEYWORD_ENTRY")
+    .where("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.contactStatus())
+    .and("AB_KEYWORD_ENTRY.KEYID", $KeywordRegistry.contactStatus$inReview(), SqlBuilder.LIKE());
 
-result.string(cond.toString());
\ No newline at end of file
+    result.string(cond.toString());
+}
\ No newline at end of file

entity/DistrictContact_entity/entityfields/setstatus/children/setactive/onActionProcess.js

+import("system.util");
 import("KeywordRegistry_basic");
 import("system.vars");
 import("system.neon");
 import("District_lib");
 
+
 var arrIds = vars.get("$sys.selection");
 DistrictUtils.setDistrictContactStatus(arrIds, $KeywordRegistry.contactStatus$active());
-neon.openHome();
\ No newline at end of file
+//refresh only if the function is called twice
+neon.refreshAll();
+neon.refreshAll();
\ No newline at end of file

entity/DistrictContact_entity/entityfields/setstatus/children/setinactive/onActionProcess.js

@@ -5,4 +5,6 @@ import("District_lib");
 
 var arrIds = vars.get("$sys.selection");
 DistrictUtils.setDistrictContactStatus(arrIds, $KeywordRegistry.contactStatus$inactive());
-neon.openHome();
+//refresh only if the function is called twice
+neon.refreshAll();
+neon.refreshAll();
\ No newline at end of file

entity/DistrictContact_entity/recordcontainers/db/conditionProcess.js

@@ -7,24 +7,26 @@ import("Sql_lib");
 
 var isDashletView = vars.get("$param.isDashletView_param");
 var organisationID = vars.get("$param.currentOrganisationId_param");
+var districtID = vars.get("$param.DistrictId_param");
 var cond = newWhere();
 
 if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
 {
     cond.and("DISTRICTCONTACT.ADVISER_CONTACT_ID", newSelect("DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID")
-                                .from("DISTRICTRESPONSIBLE")
-                                .where("DISTRICTRESPONSIBLE.DISTRICTRESPONSIBLEID", "$param.RowId_param")
-                                , SqlBuilder.IN());
+        .from("DISTRICTRESPONSIBLE")
+        .where("DISTRICTRESPONSIBLE.DISTRICTRESPONSIBLEID", "$param.RowId_param")
+        , SqlBuilder.IN());
 }
 if (organisationID)
 {
     cond.and("DISTRICTCONTACT.CONTACT_ID", organisationID);
 } 
 
+var statusInReview = $KeywordRegistry.contactStatus$inReview();
+var districtOrigin = $KeywordRegistry.districtOrigin$auto();
+
 if(isDashletView)
 {
-    var statusInReview = $KeywordRegistry.contactStatus$inReview();
-    var districtOrigin = $KeywordRegistry.districtOrigin$auto();
     var currentContactId = EmployeeUtils.getCurrentContactId();
     
     cond.and("DISTRICTCONTACT.STATUS", statusInReview);
@@ -32,4 +34,8 @@ if(isDashletView)
     cond.and("DISTRICTCONTACT.ADVISER_CONTACT_ID", currentContactId);
 }
 
+if(districtID){    
+    cond.and("DISTRICTCONTACT.DISTRICT_ID", districtID);
+}
+
 result.string(cond.toString());
\ No newline at end of file

entity/District_entity/District_entity.aod

@@ -298,6 +298,7 @@
     </entityProvider>
     <entityConsumer>
       <name>DistrictContactUIDs</name>
+      <selectionMode>MULTI</selectionMode>
       <dependency>
         <name>dependency</name>
         <entityName>DistrictContact_entity</entityName>

neonView/DistrictMain_view/DistrictMain_view.aod

@@ -19,6 +19,11 @@
       <entityField>DistrictResponsibleUIDs</entityField>
       <view>DistrictResponsibleFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>056f1fea-5cd7-4156-a1ee-1dea0bbcef1e</name>
+      <entityField>DistrictContactUIDs</entityField>
+      <view>DistrictContactFilter_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>b409f300-c8b4-4052-9012-5e6b79c03a9c</name>
       <entityField>Organisations</entityField>