fix toggle button click

Earlier when clicking on a particular stage show more buttons, all the stage events were expanding. This commit fixes this.
dhis2 · Feb 20, 2024 · c70b2f4 · c70b2f4
1 parent 045690c
commit c70b2f4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt b/...java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt
@@ -168,6 +168,9 @@ class TeiDataRepositoryImpl(
                             )
                     } ?: false
 
+                    val showAllEvents = selectedStage.showAllEvents &&
+                        selectedStage.stageUid == programStage.uid()
+
                     eventViewModels.add(
                         EventViewModel(
                             EventViewModelType.STAGE,
@@ -186,7 +189,7 @@ class TeiDataRepositoryImpl(
                         ),
                     )
                     checkEventStatus(eventList).take(
-                        if (selectedStage.showAllEvents) eventList.size else maxEventToShow,
+                        if (showAllEvents) eventList.size else maxEventToShow,
                     ).forEachIndexed { index, event ->
                         val showTopShadow = index == 0
                         val showBottomShadow = index == eventList.size - 1
@@ -237,7 +240,7 @@ class TeiDataRepositoryImpl(
                                 groupedByStage = true,
                                 displayDate = null,
                                 nameCategoryOptionCombo = null,
-                                showAllEvents = selectedStage.showAllEvents,
+                                showAllEvents = showAllEvents,
                                 maxEventsToShow = maxEventToShow,
                             ),
                         )