correctly display correct formatted schedule or overdue date label

dhis2 · May 30, 2024 · 70bb48b · 70bb48b
1 parent f5bf20c
commit 70bb48b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/app/src/test/java/org/dhis2/bindings/DateExtensionsTest.kt b/app/src/test/java/org/dhis2/bindings/DateExtensionsTest.kt
@@ -205,7 +205,7 @@ class DateExtensionsTest {
     }
 
     @Test
-    fun `Should return 'In x days', when the scheduled date is same day but more than 3 month and same year`() {
+    fun `Should return 'In x days', when the scheduled date is same day but different month and same year`() {
         val currentDate = currentCalendar().time
         val date: Date? = currentCalendar().apply {
             add(Calendar.MONTH, 1)

diff --git a/commons/src/main/java/org/dhis2/commons/date/DateExtensions.kt b/commons/src/main/java/org/dhis2/commons/date/DateExtensions.kt
@@ -104,6 +104,9 @@ fun Date?.toOverdueOrScheduledUiText(
     }.toPeriod(PeriodType.yearMonthDayTime())
 
     return when {
+        period.days == 0 && period.months == 0 && period.years == 0 -> {
+            resourceManager.getString(R.string.overdue_today)
+        }
         period.years >= 1 -> {
             getString(
                 resourceManager,
@@ -113,7 +116,6 @@ fun Date?.toOverdueOrScheduledUiText(
                 isOverdue,
             )
         }
-
         period.months >= 3 && period.years < 1 -> {
             getString(
                 resourceManager,
@@ -123,8 +125,7 @@ fun Date?.toOverdueOrScheduledUiText(
                 isOverdue,
             )
         }
-
-        period.days in 0..89 && period.months in 1..3 -> {
+        period.days in 0..89 && period.months in 0..2 -> {
             val intervalDays = if (this.time > currentDay.time) {
                 Interval(currentDay.time, this.time)
             } else {
@@ -133,8 +134,6 @@ fun Date?.toOverdueOrScheduledUiText(
 
             getOverdueDaysString(intervalDays, isOverdue)
         }
-
-        period.days == 0 -> resourceManager.getString(R.string.overdue_today)
         else -> {
             getOverdueDaysString(period.days, isOverdue)
         }