fix: [ANDROAPP-5992] check program stage filters in WorkingListScope (#…

…3600) * fix: [ANDROAPP-5992] check program stage filters in WorkingListScope * fix: [ANDROAPP-5992] check program stage filters in WorkingListScope
dhis2 · Apr 24, 2024 · e5192ff · e5192ff
1 parent da42a43
commit e5192ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/app/src/test/java/org/dhis2/utils/filters/FilterManagerTest.kt b/app/src/test/java/org/dhis2/utils/filters/FilterManagerTest.kt
@@ -198,6 +198,9 @@ class FilterManagerTest {
             eventStatusList = listOf(),
             eventDateList = listOf("date"),
             assignedToMe = listOf(),
+            filters = mapOf(),
+            stageUid = "stageUid",
+            dataValues = mapOf(),
         )
         filterManager.setWorkingListScope(workingListScope)
 

diff --git a/commons/src/main/java/org/dhis2/commons/filters/data/TeiWorkingListScope.kt b/commons/src/main/java/org/dhis2/commons/filters/data/TeiWorkingListScope.kt
@@ -42,6 +42,9 @@ data class TeiWorkingListScope(
     val eventStatusList: List<String>?,
     val eventDateList: List<String>?,
     val assignedToMe: List<AssignedUserMode>?,
+    val filters: Map<String, String>?,
+    val stageUid: String?,
+    val dataValues: Map<String, String>?,
 ) : WorkingListScope() {
     override fun isAssignedActive(): Boolean = assignedToMe?.isNotEmpty() == true
     override fun isAssignedToMeActive(): Boolean =
@@ -109,6 +112,9 @@ fun TrackedEntityInstanceQueryRepositoryScope.mapToWorkingListScope(
         eventFilters().mapNotNull { it.eventDate() }
             .mapNotNull { resources.dateFilterPeriodToText(it) },
         eventFilters().mapNotNull { it.assignedUserMode() }.distinct(),
+        filter().associateBy({ it.key() }, { it.value() }),
+        programStage(),
+        dataValue().associateBy({ it.key() }, { it.value() }),
     )
 }