fix: Nepali calendar support #19438
+139
−33
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -570,7 +570,7 @@ public Period createPeriod(DateInterval dateInterval) { | |
| final DateTimeUnit from = cal.toIso(dateInterval.getFrom()); | ||
| final DateTimeUnit to = cal.toIso(dateInterval.getTo()); | ||
|
|
||
| return new Period(this, from.toJdkDate(), to.toJdkDate(), getIsoDate(dateInterval.getFrom())); | ||
maikelarabori marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,8 +29,14 @@ | |
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| import java.util.Date; | ||
| import java.util.List; | ||
| import org.hisp.dhis.calendar.Calendar; | ||
| import org.hisp.dhis.calendar.DateTimeUnit; | ||
| import org.hisp.dhis.period.Cal; | ||
| import org.hisp.dhis.period.Period; | ||
| import org.hisp.dhis.period.WeeklyPeriodType; | ||
| import org.joda.time.DateTime; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
@@ -74,4 +80,36 @@ void testPlusDays() { | |
| assertEquals(12, testDateTimeUnit.getMonth()); | ||
| assertEquals(30, testDateTimeUnit.getDay()); | ||
| } | ||
|
|
||
| @Test | ||
| void testGenerateWeeklyPeriods() { | ||
| Date startDate = new Cal(2021, 4, 12, true).time(); | ||
| Date endDate = new Cal(2022, 4, 10, true).time(); | ||
|
|
||
| List<Period> weeks = new WeeklyPeriodType().generatePeriods(calendar, startDate, endDate); | ||
| assertEquals(52, weeks.size()); | ||
| } | ||
|
|
||
| @Test | ||
| void testIsoDates() { | ||
| DateTimeUnit dateTimeUnit = new DateTimeUnit(2081, 1, 3, false); | ||
| DateTime startDate = new DateTime(2024, 4, 15, 0, 0); | ||
| DateTime endDate = new DateTime(2024, 4, 21, 0, 0); | ||
|
|
||
| WeeklyPeriodType periodType = new WeeklyPeriodType(); | ||
| Period period = periodType.createPeriod(dateTimeUnit, calendar); | ||
|
|
||
| assertEquals("2081W1", period.getIsoDate()); | ||
| assertEquals(startDate.toDate(), period.getStartDate()); | ||
| assertEquals(endDate.toDate(), period.getEndDate()); | ||
|
|
||
| dateTimeUnit = new DateTimeUnit(2080, 12, 26, false); | ||
| startDate = new DateTime(2024, 4, 8, 0, 0); | ||
| endDate = new DateTime(2024, 4, 14, 0, 0); | ||
|
|
||
| period = periodType.createPeriod(dateTimeUnit, calendar); | ||
| assertEquals("2080W52", period.getIsoDate()); | ||
| assertEquals(startDate.toDate(), period.getStartDate()); | ||
| assertEquals(endDate.toDate(), period.getEndDate()); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add constants to the integers here?
Also, a Javadoc would be nice. The Wikipedia website can be left as a reference.