task page filters tasks by fir

Author: yschaffler

app/admin/events/page.tsx

@@ -133,13 +133,11 @@ export default function AdminEventsPage() {
         setLoading(false);
         return;
       }
-      if (isVATGERLead()) {
-        setSelectedFir("ALL");
-        refreshEvents("ALL");
-      } else if (user.fir?.code) {
+      if (user.fir?.code) {
         setSelectedFir(user.fir.code);
         refreshEvents(user.fir.code);
       } else {
+        setSelectedFir("ALL");
         refreshEvents("ALL");
       }
     }

app/admin/tasks/page.tsx

@@ -56,13 +56,34 @@ export default function MyTasksPage() {
   // Filters for "all" tab
   const [statusFilter, setStatusFilter] = useState<"all" | "open" | "done">("all");
   const [assignFilter, setAssignFilter] = useState<"all" | "assigned" | "unassigned">("all");
+  // FIR filter for "all" tab
+  const [firFilter, setFirFilter] = useState<string | null>(null);
+  const [availableFirs, setAvailableFirs] = useState<{ code: string; name: string }[]>([]);
 
   const { user } = useUser();
   const currentCID = user?.cid;
 
+  // Determine the default FIR: use the user's own FIR if available.
+  // VATGER leads without a FIR may pick from a selector.
+  useEffect(() => {
+    if (!user) return;
+    if (user.fir?.code) {
+      setFirFilter(user.fir.code);
+    }
+    if (user.effectiveLevel === "VATGER_LEITUNG" || user.effectiveLevel === "MAIN_ADMIN") {
+      // Load available FIRs for the selector
+      fetch("/api/firs")
+        .then((r) => r.json())
+        .then((firs: { code: string; name: string }[]) => setAvailableFirs(firs))
+        .catch(() => {/* ignore */});
+    }
+  }, [user]);
+
   const loadTasks = useCallback(async () => {
     try {
-      const res = await fetch(`/api/tasks/my?view=${tab}`);
+      const params = new URLSearchParams({ view: tab });
+      if (tab === "all" && firFilter) params.set("firCode", firFilter);
+      const res = await fetch(`/api/tasks/my?${params.toString()}`);
       if (!res.ok) throw new Error("Fehler beim Laden");
       const result = await res.json();
       setData(result);
@@ -72,7 +93,7 @@ export default function MyTasksPage() {
     } finally {
       setLoading(false);
     }
-  }, [tab]);
+  }, [tab, firFilter]);
 
   useEffect(() => {
     setLoading(true);
@@ -372,7 +393,24 @@ export default function MyTasksPage() {
 
         <TabsContent value="all" className="space-y-4 mt-4">
           {/* Filters */}
-          <div className="flex items-center gap-3">
+          <div className="flex items-center gap-3 flex-wrap">
+            {/* FIR selector: only shown for VATGER leads / MAIN_ADMINs without a fixed FIR */}
+            {(user?.effectiveLevel === "VATGER_LEITUNG" || user?.effectiveLevel === "MAIN_ADMIN") && (
+              <Select
+                value={firFilter ?? "ALL"}
+                onValueChange={(v) => setFirFilter(v === "ALL" ? null : v)}
+              >
+                <SelectTrigger className="w-[180px] h-8 text-xs">
+                  <SelectValue placeholder="FIR auswählen" />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="ALL">Alle FIRs</SelectItem>
+                  {availableFirs.map((f) => (
+                    <SelectItem key={f.code} value={f.code}>{f.code} – {f.name}</SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            )}  
             <Select value={statusFilter} onValueChange={(v) => setStatusFilter(v as "all" | "open" | "done")}>
               <SelectTrigger className="w-[160px] h-8 text-xs">
                 <SelectValue />

app/api/tasks/my/route.ts

@@ -25,6 +25,7 @@ export async function GET(req: NextRequest) {
   }
 
   const view = req.nextUrl.searchParams.get("view") || "mine";
+  const firCode = req.nextUrl.searchParams.get("firCode") || null;
 
   const eventInclude = {
     select: { id: true, name: true, startTime: true, firCode: true },
@@ -55,6 +56,7 @@ export async function GET(req: NextRequest) {
     where: {
       event: {
         status: { notIn: ["CANCELLED"] },
+        ...(firCode ? { firCode } : {}),
       },
     },
     include: {

config/taskTemplates.ts

@@ -28,15 +28,15 @@ export const DEFAULT_TASK_TEMPLATES: TaskTemplate[] = [
     title: "Banner erstellen",
     description:
       "Erstelle einen Banner für das Event. Nach Fertigstellung kann die Banner-URL hinterlegt werden. Der Banner darf erst veröffentlicht werden, nachdem er im Clearing approved wurde.",
-    deadlineDaysBefore: 35,
+    deadlineDaysBefore: 33,
     sortOrder: 1,
   },
   {
     type: "CREATE_TEXT",
     title: "Bewerbungstext erstellen",
     description:
       "Schreibe einen Bewerbungstext für das Event. Der Text wird im internen Forum gepostet und ist anschließend fürs Clearing erforderlich.",
-    deadlineDaysBefore: 35,
+    deadlineDaysBefore: 33,
     sortOrder: 2,
   },
   {
@@ -52,7 +52,7 @@ export const DEFAULT_TASK_TEMPLATES: TaskTemplate[] = [
     title: "In myVATSIM eintragen",
     description:
       "Trage das Event im myVATSIM Admin Panel ein, damit es öffentlich sichtbar wird. Nach dem Eintragen muss myVATSIM das Event noch genehmigen.",
-    deadlineDaysBefore: 7,
+    deadlineDaysBefore: 8,
     sortOrder: 4,
   },
 ];