From 83c452408a9a0f275a8131b0bd044b2691924daf Mon Sep 17 00:00:00 2001 From: Gokulram A Date: Wed, 20 Dec 2023 20:29:15 +0530 Subject: [PATCH] Redesign location card UI (#6853) * redesign location card * used RecordMeta component for created and modified date --- src/Components/Assets/AssetTypes.tsx | 1 - .../Facility/LocationManagement.tsx | 87 +++++++++++-------- src/Components/Facility/models.tsx | 5 +- 3 files changed, 55 insertions(+), 38 deletions(-) diff --git a/src/Components/Assets/AssetTypes.tsx b/src/Components/Assets/AssetTypes.tsx index 041d3d0a81e..97334f6af49 100644 --- a/src/Components/Assets/AssetTypes.tsx +++ b/src/Components/Assets/AssetTypes.tsx @@ -20,7 +20,6 @@ export interface AssetLocationObject { id: string; name: string; }; - middleware_address?: string; } export enum AssetType { diff --git a/src/Components/Facility/LocationManagement.tsx b/src/Components/Facility/LocationManagement.tsx index c018a7c222b..d378dbf9953 100644 --- a/src/Components/Facility/LocationManagement.tsx +++ b/src/Components/Facility/LocationManagement.tsx @@ -6,6 +6,7 @@ import Page from "../Common/components/Page"; import routes from "../../Redux/api"; import PaginatedList from "../../CAREUI/misc/PaginatedList"; import { LocationModel } from "./models"; +import RecordMeta from "../../CAREUI/display/RecordMeta"; const Loading = lazy(() => import("../Common/Loading")); @@ -51,10 +52,11 @@ export default function LocationManagement({ facilityId }: Props) { - - className="my-8 flex grow flex-col gap-3 lg:mx-8"> - {(item) => } - +
+ className="my-8 grid gap-3 @4xl:grid-cols-2 @6xl:grid-cols-3 @[100rem]:grid-cols-4 lg:mx-8"> + {(item) => } + +
@@ -69,43 +71,56 @@ const Location = ({ name, description, middleware_address, + location_type, + created_date, + modified_date, id, }: LocationModel) => ( -
-
-
-

- {name} -

- {description || "-"} -

-

-

- {middleware_address} -

+
+
+
+
+

{name}

+
+

+ {location_type} +

+
+
+ + + Edit +
+

+ {description || "-"} +

+

+ Middleware Address: +

+

+ {middleware_address || "-"} +

-
- - - Edit - - - - Manage Beds - + + + Manage Beds + + +
+ +
); diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx index 92daaf4ca5b..bfb5750504a 100644 --- a/src/Components/Facility/models.tsx +++ b/src/Components/Facility/models.tsx @@ -1,7 +1,7 @@ import { AssignedToObjectModel, DailyRoundsModel } from "../Patient/models"; import { ProcedureType } from "../Common/prescription-builder/ProcedureBuilder"; import { NormalPrescription, PRNPrescription } from "../Medicine/models"; -import { AssetData } from "../Assets/AssetTypes"; +import { AssetData, AssetLocationType } from "../Assets/AssetTypes"; import { UserBareMinimum } from "../Users/models"; import { RouteToFacility } from "../Common/RouteToFacilitySelect"; import { ConsultationDiagnosis, CreateDiagnosis } from "../Diagnosis/types"; @@ -205,9 +205,12 @@ export interface LocationModel { name?: string; description?: string; middleware_address?: string; + location_type?: AssetLocationType; facility?: { name: string; }; + created_date?: string; + modified_date?: string; } export interface BedModel {