Skip to content

Commit 21151c0

Browse files
committed
Revert "#868 | Show "Totals" when user selects any "Program" in Dashboard filters"
This reverts commit 084a9e0.
1 parent 00931bc commit 21151c0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

packages/openchs-android/src/service/IndividualService.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,11 @@ class IndividualService extends BaseService {
135135
}
136136

137137
allInWithFilters(ignored, queryAdditions, programs = [], encounterTypes = []) {
138-
if (encounterTypes.length > 0) {
138+
if (encounterTypes.length > 0 || programs.length > 0) {
139139
return null;
140140
}
141141
return this.allIn(ignored, queryAdditions);
142+
142143
}
143144

144145
allIn(ignored, queryAdditions) {

packages/openchs-android/src/views/mydashbaord/MyDashboardView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class MyDashboardView extends AbstractComponent {
9696

9797
renderableVisits() {
9898
const {selectedPrograms, selectedGeneralEncounterTypes, visits} = this.state;
99-
if (!_.isEmpty(selectedGeneralEncounterTypes))
99+
if (!_.isEmpty(selectedPrograms) || !_.isEmpty(selectedGeneralEncounterTypes))
100100
return _.filter(visits, (visit) => _.isNil(visit.visits.total));
101101
return visits;
102102
}

0 commit comments

Comments
 (0)