update

d-tree-org · Aug 8, 2024 · 041bd6c · 041bd6c
1 parent 41385b5
commit 041bd6c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/src/app/(dashboard)/patients/[id]/fetch.ts b/src/app/(dashboard)/patients/[id]/fetch.ts
@@ -36,7 +36,6 @@ export const fetchCarePlan = async (
   }
 };
 
-
 export const createDetails = async (
   patienyId: string,
   carePlan: fhirR4.CarePlan
@@ -51,6 +50,10 @@ export const createDetails = async (
     patientId: patienyId,
     activities: tasks,
     requester: carePlan.author?.display,
+    period: {
+      start: carePlan.period?.start?.toString() ?? "NA",
+      end: carePlan.period?.end?.toString() ?? "NA",
+    },
     visitNumber:
       carePlan.category?.find(
         (e) =>

diff --git a/src/app/(dashboard)/patients/content.tsx b/src/app/(dashboard)/patients/content.tsx
@@ -35,14 +35,14 @@ const Content = ({ locationMap }: Props) => {
                 <span className="badge">BirthDate: {patient.birthDate}</span>
               </div>
               {patient.phoneNumbers.map((value, index) => (
-                <div key={value.number} className="flex flex-row gap-2">
+                <div key={value.number} className="flex flex-row flex-wrap gap-2">
                   <span className="badge">
                     Phone {index + 1}: {value.number} -- Owner: {value.owner}
                   </span>
                 </div>
               ))}
               {patient.address.map((address, index) => (
-                <div key={address.facility} className="flex flex-row gap-2">
+                <div key={address.facility} className="flex flex-row flex-wrap gap-2">
                   <span className="badge">Location: {address.facility}</span>
                   <span className="badge">Physical: {address.physical}</span>
                 </div>

diff --git a/src/components/careplan/careplanContainer.tsx b/src/components/careplan/careplanContainer.tsx
@@ -3,6 +3,8 @@
 import { CarePlanData, CarePlanDataActivity } from "@/lib/models/types";
 import { useEffect, useState } from "react";
 import { Button } from "../ui/button";
+import { format, formatISO } from "date-fns";
+import { AiOutlineDown as DownIcon } from "react-icons/ai";
 
 type Props = {
   action: (data: FormData) => Promise<any>;
@@ -208,7 +210,15 @@ const CarePlanSummary = ({
       <details className="collapse bg-base-200">
         <summary className="collapse-title text-xl font-medium">
           <div className="flex flex-row justify-between w-full items-center">
-            <span>View Care Plan Details</span>
+            <div className="flex flex-row gap-4">
+              {careplan.period.start && (
+                <span>{format(careplan.period.start, "PPP")}</span>
+              )}
+              -
+              {careplan.period.end && (
+                <span>{format(careplan.period.end, "PPP")}</span>
+              )}
+            </div>
             <div className="flex flex-row gap-2 items-center">
               {careplan.version != lastestVersion && (
                 <Button onClick={() => setCurrentVersion(careplan.version)}>
@@ -229,6 +239,7 @@ const CarePlanSummary = ({
                   Next {" >"}
                 </Button>
               )}
+              <DownIcon />
             </div>
           </div>
         </summary>

diff --git a/src/lib/models/types.ts b/src/lib/models/types.ts
@@ -8,6 +8,10 @@ export type CarePlanData = {
   requester?: string;
   author?: string;
   visitNumber: string;
+  period: {
+    start?: string | Date | undefined;
+    end: string | Date | undefined;
+  };
   tags: fhirR4.Coding[];
   activities: CarePlanDataActivity[];
 };
@@ -26,14 +30,14 @@ export type CarePlanDataActivity = {
 export type LocationData = {
   id: string;
   name: string;
-}
+};
 
 export type SummaryResponse = {
-  summaries: SummaryItem[],
-  date: string | string[] | null
-}
+  summaries: SummaryItem[];
+  date: string | string[] | null;
+};
 
 export type SummaryItem = {
   name: string;
-  value: number
-}
+  value: number;
+};