continued the kita-planer

src/app/dashboard/kalender/page.tsx

@@ -1,11 +1,11 @@
+import { DutyAssignmentStatus, TerminStatus, UserRole } from "@prisma/client";
+
 import { requireKitaSession } from "@/lib/auth-utils";
 import { prisma } from "@/lib/prisma";
-import { UserRole, TerminStatus } from "@prisma/client";
-import { TerminList } from "./_components/termin-list";
-import { PendingAnfragen } from "./_components/pending-anfragen";
-import { TerminRequestModal } from "./_components/termin-request-modal";
 import { AdminTerminModal } from "./_components/admin-termin-modal";
-import { CalendarDays } from "lucide-react";
+import { PendingAnfragen, type PendingTerminDto } from "./_components/pending-anfragen";
+import { TerminList, type CalendarListItemDto } from "./_components/termin-list";
+import { TerminRequestModal } from "./_components/termin-request-modal";
 
 export default async function KalenderPage({
   searchParams,
@@ -14,51 +14,139 @@ export default async function KalenderPage({
 }) {
   const session = await requireKitaSession();
   const isAdmin =
-    session.user.role === UserRole.ADMIN || session.user.role === UserRole.KOORDINATOR;
+    session.user.role === UserRole.ADMIN ||
+    session.user.role === UserRole.KOORDINATOR;
 
   const currentTab = searchParams.tab || "übersicht";
 
-  // Fetch confirmed events
-  const confirmedTermine = await prisma.termin.findMany({
+  const confirmedTermineRows = await prisma.termin.findMany({
     where: {
       kitaId: session.user.kitaId,
       status: TerminStatus.CONFIRMED,
     },
-    include: {
+    select: {
+      id: true,
+      title: true,
+      description: true,
+      type: true,
+      status: true,
+      startDate: true,
+      endDate: true,
+      allDay: true,
+      mitbringselListEnabled: true,
       mitbringselItems: {
-        include: {
-          user: { select: { firstName: true, lastName: true } },
+        select: {
+          id: true,
+          userId: true,
+          content: true,
+          user: {
+            select: {
+              firstName: true,
+              lastName: true,
+            },
+          },
         },
       },
     },
     orderBy: { startDate: "asc" },
   });
 
-  // Fetch user's own pending events
-  const myPendingTermine = await prisma.termin.findMany({
+  const myPendingTermineRows = await prisma.termin.findMany({
     where: {
       kitaId: session.user.kitaId,
       status: TerminStatus.PENDING,
       createdById: session.user.id,
     },
+    select: {
+      id: true,
+      title: true,
+      description: true,
+      type: true,
+      status: true,
+      startDate: true,
+      endDate: true,
+      allDay: true,
+      mitbringselListEnabled: true,
+      mitbringselItems: {
+        select: {
+          id: true,
+          userId: true,
+          content: true,
+          user: {
+            select: {
+              firstName: true,
+              lastName: true,
+            },
+          },
+        },
+      },
+    },
     orderBy: { startDate: "asc" },
   });
 
-  // Combine for general view
-  const allUserTermine = [...confirmedTermine, ...myPendingTermine].sort(
-    (a, b) => a.startDate.getTime() - b.startDate.getTime()
-  );
+  const dutyAssignmentRows = await prisma.dutyAssignment.findMany({
+    where: {
+      kitaId: session.user.kitaId,
+      status: DutyAssignmentStatus.PLANNED,
+      endDate: { gte: new Date() },
+    },
+    select: {
+      id: true,
+      startDate: true,
+      endDate: true,
+      status: true,
+      dutyType: {
+        select: {
+          name: true,
+        },
+      },
+      family: {
+        select: {
+          name: true,
+        },
+      },
+    },
+    orderBy: { startDate: "asc" },
+  });
 
-  // If admin, fetch all pending events
-  let allPendingTermine: any[] = [];
+  const allUserTermine: CalendarListItemDto[] = [
+    ...confirmedTermineRows.map((termin) => ({
+      ...termin,
+      kind: "termin" as const,
+    })),
+    ...myPendingTermineRows.map((termin) => ({
+      ...termin,
+      kind: "termin" as const,
+    })),
+    ...dutyAssignmentRows.map((assignment) => ({
+      kind: "duty" as const,
+      id: assignment.id,
+      title: assignment.dutyType.name,
+      familyName: assignment.family.name,
+      status: assignment.status,
+      startDate: assignment.startDate,
+      endDate: assignment.endDate,
+    })),
+  ].sort((a, b) => a.startDate.getTime() - b.startDate.getTime());
+
+  let allPendingTermine: PendingTerminDto[] = [];
   if (isAdmin) {
     allPendingTermine = await prisma.termin.findMany({
       where: {
         kitaId: session.user.kitaId,
         status: TerminStatus.PENDING,
       },
-      include: {
-        createdBy: { select: { firstName: true, lastName: true } },
+      select: {
+        id: true,
+        title: true,
+        startDate: true,
+        allDay: true,
+        createdBy: {
+          select: {
+            firstName: true,
+            lastName: true,
+          },
+        },
       },
       orderBy: { createdAt: "desc" },
     });
@@ -94,7 +182,7 @@ export default async function KalenderPage({
             </a>
             <a
               href="/dashboard/kalender?tab=anfragen"
-              className={`pb-2 text-sm font-medium transition-colors hover:text-primary flex items-center gap-2 ${
+              className={`flex items-center gap-2 pb-2 text-sm font-medium transition-colors hover:text-primary ${
                 currentTab === "anfragen"
                   ? "border-b-2 border-primary text-primary"
                   : "text-muted-foreground"