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: [DHIS2-17651] enrollment dashboard UI changes #3767

Merged
merged 4 commits into from
Aug 29, 2024

Conversation

cooper-joe
Copy link
Member

@cooper-joe cooper-joe commented Aug 21, 2024

Implements design changes to Stages and Events widget based on design review carried out for DHIS2-17651.

Summary:

  • Adjust visual design of stage widgets
  • Redesign Show # more events button to use alternative button style (toolbar style) to reduce button overload.
  • Remove Reset list functionality to simplify interface (discussed with and approved by product manager 19/08/24 (Mike))
  • Adjust horizontal scrolling functionality to only apply to table rows.
  • Use DataTableToolbar for action buttons
  • Adjust stage metadata display
  • Other minor design changes.

These changes were approved by product manager 19/08/24 (Mike).

I notice this may clash with the work done in #3751, so let me know how you'd like to proceed @eirikhaugstulen.

Before:
debug dhis2 org_dev_dhis-web-capture_index html (3)

After:
localhost_3000_ (5)

@cooper-joe cooper-joe requested a review from a team as a code owner August 21, 2024 08:21
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.

The UI changes look great @cooper-joe 👏 !
I fixed the cypress tests related to the selectors you modified. No need to worry about the one still failing because it's unrelated to this PR and will be fixed once is #3768 merged.

…ment-dashboard-design

# Conflicts:
#	i18n/en.pot
#	src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/Stage.component.js
#	src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js
Copy link
Contributor

@eirikhaugstulen eirikhaugstulen left a comment

Choose a reason for hiding this comment

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

Hey @cooper-joe! I decided to merge my branch, so I took care of the merge conflicts from master. I could not see any difference in the UI, but please take a look to make sure everything is as you designed it to be before moving it to testing!

Copy link

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 version

@cooper-joe cooper-joe merged commit 012b60d into master Aug 29, 2024
38 of 39 checks passed
@cooper-joe cooper-joe deleted the enrollment-dashboard-design branch August 29, 2024 07:21
dhis2-bot added a commit that referenced this pull request Aug 29, 2024
## [101.3.1](v101.3.0...v101.3.1) (2024-08-29)

### Bug Fixes

* [DHIS2-17651] enrollment dashboard UI changes ([#3767](#3767)) ([012b60d](012b60d))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 101.3.1 🎉

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