-
Notifications
You must be signed in to change notification settings - Fork 531
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.
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
Appointment as structured question + other enhancements #9661
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
837270c
fix alignments
rithviknishad 575681f
fix alignment
rithviknishad ba87083
appointment action checks, use same day check instead of is past
rithviknishad 96cd86a
appointment details page: support print
rithviknishad 2118ab1
add view patient button in app. show page
rithviknishad d4e7846
error free; but doesn't work
rithviknishad bbfa7da
appointment follow up as structured question
rithviknishad e696114
update naming
rithviknishad File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
216 changes: 216 additions & 0 deletions
216
src/components/Questionnaire/QuestionTypes/FollowUpAppointmentQuestion.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,216 @@ | ||
| import { useQuery } from "@tanstack/react-query"; | ||
| import { format } from "date-fns"; | ||
| import { useState } from "react"; | ||
| import { useTranslation } from "react-i18next"; | ||
|
|
||
| import { DatePicker } from "@/components/ui/date-picker"; | ||
| import { Label } from "@/components/ui/label"; | ||
| import { | ||
| Select, | ||
| SelectContent, | ||
| SelectItem, | ||
| SelectTrigger, | ||
| SelectValue, | ||
| } from "@/components/ui/select"; | ||
| import { Textarea } from "@/components/ui/textarea"; | ||
|
|
||
| import { Avatar } from "@/components/Common/Avatar"; | ||
| import { groupSlotsByAvailability } from "@/components/Schedule/Appointments/utils"; | ||
| import { ScheduleAPIs } from "@/components/Schedule/api"; | ||
| import { FollowUpAppointmentRequest } from "@/components/Schedule/types"; | ||
|
|
||
| import useSlug from "@/hooks/useSlug"; | ||
|
|
||
| import query from "@/Utils/request/query"; | ||
| import { dateQueryString, formatDisplayName } from "@/Utils/utils"; | ||
| import { | ||
| QuestionnaireResponse, | ||
| ResponseValue, | ||
| } from "@/types/questionnaire/form"; | ||
| import { Question } from "@/types/questionnaire/question"; | ||
| import { UserBase } from "@/types/user/user"; | ||
|
|
||
| interface FollowUpVisitQuestionProps { | ||
| question: Question; | ||
| questionnaireResponse: QuestionnaireResponse; | ||
| updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void; | ||
| disabled?: boolean; | ||
| } | ||
|
|
||
| export function FollowUpAppointmentQuestion({ | ||
| question, | ||
| questionnaireResponse, | ||
| updateQuestionnaireResponseCB, | ||
| disabled, | ||
| }: FollowUpVisitQuestionProps) { | ||
| const { t } = useTranslation(); | ||
| const [resource, setResource] = useState<UserBase>(); | ||
| const [selectedDate, setSelectedDate] = useState<Date>(); | ||
|
|
||
| const values = | ||
| (questionnaireResponse.values?.[0] | ||
| ?.value as unknown as FollowUpAppointmentRequest[]) || []; | ||
|
|
||
| const value = values[0] ?? {}; | ||
|
|
||
| const handleUpdate = (updates: Partial<FollowUpAppointmentRequest>) => { | ||
| const followUpAppointment = { ...value, ...updates }; | ||
| updateQuestionnaireResponseCB({ | ||
| ...questionnaireResponse, | ||
| values: [ | ||
| { | ||
| type: "follow_up_appointment", | ||
| value: [followUpAppointment] as unknown as ResponseValue["value"], | ||
| }, | ||
| ], | ||
| }); | ||
| }; | ||
|
|
||
| const facilityId = useSlug("facility"); | ||
|
|
||
| const resourcesQuery = useQuery({ | ||
| queryKey: ["availableResources", facilityId], | ||
| queryFn: query(ScheduleAPIs.appointments.availableDoctors, { | ||
| pathParams: { facility_id: facilityId }, | ||
| }), | ||
| }); | ||
|
|
||
| const slotsQuery = useQuery({ | ||
| queryKey: [ | ||
| "slots", | ||
| facilityId, | ||
| resource?.id, | ||
| dateQueryString(selectedDate), | ||
| ], | ||
| queryFn: query(ScheduleAPIs.slots.getSlotsForDay, { | ||
| pathParams: { facility_id: facilityId }, | ||
| body: { | ||
| resource: resource?.id, | ||
| day: dateQueryString(selectedDate), | ||
| }, | ||
| }), | ||
| enabled: !!resource && !!selectedDate, | ||
| }); | ||
|
|
||
| return ( | ||
| <div className="space-y-4"> | ||
| <Label className="text-base font-medium"> | ||
| {question.text} | ||
| {question.required && <span className="ml-1 text-red-500">*</span>} | ||
| </Label> | ||
| <div className="space-y-4"> | ||
| <div> | ||
| <Label className="mb-2">{t("reason_for_visit")}</Label> | ||
| <Textarea | ||
| placeholder={t("reason_for_visit_placeholder")} | ||
| value={value.reason_for_visit || ""} | ||
| onChange={(e) => handleUpdate({ reason_for_visit: e.target.value })} | ||
| disabled={disabled} | ||
| /> | ||
| </div> | ||
| <div> | ||
| <Label className="block mb-2">{t("select_practitioner")}</Label> | ||
| <Select | ||
| disabled={resourcesQuery.isLoading || disabled} | ||
| value={resource?.id} | ||
| onValueChange={(value) => | ||
| setResource( | ||
| resourcesQuery.data?.users.find((r) => r.id === value), | ||
| ) | ||
| } | ||
| > | ||
| <SelectTrigger> | ||
| <SelectValue placeholder={t("show_all")} /> | ||
| </SelectTrigger> | ||
| <SelectContent> | ||
| {resourcesQuery.data?.users.map((user) => ( | ||
| <SelectItem key={user.username} value={user.id}> | ||
| <div className="flex items-center gap-2"> | ||
| <Avatar | ||
| imageUrl={user.profile_picture_url} | ||
| name={formatDisplayName(user)} | ||
| className="size-6 rounded-full" | ||
| /> | ||
| <span>{formatDisplayName(user)}</span> | ||
| </div> | ||
| </SelectItem> | ||
| ))} | ||
| </SelectContent> | ||
| </Select> | ||
| </div> | ||
|
|
||
| <div className="flex gap-2"> | ||
| <div className="flex-1"> | ||
| <Label className="block mb-2">{t("select_date")}</Label> | ||
| <DatePicker date={selectedDate} onChange={setSelectedDate} /> | ||
| </div> | ||
|
|
||
| <div className="flex-1"> | ||
| <Label className="block mb-2">{t("select_time")}</Label> | ||
| {(!slotsQuery.data?.results || | ||
| slotsQuery.data.results.length === 0) && | ||
| selectedDate && | ||
| resource ? ( | ||
| <div className="rounded-md border border-input px-3 py-2 text-sm text-muted-foreground"> | ||
| {t("no_slots_available")} | ||
| </div> | ||
| ) : ( | ||
| <Select | ||
| disabled={ | ||
| !selectedDate || !resource || slotsQuery.isLoading || disabled | ||
| } | ||
| value={value.slot_id} | ||
| onValueChange={(slotId) => { | ||
| handleUpdate({ slot_id: slotId }); | ||
| }} | ||
| > | ||
| <SelectTrigger> | ||
| <SelectValue placeholder={t("select_time_slot")} /> | ||
| </SelectTrigger> | ||
| <SelectContent> | ||
| {slotsQuery.data?.results && | ||
| groupSlotsByAvailability(slotsQuery.data.results).map( | ||
| ({ availability, slots }) => ( | ||
| <div key={availability.name}> | ||
| <div className="px-2 py-1.5 text-sm font-semibold"> | ||
| {availability.name} | ||
| </div> | ||
| {slots.map((slot) => { | ||
| const isFullyBooked = | ||
| slot.allocated >= availability.tokens_per_slot; | ||
| return ( | ||
| <SelectItem | ||
| key={slot.id} | ||
| value={slot.id} | ||
| disabled={isFullyBooked} | ||
| > | ||
| <div className="flex items-center justify-between"> | ||
| <span> | ||
| {format(slot.start_datetime, "HH:mm")} | ||
| </span> | ||
| <span className="pl-1 text-xs text-gray-500"> | ||
| {availability.tokens_per_slot - | ||
| slot.allocated}{" "} | ||
| {t("slots_left")} | ||
| </span> | ||
| </div> | ||
| </SelectItem> | ||
| ); | ||
| })} | ||
| </div> | ||
| ), | ||
| )} | ||
| {slotsQuery.data?.results.length === 0 && ( | ||
| <div className="px-2 py-4 text-center text-sm text-gray-500"> | ||
| {t("no_slots_available")} | ||
| </div> | ||
| )} | ||
| </SelectContent> | ||
| </Select> | ||
| )} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Add error handling for data fetching.
The queries lack error handling which could lead to poor user experience when network requests fail.
Consider adding error handling and loading states:
const resourcesQuery = useQuery({ queryKey: ["availableResources", facilityId], queryFn: query(ScheduleAPIs.appointments.availableDoctors, { pathParams: { facility_id: facilityId }, }), + retry: 2, + onError: (error) => { + // Handle error (e.g., show toast notification) + console.error('Failed to fetch available doctors:', error); + } }); const slotsQuery = useQuery({ queryKey: [ "slots", facilityId, resource?.id, dateQueryString(selectedDate), ], queryFn: query(ScheduleAPIs.slots.getSlotsForDay, { pathParams: { facility_id: facilityId }, body: { resource: resource?.id, day: dateQueryString(selectedDate), }, }), enabled: !!resource && !!selectedDate, + retry: 2, + onError: (error) => { + // Handle error (e.g., show toast notification) + console.error('Failed to fetch slots:', error); + } });Also, consider displaying error states in the UI: