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

Add popup to acknowledge discharge #8211

Merged
merged 8 commits into from
Jul 24, 2024
Merged

Add popup to acknowledge discharge #8211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
68b0230
Add popup to acknowledge discharge
rithviknishad Jul 17, 2024
3c5ddc7
Merge branch 'develop' into rithviknishad/feat/acknowledge-popup
rithviknishad Jul 17, 2024
07a459d
Merge branch 'develop' into rithviknishad/feat/acknowledge-popup
rithviknishad Jul 24, 2024
a678f9d
modify cypress tests
rithviknishad Jul 24, 2024
6a1a562
fix cypress
rithviknishad Jul 24, 2024
557a638
adjust max width of popup
rithviknishad Jul 24, 2024
af5d281
Merge branch 'develop' into rithviknishad/feat/acknowledge-popup-2
rithviknishad Jul 24, 2024
876657b
Merge branch 'develop' into rithviknishad/feat/acknowledge-popup-2
gigincg Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cypress/e2e/patient_spec/patient_discharge.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ describe("Patient Discharge based on multiple reason", () => {
patientDischarge.clickDischarge();
patientDischarge.selectDischargeReason(patientDischargeReason4);
cy.submitButton("Confirm Discharge");
cy.submitButton("Acknowledge & Submit");
cy.verifyNotification("Patient Discharged Successfully");
cy.closeNotification();
// Verify the consultation dashboard reflection
Expand All @@ -53,6 +54,7 @@ describe("Patient Discharge based on multiple reason", () => {
patientDischarge.typeDischargeNote(patientDeathCause);
patientDischarge.typeDoctorName(doctorName);
cy.submitButton("Confirm Discharge");
cy.submitButton("Acknowledge & Submit");
cy.verifyNotification("Patient Discharged Successfully");
cy.closeNotification();
// Verify the consultation dashboard reflection
Expand All @@ -77,6 +79,7 @@ describe("Patient Discharge based on multiple reason", () => {
patientDischarge.typeReferringFacility(referringFreetextFacility);
cy.wait(2000);
cy.submitButton("Confirm Discharge");
cy.submitButton("Acknowledge & Submit");
cy.wait(2000);
cy.verifyNotification("Patient Discharged Successfully");
cy.closeNotification();
Expand Down Expand Up @@ -108,6 +111,7 @@ describe("Patient Discharge based on multiple reason", () => {
cy.closeNotification();
// submit the discharge pop-up
cy.submitButton("Confirm Discharge");
cy.submitButton("Acknowledge & Submit");
cy.wait(2000);
cy.verifyNotification("Patient Discharged Successfully");
cy.closeNotification();
Expand Down
17 changes: 17 additions & 0 deletions src/Common/hooks/useConfirmedAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { useState } from "react";

export default function useConfirmedAction(action: () => Promise<void>) {
const [showConfirmation, setShowConfirmation] = useState(false);

return {
requestConfirmation: () => setShowConfirmation(true),
submit: action,

confirmationProps: {
onClose: () => setShowConfirmation(false),
show: showConfirmation,
onConfirm: action,
action: "Submit",
},
};
}
Loading
Loading