Merge branch 'develop' into fix#6649

ohcnetwork · Dec 2, 2023 · 65f485d · 65f485d
2 parents 8ca0aad + b49247c
commit 65f485d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/src/Components/ABDM/ConfigureHealthFacility.tsx b/src/Components/ABDM/ConfigureHealthFacility.tsx
@@ -178,7 +178,7 @@ export const ConfigureHealthFacility = (props: any) => {
                 >
                   {state.form.health_facility?.registered ? (
                     <>
-                      <div className="tooltip-text tooltip-top -left-48 flex flex-col gap-4">
+                      <div className="tooltip-text -ml-20 -mt-36 flex w-48 flex-col gap-4 whitespace-break-spaces">
                         <span className="text-gray-100">
                           The ABDM health facility is successfully linked with
                           care{" "}
@@ -192,7 +192,7 @@ export const ConfigureHealthFacility = (props: any) => {
                     </>
                   ) : (
                     <>
-                      <div className="tooltip-text tooltip-top -left-48 flex flex-col gap-4">
+                      <div className="tooltip-text -ml-20 -mt-44 flex w-48 flex-col gap-4 whitespace-break-spaces">
                         <span className="text-gray-100">
                           The ABDM health facility is successfully linked with
                           care{" "}

diff --git a/src/Components/Assets/AssetTypes.tsx b/src/Components/Assets/AssetTypes.tsx
@@ -8,6 +8,7 @@ export interface AssetLocationObject {
   description: string;
   created_date?: string;
   modified_date?: string;
+  middleware_address?: string;
   facility: {
     id: string;
     name: string;

diff --git a/src/Components/ExternalResult/ResultList.tsx b/src/Components/ExternalResult/ResultList.tsx
@@ -264,11 +264,11 @@ export default function ResultList() {
               value={qParams.name}
               placeholder="Search by name"
             />
-            <div className="my-2 text-sm font-medium">Search by number</div>
             <div className="w-full max-w-sm">
               <PhoneNumberFormField
+                label="Search by number"
                 name="mobile_number"
-                labelClassName="hidden"
+                labelClassName="my-2 text-sm font-medium"
                 value={phone_number}
                 onChange={(e) => setPhoneNum(e.value)}
                 error={phoneNumberError}

diff --git a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
@@ -60,7 +60,10 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
       setMonitorBedData(monitorBedData);
       const assetDataForMonitor = monitorBedData?.asset_object;
       const hl7Meta = assetDataForMonitor?.meta;
-      const hl7Middleware = hl7Meta?.middleware_hostname || middleware_address;
+      const hl7Middleware =
+        hl7Meta?.middleware_hostname ||
+        assetDataForMonitor?.location_object?.middleware_address ||
+        middleware_address;
       if (hl7Middleware && hl7Meta?.local_ip_address) {
         setHL7SocketUrl(
           `wss://${hl7Middleware}/observations/${hl7Meta.local_ip_address}`
@@ -85,7 +88,9 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
       setVentilatorBedData(ventilatorBedData);
       const ventilatorMeta = ventilatorBedData?.asset_object?.meta;
       const ventilatorMiddleware =
-        ventilatorMeta?.middleware_hostname || middleware_address;
+        ventilatorMeta?.middleware_hostname ||
+        consultationBedVentilator?.location_object.middleware_address ||
+        middleware_address;
       if (ventilatorMiddleware && ventilatorMeta?.local_ip_address) {
         setVentilatorSocketUrl(
           `wss://${ventilatorMiddleware}/observations/${ventilatorMeta?.local_ip_address}`

diff --git a/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx b/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
@@ -236,7 +236,7 @@ export const VitalsNonWaveformContent = ({
 }: {
   children: JSX.Element | JSX.Element[];
 }) => (
-  <div className="z-10 grid grid-cols-2 gap-x-8 gap-y-4 divide-blue-600 border-b border-blue-600 bg-[#020617] tracking-wider text-white md:absolute md:inset-y-0 md:right-0 md:grid-cols-1 md:gap-0 md:divide-y md:border-b-0 md:border-l">
+  <div className="z-[5] grid grid-cols-2 gap-x-8 gap-y-4 divide-blue-600 border-b border-blue-600 bg-[#020617] tracking-wider text-white md:absolute md:inset-y-0 md:right-0 md:grid-cols-1 md:gap-0 md:divide-y md:border-b-0 md:border-l">
     {children}
   </div>
 );