Merge branch 'add-weekly-rhythm-options' into private/dev

Author: yschaffler

app/admin/weeklys/_components/AdminWeeklyForm.tsx

@@ -26,6 +26,7 @@ interface WeeklyEventConfig {
   weekday: number;
   weeksOn: number;
   weeksOff: number;
+  skipInterval: number;
   startDate: string;
   airports?: string[];
   startTime?: string;
@@ -48,6 +49,7 @@ interface FormData {
   weekday: number;
   weeksOn: number;
   weeksOff: number;
+  skipInterval: number;
   startDate: string;
   airports: string[];
   airportInput: string;
@@ -96,6 +98,7 @@ export default function AdminWeeklyForm({ config, firs }: Props) {
     weekday: 1,
     weeksOn: 1,
     weeksOff: 0,
+    skipInterval: 0,
     startDate: new Date().toISOString().split("T")[0],
     airports: [],
     airportInput: "",
@@ -127,6 +130,7 @@ export default function AdminWeeklyForm({ config, firs }: Props) {
         weekday: config.weekday,
         weeksOn: config.weeksOn,
         weeksOff: config.weeksOff,
+        skipInterval: config.skipInterval ?? 0,
         startDate: config.startDate.split("T")[0],
         airports,
         airportInput: "",
@@ -266,6 +270,7 @@ export default function AdminWeeklyForm({ config, firs }: Props) {
         weekday: formData.weekday,
         weeksOn: formData.weeksOn,
         weeksOff: formData.weeksOff,
+        skipInterval: formData.skipInterval,
         startDate: new Date(formData.startDate).toISOString(),
         airports: formData.airports.length > 0 ? formData.airports : null,
         startTime: formData.startTime || null,
@@ -380,7 +385,7 @@ export default function AdminWeeklyForm({ config, firs }: Props) {
           setActiveTab(v);
           if (v === "managers" && isEdit) loadManagers();
         }} className="w-full">
-        <TabsList className={`grid w-full ${isEdit && formData.requiresRoster ? 'grid-cols-4' : isEdit ? 'grid-cols-3' : formData.requiresRoster ? 'grid-cols-3' : 'grid-cols-2'}`}>
+        <TabsList className={`grid w-full ${isEdit && formData.requiresRoster ? 'grid-cols-4' : formData.requiresRoster ? 'grid-cols-3' : 'grid-cols-2'}`}>
           <TabsTrigger value="basic">Grunddaten</TabsTrigger>
           <TabsTrigger value="schedule">Zeitplan</TabsTrigger>
           {formData.requiresRoster && (
@@ -650,6 +655,25 @@ export default function AdminWeeklyForm({ config, firs }: Props) {
                   </p>
                 </div>
               </div>
+
+              <div className="space-y-2">
+                <Label htmlFor="skipInterval">Regelmäßige Aussetzer (optional)</Label>
+                <Input
+                  id="skipInterval"
+                  type="number"
+                  min="0"
+                  value={formData.skipInterval}
+                  onChange={(e) =>
+                    setFormData({
+                      ...formData,
+                      skipInterval: parseInt(e.target.value) || 0,
+                    })
+                  }
+                />
+                <p className="text-xs text-muted-foreground">
+                  0 = deaktiviert. Bei z.B. 3 wird jedes 3. Vorkommen übersprungen (nützlich für regelmäßige Pausen alle N Termine).
+                </p>
+              </div>
             </CardContent>
           </Card>
         </TabsContent>

app/api/admin/weeklys/[id]/route.ts

@@ -12,6 +12,7 @@ const weeklyEventConfigUpdateSchema = z.object({
   weekday: z.number().min(0).max(6).optional(),
   weeksOn: z.number().min(1).max(52).optional(),
   weeksOff: z.number().min(0).max(52).optional(),
+  skipInterval: z.number().min(0).max(52).optional(),
   startDate: z.string().refine((val) => !isNaN(Date.parse(val)), {
     message: "Invalid date format for startDate",
   }).optional(),
@@ -156,6 +157,7 @@ export async function PATCH(
     if (parsed.data.weekday !== undefined) updateData.weekday = parsed.data.weekday;
     if (parsed.data.weeksOn !== undefined) updateData.weeksOn = parsed.data.weeksOn;
     if (parsed.data.weeksOff !== undefined) updateData.weeksOff = parsed.data.weeksOff;
+    if (parsed.data.skipInterval !== undefined) updateData.skipInterval = parsed.data.skipInterval;
     if (parsed.data.startDate !== undefined) updateData.startDate = new Date(parsed.data.startDate);
     if (parsed.data.airports !== undefined) updateData.airports = parsed.data.airports ? JSON.stringify(parsed.data.airports) : null;
     if (parsed.data.startTime !== undefined) updateData.startTime = parsed.data.startTime;
@@ -174,11 +176,12 @@ export async function PATCH(
       data: updateData,
     });
 
-    // If pattern changed (weekday, weeksOn, weeksOff, or startDate), regenerate occurrences
+    // If pattern changed (weekday, weeksOn, weeksOff, skipInterval, or startDate), regenerate occurrences
     if (
       parsed.data.weekday !== undefined ||
       parsed.data.weeksOn !== undefined ||
       parsed.data.weeksOff !== undefined ||
+      parsed.data.skipInterval !== undefined ||
       parsed.data.startDate !== undefined
     ) {
       // Delete future occurrences that don't have signups

app/api/admin/weeklys/route.ts

@@ -15,6 +15,7 @@ const weeklyEventConfigSchema = z.object({
   weekday: z.number().min(0).max(6),
   weeksOn: z.number().min(1).max(52),
   weeksOff: z.number().min(0).max(52),
+  skipInterval: z.number().min(0).max(52).optional(),
   startDate: z.string().refine((val) => !isNaN(Date.parse(val)), {
     message: "Invalid date format for startDate",
   }),
@@ -191,6 +192,7 @@ export async function POST(req: NextRequest) {
         weekday: parsed.data.weekday,
         weeksOn: parsed.data.weeksOn,
         weeksOff: parsed.data.weeksOff,
+        skipInterval: parsed.data.skipInterval ?? 0,
         startDate: new Date(parsed.data.startDate),
         airports: parsed.data.airports ? (JSON.stringify(parsed.data.airports) as any) : null,
         startTime: parsed.data.startTime || null,

lib/weeklys/generateOccurrences.ts

@@ -34,17 +34,22 @@ export async function generateOccurrences(configId: number) {
     // weekCounter auf 0 – cursor ist per Definition Woche 0 des Zyklus
     const weeksOn = config.weeksOn;
     const weeksOff = config.weeksOff;
+    const skipInterval = ("skipInterval" in config ? (config as { skipInterval: number }).skipInterval : 0) ?? 0;
     const cycleLength = weeksOn + weeksOff; // bei weeksOff=0 → cycleLength=weeksOn
 
     const occurrenceDates: Date[] = [];
     let weekCounter = 0;
+    let occurrenceNumber = 0; // counts all candidate occurrences from the startDate for skip logic
 
     while (cursor <= endUTC) {
       const positionInCycle = weekCounter % cycleLength;
 
       // Nur in den ersten weeksOn Positionen des Zyklus ist ein Event
       if (positionInCycle < weeksOn) {
-        if (cursor >= todayUTC) {
+        occurrenceNumber++;
+        // Skip every Nth occurrence when skipInterval is configured
+        const isSkipped = skipInterval > 0 && (occurrenceNumber % skipInterval === 0);
+        if (!isSkipped && cursor >= todayUTC) {
           occurrenceDates.push(new Date(cursor));
         }
       }

prisma/migrations/20260312000000_add_skip_interval_to_weekly/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE `WeeklyEventConfiguration` ADD COLUMN `skipInterval` INTEGER NOT NULL DEFAULT 0;

prisma/schema.prisma

@@ -273,9 +273,10 @@ model WeeklyEventConfiguration {
 
   // Pattern configuration for recurring events
   // e.g., for "2 weeks on, 1 week off": weeksOn=2, weeksOff=1
-  weeksOn   Int      @default(1) // How many consecutive weeks the event occurs
-  weeksOff  Int      @default(0) // How many weeks off after the "on" period
-  startDate DateTime // When the pattern starts
+  weeksOn      Int      @default(1) // How many consecutive weeks the event occurs
+  weeksOff     Int      @default(0) // How many weeks off after the "on" period
+  skipInterval Int      @default(0) // Skip every Nth occurrence (0 = disabled), e.g. 3 = every 3rd occurrence is skipped
+  startDate    DateTime // When the pattern starts
 
   // Event details
   airports        Json? // Array of ICAO codes

types/weeklyEvent.ts

@@ -4,6 +4,7 @@ export interface WeeklyEventConfigurationCreate {
   weekday: number; // 0-6 (Sunday-Saturday)
   weeksOn: number;
   weeksOff: number;
+  skipInterval?: number; // 0 = disabled, N = skip every Nth occurrence
   startDate: Date | string;
   airports?: string[]; // Array of ICAO codes
   startTime?: string; // HH:mm format (UTC)
@@ -22,6 +23,7 @@ export interface WeeklyEventConfigurationUpdate {
   weekday?: number;
   weeksOn?: number;
   weeksOff?: number;
+  skipInterval?: number; // 0 = disabled, N = skip every Nth occurrence
   startDate?: Date | string;
   airports?: string[];
   startTime?: string;