Merge branch 'develop' into fix-issue-6366

.github/workflows/linter.yml

@@ -0,0 +1,31 @@
+name: Lint Code Base
+
+on:
+  pull_request:
+    branches:
+      - develop
+      - master
+  merge_group:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+      statuses: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: "18"
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run lint
+        run: npm run lint --quiet

cypress/e2e/assets_spec/asset_homepage.cy.ts

@@ -90,7 +90,7 @@ describe("Asset Tab", () => {
     assetPage.selectImportOption();
     assetPage.selectImportFacility("Dummy Facility 1");
     assetPage.importAssetFile();
-    assetPage.selectImportLocation("Camera Loc");
+    assetPage.selectImportLocation("Camera Locations");
     assetPage.clickImportAsset();
   });
 

cypress/e2e/assets_spec/assets_manage.cy.ts

@@ -5,6 +5,12 @@ import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import { AssetFilters } from "../../pageobject/Asset/AssetFilters";
 
+function addDaysToDate(numberOfDays: number) {
+  const inputDate = new Date();
+  inputDate.setDate(inputDate.getDate() + numberOfDays);
+  return inputDate.toISOString().split("T")[0];
+}
+
 describe("Asset", () => {
   const assetPage = new AssetPage();
   const loginPage = new LoginPage();
@@ -26,6 +32,33 @@ describe("Asset", () => {
     cy.awaitUrl("/assets");
   });
 
+  it("Verify Asset Warranty Expiry Label", () => {
+    assetSearchPage.typeSearchKeyword(assetname);
+    assetSearchPage.pressEnter();
+    assetSearchPage.verifyBadgeContent(assetname);
+    assetSearchPage.clickAssetByName(assetname);
+    assetPage.clickupdatedetailbutton();
+    assetPage.scrollintoWarrantyDetails();
+    assetPage.enterWarrantyExpiryDate(addDaysToDate(100)); // greater than 3 months
+    assetPage.clickassetupdatebutton();
+    assetPage.verifyWarrantyExpiryLabel("");
+    assetPage.clickupdatedetailbutton();
+    assetPage.scrollintoWarrantyDetails();
+    assetPage.enterWarrantyExpiryDate(addDaysToDate(80)); // less than 3 months
+    assetPage.clickassetupdatebutton();
+    assetPage.verifyWarrantyExpiryLabel("3 months");
+    assetPage.clickupdatedetailbutton();
+    assetPage.scrollintoWarrantyDetails();
+    assetPage.enterWarrantyExpiryDate(addDaysToDate(20)); // less than 1 month
+    assetPage.clickassetupdatebutton();
+    assetPage.verifyWarrantyExpiryLabel("1 month");
+    assetPage.clickupdatedetailbutton();
+    assetPage.scrollintoWarrantyDetails();
+    assetPage.enterWarrantyExpiryDate(addDaysToDate(100)); // check for greater than 3 months again to verify the label is removed
+    assetPage.clickassetupdatebutton();
+    assetPage.verifyWarrantyExpiryLabel("");
+  });
+
   it("Create & Edit a service history and verify reflection", () => {
     assetSearchPage.typeSearchKeyword(assetname);
     assetSearchPage.pressEnter();

cypress/e2e/patient_spec/patient_crud.cy.ts

@@ -130,12 +130,27 @@ describe("Patient Creation with consultation", () => {
     patientConsultationPage.interceptMediaBase();
     patientConsultationPage.selectMedicinebox();
     patientConsultationPage.waitForMediabaseStatusCode();
-    patientConsultationPage.prescribeMedicine();
+    patientConsultationPage.prescribefirstMedicine();
     patientConsultationPage.enterDosage("3");
     patientConsultationPage.selectDosageFrequency("Twice daily");
     patientConsultationPage.submitPrescriptionAndReturn();
   });
 
+  it("Edit created consultation to existing patient", () => {
+    updatePatientPage.visitUpdatedPatient();
+    patientConsultationPage.visitEditConsultationPage();
+    patientConsultationPage.fillIllnessHistory("editted");
+    patientConsultationPage.selectConsultationStatus(
+      "Referred from other hospital"
+    );
+    patientConsultationPage.updateSymptoms("FEVER");
+    patientConsultationPage.setSymptomsDate("01082023");
+    patientConsultationPage.updateConsultation();
+    patientConsultationPage.verifySuccessNotification(
+      "Consultation updated successfully"
+    );
+  });
+
   afterEach(() => {
     cy.saveLocalStorage();
   });

cypress/e2e/patient_spec/patient_manage.cy.ts

@@ -0,0 +1,78 @@
+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";
+
+describe("Patient", () => {
+  const loginPage = new LoginPage();
+  const patientPage = new PatientPage();
+  const patientConsultationPage = new PatientConsultationPage();
+
+  before(() => {
+    loginPage.loginAsDisctrictAdmin();
+    cy.saveLocalStorage();
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    cy.awaitUrl("/patients");
+  });
+
+  // it("Create Patient shift requests.", () => {
+  //   patientPage.visitPatient();
+  //   patientConsultationPage.visitShiftRequestPage();
+  //   patientConsultationPage.enterPatientShiftDetails(
+  //     "Test User",
+  //     phone_number,
+  //     "Dummy Shifting",
+  //     "Reason"
+  //   );
+  //   patientConsultationPage.createShiftRequest();
+  //   patientConsultationPage.verifySuccessNotification(
+  //     "Shift request created successfully"
+  //   );
+  // });
+  // commented out the shifting request, as logic need to be re-visited
+
+  it("Post doctor notes for an already created patient", () => {
+    patientPage.visitPatient();
+    patientConsultationPage.visitDoctorNotesPage();
+    patientConsultationPage.addDoctorsNotes("Test Doctor Notes");
+    patientConsultationPage.postDoctorNotes();
+    patientConsultationPage.verifySuccessNotification(
+      "Note added successfully"
+    );
+  });
+
+  it("Edit prescription for an already created patient", () => {
+    patientPage.visitPatient();
+    patientConsultationPage.visitEditPrescriptionPage();
+    patientConsultationPage.clickAddPrescription();
+    patientConsultationPage.interceptMediaBase();
+    patientConsultationPage.selectMedicinebox();
+    patientConsultationPage.waitForMediabaseStatusCode();
+    patientConsultationPage.prescribesecondMedicine();
+    patientConsultationPage.enterDosage("4");
+    patientConsultationPage.selectDosageFrequency("Twice daily");
+    patientConsultationPage.submitPrescription();
+  });
+
+  it("Upload consultations file ", () => {
+    patientPage.visitPatient();
+    patientConsultationPage.visitFilesPage();
+    patientConsultationPage.uploadFile();
+    patientConsultationPage.clickUploadFile();
+  });
+
+  it("Discharge a patient", () => {
+    patientPage.visitPatient();
+    patientConsultationPage.clickDischargePatient();
+    patientConsultationPage.selectDischargeReason("Recovered");
+    patientConsultationPage.addDischargeNotes("Discharge notes");
+    patientConsultationPage.confirmDischarge();
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+});

cypress/e2e/users_spec/user_homepage.cy.ts

@@ -0,0 +1,39 @@
+/// <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";
+
+describe("Asset Tab", () => {
+  const userPage = new UserPage();
+  const usernameToTest = "devdoctor";
+  const currentuser = "devdistrictadmin";
+  const loginPage = new LoginPage();
+  before(() => {
+    loginPage.loginAsDisctrictAdmin();
+    cy.saveLocalStorage();
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    cy.awaitUrl("/users");
+  });
+
+  it("Search by username", () => {
+    userPage.checkSearchInputVisibility();
+    userPage.typeInSearchInput(usernameToTest);
+    userPage.checkUrlForUsername(usernameToTest);
+    userPage.checkUsernameText(usernameToTest);
+    userPage.checkUsernameBadgeVisibility(true);
+    userPage.clearSearchInput();
+    userPage.checkUsernameBadgeVisibility(false);
+    userPage.typeInSearchInput(usernameToTest);
+    userPage.checkUsernameText(usernameToTest);
+    userPage.clickRemoveIcon();
+    userPage.checkUsernameBadgeVisibility(false);
+    userPage.checkUsernameText(currentuser);
+  });
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+});

cypress/pageobject/Asset/AssetCreation.ts

@@ -150,7 +150,7 @@ export class AssetPage {
 
   configureVitalAsset(hostName: string, localIp: string) {
     cy.get("[data-testid=asset-configure-button]").click();
-    cy.get("#middlewareHostname").type(hostName);
+    cy.get("#middleware_hostname").type(hostName);
     cy.get("#localipAddress").type(localIp);
   }
 
@@ -285,16 +285,39 @@ export class AssetPage {
     cy.get("#notes").scrollIntoView();
   }
 
-  enterAssetNotes(text) {
+  enterAssetNotes(text: string) {
     cy.get("#notes").click().clear();
     cy.get("#notes").click().type(text);
   }
 
-  enterAssetservicedate(text) {
+  enterAssetservicedate(text: string) {
     cy.get("input[name='last_serviced_on']").click();
     cy.get("#date-input").click().type(text);
   }
 
+  scrollintoWarrantyDetails() {
+    cy.get("#warranty-details").scrollIntoView();
+  }
+
+  enterWarrantyExpiryDate(text: string) {
+    cy.get("#WarrantyAMCExpiry").click();
+    cy.get("#WarrantyAMCExpiry").click().type(text);
+  }
+
+  verifyWarrantyExpiryLabel(duration: string) {
+    if (duration === "") {
+      cy.get("#warranty-amc-expired-red").should("not.exist");
+      cy.get("#warranty-amc-expiring-soon-orange").should("not.exist");
+      cy.get("#warranty-amc-expiring-soon-yellow").should("not.exist");
+    } else if (duration === "expired") {
+      cy.get("#warranty-amc-expired-red").should("be.visible");
+    } else if (duration === "1 month") {
+      cy.get("#warranty-amc-expiring-soon-orange").should("be.visible");
+    } else if (duration === "3 months") {
+      cy.get("#warranty-amc-expiring-soon-yellow").should("be.visible");
+    }
+  }
+
   clickassetupdatebutton() {
     cy.get("#submit").click();
   }