Merge Develop to Staging v24.36.0

cypress.config.ts

@@ -33,6 +33,6 @@ export default defineConfig({
     excludeSpecPattern: "**/*roles.cy.ts",
   },
   env: {
-    API_URL: process.env.REACT_CARE_API_URL,
+    API_URL: process.env.REACT_CARE_API_URL ?? "http://localhost:9000",
   },
 });

cypress/e2e/assets_spec/asset_homepage.cy.ts

@@ -1,6 +1,3 @@
-/// <reference types="cypress" />
-
-import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
 import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
 import { AssetQRScanPage } from "../../pageobject/Asset/AssetQRScan";
 import { AssetPagination } from "../../pageobject/Asset/AssetPagination";
@@ -65,7 +62,7 @@ describe("Asset Tab", () => {
       "Dummy Facility 40",
       "ACTIVE",
       "ONVIF Camera",
-      "Camera Loc"
+      "Camera Loc",
     );
     assetFilters.clickadvancefilter();
     assetFilters.clickslideoverbackbutton(); // to verify the back button doesn't clear applied filters

cypress/e2e/assets_spec/assets_creation.cy.ts

@@ -1,5 +1,3 @@
-/// <reference types="cypress" />
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import { AssetPage } from "../../pageobject/Asset/AssetCreation";
 import { v4 as uuidv4 } from "uuid";
 import LoginPage from "../../pageobject/Login/LoginPage";

cypress/e2e/assets_spec/assets_manage.cy.ts

@@ -1,4 +1,3 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import { AssetPage } from "../../pageobject/Asset/AssetCreation";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";

cypress/e2e/auth_spec/auth.cy.ts

@@ -1,7 +1,3 @@
-/// <reference types="cypress" />
-
-import { cy, describe, beforeEach, it } from "local-cypress";
-
 describe("Authorisation/Authentication", () => {
   beforeEach(() => {
     cy.awaitUrl("/", true);

cypress/e2e/auth_spec/forget_password.cy.ts

@@ -1,5 +1,3 @@
-import { cy, describe, beforeEach, it } from "local-cypress";
-
 describe("Forgot Password", () => {
   beforeEach(() => {
     cy.awaitUrl("/", true);

cypress/e2e/auth_spec/redirect.cy.ts

@@ -1,4 +1,3 @@
-import { cy, describe, it, beforeEach, Cypress } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 
 describe("redirect", () => {

cypress/e2e/auth_spec/roles.cy.ts

@@ -1,4 +1,3 @@
-import { afterEach, cy, describe, it } from "local-cypress";
 import * as users from "../../fixtures/users.json";
 
 describe("authentication", () => {

cypress/e2e/external_results_spec/external_result.cy.ts

@@ -1,13 +1,3 @@
-import {
-  cy,
-  describe,
-  it,
-  before,
-  beforeEach,
-  afterEach,
-  expect,
-} from "local-cypress";
-
 describe("Edit Profile Testing", () => {
   before(() => {
     cy.loginByApi("devdistrictadmin", "Coronasafe@123");
@@ -52,7 +42,7 @@ describe("Edit Profile Testing", () => {
   });
 
   it("export", () => {
-    cy.intercept("**", (req: Cypress.Request) => {
+    cy.intercept("**", (req) => {
       const url = new URL(req.url);
       const params = new URLSearchParams(url.search);
       if (

cypress/e2e/external_results_spec/filter.cy.ts

@@ -1,5 +1,3 @@
-import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
-
 describe("External Results Filters", () => {
   before(() => {
     cy.loginByApi("devdistrictadmin", "Coronasafe@123");

cypress/e2e/facility_spec/facility_creation.cy.ts

@@ -1,13 +1,3 @@
-// FacilityCreation
-import {
-  cy,
-  describe,
-  before,
-  beforeEach,
-  it,
-  afterEach,
-  expect,
-} from "local-cypress";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import FacilityHome from "../../pageobject/Facility/FacilityHome";

cypress/e2e/facility_spec/facility_homepage.cy.ts

@@ -1,5 +1,5 @@
 // FacilityCreation
-import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
+
 import LoginPage from "../../pageobject/Login/LoginPage";
 import FacilityHome from "../../pageobject/Facility/FacilityHome";
 import ManageUserPage from "../../pageobject/Users/ManageUserPage";

cypress/e2e/facility_spec/facility_manage.cy.ts

@@ -1,4 +1,3 @@
-import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import FacilityManage from "../../pageobject/Facility/FacilityManage";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";

cypress/e2e/facility_spec/inventory.cy.ts

@@ -1,4 +1,3 @@
-import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import FacilityHome from "../../pageobject/Facility/FacilityHome";

cypress/e2e/facility_spec/locations.cy.ts

@@ -1,4 +1,3 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import { AssetPage } from "../../pageobject/Asset/AssetCreation";
 import { UserCreationPage } from "../../pageobject/Users/UserCreation";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
@@ -92,7 +91,7 @@ describe("Location Management Section", () => {
     facilityLocation.selectBedType(bedType);
     assetPage.clickassetupdatebutton();
     facilityLocation.verifyNotification(
-      "Name - Bed with same name already exists in location"
+      "Name - Bed with same name already exists in location",
     );
     facilityHome.verifyAndCloseNotifyModal();
     // edit the created bed
@@ -185,7 +184,7 @@ describe("Location Management Section", () => {
     facilityLocation.deleteLocation("Test Location");
     assetPage.clickassetupdatebutton();
     facilityLocation.verifyNotification(
-      "Location Test Location deleted successfully"
+      "Location Test Location deleted successfully",
     );
     facilityLocation.closeNotification();
   });
@@ -204,7 +203,7 @@ describe("Location Management Section", () => {
     facilityLocation.deleteLocation("Test Location with Beds");
     assetPage.clickassetupdatebutton();
     facilityLocation.verifyNotification(
-      "Cannot delete a Location with associated Beds"
+      "Cannot delete a Location with associated Beds",
     );
     facilityLocation.closeNotification();
 
@@ -219,7 +218,7 @@ describe("Location Management Section", () => {
     facilityLocation.deleteLocation("Test Location with Beds");
     assetPage.clickassetupdatebutton();
     facilityLocation.verifyNotification(
-      "Location Test Location with Beds deleted successfully"
+      "Location Test Location with Beds deleted successfully",
     );
     facilityLocation.closeNotification();
   });
@@ -249,14 +248,14 @@ describe("Location Management Section", () => {
       "Vendor's Name",
       serialNumber,
       "25122021",
-      "Test note for asset creation!"
+      "Test note for asset creation!",
     );
     assetPage.clickassetupdatebutton();
     facilityLocation.loadLocationManagementPage("Dummy Shifting Center");
     facilityLocation.deleteLocation("Test Location with linked Assets");
     assetPage.clickassetupdatebutton();
     facilityLocation.verifyNotification(
-      "Cannot delete a Location with associated Assets"
+      "Cannot delete a Location with associated Assets",
     );
     facilityLocation.closeNotification();
 
@@ -271,7 +270,7 @@ describe("Location Management Section", () => {
     facilityLocation.deleteLocation("Test Location with linked Assets");
     assetPage.clickassetupdatebutton();
     facilityLocation.verifyNotification(
-      "Location Test Location with linked Assets deleted successfully"
+      "Location Test Location with linked Assets deleted successfully",
     );
     facilityLocation.closeNotification();
   });

cypress/e2e/patient_spec/patient_consultation.cy.ts

@@ -1,4 +1,3 @@
-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";

cypress/e2e/patient_spec/patient_discharge.cy.ts

@@ -1,4 +1,3 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 import PatientDischarge from "../../pageobject/Patient/PatientDischarge";

cypress/e2e/patient_spec/patient_fileupload.cy.ts

@@ -1,4 +1,3 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 import { PatientFileUpload } from "../../pageobject/Patient/PatientFileupload";

cypress/e2e/patient_spec/patient_logupdate.cy.ts

@@ -1,14 +1,17 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientConsultationPage } from "../../pageobject/Patient/PatientConsultation";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 import PatientLogupdate from "../../pageobject/Patient/PatientLogupdate";
+import PatientInvestigation from "../../pageobject/Patient/PatientInvestigation";
+import PatientPrescription from "../../pageobject/Patient/PatientPrescription";
 
 describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
   const loginPage = new LoginPage();
   const patientConsultationPage = new PatientConsultationPage();
   const patientPage = new PatientPage();
   const patientLogupdate = new PatientLogupdate();
+  const patientInvestigation = new PatientInvestigation();
+  const patientPrescription = new PatientPrescription();
   const domicilaryPatient = "Dummy Patient 11";
   const patientCategory = "Moderate";
   const additionalSymptoms = "Fever";
@@ -36,7 +39,72 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     cy.awaitUrl("/patients");
   });
 
-  it("Create a new log teleicu update for a domicilary care patient and verify the copy previous value function", () => {
+  it("Create a new Progress log update for a admitted patient and edit it", () => {
+    patientPage.visitPatient("Dummy Patient 12");
+    patientLogupdate.clickLogupdate();
+    cy.verifyNotification("Please assign a bed to the patient");
+    patientLogupdate.selectBed("Dummy Bed 4");
+    cy.closeNotification();
+    patientLogupdate.clickLogupdate();
+    // Only will be using random non-unique progress note fields
+    patientLogupdate.selectPatientCategory(patientCategory);
+    patientLogupdate.selectRoundType("Progress Note");
+    patientLogupdate.selectSymptomsDate("01012024");
+    patientLogupdate.typeAndMultiSelectSymptoms("fe", ["Fever"]);
+    patientLogupdate.typeTemperature(patientTemperature);
+    // add diagnosis
+    patientConsultationPage.selectPatientDiagnosis(
+      "1A06",
+      "add-icd11-diagnosis-as-differential",
+    );
+    // add a investigation for the patient
+    patientInvestigation.clickAddInvestigation();
+    patientInvestigation.selectInvestigation("Vitals (GROUP)");
+    patientInvestigation.clickInvestigationCheckbox();
+    patientInvestigation.selectInvestigationFrequency("6");
+    // add a medicine for the patient
+    patientPrescription.clickAddPrescription();
+    patientPrescription.interceptMedibase();
+    patientPrescription.selectMedicinebox();
+    patientPrescription.selectMedicine("DOLO");
+    patientPrescription.enterDosage("4");
+    patientPrescription.selectDosageFrequency("Twice daily");
+    cy.submitButton("Submit");
+    cy.verifyNotification("Medicine prescribed");
+    cy.closeNotification();
+    // Submit the doctors log update
+    cy.submitButton("Save and Continue");
+    cy.verifyNotification("Progress Note log created successfully");
+    cy.closeNotification();
+    // modify the relevant critical care log update
+    cy.contains("button", "Neurological Monitoring").click();
+    cy.get("#consciousness_level-option-RESPONDS_TO_PAIN").click();
+    cy.get("#left_pupil_light_reaction-option-FIXED").click();
+    cy.submitButton("Update Details");
+    cy.verifyNotification(
+      "Neurological Monitoring details succesfully updated.",
+    );
+    cy.closeNotification();
+    // Final Submission of the form
+    cy.submitButton("Complete");
+    cy.verifyNotification("Progress Note Log Update filed successfully");
+    cy.closeNotification();
+    // Verify the data reflection
+    cy.contains("button", "Daily Rounds").click();
+    patientLogupdate.clickLogupdateCard("#dailyround-entry", patientCategory);
+    cy.verifyContentPresence("#consultation-preview", [
+      patientCategory,
+      patientTemperature,
+    ]);
+    // verify the edit functionality
+    patientLogupdate.clickUpdateDetail();
+    patientLogupdate.typeSystolic(patientModifiedSystolic);
+    patientLogupdate.typeDiastolic(patientModifiedDiastolic);
+    cy.submitButton("Continue");
+    cy.verifyNotification("Progress Note log updated successfully");
+  });
+
+  it("Create a new TeleIcu log update for a domicilary care patient", () => {
     patientPage.visitPatient("Dummy Patient 11");
     patientConsultationPage.clickEditConsultationButton();
     patientConsultationPage.selectPatientSuggestion("Domiciliary Care");
@@ -63,7 +131,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     cy.verifyNotification("Telemedicine log created successfully");
   });
 
-  it("Create a new log normal update for a domicilary care patient and edit it", () => {
+  it("Create a new Normal Log update for a domicilary care patient and edit it", () => {
     patientPage.visitPatient(domicilaryPatient);
     patientConsultationPage.clickEditConsultationButton();
     patientConsultationPage.selectPatientSuggestion("Domiciliary Care");
@@ -118,7 +186,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     ]);
   });
 
-  it("Create a new log normal update for a admission patient and verify its reflection in cards", () => {
+  it("Create a new Normal update for a admission patient and verify its reflection in cards", () => {
     patientPage.visitPatient("Dummy Patient 13");
     patientLogupdate.clickLogupdate();
     cy.verifyNotification("Please assign a bed to the patient");
@@ -148,7 +216,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     cy.verifyContentPresence("#encounter-symptoms", [additionalSymptoms]);
   });
 
-  it("Create a normal log update to verify MEWS Score Functionality", () => {
+  it("Create a Normal Log update to verify MEWS Score Functionality", () => {
     patientPage.visitPatient(domicilaryPatient);
     patientConsultationPage.clickEditConsultationButton();
     patientConsultationPage.selectPatientSuggestion("Domiciliary Care");

cypress/e2e/patient_spec/patient_manage.cy.ts

@@ -1,4 +1,3 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientConsultationPage } from "../../pageobject/Patient/PatientConsultation";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";

cypress/e2e/patient_spec/patient_prescription.cy.ts

@@ -1,4 +1,3 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import PatientPrescription from "../../pageobject/Patient/PatientPrescription";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";

cypress/e2e/patient_spec/patient_registration.cy.ts

@@ -1,4 +1,3 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";

cypress/e2e/resource_spec/filter.cy.ts

@@ -1,5 +1,3 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
-
 describe("Resource filter", () => {
   before(() => {
     cy.loginByApi("devdistrictadmin", "Coronasafe@123");

cypress/e2e/resource_spec/resources.cy.ts

@@ -1,4 +1,3 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import ResourcePage from "../../pageobject/Resource/ResourcePage";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";

cypress/e2e/sample_test_spec/filter.cy.ts

@@ -1,5 +1,3 @@
-import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
-
 describe("Sample Filter", () => {
   before(() => {
     cy.loginByApi("devdistrictadmin", "Coronasafe@123");

cypress/e2e/sample_test_spec/sample_test.cy.ts

@@ -1,5 +1,3 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
-
 describe("Sample List", () => {
   before(() => {
     cy.loginByApi("devdistrictadmin", "Coronasafe@123");

cypress/e2e/shifting_spec/filter.cy.ts

@@ -1,4 +1,3 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import ShiftingPage from "../../pageobject/Shift/ShiftFilters";
 
 describe("Shifting section filter", () => {

cypress/e2e/shifting_spec/shifting.cy.ts

@@ -1,5 +1,3 @@
-import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
-
 describe("Shifting Page", () => {
   before(() => {
     cy.loginByApi("devdistrictadmin", "Coronasafe@123");

cypress/e2e/users_spec/user_creation.cy.ts

@@ -1,4 +1,3 @@
-import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";

cypress/e2e/users_spec/user_homepage.cy.ts

@@ -1,6 +1,3 @@
-/// <reference types="cypress" />
-
-import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { UserPage } from "../../pageobject/Users/UserSearch";
 

cypress/e2e/users_spec/user_manage.cy.ts

@@ -1,4 +1,3 @@
-import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { UserPage } from "../../pageobject/Users/UserSearch";
 import ManageUserPage from "../../pageobject/Users/ManageUserPage";

cypress/e2e/users_spec/user_profile.cy.ts

@@ -1,4 +1,3 @@
-import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import UserProfilePage from "../../pageobject/Users/UserProfilePage";
 import ManageUserPage from "../../pageobject/Users/ManageUserPage";

cypress/pageobject/Asset/AssetCreation.ts

@@ -1,5 +1,4 @@
 // assetPage.ts
-import { cy, expect } from "local-cypress";
 
 export class AssetPage {
   createAsset() {