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

Add titrated prescription dosage type #6565

Merged
merged 27 commits into from
Mar 19, 2024

Conversation

GokulramGHV
Copy link
Member

@GokulramGHV GokulramGHV commented Nov 8, 2023

WHAT

🤖 Generated by Copilot at 382550a

This pull request adds support for titrated dosage prescriptions and improves the prescription and administration modules. It updates the components, models, validators, and actions related to prescriptions and administrations to use the new fields and objects introduced in the backend. It also fixes some layout and translation issues in the prescription module.

Proposed Changes

@coronasafe/care-fe-code-reviewers @coronasafe/code-reviewers

Merge Checklist

  • Add specs that demonstrate bug / test a new feature.
  • Update product documentation.
  • Ensure that UI text is kept in I18n files.
  • Prep screenshot or demo video for changelog entry, and attach it to issue.
  • Request for Peer Reviews
  • Completion of QA

HOW

🤖 Generated by Copilot at 382550a

  • Add CheckBoxFormField for titrate dosage option and NumericWithUnitsFormField for start and target dosage in CreatePrescriptionForm and EditPrescriptionForm components (link, link, link, link, link, link)
  • Add NumericWithUnitsFormField for dosage input and validation logic in AdministerMedicine component (link, link, link, link, link)
  • Add Detail component for instruction on titration and conditionally render dosage details according to dosage type in PrescriptionDetailCard component (link, link, link, link, link, link)
  • Modify prescription model interfaces and types to use dosage_type, base_dosage, target_dosage, and last_administration fields instead of is_prn, dosage, and last_administered_on fields in models.ts and validators.ts files (link, link, link, link, link, link, link)
  • Modify query filters to use dosage_type instead of is_prn field to fetch prescriptions in PrescriptionAdministrationsTable, PrescriptionBuilder, and PrescriptionsTable components (link, link, link)
  • Modify lastModified and last_administered__pretty props to use last_administration object instead of last_administered_on field to show latest administration record in PrescriptionAdministrationsTable and PrescriptionsTable components (link, link)
  • Modify title and dosage props to use dosage_type and base_dosage fields instead of is_prn and dosage fields to show prescription details in PrescriptionAdministrationsTable and PrescriptionsTable components (link, link, link, link)
  • Modify last_administered_on prop to use last_administration object to show last administered information in MedicineAdministration component (link)
  • Add translation keys for new labels in Medicine.json file and remove trailing comma (link, link)

@GokulramGHV GokulramGHV requested a review from a team November 8, 2023 09:12
@GokulramGHV GokulramGHV requested a review from a team as a code owner November 8, 2023 09:12
Copy link

vercel bot commented Nov 8, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
care-storybook ✅ Ready (Inspect) Visit Preview 💬 Add feedback Mar 19, 2024 6:40am

Copy link

netlify bot commented Nov 8, 2023

Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit eb8d4ad
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/65f9330bf9f68f00082bec1e
😎 Deploy Preview https://deploy-preview-6565--care-egov-staging.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Nov 8, 2023
Copy link

github-actions bot commented Nov 8, 2023

👋 Hi, @GokulramGHV,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.


This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

@github-actions github-actions bot removed the merge conflict pull requests with merge conflict label Nov 8, 2023
and fix dosage validation
@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Nov 10, 2023
Copy link

👋 Hi, @GokulramGHV,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.


This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

src/Components/Form/FormFields/DosageFormField.tsx Outdated Show resolved Hide resolved
src/Components/Medicine/validators.ts Outdated Show resolved Hide resolved
src/Components/Medicine/AdministerMedicine.tsx Outdated Show resolved Hide resolved
src/Components/Medicine/AdministerMedicine.tsx Outdated Show resolved Hide resolved
src/Components/Medicine/MedicineAdministration.tsx Outdated Show resolved Hide resolved
@GokulramGHV GokulramGHV removed the merge conflict pull requests with merge conflict label Nov 10, 2023
Copy link

👋 Hi, @GokulramGHV,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.


This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

@nihal467
Copy link
Member

@GokulramGHV can you clear the merge conflict

@rithviknishad rithviknishad removed the merge conflict pull requests with merge conflict label Jan 18, 2024
@rithviknishad rithviknishad added the reviewed reviewed by a core member label Jan 18, 2024
@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Jan 19, 2024
Copy link

👋 Hi, @GokulramGHV,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.


This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

@GokulramGHV GokulramGHV removed the merge conflict pull requests with merge conflict label Jan 19, 2024
@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Feb 26, 2024
Copy link

👋 Hi, @GokulramGHV,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.


This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

@rithviknishad rithviknishad removed the merge conflict pull requests with merge conflict label Feb 26, 2024
Copy link

vercel bot commented Mar 17, 2024

@rithviknishad is attempting to deploy a commit to the Open Healthcare Network Team on Vercel.

A member of the Team first needs to authorize it.

@khavinshankar khavinshankar merged commit df8c57b into ohcnetwork:develop Mar 19, 2024
35 of 36 checks passed
Copy link

@GokulramGHV Your efforts have helped advance digital healthcare and TeleICU systems. 🚀 Thank you for taking the time out to make CARE better. We hope you continue to innovate and contribute; your impact is immense! 🙌

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
reviewed reviewed by a core member tested
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Prescription: Titrated drug dose
5 participants