Merge branch 'develop' into qa-testing

cypress/e2e/facility_spec/facility_manage.cy.ts

@@ -13,11 +13,11 @@ describe("Facility Manage Functions", () => {
   const facilityUpdatedMiddleware = "updated.coronasafe.live";
   const facilityMiddlewareSuccessfullNotification =
     "Facility updated successfully";
-  const facilityHrfidUpdateButton = "Link Health Facility";
-  const facilityHrfidSuccessfullNotification =
-    "Health Facility config updated successfully";
-  const facilityHrfId = uuidv4();
-  const facilityUpdatedHrfId = uuidv4();
+  const facilityHfridUpdateButton = "Link Health Facility";
+  const facilityHfridToastNotificationText =
+    /Health Facility config updated successfully|Health ID registration failed/;
+  const facilityHfrId = "IN180000018";
+  const facilityUpdatedHfrId = uuidv4();
   const doctorCapacity = "5";
   const doctorModifiedCapacity = "7";
   const totalCapacity = "100";
@@ -80,28 +80,29 @@ describe("Facility Manage Functions", () => {
     facilityPage.clickManageFacilityDropdown();
     facilityManage.clickFacilityConfigureButton();
     // verify mandatory field error message
-    facilityManage.clickButtonWithText(facilityHrfidUpdateButton);
+    facilityManage.clearHfrId();
+    facilityManage.clickButtonWithText(facilityHfridUpdateButton);
     facilityManage.checkErrorMessageVisibility(
       "Health Facility Id is required"
     );
     // add facility health ID and verify notification
-    facilityManage.typeHrfId(facilityHrfId);
-    facilityManage.clickButtonWithText(facilityHrfidUpdateButton);
+    facilityManage.typeHfrId(facilityHfrId);
+    facilityManage.clickButtonWithText(facilityHfridUpdateButton);
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      facilityHrfidSuccessfullNotification
+      facilityHfridToastNotificationText
     );
     // update the existing middleware
     facilityPage.clickManageFacilityDropdown();
     facilityManage.clickFacilityConfigureButton();
-    facilityManage.typeHrfId(facilityUpdatedHrfId);
-    facilityManage.clickButtonWithText(facilityHrfidUpdateButton);
+    facilityManage.typeHfrId(facilityUpdatedHfrId);
+    facilityManage.clickButtonWithText(facilityHfridUpdateButton);
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      facilityHrfidSuccessfullNotification
+      facilityHfridToastNotificationText
     );
     // verify its reflection
     facilityPage.clickManageFacilityDropdown();
     facilityManage.clickFacilityConfigureButton();
-    facilityManage.verifyHrfIdValue(facilityUpdatedHrfId);
+    facilityManage.verifyHfrIdValue(facilityUpdatedHfrId);
   });
 
   it("Modify doctor capacity in Facility detail page", () => {

cypress/e2e/patient_spec/patient_consultation.cy.ts

@@ -0,0 +1,104 @@
+import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
+import LoginPage from "../../pageobject/Login/LoginPage";
+import { PatientPage } from "../../pageobject/Patient/PatientCreation";
+import { PatientConsultationPage } from "../../pageobject/Patient/PatientConsultation";
+import {
+  emergency_phone_number,
+  phone_number,
+} from "../../pageobject/constants";
+import FacilityPage from "../../pageobject/Facility/FacilityCreation";
+import PatientMedicalHistory from "../../pageobject/Patient/PatientMedicalHistory";
+
+describe("Patient Creation with consultation", () => {
+  const patientConsultationPage = new PatientConsultationPage();
+  const loginPage = new LoginPage();
+  const patientPage = new PatientPage();
+  const facilityPage = new FacilityPage();
+  const patientMedicalHistory = new PatientMedicalHistory();
+  const patientDateOfBirth = "01012001";
+  const patientOneName = "Patient With Consultation";
+  const patientOneGender = "Male";
+  const patientOneAddress = "Test Patient Address";
+  const patientOnePincode = "682001";
+  const patientOneState = "Kerala";
+  const patientOneDistrict = "Ernakulam";
+  const patientOneLocalbody = "Aluva";
+  const patientOneWard = "4";
+  const patientOneBloodGroup = "O+";
+
+  before(() => {
+    loginPage.loginAsDisctrictAdmin();
+    cy.saveLocalStorage();
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    cy.clearLocalStorage(/filters--.+/);
+    cy.awaitUrl("/patients");
+  });
+
+  it("Create a patient with consultation", () => {
+    patientPage.createPatient();
+    patientPage.selectFacility("Dummy Facility 40");
+    patientPage.patientformvisibility();
+    patientPage.typePatientPhoneNumber(phone_number);
+    patientPage.typePatientEmergencyNumber(emergency_phone_number);
+    patientPage.typePatientDateOfBirth(patientDateOfBirth);
+    patientPage.typePatientName(patientOneName);
+    patientPage.selectPatientGender(patientOneGender);
+    patientPage.typePatientAddress(patientOneAddress);
+    facilityPage.fillPincode(patientOnePincode);
+    facilityPage.selectStateOnPincode(patientOneState);
+    facilityPage.selectDistrictOnPincode(patientOneDistrict);
+    facilityPage.selectLocalBody(patientOneLocalbody);
+    facilityPage.selectWard(patientOneWard);
+    patientMedicalHistory.clickNoneMedicialHistory();
+    patientPage.selectPatientBloodGroup(patientOneBloodGroup);
+    patientPage.clickCreatePatient();
+    patientPage.verifyPatientIsCreated();
+    patientConsultationPage.fillIllnessHistory("history");
+    patientConsultationPage.selectConsultationStatus(
+      "Outpatient/Emergency Room"
+    );
+    patientConsultationPage.selectSymptoms("ASYMPTOMATIC");
+
+    patientConsultationPage.enterConsultationDetails(
+      "Stable",
+      "Examination details and Clinical conditions",
+      "70",
+      "170",
+      "IP007",
+      "generalnote",
+      "Dev Doctor"
+    );
+    patientConsultationPage.submitConsultation();
+
+    // Below code for the prescription module only present while creating a new consultation
+    patientConsultationPage.clickAddPrescription();
+    patientConsultationPage.interceptMediaBase();
+    patientConsultationPage.selectMedicinebox();
+    patientConsultationPage.waitForMediabaseStatusCode();
+    patientConsultationPage.prescribefirstMedicine();
+    patientConsultationPage.enterDosage("3");
+    patientConsultationPage.selectDosageFrequency("Twice daily");
+    patientConsultationPage.submitPrescriptionAndReturn();
+    patientConsultationPage.verifyConsultationPatientName(patientOneName);
+  });
+
+  it("Edit created consultation to existing patient", () => {
+    // temporary fixing, whole file will be refactored soon
+    cy.get("[data-cy='patient']").first().click();
+    patientConsultationPage.clickEditConsultationButton();
+    patientConsultationPage.fillIllnessHistory("editted");
+    patientConsultationPage.updateSymptoms("FEVER");
+    patientConsultationPage.setSymptomsDate("01082023");
+    patientConsultationPage.updateConsultation();
+    patientConsultationPage.verifySuccessNotification(
+      "Consultation updated successfully"
+    );
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+});