Merged with develop barnch and fixed linking of care context

ohcnetwork · Oct 17, 2023 · 1cc11f3 · 1cc11f3
2 parents c7ff758 + 8ad1353
commit 1cc11f3
Show file tree

Hide file tree

Showing 98 changed files with 2,396 additions and 1,243 deletions.
diff --git a/cypress/e2e/assets_spec/asset_homepage.cy.ts b/cypress/e2e/assets_spec/asset_homepage.cy.ts
@@ -73,7 +73,7 @@ describe("Asset Tab", () => {
     assetFilters.assertAssetTypeText("INTERNAL");
     assetFilters.assertAssetClassText("ONVIF");
     assetFilters.assertStatusText("ACTIVE");
-    assetFilters.assertLocationText("Camera Locations");
+    assetFilters.assertLocationText("Camera Loc");
     assetFilters.clickadvancefilter();
     assetFilters.clearFilters();
   });
@@ -90,9 +90,8 @@ describe("Asset Tab", () => {
     assetPage.selectImportOption();
     assetPage.selectImportFacility("Dummy Facility 1");
     assetPage.importAssetFile();
-    assetPage.selectImportLocation("Camera Locations");
+    assetPage.selectImportLocation("Camera Loc");
     assetPage.clickImportAsset();
-    assetPage.verifySuccessNotification("Assets imported successfully");
   });
 
   it("verify imported asset", () => {

diff --git a/cypress/e2e/assets_spec/assets_manage.cy.ts b/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();

diff --git a/cypress/e2e/facility_spec/locations.cy.ts b/cypress/e2e/facility_spec/locations.cy.ts
@@ -13,6 +13,7 @@ describe("Location Management Section", () => {
     cy.intercept("GET", "**/api/v1/facility/**").as("getFacilities");
     cy.get("[id='facility-details']").first().click();
     cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
+    cy.get("h1.text-3xl.font-bold", { timeout: 10000 }).should("be.visible");
     cy.get("#manage-facility-dropdown button").should("be.visible");
     cy.get("[id='manage-facility-dropdown']").scrollIntoView().click();
     cy.get("[id=location-management]").click();

diff --git a/cypress/fixtures/sampleAsset.xlsx b/cypress/fixtures/sampleAsset.xlsx
diff --git a/cypress/pageobject/Asset/AssetCreation.ts b/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();
   }

diff --git a/cypress/pageobject/Facility/FacilityCreation.ts b/cypress/pageobject/Facility/FacilityCreation.ts
@@ -106,6 +106,7 @@ class FacilityPage {
   }
 
   clickManageFacilityDropdown() {
+    cy.get("h1.text-3xl.font-bold", { timeout: 20000 }).should("be.visible");
     cy.get("#manage-facility-dropdown button").scrollIntoView();
     cy.get("#manage-facility-dropdown button")
       .contains("Manage Facility")
@@ -198,8 +199,6 @@ class FacilityPage {
     cy.intercept("GET", "**/api/v1/facility/**").as("getManagePage");
     cy.go("back");
     cy.wait("@getManagePage").its("response.statusCode").should("eq", 200);
-    cy.get("#manage-facility-dropdown").scrollIntoView();
-    cy.get("#manage-facility-dropdown").should("exist");
   }
 
   verifyfacilityviewassetredirection() {

diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -49,15 +49,15 @@ export class PatientConsultationPage {
       .click()
       .type("1A");
     cy.get("#icd11_diagnoses_object [role='option']")
-      .contains("1A03 Intestinal infections due to Escherichia coli")
+      .contains("1A00 Cholera")
       .scrollIntoView()
       .click();
     cy.get("label[for='icd11_diagnoses_object']").click();
     cy.wait("@getIcdResults").its("response.statusCode").should("eq", 200);
 
     cy.get("#icd11_principal_diagnosis [role='combobox']").click().type("1A");
     cy.get("#icd11_principal_diagnosis [role='option']")
-      .contains("1A03 Intestinal infections due to Escherichia coli")
+      .contains("1A00 Cholera")
       .click();
 
     cy.get("#consultation_notes").click().type(consulationNotes);

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -81,7 +81,7 @@ Cypress.Commands.add(
 
 Cypress.Commands.add("verifyNotification", (text) => {
   cy.get(".pnotify-container").should("exist").contains(text);
-  return cy.get(".pnotify-container").click({ force: true });
+  return cy.get(".pnotify-container").contains(text).click({ force: true });
 });
 
 Cypress.on("uncaught:exception", () => {