fix: [ANDROAPP-6354] line listing filters

Signed-off-by: Manu Muñoz <[email protected]>
dhis2 · Dec 26, 2024 · 9447c3f · 9447c3f
1 parent e398b73
commit 9447c3f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...roid_analytics/src/main/java/dhis2/org/analytics/charts/bindings/LineListingExtensions.kt b/...roid_analytics/src/main/java/dhis2/org/analytics/charts/bindings/LineListingExtensions.kt
@@ -18,19 +18,19 @@ fun TrackerLineListItem.withFilters(
         TrackerLineListItem.LastUpdatedBy -> this
         is TrackerLineListItem.EnrollmentDate -> this.copy(
             filters = this.filters + listOf(
-                DateFilter.Range(value, value),
+                DateFilter.Like(value),
             ),
         )
 
         is TrackerLineListItem.EventDate -> this.copy(
             filters = this.filters + listOf(
-                DateFilter.Range(value, value),
+                DateFilter.Like(value),
             ),
         )
 
         is TrackerLineListItem.ScheduledDate -> this.copy(
             filters = this.filters + listOf(
-                DateFilter.Range(value, value),
+                DateFilter.Like(value),
             ),
         )
 
@@ -42,13 +42,13 @@ fun TrackerLineListItem.withFilters(
 
         is TrackerLineListItem.IncidentDate -> this.copy(
             filters = this.filters + listOf(
-                DateFilter.Range(value, value),
+                DateFilter.Like(value),
             ),
         )
 
         is TrackerLineListItem.LastUpdated -> this.copy(
             filters = this.filters + listOf(
-                DateFilter.Range(value, value),
+                DateFilter.Like(value),
             ),
         )
 

diff --git a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/data/GraphFilters.kt b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/data/GraphFilters.kt
@@ -41,9 +41,7 @@ sealed class GraphFilters {
             lineListFilters.isNotEmpty() || orgUnitsSelected.isNotEmpty() || periodToDisplaySelected.isNotEmpty()
 
         override fun count(): Int {
-            var count = 0
-            if (hasFilters()) count++
-            return count
+            return columnsWithFilters().size
         }
 
         override fun canDisplayChart(dataIsNotEmpty: Boolean): Boolean {