Fixed Multi-selection functionality.

cypress/e2e/patient_spec/PatientInvestigation.cy.ts

@@ -1,13 +1,30 @@
-import { PatientPage } from "pageobject/Patient/PatientCreation";
-import PatientInvestigation from "pageobject/Patient/PatientInvestigation";
+import { advanceFilters } from "pageobject/utils/advanceFilterHelpers";
+import { pageNavigation } from "pageobject/utils/paginationHelpers";
 
 import LoginPage from "../../pageobject/Login/LoginPage";
+import PatientHome from "../../pageobject/Patient/PatientHome";
 
-describe("Patient Investigation Creation from Patient consultation page", () => {
+describe("Patient Homepage present functionalities", () => {
   const loginPage = new LoginPage();
-  const patientPage = new PatientPage();
-  const patientInvestigation = new PatientInvestigation();
-  const patientName = "Dummy Patient Thirteen";
+  const patientHome = new PatientHome();
+  const patientGender = "Male";
+  const patientCategory = "Moderate";
+  const patientMinimumAge = "18";
+  const patientMaximumAge = "24";
+  const patientLastAdmittedBed = "No bed assigned";
+  const PatientLastConsentType = "No consents";
+  const patientTelemedicinePerference = "No";
+  const patientReviewStatus = "No";
+  const patientMedicoStatus = "Non-Medico-Legal";
+  const patientIcdDiagnosis = "1A00";
+  const facilityName = "Dummy Facility 40";
+  const facilityType = "Private Hospital";
+  const facilityLsgBody = "Aikaranad Grama Panchayat, Ernakulam District";
+  const facilityDistrict = "Ernakulam";
+  const patientFromDate = "01122023";
+  const patientToDate = "07122023";
+  const patientFromDateBadge = "2023-12-01";
+  const patientToDateBadge = "2023-12-07";
 
   before(() => {
     loginPage.loginByRole("districtAdmin");
@@ -20,18 +37,140 @@ describe("Patient Investigation Creation from Patient consultation page", () =>
     cy.awaitUrl("/patients");
   });
 
-  it("Create a investigation for a patient and verify its reflection", () => {
-    patientPage.visitPatient(patientName);
-    patientInvestigation.clickInvestigationTab();
-    patientInvestigation.clickLogLabResults();
-    patientInvestigation.selectInvestigationOption([
-      "Haematology",
-      "Urine Test",
-    ]);
-    cy.clickSubmitButton("Save Investigation");
-    cy.verifyNotification("Please Enter at least one value");
+  it("Date based advance filters applied in the patient tab", () => {
+    advanceFilters.clickAdvancedFiltersButton();
+    patientHome.typePatientCreatedBeforeDate(patientFromDate);
+    patientHome.typePatientCreatedAfterDate(patientToDate);
+    patientHome.typePatientModifiedBeforeDate(patientFromDate);
+    patientHome.typePatientModifiedAfterDate(patientToDate);
+    patientHome.typePatientAdmitedBeforeDate(patientFromDate);
+    patientHome.typePatientAdmitedAfterDate(patientToDate);
+    patientHome.clickPatientFilterApply();
+    // verify the badge and clear the count
+    patientHome.verifyPatientCreatedBeforeDate(patientToDateBadge);
+    patientHome.verifyPatientCreatedAfterDate(patientFromDateBadge);
+    patientHome.verifyPatientModifiedBeforeDate(patientToDateBadge);
+    patientHome.verifyPatientModifiedAfterDate(patientFromDateBadge);
+    patientHome.verifyPatientAdmittedBeforeDate(patientToDateBadge);
+    patientHome.verifyPatientAdmittedAfterDate(patientFromDateBadge);
+    cy.clearAllFilters();
+  });
+
+  it("Facility Geography based advance filters applied in the patient tab", () => {
+    advanceFilters.clickAdvancedFiltersButton();
+    patientHome.typeFacilityName(facilityName);
+    patientHome.selectFacilityType(facilityType);
+    patientHome.typeFacilityLsgBody(facilityLsgBody);
+    patientHome.typeFacilityDistrict(facilityDistrict);
+    patientHome.clickPatientFilterApply();
+    patientHome.verifyTotalPatientCount("1");
+    // Clear the badges and verify the patient count along with badges
+    patientHome.verifyFacilityNameBadgeContent(facilityName);
+    patientHome.verifyFacilityTypeBadgeContent(facilityType);
+    patientHome.verifyFacilityLsgBadgeContent(facilityLsgBody);
+    patientHome.verifyFacilityDistrictContent(facilityDistrict);
+    cy.clearAllFilters();
+  });
+
+  it("Patient diagnosis based advance filters applied in the patient tab", () => {
+    // Patient Filtering based on icd-11 data
+    advanceFilters.clickAdvancedFiltersButton();
+    patientHome.selectAnyIcdDiagnosis(patientIcdDiagnosis, patientIcdDiagnosis);
+    patientHome.selectConfirmedIcdDiagnosis(
+      patientIcdDiagnosis,
+      patientIcdDiagnosis,
+    );
+    patientHome.selectUnconfirmedIcdDiagnosis(
+      patientIcdDiagnosis,
+      patientIcdDiagnosis,
+    );
+    patientHome.selectProvisionalIcdDiagnosis(
+      patientIcdDiagnosis,
+      patientIcdDiagnosis,
+    );
+    patientHome.selectDifferentialIcdDiagnosis(
+      patientIcdDiagnosis,
+      patientIcdDiagnosis,
+    );
+    patientHome.clickPatientFilterApply();
+    patientHome.verifyTotalPatientCount("0");
+    // verify the badges presence in the platform
+    patientHome.verifyAnyDiagnosisBadgeContent(patientIcdDiagnosis);
+    patientHome.verifyConfirmedDiagnosisBadgeContent(patientIcdDiagnosis);
+    patientHome.verifyUnconfirmedDiagnosisBadgeContent(patientIcdDiagnosis);
+    patientHome.verifyProvisionalDiagnosisBadgeContent(patientIcdDiagnosis);
+    patientHome.verifyDifferentialDiagnosisBadgeContent(patientIcdDiagnosis);
+    // Clear the badges and verify the patient count along with badges
+    cy.clearAllFilters();
+    // Apply Any and confirmed diagonsis to verify patient count 17
+    advanceFilters.clickAdvancedFiltersButton();
+    patientHome.selectAnyIcdDiagnosis(patientIcdDiagnosis, patientIcdDiagnosis);
+    patientHome.selectConfirmedIcdDiagnosis(
+      patientIcdDiagnosis,
+      patientIcdDiagnosis,
+    );
+    patientHome.clickPatientFilterApply();
+    patientHome.verifyTotalPatientCount("1");
+  });
+
+  it("Patient Details based advance filters applied in the patient tab", () => {
+    // Patient Filtering based on patient details
+    advanceFilters.clickAdvancedFiltersButton();
+    patientHome.selectPatientGenderfilter(patientGender);
+    patientHome.selectPatientCategoryfilter(patientCategory);
+    patientHome.typePatientMinimumAgeFilter(patientMinimumAge);
+    patientHome.typePatientMaximumAgeFilter(patientMaximumAge);
+    patientHome.selectPatientLastAdmittedBed(patientLastAdmittedBed);
+    patientHome.selectPatientLastConsentType(PatientLastConsentType);
+    patientHome.selectPatientTelemedicineFilter(patientTelemedicinePerference);
+    patientHome.selectPatientReviewFilter(patientReviewStatus);
+    patientHome.selectPatientMedicoFilter(patientMedicoStatus);
+    patientHome.clickPatientFilterApply();
+    cy.get("a[data-cy='patient']").should("contain.text", "Dummy Patient");
+    // Verify the presence of badges
+    patientHome.verifyGenderBadgeContent(patientGender);
+    patientHome.verifyCategoryBadgeContent(patientCategory);
+    patientHome.verifyMinAgeBadgeContent(patientMinimumAge);
+    patientHome.verifyMaxAgeBadgeContent(patientMaximumAge);
+    patientHome.verifyLastAdmittedBedBadgeContent(patientLastAdmittedBed);
+    patientHome.verifyLastConsentTypeBadgeContent("No Consents");
+    patientHome.verifyTelemedicineBadgeContent("false");
+    patientHome.verifyReviewMissedBadgeContent("false");
+    patientHome.verifyMedicoBadgeContent("false");
+    // Clear the badges and verify the patient count along with badges
+    cy.clearAllFilters();
+  });
+
+  it("Export the live patient list based on a date range", () => {
+    patientHome.clickPatientExport();
+    cy.verifyNotification("Please select a seven day period");
     cy.closeNotification();
-    // Temporary workflow for investigation since we dont have dummy data and moving away from existing module
+    patientHome.typePatientModifiedBeforeDate("01122023");
+    patientHome.typePatientModifiedAfterDate("07122023");
+    patientHome.clickPatientFilterApply();
+    patientHome.interceptPatientExportRequest();
+    patientHome.clickPatientExport();
+    patientHome.verifyPatientExportRequest();
+  });
+
+  it("Test Pagination on Patient List Page", () => {
+    let firstPatientPageOne: string;
+    cy.get('[data-cy="patient"]')
+      .first()
+      .invoke("text")
+      .then((patientOne: string) => {
+        firstPatientPageOne = patientOne.trim();
+        pageNavigation.navigateToNextPage();
+        pageNavigation.verifyCurrentPageNumber(2);
+        cy.get('[data-cy="patient"]')
+          .first()
+          .invoke("text")
+          .then((patientTwo: string) => {
+            const firstPatientPageTwo = patientTwo.trim();
+            expect(firstPatientPageOne).not.to.eq(firstPatientPageTwo);
+            pageNavigation.navigateToPreviousPage();
+          });
+      });
   });
 
   afterEach(() => {

src/components/Facility/Investigations/Reports/index.tsx

@@ -1,7 +1,8 @@
 import { useCallback, useReducer, useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import ButtonV2 from "@/components/Common/ButtonV2";
+import { Button } from "@/components/ui/button";
+
 import CircularProgress from "@/components/Common/CircularProgress";
 import Loading from "@/components/Common/Loading";
 import Page from "@/components/Common/Page";
@@ -53,42 +54,36 @@ const initialState: InitialState = {
 
 const investigationReportsReducer = (state = initialState, action: any) => {
   switch (action.type) {
-    case "set_investigation_groups": {
+    case "set_investigation_groups":
       return {
         ...state,
         investigationGroups: action.payload,
       };
-    }
-    case "set_selected_group": {
+    case "set_selected_group":
       return {
         ...state,
         selectedGroup: action.payload,
       };
-    }
-    case "set_investigations": {
+    case "set_investigations":
       return {
         ...state,
         investigations: action.payload,
       };
-    }
-    case "set_selected_investigations": {
+    case "set_selected_investigations":
       return {
         ...state,
         selectedInvestigations: action.payload,
       };
-    }
-    case "set_investigation_table_data": {
+    case "set_investigation_table_data":
       return {
         ...state,
         investigationTableData: action.payload,
       };
-    }
-    case "set_loading": {
+    case "set_loading":
       return {
         ...state,
         isLoading: action.payload,
       };
-    }
     default:
       return state;
   }
@@ -113,6 +108,10 @@ const InvestigationReports = ({ id }: any) => {
     selectedInvestigations,
   } = state as InitialState;
 
+  const clearSelectedInvestigations = () => {
+    dispatch({ type: "set_selected_investigations", payload: [] });
+  };
+
   const fetchInvestigationsData = useCallback(
     async (
       onSuccess: (
@@ -314,14 +313,13 @@ const InvestigationReports = ({ id }: any) => {
             />
           </div>
           {!isLoading.investigationLoading && (
-            <ButtonV2
+            <Button
               onClick={() => fetchInvestigation()}
               disabled={getTestDisabled}
               variant="primary"
-              className="my-2.5"
             >
               {t("get_tests")}
-            </ButtonV2>
+            </Button>
           )}
           {!!isLoading.investigationLoading && (
             <CircularProgress className="text-primary-500" />
@@ -342,23 +340,31 @@ const InvestigationReports = ({ id }: any) => {
                     })
                   }
                   optionLabel={(option) => option.name}
-                  optionValue={(option) => option}
+                  optionValue={(option) => option.external_id}
                   isLoading={isLoading.investigationLoading}
                   placeholder={t("select_investigations")}
+                  selectAll={true}
                 />
               </div>
-
-              <ButtonV2
-                onClick={() => {
-                  setSessionPage(1);
-                  handleGenerateReports(1);
-                }}
-                disabled={generateReportDisabled}
-                variant="primary"
-                className="my-2.5"
-              >
-                {t("generate_report")}
-              </ButtonV2>
+              <div className="flex space-x-2">
+                <Button
+                  onClick={() => {
+                    setSessionPage(1);
+                    handleGenerateReports(1);
+                  }}
+                  disabled={generateReportDisabled}
+                  variant="primary"
+                >
+                  {t("generate_report")}
+                </Button>
+                <Button
+                  onClick={clearSelectedInvestigations}
+                  disabled={!selectedInvestigations.length}
+                  variant="secondary"
+                >
+                  {t("clear")}
+                </Button>
+              </div>
             </>
           )}
           {isLoading.tableData && (
@@ -370,19 +376,19 @@ const InvestigationReports = ({ id }: any) => {
             {!!investigationTableData.length && (
               <>
                 <div className="my-2.5">
-                  <ButtonV2
+                  <Button
                     onClick={() => handleSessionPage("NEXT")}
                     disabled={prevSessionDisabled}
                   >
                     {isLoading.tableData ? "Loading..." : t("next_sessions")}
-                  </ButtonV2>
-                  <ButtonV2
+                  </Button>
+                  <Button
                     onClick={() => handleSessionPage("PREV")}
                     disabled={nextSessionDisabled}
                     className="ml-3"
                   >
                     {isLoading.tableData ? "Loading..." : t("prev_sessions")}
-                  </ButtonV2>
+                  </Button>
                 </div>
 
                 <ReportTable
@@ -396,14 +402,13 @@ const InvestigationReports = ({ id }: any) => {
                 />
 
                 {!loadMoreDisabled && (
-                  <ButtonV2
+                  <Button
                     disabled={loadMoreDisabled}
                     onClick={handleLoadMore}
-                    className="my-2.5 w-full"
                     variant="primary"
                   >
                     {t("load_more")}
-                  </ButtonV2>
+                  </Button>
                 )}
               </>
             )}