From fa6321b80875a79d27abeb66ef754f66eae8f7eb Mon Sep 17 00:00:00 2001 From: PxlLoewe <72106766+PxlLoewe@users.noreply.github.com> Date: Fri, 6 Jun 2025 12:32:19 -0700 Subject: [PATCH] fixed event completed Workflow --- apps/discord-server/routes/helper.ts | 1 + apps/hub-server/modules/event.ts | 1 - apps/hub-server/routes/event.ts | 1 + .../event/_components/AppointmentModal.tsx | 187 +++++++++--------- .../event/_components/ParticipantModal.tsx | 10 - packages/database/prisma/schema/event.prisma | 2 - 6 files changed, 101 insertions(+), 101 deletions(-) diff --git a/apps/discord-server/routes/helper.ts b/apps/discord-server/routes/helper.ts index f2018d1b..b730bb9a 100644 --- a/apps/discord-server/routes/helper.ts +++ b/apps/discord-server/routes/helper.ts @@ -19,6 +19,7 @@ router.post("/set-standard-name", async (req, res) => { id: userId, }, }); + console.log(`Setting standard name for user ${userId} (${user?.publicId}) to member ${memberId}`); if (!user) { res.status(404).json({ error: "User not found" }); return; diff --git a/apps/hub-server/modules/event.ts b/apps/hub-server/modules/event.ts index 45107118..91abbfcd 100644 --- a/apps/hub-server/modules/event.ts +++ b/apps/hub-server/modules/event.ts @@ -47,7 +47,6 @@ export const handleParticipantFinished = async ( id: participant.id, }, data: { - completetionWorkflowFinished: true, statusLog: { push: { event: "Berechtigungen und Badges vergeben", diff --git a/apps/hub-server/routes/event.ts b/apps/hub-server/routes/event.ts index 28d9c522..36e37466 100644 --- a/apps/hub-server/routes/event.ts +++ b/apps/hub-server/routes/event.ts @@ -24,6 +24,7 @@ router.post("/handle-participant-finished", async (req, res) => { }, }, }); + console.log("Handeling Participant-completed", participant?.User.publicId); if (!participant) { res.status(404).json({ error: "Participant not found" }); return; diff --git a/apps/hub/app/(app)/admin/event/_components/AppointmentModal.tsx b/apps/hub/app/(app)/admin/event/_components/AppointmentModal.tsx index 78f00643..8e6d7817 100644 --- a/apps/hub/app/(app)/admin/event/_components/AppointmentModal.tsx +++ b/apps/hub/app/(app)/admin/event/_components/AppointmentModal.tsx @@ -1,6 +1,6 @@ import { Event, Participant } from "@repo/db"; import { EventAppointmentOptionalDefaults } from "@repo/db/zod"; -import { CellContext } from "@tanstack/react-table"; +import { ColumnDef } from "@tanstack/react-table"; import { useSession } from "next-auth/react"; import { RefObject, useRef } from "react"; import { UseFormReturn } from "react-hook-form"; @@ -10,6 +10,7 @@ import { DateInput } from "../../../../_components/ui/DateInput"; import { upsertParticipant } from "../../../events/actions"; import { deleteAppoinement, upsertAppointment } from "../action"; import { handleParticipantFinished } from "../../../../../helper/events"; +import toast from "react-hot-toast"; interface AppointmentModalProps { event?: Event; @@ -74,101 +75,111 @@ export const AppointmentModal = ({ ) => { - return {new Date(row.original.enscriptionDate).toLocaleString()}; + columns={ + [ + { + accessorKey: "User.firstname", + header: "Vorname", }, - }, - { - header: "Anwesend", - cell: ({ row }: CellContext) => { - if (row.original.attended) { - return Ja; - } else if (row.original.appointmentCancelled) { - return Nein (Termin abgesagt); - } else { - return ?; - } + { + accessorKey: "User.lastname", + header: "Nachname", }, - }, - { - header: "Aktion", + { + accessorKey: "enscriptionDate", + header: "Einschreibedatum", + cell: ({ row }) => { + return {new Date(row.original.enscriptionDate).toLocaleString()}; + }, + }, + { + header: "Anwesend", + cell: ({ row }) => { + if (row.original.attended) { + return Ja; + } else if (row.original.appointmentCancelled) { + return Nein (Termin abgesagt); + } else { + return ?; + } + }, + }, + { + header: "Aktion", - cell: ({ row }: CellContext) => { - return ( -
- - {!row.original.attended && event?.hasPresenceEvents && ( + cell: ({ row }) => { + return ( +
- )} - {!row.original.appointmentCancelled && event?.hasPresenceEvents && ( - - )} -
- ); + {!row.original.attended && event?.hasPresenceEvents && ( + + )} + {!row.original.appointmentCancelled && event?.hasPresenceEvents && ( + + )} +
+ ); + }, }, - }, - ]} + ] as ColumnDef[] + } prismaModel={"participant"} filter={{ eventAppointmentId: appointmentForm.watch("id"), diff --git a/apps/hub/app/(app)/admin/event/_components/ParticipantModal.tsx b/apps/hub/app/(app)/admin/event/_components/ParticipantModal.tsx index b8f5ae7f..c548b618 100644 --- a/apps/hub/app/(app)/admin/event/_components/ParticipantModal.tsx +++ b/apps/hub/app/(app)/admin/event/_components/ParticipantModal.tsx @@ -61,16 +61,6 @@ export const ParticipantModal = ({ participantForm, ref }: ParticipantModalProps name="finisherMoodleCurseCompleted" label="Abschluss-Moodle-Kurs abgeschlossen" /> - -

Termine

diff --git a/packages/database/prisma/schema/event.prisma b/packages/database/prisma/schema/event.prisma index 2d9e5130..0162de2f 100644 --- a/packages/database/prisma/schema/event.prisma +++ b/packages/database/prisma/schema/event.prisma @@ -22,8 +22,6 @@ model Participant { finisherMoodleCurseCompleted Boolean @default(false) attended Boolean @default(false) appointmentCancelled Boolean @default(false) - completetionWorkflowFinished Boolean @default(false) - inscriptionWorkflowCompleted Boolean @default(false) eventAppointmentId Int? enscriptionDate DateTime @default(now())