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

[FIXED] Modified Notification related to Patient Log update successfully #7645

Merged
merged 16 commits into from
May 7, 2024
+17 −10
Merged

[FIXED] Modified Notification related to Patient Log update successfully #7645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bd298cb
Modified Notification related to Patient Log update successfully
r-nikhilkumar Apr 17, 2024
c57fd95
change request done
r-nikhilkumar Apr 24, 2024
a8a065d
done
r-nikhilkumar Apr 24, 2024
8c79742
Merge branch 'develop' into Fixes#7619_Modify_Notification_related_to…
r-nikhilkumar Apr 24, 2024
2759ef4
Merge branch 'develop' into Fixes#7619_Modify_Notification_related_to…
r-nikhilkumar Apr 25, 2024
b6669b6
cypress_update
r-nikhilkumar Apr 25, 2024
a067fe8
done
r-nikhilkumar Apr 25, 2024
e556fb2
cyp_test_try1
r-nikhilkumar Apr 26, 2024
5d32b0f
just minor changes
r-nikhilkumar Apr 26, 2024
c1c8b84
change request | test failed done
r-nikhilkumar Apr 30, 2024
689fe32
Merge branch 'develop' into Fixes#7619_Modify_Notification_related_to…
r-nikhilkumar Apr 30, 2024
5364c7b
Merge branch 'develop' into Fixes#7619_Modify_Notification_related_to…
nihal467 May 7, 2024
cd26437
fix the flaky test
nihal467 May 7, 2024
dcdcac8
fix the flaky test
nihal467 May 7, 2024
f9ea095
fix the flaky test
nihal467 May 7, 2024
d81a97f
fix the flaky test
nihal467 May 7, 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
17 changes: 10 additions & 7 deletions cypress/e2e/patient_spec/patient_logupdate.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
cy.closeNotification();
patientLogupdate.clickLogupdate();
patientLogupdate.typePhysicalExamination(physicalExamination);
patientLogupdate.selectRoundType("Telemedicine");
patientLogupdate.typeOtherDetails(otherExamination);
patientLogupdate.typeAdditionalSymptoms(additionalSymptoms);
patientLogupdate.selectPatientCategory(patientCategory);
Expand All @@ -58,7 +59,9 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
patientLogupdate.typeRhythm(patientRhythm);
cy.get("#consciousness_level-2").click();
cy.submitButton("Save");
cy.verifyNotification("Consultation Updates details created successfully");
cy.verifyNotification(
"Telemedicine Log Updates details created successfully",
);
// verify the copied previous value
cy.closeNotification();
patientLogupdate.clickLogupdate();
Expand All @@ -71,7 +74,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
]);
cy.verifyContentPresence("#rhythm_detail", [patientRhythm]);
cy.submitButton("Continue");
cy.verifyNotification("Consultation Updates details updated successfully");
cy.verifyNotification("Normal Log Updates details updated successfully");
});

it("Create a new log normal update for a domicilary care patient and edit it", () => {
Expand All @@ -96,7 +99,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
patientLogupdate.typeRhythm(patientRhythm);
cy.get("#consciousness_level-2").click();
cy.submitButton("Save");
cy.verifyNotification("Consultation Updates details created successfully");
cy.verifyNotification("Normal Log Updates details created successfully");
cy.closeNotification();
// edit the card and verify the data.
patientLogupdate.clickLogupdateCard("#dailyround-entry", patientCategory);
Expand All @@ -118,7 +121,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
patientLogupdate.clickClearButtonInElement("#diastolic");
patientLogupdate.typeDiastolic(patientModifiedDiastolic);
cy.submitButton("Continue");
cy.verifyNotification("Consultation Updates details updated successfully");
cy.verifyNotification("Normal Log Updates details updated successfully");
patientLogupdate.clickLogupdateCard("#dailyround-entry", patientCategory);
cy.verifyContentPresence("#consultation-preview", [
patientModifiedDiastolic,
Expand Down Expand Up @@ -148,7 +151,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
cy.get("#consciousness_level-2").click();
cy.submitButton("Save");
cy.wait(2000);
cy.verifyNotification("Consultation Updates details created successfully");
cy.verifyNotification("Normal Log Updates details created successfully");
// Verify the card content
cy.get("#basic-information").scrollIntoView();
cy.verifyContentPresence("#basic-information", [additionalSymptoms]);
Expand All @@ -171,7 +174,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
patientLogupdate.typeRespiratory(patientRespiratory);
cy.get("#consciousness_level-2").click();
cy.submitButton("Save");
cy.verifyNotification("Consultation Updates details created successfully");
cy.verifyNotification("Normal Log Updates details created successfully");
cy.closeNotification();
cy.verifyContentPresence("#consultation-buttons", ["9"]);
// Verify the Incomplete data will give blank info
Expand All @@ -181,7 +184,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
patientLogupdate.typeDiastolic(patientDiastolic);
patientLogupdate.typePulse(patientPulse);
cy.submitButton("Save");
cy.verifyNotification("Consultation Updates details created successfully");
cy.verifyNotification("Normal Log Updates details created successfully");
cy.closeNotification();
cy.verifyContentPresence("#consultation-buttons", ["-"]);
});
Expand Down
4 changes: 4 additions & 0 deletions cypress/pageobject/Patient/PatientLogupdate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ class PatientLogupdate {
cy.wait(2000);
}

selectRoundType(roundType: string) {
cy.clickAndSelectOption("#rounds_type", roundType);
}

selectBed(bed: string) {
cy.searchAndSelectOption("input[name='bed']", bed);
cy.submitButton("Move to bed");
Expand Down
6 changes: 3 additions & 3 deletions src/Components/Patient/DailyRounds.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import useAppHistory from "../../Common/hooks/useAppHistory";
import { DraftSection, useAutoSaveReducer } from "../../Utils/AutoSave";
import * as Notification from "../../Utils/Notifications";
import { formatDateTime } from "../../Utils/utils";
import { capitalize } from "lodash-es";
import BloodPressureFormField, {
BloodPressureValidator,
} from "../Common/BloodPressureFormField";
Expand Down Expand Up @@ -296,7 +297,7 @@ export const DailyRounds = (props: any) => {
if (obj) {
dispatch({ type: "set_form", form: initForm });
Notification.Success({
msg: "Consultation Updates details updated successfully",
msg: `${obj.rounds_type === "VENTILATOR" ? "Critical Care" : capitalize(obj.rounds_type)} Log Updates details updated successfully`,
});
if (["NORMAL", "TELEMEDICINE"].includes(state.form.rounds_type)) {
navigate(
Expand All @@ -316,9 +317,8 @@ export const DailyRounds = (props: any) => {
setIsLoading(false);
if (obj) {
dispatch({ type: "set_form", form: initForm });

Notification.Success({
msg: "Consultation Updates details created successfully",
msg: `${obj.rounds_type === "VENTILATOR" ? "Critical Care" : capitalize(obj.rounds_type)} Log Updates details created successfully`,
});
if (["NORMAL", "TELEMEDICINE"].includes(state.form.rounds_type)) {
if (data.clone_last) {
Expand Down
Loading