diff --git a/app/src/main/java/com/example/data/model/MaintenanceActivity.kt b/app/src/main/java/com/example/data/model/MaintenanceActivity.kt index 99b48d7..e194775 100644 --- a/app/src/main/java/com/example/data/model/MaintenanceActivity.kt +++ b/app/src/main/java/com/example/data/model/MaintenanceActivity.kt @@ -90,7 +90,7 @@ fun adjustTwoDigitYear(date: Date?): Date? { } fun parseDateOnly(dateStr: String): Date? { - val clean = dateStr.trim() + val clean = extractDateOnly(dateStr).trim() val formats = listOf( "dd/MM/yyyy", "dd/MM/yy", diff --git a/app/src/test/java/com/example/ExampleUnitTest.kt b/app/src/test/java/com/example/ExampleUnitTest.kt index b7aa2fd..1e2b23d 100644 --- a/app/src/test/java/com/example/ExampleUnitTest.kt +++ b/app/src/test/java/com/example/ExampleUnitTest.kt @@ -54,6 +54,21 @@ class ExampleUnitTest { assertEquals(2026, cal3.get(Calendar.YEAR)) assertEquals(Calendar.AUGUST, cal3.get(Calendar.MONTH)) assertEquals(17, cal3.get(Calendar.DAY_OF_MONTH)) + + // Tests for dates containing weekdays or times + val date4 = parseDateOnly("Sex 14/08/26 07:00") + assertNotNull(date4) + val cal4 = Calendar.getInstance().apply { time = date4!! } + assertEquals(2026, cal4.get(Calendar.YEAR)) + assertEquals(Calendar.AUGUST, cal4.get(Calendar.MONTH)) + assertEquals(14, cal4.get(Calendar.DAY_OF_MONTH)) + + val date5 = parseDateOnly("14/08/2026 08:30") + assertNotNull(date5) + val cal5 = Calendar.getInstance().apply { time = date5!! } + assertEquals(2026, cal5.get(Calendar.YEAR)) + assertEquals(Calendar.AUGUST, cal5.get(Calendar.MONTH)) + assertEquals(14, cal5.get(Calendar.DAY_OF_MONTH)) } @Test