Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIXED: The assets configuration page lacks mobile responsiveness #9467

Closed
wants to merge 11 commits into from
Closed

FIXED: The assets configuration page lacks mobile responsiveness #9467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0fcd48e
shadcn Card and responsiveness added
modamaan Dec 16, 2024
e15f966
shadcn button added
modamaan Dec 16, 2024
6bf605c
try to fix AssertionError: Timed out retrying after 10000ms: Expecte…
modamaan Dec 17, 2024
3a868a2
use screen's width as in other pages corrected
modamaan Dec 18, 2024
9ccacd1
Merge branch 'develop' into issues/9465/responsive-configurePage
modamaan Dec 19, 2024
eb38b11
responsiveness updated
modamaan Dec 19, 2024
bb46008
Merge remote-tracking branch 'upstream/develop' into issues/9465/resp…
modamaan Dec 19, 2024
b8567f5
Merge branch 'issues/9465/responsive-configurePage' of https://github…
modamaan Dec 19, 2024
0c193b9
Ventilator responsiveness added
modamaan Dec 19, 2024
50620d5
responsive update
modamaan Dec 19, 2024
6e1cb0b
Merge branch 'develop' into issues/9465/responsive-configurePage
modamaan Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/components/Assets/AssetType/HL7Monitor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { SyntheticEvent, useEffect, useState } from "react";

import Card from "@/CAREUI/display/Card";
import CareIcon from "@/CAREUI/icons/CareIcon";

import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card";
modamaan marked this conversation as resolved.
Show resolved Hide resolved

import {
AssetClass,
AssetData,
ResolvedMiddleware,
} from "@/components/Assets/AssetTypes";
import { BedSelect } from "@/components/Common/BedSelect";
import { Submit } from "@/components/Common/ButtonV2";
import Loading from "@/components/Common/Loading";
import { BedModel } from "@/components/Facility/models";
import { FieldLabel } from "@/components/Form/FormFields/FormField";
Expand Down Expand Up @@ -91,7 +92,7 @@ const HL7Monitor = (props: HL7MonitorProps) => {
<div className="mx-auto flex flex-col gap-4 xl:flex-row-reverse">
{["DistrictAdmin", "StateAdmin"].includes(authUser.user_type) && (
<div className="flex w-full shrink-0 flex-col gap-4 xl:max-w-xs">
<Card className="flex w-full flex-col">
<Card className="flex flex-wrap flex-col p-4 m-1 mt-4 md:m-0 w-[55%] sm:w-3/4 md:w-full">
<form onSubmit={handleSubmit}>
<h2 className="mb-2 text-lg font-bold">Connection</h2>
<div className="flex flex-col gap-2">
Expand Down Expand Up @@ -127,15 +128,19 @@ const HL7Monitor = (props: HL7MonitorProps) => {
required
error={ipadrdress_error}
/>
<Submit className="w-full">
<Button
id="submit"
variant={"primary"}
className="flex gap-2 w-full"
>
<CareIcon icon="l-save" />
<span>Save Configuration</span>
</Submit>
</Button>
</div>
</form>
</Card>
{["HL7MONITOR"].includes(assetType) && (
<Card>
<Card className="p-4 m-1 md:m-0 w-[55%] sm:w-3/4 md:w-full">
<MonitorConfigure asset={asset as AssetData} />
</Card>
)}
Expand All @@ -150,6 +155,7 @@ const HL7Monitor = (props: HL7MonitorProps) => {
hideFooter={true}
/>
)}

{assetType === "VENTILATOR" && (
<VentilatorPatientVitalsMonitor
key={socketUrl}
Expand Down Expand Up @@ -231,10 +237,14 @@ function MonitorConfigure({ asset }: { asset: AssetData }) {
className="w-full"
/>
</div>
<Submit className="mt-6 w-full shrink-0">
<Button
id="submit"
variant={"primary"}
className="flex gap-2 mt-6 w-full shrink-0"
>
<CareIcon icon="l-bed" className="text-lg" />
{shouldUpdateLink ? "Update Bed" : "Save Bed"}
</Submit>
</Button>
</div>
</form>
);
Expand Down
6 changes: 3 additions & 3 deletions src/components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function HL7PatientVitalsMonitor(props: IVitalsComponentProps) {
);

return (
<div className="flex flex-col gap-1 rounded bg-[#020617] p-2">
<div className="flex flex-col gap-1 rounded bg-[#020617] p-2 w-[55%] m-1 md:w-full md:m-0">
{props.hideHeader ? null : (
<VitalsMonitorHeader patientAssetBed={props.patientAssetBed} />
)}
Expand Down Expand Up @@ -150,7 +150,7 @@ export default function HL7PatientVitalsMonitor(props: IVitalsComponentProps) {
</div>
</div>
</VitalsNonWaveformContent>
<div>
<div className="flex flex-wrap md:flex-nowrap">
<div
className={classNames(
"flex flex-col items-center justify-center gap-1 p-1 text-center font-mono font-medium text-warning-500",
Expand Down Expand Up @@ -203,7 +203,7 @@ export const VitalsNonWaveformContent = ({
}: {
children: JSX.Element | JSX.Element[];
}) => (
<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">
<div className="z-[5] grid grid-cols-2 gap-x-8 gap-y-8 sm:gap-y-4 mt-2 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 md:mt-0">
{children}
</div>
);
Expand Down
4 changes: 2 additions & 2 deletions src/components/VitalsMonitor/VentilatorPatientVitalsMonitor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ export default function VentilatorPatientVitalsMonitor(
}, [props.socketUrl]);

return (
<div className="flex flex-col gap-1 rounded bg-[#020617] p-2">
<div className="flex flex-col gap-1 rounded bg-[#020617] p-2 w-[55%] m-1 md:w-full md:m-0">
{props.hideHeader ? null : (
<VitalsMonitorHeader patientAssetBed={props.patientAssetBed} />
)}
<div className="relative flex flex-col gap-2 divide-x-0 divide-y divide-blue-600 md:flex-row md:justify-between md:divide-x md:divide-y-0">
<div>
<div className="flex flex-wrap md:flex-nowrap">
<div
className={classNames(
"flex flex-col items-center justify-center gap-1 p-1 text-center font-mono font-medium text-warning-500",
Expand Down
Loading