diff --git a/cypress.config.ts b/cypress.config.ts index 7a4c86157da..f7302869051 100644 --- a/cypress.config.ts +++ b/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", }, }); diff --git a/cypress/e2e/assets_spec/asset_homepage.cy.ts b/cypress/e2e/assets_spec/asset_homepage.cy.ts index 5710df08e83..0f6bfe4da2c 100644 --- a/cypress/e2e/assets_spec/asset_homepage.cy.ts +++ b/cypress/e2e/assets_spec/asset_homepage.cy.ts @@ -1,6 +1,3 @@ -/// - -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 diff --git a/cypress/e2e/assets_spec/assets_creation.cy.ts b/cypress/e2e/assets_spec/assets_creation.cy.ts index 8602ab8eb5b..1bcd984a7a3 100644 --- a/cypress/e2e/assets_spec/assets_creation.cy.ts +++ b/cypress/e2e/assets_spec/assets_creation.cy.ts @@ -1,5 +1,3 @@ -/// -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"; diff --git a/cypress/e2e/assets_spec/assets_manage.cy.ts b/cypress/e2e/assets_spec/assets_manage.cy.ts index 3a47ebec8df..983a82be07b 100644 --- a/cypress/e2e/assets_spec/assets_manage.cy.ts +++ b/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"; diff --git a/cypress/e2e/auth_spec/auth.cy.ts b/cypress/e2e/auth_spec/auth.cy.ts index d03ea34e671..61708bc029a 100644 --- a/cypress/e2e/auth_spec/auth.cy.ts +++ b/cypress/e2e/auth_spec/auth.cy.ts @@ -1,7 +1,3 @@ -/// - -import { cy, describe, beforeEach, it } from "local-cypress"; - describe("Authorisation/Authentication", () => { beforeEach(() => { cy.awaitUrl("/", true); diff --git a/cypress/e2e/auth_spec/forget_password.cy.ts b/cypress/e2e/auth_spec/forget_password.cy.ts index 86b1d761821..c1b1db7ecad 100644 --- a/cypress/e2e/auth_spec/forget_password.cy.ts +++ b/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); diff --git a/cypress/e2e/auth_spec/redirect.cy.ts b/cypress/e2e/auth_spec/redirect.cy.ts index 671a896a94f..3822a67b194 100644 --- a/cypress/e2e/auth_spec/redirect.cy.ts +++ b/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", () => { diff --git a/cypress/e2e/auth_spec/roles.cy.ts b/cypress/e2e/auth_spec/roles.cy.ts index dcf13fb2b30..07fe3c3d1fb 100644 --- a/cypress/e2e/auth_spec/roles.cy.ts +++ b/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", () => { diff --git a/cypress/e2e/external_results_spec/external_result.cy.ts b/cypress/e2e/external_results_spec/external_result.cy.ts index 2091a5f93be..d0d78e5f5f6 100644 --- a/cypress/e2e/external_results_spec/external_result.cy.ts +++ b/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 ( diff --git a/cypress/e2e/external_results_spec/filter.cy.ts b/cypress/e2e/external_results_spec/filter.cy.ts index 5a0a8eccab9..45c050cad8c 100644 --- a/cypress/e2e/external_results_spec/filter.cy.ts +++ b/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"); diff --git a/cypress/e2e/facility_spec/facility_creation.cy.ts b/cypress/e2e/facility_spec/facility_creation.cy.ts index ef309af2c24..57735a9dcde 100644 --- a/cypress/e2e/facility_spec/facility_creation.cy.ts +++ b/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"; diff --git a/cypress/e2e/facility_spec/facility_homepage.cy.ts b/cypress/e2e/facility_spec/facility_homepage.cy.ts index 1832fa973b7..11b3ec6f37f 100644 --- a/cypress/e2e/facility_spec/facility_homepage.cy.ts +++ b/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"; diff --git a/cypress/e2e/facility_spec/facility_manage.cy.ts b/cypress/e2e/facility_spec/facility_manage.cy.ts index d317b222078..868a26de022 100644 --- a/cypress/e2e/facility_spec/facility_manage.cy.ts +++ b/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"; diff --git a/cypress/e2e/facility_spec/inventory.cy.ts b/cypress/e2e/facility_spec/inventory.cy.ts index b365fb3b02d..78e7af88cea 100644 --- a/cypress/e2e/facility_spec/inventory.cy.ts +++ b/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"; diff --git a/cypress/e2e/facility_spec/locations.cy.ts b/cypress/e2e/facility_spec/locations.cy.ts index bad772ac410..113a5e3eaab 100644 --- a/cypress/e2e/facility_spec/locations.cy.ts +++ b/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(); }); diff --git a/cypress/e2e/patient_spec/patient_consultation.cy.ts b/cypress/e2e/patient_spec/patient_consultation.cy.ts index cf84b0db0d8..a27d560e1a0 100644 --- a/cypress/e2e/patient_spec/patient_consultation.cy.ts +++ b/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"; diff --git a/cypress/e2e/patient_spec/patient_discharge.cy.ts b/cypress/e2e/patient_spec/patient_discharge.cy.ts index 242c936730d..be9b06303cb 100644 --- a/cypress/e2e/patient_spec/patient_discharge.cy.ts +++ b/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"; diff --git a/cypress/e2e/patient_spec/patient_fileupload.cy.ts b/cypress/e2e/patient_spec/patient_fileupload.cy.ts index 3d5bb37ce58..9d6852d16e7 100644 --- a/cypress/e2e/patient_spec/patient_fileupload.cy.ts +++ b/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"; diff --git a/cypress/e2e/patient_spec/patient_logupdate.cy.ts b/cypress/e2e/patient_spec/patient_logupdate.cy.ts index 26894bd0815..13e69e33211 100644 --- a/cypress/e2e/patient_spec/patient_logupdate.cy.ts +++ b/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"); diff --git a/cypress/e2e/patient_spec/patient_manage.cy.ts b/cypress/e2e/patient_spec/patient_manage.cy.ts index 313877ac565..22d77aa2fda 100644 --- a/cypress/e2e/patient_spec/patient_manage.cy.ts +++ b/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"; diff --git a/cypress/e2e/patient_spec/patient_prescription.cy.ts b/cypress/e2e/patient_spec/patient_prescription.cy.ts index 4a27ce14cb2..a150bfa6e31 100644 --- a/cypress/e2e/patient_spec/patient_prescription.cy.ts +++ b/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"; diff --git a/cypress/e2e/patient_spec/patient_registration.cy.ts b/cypress/e2e/patient_spec/patient_registration.cy.ts index f94dbbe46cd..2e7ce853fc5 100644 --- a/cypress/e2e/patient_spec/patient_registration.cy.ts +++ b/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"; diff --git a/cypress/e2e/resource_spec/filter.cy.ts b/cypress/e2e/resource_spec/filter.cy.ts index d9f5f50c16f..aafc03680ee 100644 --- a/cypress/e2e/resource_spec/filter.cy.ts +++ b/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"); diff --git a/cypress/e2e/resource_spec/resources.cy.ts b/cypress/e2e/resource_spec/resources.cy.ts index f0c2b8698f9..2b4e75e1883 100644 --- a/cypress/e2e/resource_spec/resources.cy.ts +++ b/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"; diff --git a/cypress/e2e/sample_test_spec/filter.cy.ts b/cypress/e2e/sample_test_spec/filter.cy.ts index df934c641bb..ad2e57b7433 100644 --- a/cypress/e2e/sample_test_spec/filter.cy.ts +++ b/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"); diff --git a/cypress/e2e/sample_test_spec/sample_test.cy.ts b/cypress/e2e/sample_test_spec/sample_test.cy.ts index 1a134fffdac..1af1cfc5cb4 100644 --- a/cypress/e2e/sample_test_spec/sample_test.cy.ts +++ b/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"); diff --git a/cypress/e2e/shifting_spec/filter.cy.ts b/cypress/e2e/shifting_spec/filter.cy.ts index 82fad9d99e4..bb536a1865c 100644 --- a/cypress/e2e/shifting_spec/filter.cy.ts +++ b/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", () => { diff --git a/cypress/e2e/shifting_spec/shifting.cy.ts b/cypress/e2e/shifting_spec/shifting.cy.ts index f33278cbec4..a0a637f97f1 100644 --- a/cypress/e2e/shifting_spec/shifting.cy.ts +++ b/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"); diff --git a/cypress/e2e/users_spec/user_creation.cy.ts b/cypress/e2e/users_spec/user_creation.cy.ts index 91efb3aee31..cc3a8250971 100644 --- a/cypress/e2e/users_spec/user_creation.cy.ts +++ b/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"; diff --git a/cypress/e2e/users_spec/user_homepage.cy.ts b/cypress/e2e/users_spec/user_homepage.cy.ts index 3ac07dd9d9c..b1ecd567d86 100644 --- a/cypress/e2e/users_spec/user_homepage.cy.ts +++ b/cypress/e2e/users_spec/user_homepage.cy.ts @@ -1,6 +1,3 @@ -/// - -import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress"; import LoginPage from "../../pageobject/Login/LoginPage"; import { UserPage } from "../../pageobject/Users/UserSearch"; diff --git a/cypress/e2e/users_spec/user_manage.cy.ts b/cypress/e2e/users_spec/user_manage.cy.ts index 0ff66fba27a..9c339f4b8e3 100644 --- a/cypress/e2e/users_spec/user_manage.cy.ts +++ b/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"; diff --git a/cypress/e2e/users_spec/user_profile.cy.ts b/cypress/e2e/users_spec/user_profile.cy.ts index 3cbc2e91404..2672cccad7e 100644 --- a/cypress/e2e/users_spec/user_profile.cy.ts +++ b/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"; diff --git a/cypress/pageobject/Asset/AssetCreation.ts b/cypress/pageobject/Asset/AssetCreation.ts index 331a4588c6f..2de13561a0b 100644 --- a/cypress/pageobject/Asset/AssetCreation.ts +++ b/cypress/pageobject/Asset/AssetCreation.ts @@ -1,5 +1,4 @@ // assetPage.ts -import { cy, expect } from "local-cypress"; export class AssetPage { createAsset() { diff --git a/cypress/pageobject/Facility/FacilityCreation.ts b/cypress/pageobject/Facility/FacilityCreation.ts index 328719f5e90..a1676e625dd 100644 --- a/cypress/pageobject/Facility/FacilityCreation.ts +++ b/cypress/pageobject/Facility/FacilityCreation.ts @@ -1,5 +1,4 @@ // FacilityPage.ts -import { cy } from "local-cypress"; class FacilityPage { visitCreateFacilityPage() { diff --git a/cypress/pageobject/Facility/FacilityHome.ts b/cypress/pageobject/Facility/FacilityHome.ts index fa163757584..b10368717a6 100644 --- a/cypress/pageobject/Facility/FacilityHome.ts +++ b/cypress/pageobject/Facility/FacilityHome.ts @@ -1,5 +1,3 @@ -// cypress/support/pageObjects/FacilityHome.ts - class FacilityHome { // Selectors exportButton = "#export-button"; diff --git a/cypress/pageobject/Login/LoginPage.ts b/cypress/pageobject/Login/LoginPage.ts index 94e52c33613..c75a024ae03 100644 --- a/cypress/pageobject/Login/LoginPage.ts +++ b/cypress/pageobject/Login/LoginPage.ts @@ -1,5 +1,4 @@ // LoginPage.ts -import { cy } from "local-cypress"; class LoginPage { loginAsDisctrictAdmin(): void { diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts index dc5d9e2b2bb..e4a9810141e 100644 --- a/cypress/pageobject/Patient/PatientConsultation.ts +++ b/cypress/pageobject/Patient/PatientConsultation.ts @@ -52,7 +52,7 @@ export class PatientConsultationPage { cy.searchAndSelectOption("#icd11-search", icdCode); cy.get("#diagnosis-list") .contains("Add as") - .focus() + .scrollIntoView() .click() .then(() => { cy.get(`#${statusId}`).click(); diff --git a/cypress/pageobject/Patient/PatientFileupload.ts b/cypress/pageobject/Patient/PatientFileupload.ts index 8d5fecace4f..3f353cb8807 100644 --- a/cypress/pageobject/Patient/PatientFileupload.ts +++ b/cypress/pageobject/Patient/PatientFileupload.ts @@ -1,5 +1,3 @@ -import { cy } from "local-cypress"; - export class PatientFileUpload { clickFileUploadIcon() { cy.get("#patient-details").click(); diff --git a/cypress/pageobject/Patient/PatientPrescription.ts b/cypress/pageobject/Patient/PatientPrescription.ts index 108fedbd676..403d361e55c 100644 --- a/cypress/pageobject/Patient/PatientPrescription.ts +++ b/cypress/pageobject/Patient/PatientPrescription.ts @@ -1,4 +1,3 @@ -import { cy } from "local-cypress"; export class PatientPrescription { clickAddPrescription() { cy.get("#add-prescription").scrollIntoView(); diff --git a/cypress/pageobject/Users/UserProfilePage.ts b/cypress/pageobject/Users/UserProfilePage.ts index 77b624606cc..c3de5035dc7 100644 --- a/cypress/pageobject/Users/UserProfilePage.ts +++ b/cypress/pageobject/Users/UserProfilePage.ts @@ -1,5 +1,3 @@ -import { cy } from "local-cypress"; - export default class UserProfilePage { assertVideoConnectLink(link: string) { cy.get("#videoconnectlink-profile-details").should("contain.text", link); diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index 776e3409511..c6437505349 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -1,7 +1,5 @@ import "cypress-localstorage-commands"; -import { Cypress, cy } from "local-cypress"; - const apiUrl = Cypress.env("API_URL"); Cypress.Commands.add("login", (username: string, password: string) => { diff --git a/cypress/support/index.ts b/cypress/support/index.ts index c9af6a02c96..9ddfd0c819a 100644 --- a/cypress/support/index.ts +++ b/cypress/support/index.ts @@ -1,4 +1,3 @@ -/// import "./commands"; declare global { diff --git a/package-lock.json b/package-lock.json index b3eeb9e919f..b9b0c4d0583 100644 --- a/package-lock.json +++ b/package-lock.json @@ -67,7 +67,7 @@ "@typescript-eslint/eslint-plugin": "^7.18.0", "@vitejs/plugin-react-swc": "^3.6.0", "autoprefixer": "^10.4.19", - "cypress": "^13.13.1", + "cypress": "^13.14.1", "cypress-localstorage-commands": "^2.2.5", "cypress-split": "^1.23.2", "eslint-config-prettier": "^9.1.0", @@ -6590,13 +6590,13 @@ "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "node_modules/cypress": { - "version": "13.13.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.13.1.tgz", - "integrity": "sha512-8F9UjL5MDUdgC/S5hr8CGLHbS5gGht5UOV184qc2pFny43fnkoaKxlzH/U6//zmGu/xRTaKimNfjknLT8+UDFg==", + "version": "13.14.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.14.1.tgz", + "integrity": "sha512-Wo+byPmjps66hACEH5udhXINEiN3qS3jWNGRzJOjrRJF3D0+YrcP2LVB1T7oYaVQM/S+eanqEvBWYc8cf7Vcbg==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "^3.0.0", + "@cypress/request": "^3.0.1", "@cypress/xvfb": "^1.2.4", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", diff --git a/package.json b/package.json index d57aee0fda4..0b3d1547ee0 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "@typescript-eslint/eslint-plugin": "^7.18.0", "@vitejs/plugin-react-swc": "^3.6.0", "autoprefixer": "^10.4.19", - "cypress": "^13.13.1", + "cypress": "^13.14.1", "cypress-localstorage-commands": "^2.2.5", "cypress-split": "^1.23.2", "eslint-config-prettier": "^9.1.0", diff --git a/src/Components/Facility/DischargedPatientsList.tsx b/src/Components/Facility/DischargedPatientsList.tsx index ca375fa505b..5a7d706ee87 100644 --- a/src/Components/Facility/DischargedPatientsList.tsx +++ b/src/Components/Facility/DischargedPatientsList.tsx @@ -402,10 +402,6 @@ const DischargedPatientsList = ({ badge("Declared Status", "is_declared_positive"), ...dateRange("Result", "date_of_result"), ...dateRange("Declared positive", "date_declared_positive"), - ...dateRange( - "Symptoms onset", - "last_consultation_symptoms_onset_date", - ), ...dateRange("Last vaccinated", "last_vaccinated_date"), { name: "Telemedicine", diff --git a/src/Components/Facility/LocationManagement.tsx b/src/Components/Facility/LocationManagement.tsx index abf4a056695..83bf335aff2 100644 --- a/src/Components/Facility/LocationManagement.tsx +++ b/src/Components/Facility/LocationManagement.tsx @@ -87,7 +87,7 @@ export default function LocationManagement({ facilityId }: Props) { id="add-new-location" href={`/facility/${facilityId}/location/add`} authorizeFor={NonReadOnlyUsers} - className="mr-8 hidden lg:block" + className="mr-4 hidden lg:block" > Add New Location diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx index 81177925f08..0f0c7396f5e 100644 --- a/src/Components/Patient/DailyRounds.tsx +++ b/src/Components/Patient/DailyRounds.tsx @@ -781,11 +781,10 @@ export const DailyRounds = (props: any) => { {state.form.rounds_type === "DOCTORS_LOG" && ( <>
-
+

{t("diagnosis")}

- {/* */} {diagnoses ? ( {
)}
-
+

{t("investigations")}

diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx index ab570dd57b6..944a5163c96 100644 --- a/src/Components/Patient/ManagePatients.tsx +++ b/src/Components/Patient/ManagePatients.tsx @@ -206,10 +206,6 @@ export const PatientManager = () => { covin_id: qParams.covin_id || undefined, is_kasp: qParams.is_kasp || undefined, is_declared_positive: qParams.is_declared_positive || undefined, - last_consultation_symptoms_onset_date_before: - qParams.last_consultation_symptoms_onset_date_before || undefined, - last_consultation_symptoms_onset_date_after: - qParams.last_consultation_symptoms_onset_date_after || undefined, last_vaccinated_date_before: qParams.last_vaccinated_date_before || undefined, last_vaccinated_date_after: qParams.last_vaccinated_date_after || undefined, @@ -262,10 +258,6 @@ export const PatientManager = () => { params.last_consultation_discharge_date_before, params.last_consultation_discharge_date_after, ], - [ - params.last_consultation_symptoms_onset_date_before, - params.last_consultation_symptoms_onset_date_after, - ], ]; const durations = date_range_fields.map((field: string[]) => { @@ -854,7 +846,7 @@ export const PatientManager = () => { { text: t("discharged"), value: 1 }, ]} onTabChange={(tab) => { - if (tab === "LIVE") { + if (tab === 0) { updateQuery({ is_active: "True" }); } else { const id = qParams.facility || onlyAccessibleFacility?.id; @@ -1125,10 +1117,6 @@ export const PatientManager = () => { ), badge("Declared Status", "is_declared_positive"), ...dateRange("Declared positive", "date_declared_positive"), - ...dateRange( - "Symptoms onset", - "last_consultation_symptoms_onset_date", - ), ...dateRange("Last vaccinated", "last_vaccinated_date"), { name: "Telemedicine", diff --git a/src/Components/Patient/PatientFilter.tsx b/src/Components/Patient/PatientFilter.tsx index 31c54c5b9c4..773a3f333b7 100644 --- a/src/Components/Patient/PatientFilter.tsx +++ b/src/Components/Patient/PatientFilter.tsx @@ -87,10 +87,6 @@ export default function PatientFilter(props: any) { covin_id: filter.covin_id || null, is_kasp: filter.is_kasp || null, is_declared_positive: filter.is_declared_positive || null, - last_consultation_symptoms_onset_date_before: - filter.last_consultation_symptoms_onset_date_before || null, - last_consultation_symptoms_onset_date_after: - filter.last_consultation_symptoms_onset_date_after || null, last_vaccinated_date_before: filter.last_vaccinated_date_before || null, last_vaccinated_date_after: filter.last_vaccinated_date_after || null, last_consultation_is_telemedicine: @@ -191,8 +187,6 @@ export default function PatientFilter(props: any) { covin_id, is_kasp, is_declared_positive, - last_consultation_symptoms_onset_date_before, - last_consultation_symptoms_onset_date_after, last_vaccinated_date_before, last_vaccinated_date_after, last_consultation_is_telemedicine, @@ -250,12 +244,6 @@ export default function PatientFilter(props: any) { covin_id: covin_id || "", is_kasp: is_kasp || "", is_declared_positive: is_declared_positive || "", - last_consultation_symptoms_onset_date_before: dateQueryString( - last_consultation_symptoms_onset_date_before, - ), - last_consultation_symptoms_onset_date_after: dateQueryString( - last_consultation_symptoms_onset_date_after, - ), last_vaccinated_date_before: dateQueryString(last_vaccinated_date_before), last_vaccinated_date_after: dateQueryString(last_vaccinated_date_after), last_consultation_is_telemedicine: @@ -590,21 +578,6 @@ export default function PatientFilter(props: any) { onChange={handleDateRangeChange} errorClassName="hidden" /> -