You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
This pull request adds a new feature to show a timeline of events for each prescription in the medicine administration module. It also improves the Redux actions and the API integration for managing and archiving administrations. It modifies the PrescriptionAdministrationsTable, actions, api, and models modules, and creates a new component MedicineAdministrationEventsTimeline.
Add a new component MedicineAdministrationEventsTimeline to render a timeline of events for a prescription (link)
Update the type definition of MedicineAdministrationRecord to include archiving properties and make some properties required (link)
Import the new component into PrescriptionAdministrationsTable and use it to show the history of events for each prescription in a modal dialog (link, link, link)
Add a property archived to the PrescriptionRow component state to filter out archived administrations from the table view (link)
Fix a bug where the PrescriptionRow component was rendered outside of a table row element (link)
Modify the AdministrationCell component to simplify the logic for discontinued prescriptions and render a stack of icons for multiple administrations or discontinuation (link)
Remove the commented out code and the tooltip text from the AdministrationCell component, as the details are shown in the timeline component (link, link)
Update the PrescriptionActions object to make the obj parameter of the administer action partial and add a new action archive for archiving an administration (link, link)
Add a new route archiveAdministration to the routes object for the API endpoint for archiving an administration (link)
currently, only the medicine administration is getting archived, but co-related note is still active in the timeline, should be keep it or change it { Discussion on EOD }
As per discussion, the administration comment should be shown along with the administration event itself instead of a seperate event. And it should be greyed out too.
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.
rithviknishad
added
needs testing
and removed
merge conflict
WHAT
🤖 Generated by Copilot at fa76e7f
This pull request adds a new feature to show a timeline of events for each prescription in the medicine administration module. It also improves the Redux actions and the API integration for managing and archiving administrations. It modifies the
PrescriptionAdministrationsTable,actions,api, andmodelsmodules, and creates a new componentMedicineAdministrationEventsTimeline.Required Backends
Proposed Changes
@coronasafe/care-fe-code-reviewers @coronasafe/code-reviewers
Merge Checklist
HOW
🤖 Generated by Copilot at fa76e7f
MedicineAdministrationEventsTimelineto render a timeline of events for a prescription (link)MedicineAdministrationRecordto include archiving properties and make some properties required (link)PrescriptionAdministrationsTableand use it to show the history of events for each prescription in a modal dialog (link, link, link)archivedto thePrescriptionRowcomponent state to filter out archived administrations from the table view (link)PrescriptionRowcomponent was rendered outside of a table row element (link)AdministrationCellcomponent to simplify the logic for discontinued prescriptions and render a stack of icons for multiple administrations or discontinuation (link)AdministrationCellcomponent, as the details are shown in the timeline component (link, link)PrescriptionActionsobject to make theobjparameter of theadministeraction partial and add a new actionarchivefor archiving an administration (link, link)archiveAdministrationto theroutesobject for the API endpoint for archiving an administration (link)