Merge Develop To Staging v24.48.0 | Patch (#9195)

ohcnetwork · Nov 25, 2024 · 30739f1 · 30739f1
2 parents 3de98d9 + fdfc53d
commit 30739f1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 47 deletions.
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -1,7 +1,10 @@
 import { defineConfig } from "cypress";
 import cypressSplit from "cypress-split";
+import * as dotenv from "dotenv";
 import fs from "fs";
 
+dotenv.config();
+
 export default defineConfig({
   projectId: "wf7d2m",
   defaultCommandTimeout: 10000,
@@ -32,7 +35,7 @@ export default defineConfig({
     requestTimeout: 15000,
   },
   env: {
-    API_URL: process.env.REACT_CARE_API_URL ?? "http://localhost:9000",
+    API_URL: process.env.REACT_CARE_API_URL,
     ENABLE_HCX: process.env.REACT_ENABLE_HCX ?? false,
   },
 });
diff --git a/...ess/e2e/patient_spec/PatientFileUpload.ts → .../e2e/patient_spec/PatientFileUpload.cy.ts b/...ess/e2e/patient_spec/PatientFileUpload.ts → .../e2e/patient_spec/PatientFileUpload.cy.ts
diff --git a/cypress/pageobject/Patient/PatientFileupload.ts b/cypress/pageobject/Patient/PatientFileupload.ts
@@ -20,7 +20,9 @@ export class PatientFileUpload {
 
   recordAudio() {
     cy.get("#record-audio").click();
-    cy.wait(5000);
+    cy.wait(2000);
+    cy.get("#start-recording").click();
+    cy.wait(2000);
     cy.get("#stop-recording").click();
     cy.wait(1000);
     cy.get("#save-recording").click();

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/Files/AudioCaptureDialog.tsx b/src/components/Files/AudioCaptureDialog.tsx
@@ -133,7 +133,7 @@ export default function AudioCaptureDialog(props: AudioCaptureDialogProps) {
         <div>
           <h2 className="font-bold text-white">{t("audio__record")}</h2>
           <div className="text-secondary-200">{t("audio__record_helper")}</div>
-          <div className="mt-4">
+          <div className="mt-4" id="start-recording">
             <button
               onClick={handleStartRecording}
               className="inline-flex aspect-square w-32 items-center justify-center rounded-full bg-white/10 text-6xl text-white hover:bg-white/20"

diff --git a/src/components/Patient/DailyRounds.tsx b/src/components/Patient/DailyRounds.tsx
@@ -59,7 +59,6 @@ import request from "@/Utils/request/request";
 import { formatDateTime } from "@/Utils/utils";
 import { scrollTo } from "@/Utils/utils";
 
-import RangeAutocompleteFormField from "../Form/FormFields/RangeAutocompleteFormField";
 import TextFormField from "../Form/FormFields/TextFormField";
 
 export const DailyRounds = (props: any) => {
@@ -704,27 +703,32 @@ export const DailyRounds = (props: any) => {
                 ]}
               />
 
-              <RangeAutocompleteFormField
+              <TextFormField
                 {...field("ventilator_spo2")}
-                unit="%"
-                start={0}
-                end={100}
-                step={1}
+                labelSuffix="%"
+                type="number"
+                min={0}
+                max={100}
                 thresholds={[
                   {
                     value: 0,
                     className: "text-danger-500",
-                    label: "Low",
+                    label: t("SPO2_LEVEL_SEVERE_HYPOXEMIA"),
                   },
                   {
-                    value: 90,
-                    className: "text-primary-500",
-                    label: "Normal",
+                    value: 86,
+                    className: "text-danger-500",
+                    label: t("SPO2_LEVEL_MODERATE_HYPOXEMIA"),
                   },
                   {
-                    value: 100,
-                    className: "text-danger-500",
-                    label: "High",
+                    value: 91,
+                    className: "text-warning-400",
+                    label: t("SPO2_LEVEL_MILD_HYPOXEMIA"),
+                  },
+                  {
+                    value: 95,
+                    className: "text-primary-500",
+                    label: t("SPO2_LEVEL_NORMAL"),
                   },
                 ]}
               />
@@ -790,36 +794,6 @@ export const DailyRounds = (props: any) => {
                 ]}
               />
 
-              <TextFormField
-                {...field("ventilator_spo2")}
-                labelSuffix="%"
-                type="number"
-                min={0}
-                max={100}
-                thresholds={[
-                  {
-                    value: 0,
-                    className: "text-danger-500",
-                    label: t("SPO2_LEVEL_SEVERE_HYPOXEMIA"),
-                  },
-                  {
-                    value: 86,
-                    className: "text-danger-500",
-                    label: t("SPO2_LEVEL_MODERATE_HYPOXEMIA"),
-                  },
-                  {
-                    value: 91,
-                    className: "text-warning-400",
-                    label: t("SPO2_LEVEL_MILD_HYPOXEMIA"),
-                  },
-                  {
-                    value: 95,
-                    className: "text-primary-500",
-                    label: t("SPO2_LEVEL_NORMAL"),
-                  },
-                ]}
-              />
-
               <SelectFormField
                 {...field("rhythm")}
                 placeholder={t("HEARTBEAT_RHYTHM__UNKNOWN")}