#868 | Sachin / Himesh | Always fetch latest hideTotalForProgram in i…

…ndividualService.allInWithFilters()
avniproject · Feb 22, 2023 · 95354e3 · 95354e3
1 parent 8d8fb23
commit 95354e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/openchs-android/src/service/IndividualService.js b/packages/openchs-android/src/service/IndividualService.js
@@ -44,7 +44,7 @@ class IndividualService extends BaseService {
     init() {
         this.encounterService = this.getService(EncounterService);
         this.entityApprovalStatusService = this.getService(EntityApprovalStatusService);
-        this.hideTotalForProgram = this.getService(OrganisationConfigService).hasHideTotalForProgram();
+        this.hideTotalForProgram = this.getService(OrganisationConfigService).hasHideTotalForProgram;
     }
 
     search(criteria) {
@@ -135,7 +135,7 @@ class IndividualService extends BaseService {
     }
 
     allInWithFilters = (ignored, queryAdditions, programs = [], encounterTypes = []) => {
-        if(_.isEmpty(encounterTypes) && (!this.hideTotalForProgram || _.isEmpty(programs))) {
+        if(_.isEmpty(encounterTypes) && (!this.hideTotalForProgram() || _.isEmpty(programs))) {
             return this.allIn(ignored, queryAdditions);
         }
         return null;

diff --git a/packages/openchs-android/src/service/OrganisationConfigService.js b/packages/openchs-android/src/service/OrganisationConfigService.js
@@ -59,7 +59,7 @@ class OrganisationConfigService extends BaseService {
         return this.getSettings().maxAddressDisplayInlineCount || 30;
     }
 
-    hasHideTotalForProgram() {
+    hasHideTotalForProgram = () => {
         return this.getSettings().hideTotalForProgram === undefined || this.getSettings().hideTotalForProgram  ;
     }
 }