fix min period date calculation

dhis2 · Dec 23, 2024 · 3b98443 · 3b98443
1 parent b61b828
commit 3b98443
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/commons/src/main/java/org/dhis2/commons/periods/data/EventPeriodRepository.kt b/commons/src/main/java/org/dhis2/commons/periods/data/EventPeriodRepository.kt
@@ -38,10 +38,10 @@ class EventPeriodRepository(private val d2: D2) {
             generatePeriod(PeriodType.Daily, currentPeriod.startDate()!!, expiryDays ?: 0)
                 .startDate()
 
-        return if (currentDate.after(previousPeriodLastDay)) {
+        return if (currentDate.after(previousPeriodLastDay) or (currentDate == previousPeriodLastDay)) {
             currentPeriod.startDate()
         } else {
-            generatePeriod(periodType, offset = -1).startDate()
+            generatePeriod(periodType, currentDate, offset = -1).startDate()
         } ?: Date()
     }