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

Rework Shifting Process for "Complete" stage #7697

Merged
merged 14 commits into from
Jun 26, 2024
Merged

Conversation

Ashesh3
Copy link
Member

@Ashesh3 Ashesh3 commented Apr 24, 2024

Fixes #7684
Backend: coronasafe/care#2114

This pull request includes changes to the Shifting Process for the "Complete" stage. It introduces the ability to set a discharge reason when the status is "PATIENT EXPIRED" or "COMPLETED". Additionally, it adds a new prop disabled to the FacilitySelect component.

@Ashesh3 Ashesh3 requested a review from a team as a code owner April 24, 2024 08:21
Copy link

vercel bot commented Apr 24, 2024

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 Jun 10, 2024 1:16pm

Copy link

netlify bot commented Apr 24, 2024

Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit 136b82c
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/6666fc94a698da0008afb9ef
😎 Deploy Preview https://deploy-preview-7697--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.

Copy link

cypress bot commented Apr 24, 2024

Passing run #2737 ↗︎

0 124 0 0 Flakiness 0

Details:

Rework Shifting Process for "Complete" stage
Project: CARE Commit: 136b82c10e
Status: Passed Duration: 02:55 💡
Started: Jun 10, 2024 1:20 PM Ended: Jun 10, 2024 1:23 PM

Review all test suite changes for PR #7697 ↗︎

Copy link

👋 Hi, @Ashesh3,
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.

Copy link

github-actions bot commented May 8, 2024

Hi, This pr has been automatically marked as stale because it has not had any recent activity. It will be automatically closed if no further activity occurs for 7 more days. Thank you for your contributions.

@github-actions github-actions bot added the stale label May 8, 2024
Copy link

Hi, @coronasafe/care-frontend-maintainers, This PR has been automatically closed due to inactivity. Thank you for your contributions. Feel free to re-open the PR.

@github-actions github-actions bot closed this May 15, 2024
@nihal467 nihal467 reopened this May 29, 2024
@github-actions github-actions bot removed the stale label May 30, 2024
@github-actions github-actions bot removed the merge conflict pull requests with merge conflict label Jun 3, 2024
@nihal467 nihal467 added the question Further information is requested label Jun 5, 2024
@nihal467
Copy link
Member

nihal467 commented Jun 5, 2024

@aparnacoronasafe
image

  • When you are marking a patient complete, the destination facility is mandatory, then only we can successfully discharge a patient in the shifting module
  • But at the same time, the referred to discharge pop-up destination facility is an optional field, so it will throw an error, since we are trying to reuse the discharge pop-up here

Similar operation but different approach can be confusing, but can you comment on this issue how to handle it @aparnacoronasafe

@nihal467
Copy link
Member

nihal467 commented Jun 5, 2024

@khavinshankar the validation for shifting form destination facility is skipped, when we mark the complete and submit the form. So modify the PR to ensure that the shifting form validation is passed first then only the discharge pop-up should comes into the screen

@nihal467
Copy link
Member

LGTM

@khavinshankar khavinshankar merged commit a8f50ef into develop Jun 26, 2024
62 of 63 checks passed
@khavinshankar khavinshankar deleted the shifting-perms branch June 26, 2024 14:16
Copy link

@Ashesh3 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make avail the Back Date entry in Shifting Module
4 participants