Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Nepali calendar support #19438

Merged
merged 11 commits into from
Jan 13, 2025
Merged

fix: Nepali calendar support #19438

merged 11 commits into from
Jan 13, 2025

Conversation

abyot
Copy link
Member

@abyot abyot commented Dec 11, 2024

  • ISO period names should match Nepali calendar. Baisakh 2081 is 208101 not 202404
  • Fix to weekly periods start and end dates

@abyot abyot marked this pull request as ready for review December 13, 2024 12:45
@maikelarabori maikelarabori added the run-api-analytics-tests Enables analytics e2e tests label Dec 16, 2024
maikelarabori
maikelarabori reviewed Dec 16, 2024
View reviewed changes
Copy link
Contributor

@maikelarabori maikelarabori left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the changes @abyot, I left some questions and suggestions.
Please, take a look... thanks!

dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java Outdated Show resolved Hide resolved
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java Outdated Show resolved Hide resolved
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java Show resolved Hide resolved
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java Show resolved Hide resolved
@maikelarabori
Copy link
Contributor

maikelarabori commented Jan 7, 2025 •
edited
Loading

Hi @abyot, would you have any updates on this PR? Did you have any time to review the comments?

Thanks!

@abyot
Copy link
Member Author

abyot commented Jan 9, 2025

Hi @abyot, would you have any updates on this PR? Did you have any time to review the comments?

Thanks!

now updated. thanks.

@maikelarabori maikelarabori self-requested a review January 9, 2025 14:01
@maikelarabori maikelarabori requested review from gnespolino and luciano-fiandesio and removed request for d-bernat January 9, 2025 14:01
@maikelarabori
Copy link
Contributor

Thanks for the update @abyot.
Please, do not forget to apply the same changes to branches 41 and 42. 👍

@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Jan 9, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
40.9% Duplication on New Code

See analysis details on SonarQube Cloud

@abyot abyot merged commit 9bd3b4b into 2.40 Jan 13, 2025
15 checks passed
@abyot abyot deleted the 2.40-DHIS2-18268 branch January 13, 2025 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maikelarabori maikelarabori maikelarabori approved these changes

@gnespolino gnespolino gnespolino approved these changes

@luciano-fiandesio luciano-fiandesio Awaiting requested review from luciano-fiandesio

Assignees
No one assigned
Labels
run-api-analytics-tests Enables analytics e2e tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@abyot @maikelarabori @gnespolino @larshelge