Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/app/(dashboard)/pacientes/[id]/_documentos/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ const PATIENT_SECTIONS = [
{
id: '1',
name: 'Laudo_Cardiologico_2025.pdf',
created_at: '2025-10-05',
createdAt: '2025-10-05',
size: '783.4 KB',
url: '/documents/Laudo_Cardiologico_2025.pdf',
},
{
id: '2',
name: 'Exame_de_Sangue_Completo.pdf',
created_at: '2025-09-28',
createdAt: '2025-09-28',
size: '1.2 MB',
url: '/documents/Exame_de_Sangue_Completo.pdf',
},
Expand All @@ -26,14 +26,14 @@ const PATIENT_SECTIONS = [
{
id: '3',
name: 'RG_Frente_Verso.pdf',
created_at: '2025-01-15',
createdAt: '2025-01-15',
size: '450.1 KB',
url: '/documents/RG_Frente_Verso.pdf',
},
{
id: '4',
name: 'Comprovante_Residencia.pdf',
created_at: '2025-08-01',
createdAt: '2025-08-01',
size: '249.0 KB',
url: '/documents/Comprovante_Residencia.pdf',
},
Expand Down
8 changes: 4 additions & 4 deletions src/app/(dashboard)/perfil/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ export default async function Page() {
return null
}

const showUpdatedDate = new Date(user.updated_at) > new Date(user.created_at)
const showUpdatedDate = new Date(user.updatedAt) > new Date(user.createdAt)

return (
<>
<div className='flex items-center gap-4'>
<Avatar src={user.avatar_url} className='size-16' />
<Avatar src={user.avatarUrl} className='size-16' />
<div>
<p className='text-xl font-semibold'>{user.name}</p>
<span className='text-foreground-soft text-sm'>{user.email}</span>
Expand All @@ -36,13 +36,13 @@ export default async function Page() {

<span className='text-foreground-soft text-sm'>
Conta registrada em{' '}
{formatDate(user.created_at, {
{formatDate(user.createdAt, {
dateStyle: 'short',
timeStyle: 'short',
})}
.
{showUpdatedDate &&
` Última atualização realizada em ${formatDate(user.updated_at, {
` Última atualização realizada em ${formatDate(user.updatedAt, {
dateStyle: 'short',
timeStyle: 'short',
})}.`}
Expand Down
2 changes: 1 addition & 1 deletion src/app/_paciente/_header/user-dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export function PatientHeaderUserDropdown({
className='rounded-full pl-1'
indicator
>
<Avatar src={user.avatar_url} className='size-8 [&_svg]:size-4' />
<Avatar src={user.avatarUrl} className='size-8 [&_svg]:size-4' />
{firstName}
</DropdownMenuTrigger>

Expand Down
8 changes: 4 additions & 4 deletions src/app/_paciente/documentos/pendentes/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ export default async function Page() {
type: 'screening',
status: 'pending',
description: null,
created_at: '2024-10-20',
submitted_at: null,
approved_at: null,
patient: { id: '2', name: 'Paciente Exemplo', avatar_url: null },
createdAt: '2024-10-20',
submittedAt: null,
approvedAt: null,
patient: { id: '2', name: 'Paciente Exemplo', avatarUrl: null },
}

return (
Expand Down
12 changes: 6 additions & 6 deletions src/app/_paciente/triagem/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ export function useScreening({ storageKey }: Readonly<UseScreeningProps>) {
...patient.data,
phone: removeNonNumbers(patient.data.phone),
cpf: removeNonNumbers(patient.data.cpf),
has_disability: medicalReport.data.has_disability === 'yes',
disability_desc: medicalReport.data.disability_desc ?? null,
need_legal_assistance: medicalReport.data.need_legal_assistance === 'yes',
take_medication: medicalReport.data.take_medication === 'yes',
medication_desc: medicalReport.data.medication_desc ?? null,
has_nmo_diagnosis: medicalReport.data.has_nmo_diagnosis === 'yes',
hasDisability: medicalReport.data.hasDisability === 'yes',
disabilityDesc: medicalReport.data.disabilityDesc ?? null,
needLegalAssistance: medicalReport.data.needLegalAssistance === 'yes',
takeMedication: medicalReport.data.takeMedication === 'yes',
medicationDesc: medicalReport.data.medicationDesc ?? null,
hasNmoDiagnosis: medicalReport.data.hasNmoDiagnosis === 'yes',
supports,
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,46 @@ import { yesOrNoSchema } from '@/schemas'

export const screeningMedicalReportFormSchema = z
.object({
has_disability: yesOrNoSchema,
disability_desc: z
hasDisability: yesOrNoSchema,
disabilityDesc: z
.string()
.transform((data) => data?.trim())
.nullable(),
need_legal_assistance: yesOrNoSchema,
take_medication: yesOrNoSchema,
medication_desc: z
needLegalAssistance: yesOrNoSchema,
takeMedication: yesOrNoSchema,
medicationDesc: z
.string()
.transform((data) => data?.trim())
.nullable(),
has_nmo_diagnosis: yesOrNoSchema,
hasNmoDiagnosis: yesOrNoSchema,
})
.refine(
(data) => {
if (data.has_disability === 'yes' && !data.disability_desc) {
if (data.hasDisability === 'yes' && !data.disabilityDesc) {
return false
}
if (data.has_disability === 'no') {
data.disability_desc = null
if (data.hasDisability === 'no') {
data.disabilityDesc = null
}
return true
},
{
path: ['disability_desc'],
path: ['disabilityDesc'],
message: 'Descrição da deficiência é obrigatória',
},
)
.refine(
(data) => {
if (data.take_medication === 'yes' && !data.medication_desc) {
if (data.takeMedication === 'yes' && !data.medicationDesc) {
return false
}
if (data.take_medication === 'no') {
data.medication_desc = null
if (data.takeMedication === 'no') {
data.medicationDesc = null
}
return true
},
{
path: ['medication_desc'],
path: ['medicationDesc'],
message: 'Descrição do medicamento é obrigatória',
},
)
Expand All @@ -53,9 +53,9 @@ export type ScreeningMedicalReportFormSchema = z.infer<
>

export const screeningMedicalReportFormDefaultValues = {
has_disability: '',
disability_desc: '',
take_medication: '',
medication_desc: '',
has_nmo_diagnosis: '',
hasDisability: '',
disabilityDesc: '',
takeMedication: '',
medicationDesc: '',
hasNmoDiagnosis: '',
} as unknown as ScreeningMedicalReportFormSchema
19 changes: 8 additions & 11 deletions src/app/_paciente/triagem/laudo-medico/medical-report-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ export function ScreeningMedicalReportForm() {
mode: 'onBlur',
})
const { setValue, watch } = formMethods
const hasDisability = watch('has_disability') === 'yes'
const takeMedication = watch('take_medication') === 'yes'
const hasDisability = watch('hasDisability') === 'yes'
const takeMedication = watch('takeMedication') === 'yes'

useEffect(() => {
const savedFormData = getStoredFormData(screeningMedicalReportFormSchema)
Expand All @@ -60,40 +60,37 @@ export function ScreeningMedicalReportForm() {
>
<FormField>
<RadioInput
name='has_disability'
name='hasDisability'
label='Você possui alguma deficiência?'
isRequired
options={YES_OR_NO_OPTIONS}
/>
{hasDisability && (
<TextInput
name='disability_desc'
label='Descreva sua deficiência'
/>
<TextInput name='disabilityDesc' label='Descreva sua deficiência' />
)}
</FormField>

<RadioInput
name='need_legal_assistance'
name='needLegalAssistance'
label='Precisa de assistência legal?'
isRequired
options={YES_OR_NO_OPTIONS}
/>

<FormField>
<RadioInput
name='take_medication'
name='takeMedication'
label='Faz uso de medicamentos?'
isRequired
options={YES_OR_NO_OPTIONS}
/>
{takeMedication && (
<TextInput name='medication_desc' label='Quais medicamentos?' />
<TextInput name='medicationDesc' label='Quais medicamentos?' />
)}
</FormField>

<RadioInput
name='has_nmo_diagnosis'
name='hasNmoDiagnosis'
label='Você possui um Diagnóstico de NMO?'
isRequired
options={YES_OR_NO_OPTIONS}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
export const screeningPatientDataFormSchema = z.object({
name: nameSchema,
gender: genderSchema,
date_of_birth: dateOfBirthSchema,
dateOfBirth: dateOfBirthSchema,
state: stateSchema,
city: citySchema,
phone: phoneSchema,
Expand Down
4 changes: 2 additions & 2 deletions src/app/_paciente/triagem/seus-dados/patient-data-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function ScreeningPatientDataForm() {
defaultValues: {
name: '',
gender: '',
date_of_birth: '',
dateOfBirth: '',
city: '',
state: '',
phone: '',
Expand Down Expand Up @@ -88,7 +88,7 @@ export function ScreeningPatientDataForm() {
isRequired
/>
<DateInput
name='date_of_birth'
name='dateOfBirth'
label='Data de nascimento'
navMode='dropdown'
isRequired
Expand Down
2 changes: 1 addition & 1 deletion src/components/sidebar/account.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function SidebarAccount({ user }: Readonly<SidebarAccountProps>) {

return (
<div className='relative flex items-center gap-3'>
<Avatar src={user?.avatar_url} />
<Avatar src={user?.avatarUrl} />

<div
data-visible={expanded}
Expand Down
1 change: 0 additions & 1 deletion src/components/ui/date-picker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { useCallback, useState } from 'react'

import { cn } from '@/utils/class-name-merge'
import { formatDate } from '@/utils/formatters/format-date'
import { parseDateOnly } from '@/utils/parse-date-only'

import { Calendar, type CalendarProps } from './calendar'
import { Popover } from './popover'
Expand Down
22 changes: 11 additions & 11 deletions src/modules/appointments/appointment-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ import type { Appointment } from '@/types/appointments'
const appointmentFormSchema = z
.object({
role: userRoleSchema,
patient_id: z.string().uuid('Paciente é obrigatório'),
patientId: z.string().uuid('Paciente é obrigatório'),
date: dateSchema,
category: specialtySchema.optional(),
condition: patientConditionSchema,
professional_name: professionalNameSchema,
professionalName: professionalNameSchema,
annotation: z
.string()
.max(500)
Expand Down Expand Up @@ -85,22 +85,22 @@ export function AppointmentModal({
resolver: zodResolver(appointmentFormSchema),
defaultValues: {
role: user?.role,
patient_id: patientId ?? (appointment?.patient_id || ''),
patientId: patientId ?? (appointment?.patientId || ''),
date: appointment?.date || '',
condition: appointment?.condition || '',
category: isUserSpecialist ? undefined : appointment?.category || '',
professional_name: appointment?.professional_name || '',
professionalName: appointment?.professionalName || '',
annotation: appointment?.annotation || '',
} as AppointmentFormSchema,
mode: 'onBlur',
})

async function submitForm({
patient_id,
patientId,
date,
category,
condition,
professional_name,
professionalName,
annotation,
}: AppointmentFormSchema) {
const payload: Partial<AppointmentFormSchema> = {
Expand All @@ -110,9 +110,9 @@ export function AppointmentModal({
}

if (isCreateMode) {
payload.patient_id = patient_id
payload.patientId = patientId
payload.category = isUserSpecialist ? undefined : category
payload.professional_name = professional_name
payload.professionalName = professionalName
}

const response = isCreateMode
Expand All @@ -137,7 +137,7 @@ export function AppointmentModal({
QUERY_CACHE_KEYS.statistics.totalAppointments,
])
revalidateServerCache([
NEXT_CACHE_TAGS.patient(patient_id),
NEXT_CACHE_TAGS.patient(patientId),
NEXT_CACHE_TAGS.appointments.main,
NEXT_CACHE_TAGS.statistics.totalAppointments.main,
NEXT_CACHE_TAGS.statistics.totalPatientsWithAppointments.main,
Expand All @@ -162,7 +162,7 @@ export function AppointmentModal({
onSubmit={formMethods.handleSubmit(submitForm)}
>
<ComboboxInput
name='patient_id'
name='patientId'
label='Paciente'
options={patientOptions}
className='sm:col-span-full'
Expand Down Expand Up @@ -197,7 +197,7 @@ export function AppointmentModal({
isRequired
/>
<TextInput
name='professional_name'
name='professionalName'
label='Profissional responsável'
placeholder='Insira o nome'
wrapperClassName='sm:col-span-1'
Expand Down
2 changes: 1 addition & 1 deletion src/modules/appointments/cancel-appointment-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export function CancelAppointmentModal({
QUERY_CACHE_KEYS.statistics.totalAppointmentsByState,
])
revalidateServerCache([
NEXT_CACHE_TAGS.patient(appointment.patient_id),
NEXT_CACHE_TAGS.patient(appointment.patientId),
NEXT_CACHE_TAGS.appointments.main,
NEXT_CACHE_TAGS.statistics.totalAppointments.main,
NEXT_CACHE_TAGS.statistics.totalPatientsWithAppointments.main,
Expand Down
4 changes: 2 additions & 2 deletions src/modules/appointments/table/actions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export function AppointmentsTableActions({
<MenuItem
onClick={() =>
router.push(
ROUTES.dashboard.patients.details.info(appointment.patient_id),
ROUTES.dashboard.patients.details.info(appointment.patientId),
)
}
>
Expand All @@ -66,7 +66,7 @@ export function AppointmentsTableActions({
onClick={() =>
router.push(
ROUTES.dashboard.patients.details.history(
appointment.patient_id,
appointment.patientId,
),
)
}
Expand Down
Loading
Loading