Fixed: Chores filter for due entries was not working (closes #760)

patzly · Sep 30, 2023 · c0efa41 · c0efa41
1 parent 5075573
commit c0efa41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/viewmodel/ChoresViewModel.java b/app/src/main/java/xyz/zedler/patrick/grocy/viewmodel/ChoresViewModel.java
@@ -190,7 +190,9 @@ public void updateFilteredChoreEntries() {
       }
 
       int daysFromNow = DateUtil.getDaysFromNow(choreEntry.getNextEstimatedExecutionTime());
-      if (filterChipLiveDataStatus.getStatus() == FilterChipLiveDataChoresStatus.STATUS_OVERDUE
+      if (filterChipLiveDataStatus.getStatus() == FilterChipLiveDataChoresStatus.STATUS_DUE
+          && daysFromNow > 0
+          || filterChipLiveDataStatus.getStatus() == FilterChipLiveDataChoresStatus.STATUS_OVERDUE
           && daysFromNow >= 0
           || filterChipLiveDataStatus.getStatus() == FilterChipLiveDataChoresStatus.STATUS_DUE_TODAY
           && daysFromNow != 0

diff --git a/app/src/main/res/raw/changelog.txt b/app/src/main/res/raw/changelog.txt
@@ -4,6 +4,7 @@
 - Fixed: On purchase page, decimal places for displaying prices were used for quantity unit
   conversion instead of decimal places for input (#778)
 - Fixed: Form validation bug on inventory page when using quantity unit conversion
+- Fixed: Chores filter for due entries was not working (#760)
 
 ## 3.3.2