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

Rearranging buttons in the Patient consultation page #6674

Merged
merged 4 commits into from
Nov 29, 2023

Conversation

GokulramGHV
Copy link
Member

@GokulramGHV GokulramGHV commented Nov 20, 2023

WHAT

🤖[deprecated] Generated by Copilot at 045444b

The pull request refactors the code and improves the user interface for the consultation details and patient info card components. It removes unused code and dependencies from src/Components/Facility/ConsultationDetails/index.tsx and moves the buttons for shifting and discharge actions to src/Components/Patient/PatientInfoCard.tsx. It also adds a dropdown menu for the buttons and enables their functionality and localization.

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

🤖[deprecated] Generated by Copilot at 045444b

  • Move the buttons for shifting, tracking shifting, discharge summary and discharge from care from the ConsultationDetails component to the PatientInfoCard component and place them in a dropdown menu (link, link, link, link, link, link)
  • Add the imports of navigate, DischargeSummaryModal, DischargeModal and useTranslation to the PatientInfoCard component to enable the functionality and localization of the buttons (link, link)
  • Add the state variables openDischargeSummaryDialog and openDischargeDialog to the PatientInfoCard component to control the visibility of the modals for discharge summary and discharge from care (link, link)
  • Declare the variable activeShiftingData to store the prop activeShiftingData in the PatientInfoCard component to simplify the access to the data of the active shifting request of the patient (link)
  • Remove the imports of ButtonV2, CareIcon, DischargeModal, DischargeSummaryModal and useTranslation from the ConsultationDetails component as they are no longer used in this component (link, link)
  • Remove the state variables openDischargeSummaryDialog and openDischargeDialog from the ConsultationDetails component as they are no longer used in this component (link)
  • Remove the function hasActiveShiftingRequest from the ConsultationDetails component as it is no longer used in this component (link)
  • Remove the declaration of const { t } = useTranslation(); from the TABS value in the ConsultationDetails component as it is no longer used in this value (link)
  • Remove the rendering of DischargeSummaryModal and DischargeModal components from the ConsultationDetails component as they are no longer used in this component (link)

@GokulramGHV GokulramGHV requested a review from a team November 20, 2023 15:08
@GokulramGHV GokulramGHV requested a review from a team as a code owner November 20, 2023 15:08
@GokulramGHV GokulramGHV requested a review from gigincg November 20, 2023 15:08
Copy link

vercel bot commented Nov 20, 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 Nov 28, 2023 0:42am

Copy link

netlify bot commented Nov 20, 2023

Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit c0123b1
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/6565dfed90cc89000881e226
😎 Deploy Preview https://deploy-preview-6674--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.

@nihal467
Copy link
Member

nihal467 commented Nov 21, 2023

image

@GokulramGHV

  • fix the cypress it's failing
  • The shift patient button had a logic I guess, if there is a shifting already present for the patient, the button should be shown as track shifting something like, can you check, because of the change you made, i can't find that button logic present anymore

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Nov 23, 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.

@GokulramGHV
Copy link
Member Author

@nihal467 I'm not able to reproduce the shift patient button issue. I'm able to see "Track Shifting". I didn't change or remove the shift patient logic.
image

@nihal467
Copy link
Member

LGTM

@nihal467 nihal467 added tested and removed test failed merge conflict pull requests with merge conflict labels Nov 28, 2023
@khavinshankar khavinshankar merged commit 88fa9a2 into ohcnetwork:develop Nov 29, 2023
34 of 36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rearranging buttons in the Patient consultation page
3 participants