feat: [DHIS2-13299][DHIS2-16291] Related Stages #3488
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
* feat: [DHIS2-13439] add referral actions to new event page * feat: [DHIS2-13439] referral actions * chore: [DHIS2-13672] update use referral using index db
# Conflicts: # i18n/en.pot # src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/enrollment.actions.js # src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js # src/core_modules/capture-core/metaData/RelationshipType/RelationshipType.js # src/core_modules/capture-core/metaDataStoreLoaders/baseLoader/quickStoreOperations/storeRelationshipTypes.js # src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js
# Conflicts: # src/core_modules/capture-core/utils/reactQueryHelpers/query/useApiDataQuery.js
…_RelatedStagesRebrand
…_RelatedStagesRebrand # Conflicts: # i18n/en.pot # src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedAddEvent.js # src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js
eirikhaugstulen
changed the base branch from
DHIS2-13299-referrals
to
master
eirikhaugstulen
changed the title
JoakimSM
approved these changes
Mar 4, 2024
…_RelatedStagesRebrand # Conflicts: # i18n/en.pot
|
🚀 Deployed on https://deploy-preview-3488--dhis2-capture.netlify.app |
|
Tested successfully on 2.41, 2.40.4, 2.39.6, 2.38.7 versions |
…_RelatedStagesRebrand # Conflicts: # i18n/en.pot # src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.container.js # src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.container.js # src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/enrollment.actions.js # src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js # src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js # src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedAddEvent.js # src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.actions.js # src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.epics.js # src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js
…_RelatedStagesRebrand # Conflicts: # i18n/en.pot
…_RelatedStagesRebrand
...les/capture-core/components/WidgetEventEdit/EditEventDataEntry/editEventDataEntry.actions.js
Outdated
Show resolved
Hide resolved
.../EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.container.js
Show resolved
Hide resolved
...e_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.epics.js
Outdated
Show resolved
Hide resolved
|
Thanks for the review! All updated now. |
JoakimSM
approved these changes
Mar 20, 2024
simonadomnisoru
approved these changes
Mar 20, 2024
dhis2-bot
added a commit
that referenced
this pull request
Apr 25, 2024
# [100.68.0](v100.67.12...v100.68.0) (2024-04-25) ### Features * [DHIS2-13299][DHIS2-16291] Related Stages ([#3488](#3488)) ([85f38be](85f38be))
|
🎉 This PR is included in version 100.68.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:
This widget checks if there are a relationship type of program stage to program stage. If there are on, there is a widget appearing underneath the New Enrollment event form.
How to test:
Event in program or program stage=>Event in program or program stagein the same programThis PR is made up of several issues who have all been reviewed. Please only check the latest commit