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.

Sign up for GitHub

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

Jump to bottom

Prescriptions: Default Discontinued Prescriptions Collapsed #7833

Merged
merged 8 commits into from
May 28, 2024
Merged

Prescriptions: Default Discontinued Prescriptions Collapsed #7833

merged 8 commits into from
May 28, 2024

Conversation

Sulochan-khadka
Copy link
Contributor

@Sulochan-khadka Sulochan-khadka commented May 16, 2024 •
edited by rithviknishad
Loading

Proposed Changes

image

@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

@Sulochan-khadka Sulochan-khadka requested a review from a team as a code owner May 16, 2024 15:47
@vercel Vercel
Copy link

vercel bot commented May 16, 2024

@Sulochan-khadka is attempting to deploy a commit to the Open Healthcare Network Team on Vercel.

A member of the Team first needs to authorize it.

@netlify Netlify
Copy link

netlify bot commented May 16, 2024 •
edited
Loading

✅ Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit 5f520dc
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/664f4ccd40e50200080c6bd0
😎 Deploy Preview https://deploy-preview-7833--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.

rithviknishad
rithviknishad requested changes May 16, 2024
View reviewed changes
Copy link
Member

@rithviknishad rithviknishad left a comment

Choose a reason for hiding this comment

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

Nice work, however there is one problem. For active prescriptions, if we click on one of the buttons (administer/discontinue), the shrinked state of the card also changes. This is not expected behaviour.

src/Components/Medicine/PrescriptionDetailCard.tsx Outdated Show resolved Hide resolved
@rithviknishad
Copy link
Member

@Sulochan-khadka you might also want to update the cypress tests are related test is failing.

rithviknishad
rithviknishad requested changes May 16, 2024
View reviewed changes
Copy link
Member

@rithviknishad rithviknishad left a comment

Choose a reason for hiding this comment

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

Let's not collapse or make it collapsible where this component is used in other places.

image

@rithviknishad
Copy link
Member

rithviknishad commented May 16, 2024 •
edited
Loading

Here too, (click on Administer Medicines button to open this slideover)

https://deploy-preview-7833--care-net.netlify.app/facility/0c95c7f0-e1d2-4aff-83fa-933cef60d3a8/patient/7e8fc20f-02da-47f7-8c33-f2d8c7e52dd8/consultation/edfe0bd6-0f50-4a4c-8cd0-2d4ad0e9cea1/medicines

image

@rithviknishad rithviknishad changed the title fixes: Prescriptions: Default Discontinued Prescriptions Collapsed #7767 Prescriptions: Default Discontinued Prescriptions Collapsed May 17, 2024
@github-actions GitHub Actions
Copy link

👋 Hi, @Sulochan-khadka,
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 added the merge conflict pull requests with merge conflict label May 22, 2024
@rithviknishad rithviknishad removed the merge conflict pull requests with merge conflict label May 22, 2024
@nihal467
Copy link
Member

image

@Sulochan-khadka newly added active medicine is getting by-default collapsed state, which is not expected, only discontinued medicine should be in collapsed state bydefault.

Steps to replicate

  1. Create a new medicine and manually collapse it
  2. then create two more medicines.
  3. Then you will be seeing except the latest added medicine, all other ones are collapsed

@nihal467
Copy link
Member

LGTM

@nihal467
Copy link
Member

@rithviknishad create a new PR to sort the prescription table to show live medicine on the top

@rithviknishad rithviknishad mentioned this pull request May 28, 2024
Merged
6 tasks
@khavinshankar khavinshankar merged commit e42982e into ohcnetwork:develop May 28, 2024
28 of 30 checks passed
@github-actions GitHub Actions
Copy link

@Sulochan-khadka 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
Reviewers

@khavinshankar khavinshankar khavinshankar approved these changes

@rithviknishad rithviknishad rithviknishad approved these changes

Assignees
No one assigned
Labels
needs review tested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Prescriptions: Default Discontinued Prescriptions Collapsed
4 participants
@Sulochan-khadka @rithviknishad @nihal467 @khavinshankar