feat: [DHIS2-17655] Two event workspace #3726
Merged
Conversation
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
…-plugins-in-event-programs # Conflicts: # src/core_modules/capture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.component.js
…t/DHIS2-17591-plugins-in-event-programs # Conflicts: # i18n/en.pot
…t/DHIS2-17655-two-event-workspace
…t/DHIS2-17655-two-event-workspace
…t/DHIS2-17655-two-event-workspace
…t/DHIS2-17655-two-event-workspace # Conflicts: # i18n/en.pot # src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/PageLayout/DefaultPageLayout.constants.js # src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/EnrollmentPageLayout/DefaultEnrollmentLayout.types.js
|
🚀 Deployed on https://deploy-preview-3726--dhis2-capture.netlify.app |
There was a problem hiding this comment.
Hi @eirikhaugstulen,
It looks good overall 👏 . I added a comment with the dataElements types that are not properly displayed. Besides that, is it possible to add some cypress tests for this feature?
Thanks!
...modules/capture-core/components/WidgetTwoEventWorkspace/WidgetTwoEventWorkspace.component.js
Outdated
Show resolved
Hide resolved
…t/DHIS2-17655-two-event-workspace
…t/DHIS2-17655-two-event-workspace # Conflicts: # i18n/en.pot # src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/index.js # src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/index.js # src/core_modules/capture-core/components/Pages/common/WidgetEventEditWrapper/WidgetEventEditWrapper.js
|
Thanks for the review @simonadomnisoru! I was missing the clientSubValues, which meant the values was not displaying correctly. Nice catch! |
simonadomnisoru
approved these changes
Aug 12, 2024
| return { | ||
| id, | ||
| name, | ||
| url: `${absoluteApiPath}/events/files?dataElementUid=${dataElement.id}&eventUid=${eventId}`, |
There was a problem hiding this comment.
A reminder that this URL is not working in 2.41. The fix can be handled along with the rest of the places in DHIS2-17537. Thanks!
geethaalwan
approved these changes
Aug 14, 2024
dhis2-bot
added a commit
that referenced
this pull request
Aug 14, 2024
# [101.1.0](v101.0.0...v101.1.0) (2024-08-14) ### Features * [DHIS2-17655] Two event workspace ([#3726](#3726)) ([bad5312](bad5312))
|
🎉 This PR is included in version 101.1.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
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.
Tech-summary: