From 979ef221267d85e1d1b145ca47220c85e7309876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Rafael=20Siqueira?= Date: Thu, 11 Dec 2025 23:19:43 -0300 Subject: [PATCH] fix --- .../app/routes/enrollments/enroll.py | 2 + .../route.tsx | 40 ++++++++++++++----- .../routes/_.$orgid.enrollments.add/data.ts | 6 ++- 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/api.saladeaula.digital/app/routes/enrollments/enroll.py b/api.saladeaula.digital/app/routes/enrollments/enroll.py index a6de86f..14b3692 100644 --- a/api.saladeaula.digital/app/routes/enrollments/enroll.py +++ b/api.saladeaula.digital/app/routes/enrollments/enroll.py @@ -307,6 +307,8 @@ def enroll_later(enrollment: Enrollment, context: Context): exc_cls=DeduplicationConflictError, ) + return enrollment + def date_to_midnight(dt: date) -> datetime: return datetime.combine(dt, time(0, 0)).replace(tzinfo=pytz.timezone(TZ)) diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id.submitted/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id.submitted/route.tsx index d48cca1..1cb82ee 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id.submitted/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id.submitted/route.tsx @@ -7,7 +7,8 @@ import { CalendarIcon, UserIcon, BanIcon, - PlusIcon + PlusIcon, + XIcon } from 'lucide-react' import { Link } from 'react-router' import { Suspense } from 'react' @@ -46,6 +47,7 @@ import { Skeleton } from '@repo/ui/components/skeleton' import { Await } from 'react-router' import { Abbr } from '@repo/ui/components/abbr' import { Button } from '@repo/ui/components/ui/button' +import { Badge } from '@repo/ui/components/ui/badge' export function meta({}: Route.MetaArgs) { return [{ title: 'Relatório de matrículas' }] @@ -88,12 +90,13 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) { - }> + {/*}>*/} + {({ enrolled, scheduled, sk, created_by }) => { - const succeed = enrolled.filter( + const succeed = enrolled?.filter( ({ status }) => status === 'success' ) - const failed = enrolled.filter(({ status }) => status === 'fail') + const failed = enrolled?.filter(({ status }) => status === 'fail') return (
@@ -156,8 +159,25 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) {
    -
  • ...
  • -
  • ...
  • + {scheduled.map( + ({ output, input_record, status }, index) => + status === 'success' ? ( +
  • + {output.user.name} + + {output.course.name} +
  • + ) : ( +
  • + {input_record.user.name} + + {input_record.course.name} + + (Agendado anteriormente) + +
  • + ) + )}
@@ -174,11 +194,9 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) { {formatted.format(new Date(sk))} - {created_by && ( -
  • - {created_by.name} -
  • - )} +
  • + {created_by.name} +
  • diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/data.ts b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/data.ts index 0d25b50..e09e196 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/data.ts +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/data.ts @@ -1,4 +1,5 @@ import { z } from 'zod' +import { format } from 'date-fns' export const MAX_ITEMS = 50 @@ -30,7 +31,10 @@ export const enrollment = z.object({ offset_days: z.number() }) .optional(), - scheduled_for: z.date().optional() + scheduled_for: z + .date() + .optional() + .transform((date) => (date ? format(date, 'yyyy-MM-dd') : undefined)) }) export const formSchema = z.object({