Merge branch 'develop' into type-error-autocomplete

ohcnetwork · Jun 20, 2024 · 7661320 · 7661320
2 parents 59fd9ed + c8a579a
commit 7661320
Show file tree

Hide file tree

Showing 21 changed files with 336 additions and 193 deletions.
diff --git a/cypress/e2e/patient_spec/patient_prescription.cy.ts b/cypress/e2e/patient_spec/patient_prescription.cy.ts
@@ -1,15 +1,18 @@
+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";
 
 const patientPrescription = new PatientPrescription();
 const loginPage = new LoginPage();
 const patientPage = new PatientPage();
-const medicineName = "DOLO";
+const medicineNameOne = "DOLO";
+const medicineNameTwo = "FDEP PLUS";
 const medicineBaseDosage = "4";
 const medicineTargetDosage = "9";
 const medicineFrequency = "Twice daily";
 const medicineAdministerNote = "Medicine Administration Note";
+const medicineIndicator = "Test Indicator";
 
 describe("Patient Medicine Administration", () => {
   before(() => {
@@ -23,14 +26,85 @@ describe("Patient Medicine Administration", () => {
     cy.awaitUrl("/patients");
   });
 
+  it("Add a new medicine | Verify the Edit and Discontinue Medicine workflow |", () => {
+    patientPage.visitPatient("Dummy Patient 9");
+    patientPrescription.visitMedicineTab();
+    patientPrescription.visitEditPrescription();
+    // Add a normal Medicine to the patient
+    patientPrescription.clickAddPrescription();
+    patientPrescription.interceptMedibase();
+    patientPrescription.selectMedicinebox();
+    patientPrescription.selectMedicine(medicineNameOne);
+    patientPrescription.enterDosage(medicineBaseDosage);
+    patientPrescription.selectDosageFrequency(medicineFrequency);
+    cy.submitButton("Submit");
+    cy.verifyNotification("Medicine prescribed");
+    cy.closeNotification();
+    // Edit the existing medicine & Verify they are properly moved to discontinue position
+    patientPrescription.clickReturnToDashboard();
+    patientPrescription.visitMedicineTab();
+    cy.verifyAndClickElement("#0", medicineNameOne);
+    cy.verifyContentPresence("#submit", ["Discontinue"]); // To verify the pop-up is open
+    cy.submitButton("Edit");
+    patientPrescription.enterDosage(medicineTargetDosage);
+    cy.submitButton("Submit");
+    cy.verifyNotification("Prescription edited successfully");
+    cy.closeNotification();
+    // Discontinue a medicine & Verify the notification
+    cy.verifyAndClickElement("#0", medicineNameOne);
+    cy.submitButton("Discontinue");
+    patientPrescription.enterDiscontinueReason("Medicine is been discontinued");
+    cy.submitButton("Discontinue");
+    cy.verifyNotification("Prescription discontinued");
+    cy.closeNotification();
+    // verify the discontinue medicine view
+    cy.verifyContentPresence("#discontinued-medicine", [
+      "discontinued prescription(s)",
+    ]);
+  });
+
+  it("Add a PRN Prescription medicine | Group Administrate it |", () => {
+    patientPage.visitPatient("Dummy Patient 6");
+    patientPrescription.visitMedicineTab();
+    patientPrescription.visitEditPrescription();
+    // Add First Medicine
+    patientPrescription.clickAddPrnPrescriptionButton();
+    patientPrescription.interceptMedibase();
+    patientPrescription.selectMedicinebox();
+    patientPrescription.selectMedicine(medicineNameOne);
+    patientPrescription.enterDosage(medicineBaseDosage);
+    patientPrescription.enterIndicator(medicineIndicator);
+    cy.submitButton("Submit");
+    cy.verifyNotification("Medicine prescribed");
+    cy.closeNotification();
+    // Add Second Medicine
+    patientPrescription.clickAddPrnPrescriptionButton();
+    patientPrescription.interceptMedibase();
+    patientPrescription.selectMedicinebox();
+    patientPrescription.selectMedicine(medicineNameTwo);
+    patientPrescription.enterDosage(medicineBaseDosage);
+    patientPrescription.enterIndicator(medicineIndicator);
+    cy.submitButton("Submit");
+    cy.verifyNotification("Medicine prescribed");
+    cy.closeNotification();
+    patientPrescription.clickReturnToDashboard();
+    // Group Administer the PRN Medicine
+    patientPrescription.visitMedicineTab();
+    patientPrescription.clickAdministerBulkMedicine();
+    patientPrescription.clickAllVisibleAdministration();
+    patientPrescription.clickAdministerSelectedMedicine();
+    cy.verifyNotification("Medicine(s) administered");
+    cy.closeNotification();
+  });
+
   it("Add a new titrated medicine for a patient | Individual Administeration |", () => {
     patientPage.visitPatient("Dummy Patient 5");
     patientPrescription.visitMedicineTab();
     patientPrescription.visitEditPrescription();
     patientPrescription.clickAddPrescription();
     patientPrescription.interceptMedibase();
     patientPrescription.selectMedicinebox();
-    patientPrescription.selectMedicine(medicineName);
+    patientPrescription.selectMedicine(medicineNameOne);
     patientPrescription.clickTitratedDosage();
     patientPrescription.enterDosage(medicineBaseDosage);
     patientPrescription.enterTargetDosage(medicineTargetDosage);
@@ -47,14 +121,14 @@ describe("Patient Medicine Administration", () => {
     cy.closeNotification();
     // Verify the Reflection on the Medicine
     cy.verifyContentPresence("#medicine-preview", [
-      medicineName,
+      medicineNameOne,
       medicineBaseDosage,
       medicineTargetDosage,
     ]);
     patientPrescription.clickReturnToDashboard();
     // Go to medicine tab and administer it again
     patientPrescription.visitMedicineTab();
-    cy.verifyAndClickElement("#0", medicineName);
+    cy.verifyAndClickElement("#0", medicineNameOne);
     cy.submitButton("Administer");
     patientPrescription.enterAdministerDosage(medicineBaseDosage);
     cy.submitButton("Administer Medicine");
@@ -68,7 +142,7 @@ describe("Patient Medicine Administration", () => {
     patientPrescription.clickAddPrescription();
     patientPrescription.interceptMedibase();
     patientPrescription.selectMedicinebox();
-    patientPrescription.selectMedicine(medicineName);
+    patientPrescription.selectMedicine(medicineNameOne);
     patientPrescription.enterDosage(medicineBaseDosage);
     patientPrescription.selectDosageFrequency(medicineFrequency);
     cy.submitButton("Submit");
@@ -78,7 +152,7 @@ describe("Patient Medicine Administration", () => {
     patientPrescription.clickAddPrescription();
     patientPrescription.interceptMedibase();
     patientPrescription.selectMedicinebox();
-    patientPrescription.selectMedicine(medicineName);
+    patientPrescription.selectMedicine(medicineNameOne);
     patientPrescription.enterDosage(medicineBaseDosage);
     patientPrescription.selectDosageFrequency(medicineFrequency);
     cy.submitButton("Submit");

diff --git a/cypress/pageobject/Patient/PatientPrescription.ts b/cypress/pageobject/Patient/PatientPrescription.ts
@@ -1,3 +1,4 @@
+import { cy } from "local-cypress";
 export class PatientPrescription {
   clickAddPrescription() {
     cy.get("#add-prescription").scrollIntoView();
@@ -7,6 +8,10 @@ export class PatientPrescription {
     );
   }
 
+  clickAddPrnPrescriptionButton() {
+    cy.contains("button", "Add PRN Prescription").click();
+  }
+
   interceptMedibase() {
     cy.intercept("GET", "**/api/v1/medibase/**").as("getMedibase");
   }
@@ -27,6 +32,15 @@ export class PatientPrescription {
     cy.verifyAndClickElement("#administer-medicine", "Administer");
   }
 
+  clickAdministerBulkMedicine() {
+    cy.get("#bulk-administer").should("be.visible");
+    cy.get("#bulk-administer").click();
+  }
+
+  clickAllVisibleAdministration() {
+    cy.get("#should_administer").should("be.visible").click();
+  }
+
   selectMedicinebox() {
     cy.get(
       "div#medicine_object input[placeholder='Select'][role='combobox']",
@@ -38,9 +52,20 @@ export class PatientPrescription {
   }
 
   enterDosage(doseAmount: string) {
+    cy.get("#base_dosage").clear({ force: true });
+    cy.get("#base_dosage").click({ force: true });
     cy.get("#base_dosage").type(doseAmount, { force: true });
   }
 
+  enterIndicator(indicator: string) {
+    cy.get("#indicator").type(indicator);
+  }
+
+  enterDiscontinueReason(reason: string) {
+    cy.wait(2000);
+    cy.get("#discontinuedReason").type(reason);
+  }
+
   enterAdministerDosage(dosage: string) {
     cy.get("#dosage").type(dosage);
   }
@@ -64,14 +89,9 @@ export class PatientPrescription {
     );
   }
 
-  discontinuePreviousPrescription() {
-    cy.intercept(
-      "POST",
-      "**/api/v1/consultation/*/prescriptions/*/discontinue/",
-    ).as("deletePrescription");
-    cy.get("button").contains("Discontinue").click();
-    cy.get("#submit").contains("Discontinue").click();
-    cy.wait("@deletePrescription").its("response.statusCode").should("eq", 200);
+  clickAdministerSelectedMedicine() {
+    cy.get("#administer-selected-medicine").should("be.visible");
+    cy.get("#administer-selected-medicine").click();
   }
 
   visitMedicineTab() {

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -112,6 +112,7 @@ Cypress.Commands.add("clearAllFilters", () => {
 });
 
 Cypress.Commands.add("submitButton", (buttonText = "Submit") => {
+  cy.get("button[type='submit']").contains(buttonText).scrollIntoView();
   cy.get("button[type='submit']").contains(buttonText).click();
 });
 

diff --git a/src/Components/Common/FilePreviewDialog.tsx b/src/Components/Common/FilePreviewDialog.tsx
@@ -130,7 +130,7 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
                 <img
                   src={fileUrl}
                   alt="file"
-                  className={`${
+                  className={`h-full w-full object-contain ${
                     zoom_values[file_state.zoom - 1]
                   } ${getRotationClass(file_state.rotation)}`}
                 />

diff --git a/src/Components/CriticalCareRecording/Others/DailyRound__General.res b/src/Components/CriticalCareRecording/Others/DailyRound__General.res
@@ -30,19 +30,28 @@ let symptoms = [
   "CONSTIPATION",
   "HEAD ACHE",
   "BLEEDING",
-  "DIZZINESS"
-];
+  "DIZZINESS",
+]
 
 @react.component
 let make = (~others, ~renderOptionalDescription, ~title) => {
-  <div> {title("Symptoms")} <div className=" flex flex-wrap max-w-full"> {Js.Array.map(id => {
-        <div className="rounded-full px-4 py-2 bg-gray-400 m-1 text-sm">
-          {str(symptoms[id - 1])}
-        </div>
-      }, Others.additional_symptoms(
-        others,
-      ))->React.array} </div> {renderOptionalDescription(
+  let additionalSymptoms = Others.additional_symptoms(others)
+  <div>
+    {title("Symptoms")}
+    <div className="flex flex-wrap max-w-full">
+      {switch additionalSymptoms {
+      | Some(symptomsArray) => Js.Array.map(id => {
+          <div className="rounded-full px-4 py-2 bg-gray-400 m-1 text-sm">
+            {str(symptoms[id - 1])}
+          </div>
+        }, symptomsArray)->React.array
+      | None => React.null
+      }}
+    </div>
+    {renderOptionalDescription(
       "Physical Examination Info",
       Others.physical_examination_info(others),
-    )} {renderOptionalDescription("Other Details", Others.other_details(others))} </div>
+    )}
+    {renderOptionalDescription("Other Details", Others.other_details(others))}
+  </div>
 }
diff --git a/src/Components/CriticalCareRecording/types/CriticalCare__Others.res b/src/Components/CriticalCareRecording/types/CriticalCare__Others.res
@@ -2,7 +2,7 @@ type t = {
   bilateral_air_entry: option<bool>,
   etco2: option<int>,
   physical_examination_info: option<string>,
-  additional_symptoms: array<int>,
+  additional_symptoms: option<array<int>>,
   other_details: option<string>,
   other_symptoms: option<string>,
 }
@@ -21,12 +21,12 @@ let make = (
   ~other_symptoms,
   ~other_details,
 ) => {
-  bilateral_air_entry: bilateral_air_entry,
-  etco2: etco2,
-  physical_examination_info: physical_examination_info,
-  other_details: other_details,
-  additional_symptoms: additional_symptoms,
-  other_symptoms: other_symptoms,
+  bilateral_air_entry,
+  etco2,
+  physical_examination_info,
+  other_details,
+  additional_symptoms,
+  other_symptoms,
 }
 
 let makeFromJs = dailyRound => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,6 +112,7 @@ Cypress.Commands.add("clearAllFilters", () => { @@
     });
     Cypress.Commands.add("submitButton", (buttonText = "Submit") => {
+      cy.get("button[type='submit']").contains(buttonText).scrollIntoView();
       cy.get("button[type='submit']").contains(buttonText).click();
     });
@@ Expand Down @@