From 5dff94b7d383d41f28f8aa89ff269e479e39408a Mon Sep 17 00:00:00 2001 From: Rishith25 Date: Mon, 27 Jan 2025 21:52:01 +0530 Subject: [PATCH 01/13] minor fixes in resource creation --- src/components/Resource/ResourceCreate.tsx | 59 +++++++++++++--------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/src/components/Resource/ResourceCreate.tsx b/src/components/Resource/ResourceCreate.tsx index 968bb40fbed..ce51f24c8f9 100644 --- a/src/components/Resource/ResourceCreate.tsx +++ b/src/components/Resource/ResourceCreate.tsx @@ -1,6 +1,6 @@ import { zodResolver } from "@hookform/resolvers/zod"; import { useQuery } from "@tanstack/react-query"; -import { navigate, useQueryParams } from "raviger"; +import { Link, navigate, useQueryParams } from "raviger"; import { useState } from "react"; import { useForm } from "react-hook-form"; import { useTranslation } from "react-i18next"; @@ -21,6 +21,7 @@ import { FormLabel, FormMessage, } from "@/components/ui/form"; +import { Input } from "@/components/ui/input"; import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group"; import { Select, @@ -30,14 +31,13 @@ import { SelectValue, } from "@/components/ui/select"; import { Separator } from "@/components/ui/separator"; +import { Textarea } from "@/components/ui/textarea"; import { FacilitySelect } from "@/components/Common/FacilitySelect"; import Loading from "@/components/Common/Loading"; import Page from "@/components/Common/Page"; import { PhoneNumberValidator } from "@/components/Form/FieldValidators"; import PhoneNumberFormField from "@/components/Form/FormFields/PhoneNumberFormField"; -import TextAreaFormField from "@/components/Form/FormFields/TextAreaFormField"; -import TextFormField from "@/components/Form/FormFields/TextFormField"; import useAppHistory from "@/hooks/useAppHistory"; import useAuthUser from "@/hooks/useAuthUser"; @@ -103,13 +103,20 @@ export default function ResourceCreate(props: ResourceProps) { const { data: facilityData } = useQuery({ queryKey: ["facility", facilityId], - queryFn: () => - query(routes.getAnyFacility, { - pathParams: { id: String(facilityId) }, - }), + queryFn: query(routes.getAnyFacility, { + pathParams: { id: String(facilityId) }, + }), enabled: !!facilityId, }); + const { data: patientData } = useQuery({ + queryKey: ["patient", related_patient], + queryFn: query(routes.patient.getPatient, { + pathParams: { id: String(related_patient) }, + }), + enabled: !!related_patient, + }); + const form = useForm({ resolver: zodResolver(resourceFormSchema), defaultValues: { @@ -192,16 +199,23 @@ export default function ResourceCreate(props: ResourceProps) {
- {related_patient && ( - -
- - - {t("linked_patient")}:{" "} - {related_patient} - -
- + {patientData && ( + + +
+ + + {t("linked_patient")}:{" "} + {patientData.name} + +
+ + )}
@@ -329,10 +343,9 @@ export default function ResourceCreate(props: ResourceProps) { {t("request_title")} - field.onChange(value.value)} /> @@ -350,11 +363,10 @@ export default function ResourceCreate(props: ResourceProps) { {t("request_reason")} - field.onChange(value.value)} /> @@ -397,10 +409,7 @@ export default function ResourceCreate(props: ResourceProps) { {t("contact_person")} - field.onChange(value.value)} - /> + {t("contact_person_description")} From 6abf479b1211c7ff32996f07c3cd9cd595f713b8 Mon Sep 17 00:00:00 2001 From: Rishith25 Date: Mon, 27 Jan 2025 22:10:05 +0530 Subject: [PATCH 02/13] trigger From d0fca5b90487e49d5b22100c51c8225b38580a90 Mon Sep 17 00:00:00 2001 From: Rishith25 Date: Wed, 29 Jan 2025 21:35:20 +0530 Subject: [PATCH 03/13] changes --- src/components/Resource/ResourceCreate.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/Resource/ResourceCreate.tsx b/src/components/Resource/ResourceCreate.tsx index 2c83982b30f..a647769abf8 100644 --- a/src/components/Resource/ResourceCreate.tsx +++ b/src/components/Resource/ResourceCreate.tsx @@ -175,11 +175,11 @@ export default function ResourceCreate(props: ResourceProps) { {patientData && ( - - -
+ +
+ {patientData.name} -
- - + +
+ )}
From f32c12e93f7ec7d79d04bc1eec9cfda32f1ebb28 Mon Sep 17 00:00:00 2001 From: Rishith25 Date: Thu, 30 Jan 2025 04:51:08 +0530 Subject: [PATCH 04/13] resource breadcrumbs uri changed --- src/components/Resource/ResourceCreate.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/Resource/ResourceCreate.tsx b/src/components/Resource/ResourceCreate.tsx index a647769abf8..16e4dfd4ad2 100644 --- a/src/components/Resource/ResourceCreate.tsx +++ b/src/components/Resource/ResourceCreate.tsx @@ -166,7 +166,10 @@ export default function ResourceCreate(props: ResourceProps) { title={t("create_resource_request")} crumbsReplacements={{ [facilityId]: { name: facilityData?.name || "" }, - resource: { style: "pointer-events-none" }, + resource: { + uri: `/resource`, + style: "pointer-events-none", + }, }} backUrl={`/facility/${facilityId}`} > @@ -179,6 +182,7 @@ export default function ResourceCreate(props: ResourceProps) {
Date: Mon, 3 Feb 2025 14:37:39 +0530 Subject: [PATCH 05/13] resource uri changes --- src/components/Resource/ResourceCreate.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Resource/ResourceCreate.tsx b/src/components/Resource/ResourceCreate.tsx index 33c3b730dbf..ab84a97c65d 100644 --- a/src/components/Resource/ResourceCreate.tsx +++ b/src/components/Resource/ResourceCreate.tsx @@ -167,7 +167,7 @@ export default function ResourceCreate(props: ResourceProps) { crumbsReplacements={{ [facilityId]: { name: facilityData?.name || "" }, resource: { - uri: `/resource`, + uri: `/facility/${facilityId}/resource`, style: "pointer-events-none", }, }} From c13705a4e79ca4dccbf2d8e04f073ee80363a9c1 Mon Sep 17 00:00:00 2001 From: Rishith25 Date: Tue, 4 Feb 2025 09:35:52 +0530 Subject: [PATCH 06/13] removed uri --- src/components/Resource/ResourceCreate.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Resource/ResourceCreate.tsx b/src/components/Resource/ResourceCreate.tsx index ab84a97c65d..8711487bffb 100644 --- a/src/components/Resource/ResourceCreate.tsx +++ b/src/components/Resource/ResourceCreate.tsx @@ -167,7 +167,6 @@ export default function ResourceCreate(props: ResourceProps) { crumbsReplacements={{ [facilityId]: { name: facilityData?.name || "" }, resource: { - uri: `/facility/${facilityId}/resource`, style: "pointer-events-none", }, }} From 97507c152457bd7b5b1157a8de93cb501c686138 Mon Sep 17 00:00:00 2001 From: Rishith25 Date: Tue, 4 Feb 2025 09:39:13 +0530 Subject: [PATCH 07/13] small change --- src/components/Resource/ResourceCreate.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/Resource/ResourceCreate.tsx b/src/components/Resource/ResourceCreate.tsx index 8711487bffb..e2a80852b35 100644 --- a/src/components/Resource/ResourceCreate.tsx +++ b/src/components/Resource/ResourceCreate.tsx @@ -166,9 +166,7 @@ export default function ResourceCreate(props: ResourceProps) { title={t("create_resource_request")} crumbsReplacements={{ [facilityId]: { name: facilityData?.name || "" }, - resource: { - style: "pointer-events-none", - }, + resource: { style: "pointer-events-none" }, }} backUrl={`/facility/${facilityId}`} > From 0778645c2ffdcccc88106bba790b4244ae9bd21d Mon Sep 17 00:00:00 2001 From: Rishith25 Date: Thu, 6 Feb 2025 10:18:32 +0530 Subject: [PATCH 08/13] resource page redirection --- src/components/Resource/ResourceCreate.tsx | 7 +++++-- src/components/Resource/ResourceList.tsx | 11 ++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/Resource/ResourceCreate.tsx b/src/components/Resource/ResourceCreate.tsx index e2a80852b35..daec50c9136 100644 --- a/src/components/Resource/ResourceCreate.tsx +++ b/src/components/Resource/ResourceCreate.tsx @@ -165,10 +165,13 @@ export default function ResourceCreate(props: ResourceProps) {
diff --git a/src/components/Resource/ResourceList.tsx b/src/components/Resource/ResourceList.tsx index 1ba35b0effe..96bab782705 100644 --- a/src/components/Resource/ResourceList.tsx +++ b/src/components/Resource/ResourceList.tsx @@ -103,7 +103,16 @@ export default function ResourceList({ facilityId }: { facilityId: string }) { const resources = queryResources?.results || []; return ( - +
From fe8aa963815949432f99673fb3ca89f134e30f27 Mon Sep 17 00:00:00 2001 From: Rishith25 Date: Thu, 6 Feb 2025 10:58:45 +0530 Subject: [PATCH 09/13] =?UTF-8?q?Trigger=C2=A0Build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From f31750a246f5c22e42e7e1c64d901ae0570521ea Mon Sep 17 00:00:00 2001 From: Rishith25 Date: Thu, 6 Feb 2025 10:59:39 +0530 Subject: [PATCH 10/13] =?UTF-8?q?Trigger=C2=A0Build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From d767fe410c9afe0cc5a3e92e7d935eddd33a1e8a Mon Sep 17 00:00:00 2001 From: Rishith25 Date: Thu, 6 Feb 2025 14:30:29 +0530 Subject: [PATCH 11/13] =?UTF-8?q?Trigger=C2=A0Build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From fa3eccb5cc30667afa42e5075ad9736d1449c767 Mon Sep 17 00:00:00 2001 From: Kamishetty Rishith <119791436+Rishith25@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:37:42 +0530 Subject: [PATCH 12/13] Update src/components/Resource/ResourceCreate.tsx Co-authored-by: Jacob John Jeevan <40040905+Jacobjeevan@users.noreply.github.com> --- src/components/Resource/ResourceCreate.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Resource/ResourceCreate.tsx b/src/components/Resource/ResourceCreate.tsx index 02795efafe4..73a5ff652e0 100644 --- a/src/components/Resource/ResourceCreate.tsx +++ b/src/components/Resource/ResourceCreate.tsx @@ -168,7 +168,7 @@ export default function ResourceCreate(props: ResourceProps) {
Date: Fri, 7 Feb 2025 11:47:38 +0530 Subject: [PATCH 13/13] Trigger