remove unused method from DateUtils and remove mobile-ui versioning

dhis2 · Feb 26, 2025 · 7f9d5dc · 7f9d5dc
1 parent 9c4ef8e
commit 7f9d5dc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 67 deletions.
diff --git a/app/src/test/java/org/dhis2/utils/DateUtilsTest.java b/app/src/test/java/org/dhis2/utils/DateUtilsTest.java
@@ -630,50 +630,6 @@ public void complete_event_with_null_complete_date_throws_error() throws ParseEx
 
     }
 
-    @Test
-    public void isInputPeriodDateInsideFutureOpenDayConfiguration() throws ParseException {
-        DateUtils.getInstance().setCurrentDate(DateUtils.oldUiDateFormat().parse("2022-11-03"));
-        DateRangeInputPeriodModel inputPeriod = DateRangeInputPeriodModel.create(
-                "datasetUid",
-                "periodUid",
-                DateUtils.oldUiDateFormat().parse("2022-11-01"),
-                DateUtils.oldUiDateFormat().parse("2022-11-07"),
-                DateUtils.oldUiDateFormat().parse("2022-11-05"),
-                DateUtils.oldUiDateFormat().parse("2022-11-05")
-        );
-
-        assertTrue(DateUtils.getInstance().isInsideFutureInputPeriod(inputPeriod.endPeriodDate(), 5));
-    }
-
-    @Test
-    public void isInputPeriodDateOutsideFutureOpenDayConfiguration() throws ParseException {
-        DateUtils.getInstance().setCurrentDate(DateUtils.oldUiDateFormat().parse("2022-11-03"));
-        DateRangeInputPeriodModel inputPeriod = DateRangeInputPeriodModel.create(
-                "datasetUid",
-                "periodUid",
-                DateUtils.oldUiDateFormat().parse("2022-11-01"),
-                DateUtils.oldUiDateFormat().parse("2022-11-07"),
-                DateUtils.oldUiDateFormat().parse("2022-11-15"),
-                DateUtils.oldUiDateFormat().parse("2022-11-15")
-        );
-
-        assertFalse(DateUtils.getInstance().isInsideFutureInputPeriod(inputPeriod.endPeriodDate(), 5));
-    }
-
-    @Test
-    public void isFutureInputPeriodsNotConfigured() {
-        DateRangeInputPeriodModel inputPeriod = DateRangeInputPeriodModel.create(
-                "",
-                "",
-                new Date(),
-                new Date(),
-                new Date(),
-                new Date()
-        );
-
-        assertFalse(DateUtils.getInstance().isInsideFutureInputPeriod(inputPeriod.endPeriodDate(), 0));
-    }
-
     @Test
     public void shouldParseDate() {
         String testDate = "2022-01-01'T'12:01:01.001";

diff --git a/commons/src/main/java/org/dhis2/commons/date/DateUtils.java b/commons/src/main/java/org/dhis2/commons/date/DateUtils.java
@@ -894,10 +894,6 @@ public  List<DatePeriod> getDatePeriodListFor(List<Date> selectedDates, Period p
         return datePeriods;
     }
 
-    public Boolean isDataSetExpired(int expiredDays, Date periodInitialDate) {
-        return Calendar.getInstance().getTime().getTime() > periodInitialDate.getTime() + TimeUnit.DAYS.toMillis(expiredDays);
-    }
-
     public Boolean isInsideInputPeriod(DataInputPeriod dataInputPeriodModel) {
         if (dataInputPeriodModel.openingDate() == null && dataInputPeriodModel.closingDate() != null)
             return Calendar.getInstance().getTime().getTime() < dataInputPeriodModel.closingDate().getTime();
@@ -912,22 +908,4 @@ public Boolean isInsideInputPeriod(DataInputPeriod dataInputPeriodModel) {
                 && Calendar.getInstance().getTime().getTime() < dataInputPeriodModel.closingDate().getTime();
     }
 
-    public Boolean isInsideFutureInputPeriod(Date endPeriodDate, Integer futureOpenDays) {
-        if (futureOpenDays != null && futureOpenDays > 0) {
-            boolean isInside = false;
-
-            Date today = DateUtils.getInstance().getToday();
-
-            long diffInMillis = Math.abs(endPeriodDate.getTime() - today.getTime());
-            long diffInDays = TimeUnit.DAYS.convert(diffInMillis, TimeUnit.MILLISECONDS);
-
-
-            if (diffInDays < futureOpenDays) {
-                isInside = true;
-            }
-            return isInside;
-        } else {
-            return false;
-        }
-    }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ gradle = "8.8.0"
 kotlin = '2.0.21'
 hilt = '2.47'
 jacoco = '0.8.10'
-designSystem = "0.5.0-20250220.121245-20"
+designSystem = "0.5.0-SNAPSHOT"
 dhis2sdk = "1.12.0-SNAPSHOT"
 ruleEngine = "3.3.2"
 expressionParser = "1.1.0"