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

feat: [DHIS2-11836] respect block entry form #3759

Merged
merged 9 commits into from
Aug 28, 2024

Conversation

henrikmv
Copy link
Contributor

@henrikmv henrikmv commented Aug 16, 2024

DHIS2-11836

  • Block the Edit event button when both of the bullet points are true:
    1. The blockEntryForm setting is set to true for Program stage
    2. User role with tracker authorities Uncomplete events is not assigned to the user.

  • Adds a Cypress test to validate that the Edit event button is disabled for users without authority.

@henrikmv henrikmv marked this pull request as ready for review August 18, 2024 18:30
@henrikmv henrikmv requested a review from a team as a code owner August 18, 2024 18:30
Copy link
Contributor

@simonadomnisoru simonadomnisoru left a comment

Choose a reason for hiding this comment

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

Hi @henrikmv,
Can you add a cypress test for this feature? You can use either First antenatal care visit or Second antenatal care visit from the WHO RMNCH program, both of which have blockEntryForm set to true.
Thanks!

Copy link

github-actions bot commented Aug 20, 2024

@henrikmv henrikmv added the e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud label Aug 22, 2024
Copy link
Contributor

@simonadomnisoru simonadomnisoru left a comment

Choose a reason for hiding this comment

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

LGTM!

@henrikmv henrikmv added testing and removed e2e-tests e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud labels Aug 27, 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.2 ,2.40.5,2.39.7 versions

@henrikmv henrikmv merged commit ed3ed5a into master Aug 28, 2024
43 checks passed
@henrikmv henrikmv deleted the hv/feat/DHIS2-11836_RespectBlockEntryFormSetting branch August 28, 2024 10:48
dhis2-bot added a commit that referenced this pull request Aug 28, 2024
# [101.3.0](v101.2.2...v101.3.0) (2024-08-28)

### Features

* [DHIS2-11836] respect block entry form ([#3759](#3759)) ([ed3ed5a](ed3ed5a))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 101.3.0 🎉

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.

5 participants