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.

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

fix: [BETA-102] handle Arabic dates when registering with auto-generate events #3621

Merged
merged 3 commits into from
Apr 30, 2024

Conversation

simonadomnisoru
Copy link
Contributor

@simonadomnisoru simonadomnisoru commented Apr 25, 2024

BETA-102

Tech summary

  • Convert the value of the scheduledAt property in the auto-generated events to server format after adding the scheduled days interval.
  • The fix handles different languages, as well as the YYYY-MM-DD and DD-MM-YYYY calendar formats.

@simonadomnisoru simonadomnisoru marked this pull request as ready for review April 25, 2024 14:05
@simonadomnisoru simonadomnisoru requested a review from a team as a code owner April 25, 2024 14:05
@superskip
Copy link
Contributor

superskip commented Apr 26, 2024

It looks like this has already been taken care of in DHIS2-17131, or am I missing something?

@simonadomnisoru simonadomnisoru changed the title fix: [BETA-102] convert to server format after adding scheduled days interval fix: [BETA-102] handle Arabic dates when registering with auto-generate events Apr 29, 2024
@simonadomnisoru
Copy link
Contributor Author

simonadomnisoru commented Apr 29, 2024

It looks like this has already been taken care of in DHIS2-17131, or am I missing something?

Hey @superskip,
I had no success using DHIS2-17131 solution to handle Arabic dates, which is the bug that this PR fixes. Does it work for you with Arabic dates?
Thanks!

Copy link
Contributor

@superskip superskip left a comment

Choose a reason for hiding this comment

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

You're right! Looks good :)
(I'll apply this fix to the DD-MM-YYYY pull request!)

Copy link

github-actions bot commented Apr 29, 2024

Copy link

@geethaalwan geethaalwan left a comment

Choose a reason for hiding this comment

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

Tested successfully on 2.42,2.41.1,2.41.0,2.40.4,2.39.6,2.38.7 versions

@simonadomnisoru simonadomnisoru merged commit 50480e4 into master Apr 30, 2024
42 checks passed
@simonadomnisoru simonadomnisoru deleted the BETA-102 branch April 30, 2024 05:54
dhis2-bot added a commit that referenced this pull request Apr 30, 2024
## [100.68.5](v100.68.4...v100.68.5) (2024-04-30)

### Bug Fixes

* [BETA-102] handle Arabic dates when registering with auto-generate events ([#3621](#3621)) ([50480e4](50480e4))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 100.68.5 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants