1068897

entity/Organisation_entity/Organisation_entity.aod

@@ -1436,6 +1436,10 @@
         <fieldName>FilterProvider</fieldName>
       </dependency>
     </entityConsumer>
+    <entityParameter>
+      <name>OnlyActive_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Organisation_entity/recordcontainers/db/conditionProcess.js

+import("KeywordRegistry_basic");
 import("Employee_lib");
 import("AttributeRegistry_basic");
 import("Attribute_lib");
@@ -40,7 +41,9 @@ if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedC
     var excludedContacts = JSON.parse(vars.getString("$param.ExcludedContactIds_param"));
     cond.andIfSet("CONTACT.CONTACTID", excludedContacts, SqlBuilder.NOT_IN())
 }
-
+if (vars.exists("$param.OnlyActive_param") && vars.get("$param.OnlyActive_param"))
+    cond.and("CONTACT.STATUS", $KeywordRegistry.contactStatus$active())
+    
 cond.andIfSet("ORGANISATION.KIND", "$param.OrganisationType_param");
 cond.andIfSet("CONTACT.CONTACTID", onlyShowContactIds, SqlBuilder.IN())
 

entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod

@@ -121,6 +121,12 @@
     </entityActionGroup>
     <entityConsumer>
       <name>Organisations</name>
+      <children>
+        <entityParameter>
+          <name>OnlyActive_param</name>
+          <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisations/children/onlyactive_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
       <dependency>
         <name>dependency</name>
         <entityName>Organisation_entity</entityName>

entity/VisitPlanEntry_entity/entityfields/organisations/children/onlyactive_param/valueProcess.js

+import("system.result");
+
+result.string(true);
\ No newline at end of file

entity/VisitRecommendation_entity/VisitRecommendation_entity.aod

@@ -99,6 +99,12 @@
     </entityConsumer>
     <entityConsumer>
       <name>OrganisationConsumer</name>
+      <children>
+        <entityParameter>
+          <name>OnlyActive_param</name>
+          <valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/organisationconsumer/children/onlyactive_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
       <dependency>
         <name>dependency</name>
         <entityName>Organisation_entity</entityName>
@@ -118,6 +124,10 @@
           <valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/personconsumer/children/orgid_param/valueProcess.js</valueProcess>
           <expose v="true" />
         </entityParameter>
+        <entityParameter>
+          <name>OnlyActive_param</name>
+          <valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/personconsumer/children/onlyactive_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
       <dependency>
         <name>dependency</name>

entity/VisitRecommendation_entity/entityfields/organisationconsumer/children/onlyactive_param/valueProcess.js

+import("system.result");
+
+result.string(true);
\ No newline at end of file

entity/VisitRecommendation_entity/entityfields/personconsumer/children/onlyactive_param/valueProcess.js

+import("system.result");
+
+result.string(true);
\ No newline at end of file