v1.3.2 - Historische Daten angepasst

colors.php

@@ -97,7 +97,7 @@ $result = mysqli_query($conn, "
         c.is_special,
         COUNT(m.id) AS usage_count
     FROM colors c
-    LEFT JOIN meetings m ON c.id = m.color_id
+    LEFT JOIN meetings m ON c.id = m.color_id AND m.is_skipped = 0
     GROUP BY c.id, c.name, c.hex_code, c.is_special
     ORDER BY $order_by
 ");

index.php

@@ -64,6 +64,7 @@ function get_current_meeting($conn)
     $sql = "SELECT id, meeting_date, color_id, reason
             FROM meetings 
             WHERE is_completed = 0
+            AND is_skipped = 0
             ORDER BY meeting_date ASC 
             LIMIT 1";
     $result = mysqli_query($conn, $sql);

kasse.php

@@ -25,18 +25,20 @@ if ($is_admin && $_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']
     mysqli_stmt_close($check);
 
     if (!$exists) {
+        // 1. Abschluss in penalty_closings protokollieren
         $insert = mysqli_prepare($conn, "INSERT INTO penalty_closings (closing_date, closed_by) VALUES (?, ?)");
         mysqli_stmt_bind_param($insert, "si", $today, $user_id);
         mysqli_stmt_execute($insert);
         mysqli_stmt_close($insert);
 
+        // 2. E-Mail-Daten: Strafen seit letztem Abschluss (für Benachrichtigung)
         $penalty_summary = [];
         $stmt_email = mysqli_prepare($conn, "
             SELECT u.username, COUNT(*) AS penalty_count
             FROM meeting_teilnehmer mt
             JOIN meetings m ON mt.meeting_id = m.id
             JOIN users u ON mt.user_id = u.id
-            WHERE m.meeting_date >= ? AND m.meeting_date <= ?
+            WHERE m.meeting_date > ? AND m.meeting_date <= ?
               AND mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1
             GROUP BY u.username
         ");
@@ -48,6 +50,24 @@ if ($is_admin && $_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']
         }
         mysqli_stmt_close($stmt_email);
 
+        // 3. NEU: Kumulierte Strafen JEDES Benutzers bis heute in penalty_history speichern
+        $stmt_save = mysqli_prepare($conn, "
+            INSERT INTO penalty_history (closing_date, user_id, username_at_close, penalty_count)
+            SELECT ?, u.id, u.username, COUNT(mt.id)
+            FROM users u
+            LEFT JOIN meeting_teilnehmer mt ON u.id = mt.user_id
+            LEFT JOIN meetings m ON mt.meeting_id = m.id
+                AND m.meeting_date <= ?
+                AND mt.attended = 1
+                AND mt.wore_color = 0
+                AND m.is_completed = 1
+            GROUP BY u.id, u.username
+        ");
+        mysqli_stmt_bind_param($stmt_save, "ss", $today, $today);
+        mysqli_stmt_execute($stmt_save);
+        mysqli_stmt_close($stmt_save);
+
+        // 4. E-Mail-Versand (unverändert)
         $all_users = [];
         $stmt_users = mysqli_prepare($conn, "SELECT id, username, email FROM users WHERE email IS NOT NULL AND email != ''");
         mysqli_stmt_execute($stmt_users);
@@ -146,6 +166,8 @@ if ($is_admin && $_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']
 }
 
 // --- DATEN FÜR ANZEIGE ---
+
+// Letztes Abschlussdatum ermitteln
 $last_closing_date = '2020-01-01';
 $result_last = mysqli_query($conn, "SELECT MAX(closing_date) AS last_date FROM penalty_closings");
 if ($result_last) {
@@ -155,107 +177,139 @@ if ($result_last) {
     }
 }
 
-$cumulative_penalties = [];
-$stmt_cum = mysqli_prepare($conn, "
-    SELECT u.username, COUNT(*) AS total_penalty_count
-    FROM meeting_teilnehmer mt
-    JOIN meetings m ON mt.meeting_id = m.id
-    JOIN users u ON mt.user_id = u.id
-    WHERE mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1
-    GROUP BY u.username
-");
-mysqli_stmt_execute($stmt_cum);
-$result_cum = mysqli_stmt_get_result($stmt_cum);
-while ($row = mysqli_fetch_assoc($result_cum)) {
-    $cumulative_penalties[$row['username']] = (int)$row['total_penalty_count'];
-}
-mysqli_stmt_close($stmt_cum);
-
-$open_penalties = [];
-$total_open = 0;
 $penalty_amount = 1;
 
+// 🔹 Alle Mitglieder initialisieren
+$penalties_data = [];
+$stmt_members = mysqli_prepare($conn, "SELECT username FROM users ORDER BY username");
+mysqli_stmt_execute($stmt_members);
+$result_members = mysqli_stmt_get_result($stmt_members);
+while ($row = mysqli_fetch_assoc($result_members)) {
+    $penalties_data[$row['username']] = [
+        'username' => $row['username'],
+        'total_penalty_count' => 0,
+        'open_penalty_count' => 0
+    ];
+}
+mysqli_stmt_close($stmt_members);
+
+// 🔹 "Strafen gesamt" = KUMULIERT seit Beginn (nur echte Strafen)
+$stmt_total = mysqli_prepare($conn, "
+    SELECT u.username, COUNT(penalty.meeting_id) AS total_penalty_count
+    FROM users u
+    LEFT JOIN (
+        SELECT mt.user_id, mt.meeting_id
+        FROM meeting_teilnehmer mt
+        INNER JOIN meetings m ON mt.meeting_id = m.id
+        WHERE mt.attended = 1
+          AND mt.wore_color = 0
+          AND m.is_completed = 1
+    ) AS penalty ON u.id = penalty.user_id
+    GROUP BY u.id, u.username
+");
+mysqli_stmt_execute($stmt_total);
+$result_total = mysqli_stmt_get_result($stmt_total);
+while ($row = mysqli_fetch_assoc($result_total)) {
+    if (isset($penalties_data[$row['username']])) {
+        $penalties_data[$row['username']]['total_penalty_count'] = (int)$row['total_penalty_count'];
+    }
+}
+mysqli_stmt_close($stmt_total);
+
+// 🔹 "offener Betrag" = Strafen SEIT letztem Abschluss (>)
 $stmt_open = mysqli_prepare($conn, "
     SELECT u.username, COUNT(*) AS open_penalty_count
     FROM meeting_teilnehmer mt
     JOIN meetings m ON mt.meeting_id = m.id
     JOIN users u ON mt.user_id = u.id
-    WHERE m.meeting_date >= ? AND mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1
+    WHERE m.meeting_date > ? AND mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1
     GROUP BY u.username
 ");
 mysqli_stmt_bind_param($stmt_open, "s", $last_closing_date);
 mysqli_stmt_execute($stmt_open);
 $result_open = mysqli_stmt_get_result($stmt_open);
 while ($row = mysqli_fetch_assoc($result_open)) {
-    $open_penalties[$row['username']] = (int)$row['open_penalty_count'];
+    if (isset($penalties_data[$row['username']])) {
-    $total_open += $row['open_penalty_count'];
+        $penalties_data[$row['username']]['open_penalty_count'] = (int)$row['open_penalty_count'];
+    }
 }
 mysqli_stmt_close($stmt_open);
 
-$penalties_data = [];
+// 🔹 Sortieren
-$all_usernames = array_unique(array_merge(array_keys($cumulative_penalties), array_keys($open_penalties)));
+$penalties_data = array_values($penalties_data);
-foreach ($all_usernames as $username) {
+usort($penalties_data, function ($a, $b) {
-    $total = $cumulative_penalties[$username] ?? 0;
+    if ($b['open_penalty_count'] !== $a['open_penalty_count']) {
-    $open = $open_penalties[$username] ?? 0;
+        return $b['open_penalty_count'] <=> $a['open_penalty_count'];
-    $penalties_data[] = [
+    }
-        'username' => $username,
+    return strcmp($a['username'], $b['username']);
-        'total_penalty_count' => $total,
+});
-        'open_penalty_count' => $open
-    ];
-}
-usort($penalties_data, fn($a, $b) => $b['open_penalty_count'] <=> $a['open_penalty_count']);
 
-$total_penalties = array_sum(array_column($penalties_data, 'total_penalty_count'));
+$total_open = array_sum(array_column($penalties_data, 'open_penalty_count'));
 $total_due = $total_open * $penalty_amount;
 
-$historical_table = [];
+// 🔹 Historische Strafen: pro Abschluss-Zeitraum
-$closing_years = [];
+$historical_periods = [];
+$closing_dates = [];
+
 $result_closings = mysqli_query($conn, "SELECT closing_date FROM penalty_closings ORDER BY closing_date");
 while ($row = mysqli_fetch_assoc($result_closings)) {
-    $closing_date = new DateTime($row['closing_date']);
+    $closing_dates[] = $row['closing_date'];
-    $year = (int)$closing_date->format('Y');
-    $month = (int)$closing_date->format('n');
-    $closed_year = ($month >= 7) ? $year : ($year - 1);
-    $closing_years[] = $closed_year;
 }
-$closing_years = array_unique($closing_years);
-sort($closing_years);
 
-if (!empty($closing_years)) {
+if (count($closing_dates) >= 2) {
-    foreach ($closing_years as $year) {
+    for ($i = 1; $i < count($closing_dates); $i++) {
-        $year_start = "$year-01-01";
+        $start_date = $closing_dates[$i - 1];
-        $year_end = "$year-12-31";
+        $end_date = $closing_dates[$i];
+        $period_label = date('d.m.Y', strtotime($start_date)) . ' – ' . date('d.m.Y', strtotime($end_date));
 
         $stmt_hist = mysqli_prepare($conn, "
             SELECT u.username, COUNT(*) AS penalty_count
             FROM meeting_teilnehmer mt
             JOIN meetings m ON mt.meeting_id = m.id
             JOIN users u ON mt.user_id = u.id
-            WHERE m.meeting_date BETWEEN ? AND ?
+            WHERE m.meeting_date > ? AND m.meeting_date <= ?
               AND mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1
             GROUP BY u.username
         ");
-        mysqli_stmt_bind_param($stmt_hist, "ss", $year_start, $year_end);
+        mysqli_stmt_bind_param($stmt_hist, "ss", $start_date, $end_date);
         mysqli_stmt_execute($stmt_hist);
         $result_hist = mysqli_stmt_get_result($stmt_hist);
         while ($row = mysqli_fetch_assoc($result_hist)) {
-            $username = $row['username'];
+            $historical_periods[] = [
-            $count = (int)$row['penalty_count'];
+                'username' => $row['username'],
-
+                'period'   => $period_label,
-            if (!isset($historical_table[$username])) {
+                'count'    => (int)$row['penalty_count']
-                $historical_table[$username] = ['years' => [], 'total' => 0];
+            ];
-            }
-            $historical_table[$username]['years'][] = $year;
-            $historical_table[$username]['total'] += $count;
         }
         mysqli_stmt_close($stmt_hist);
     }
+} elseif (count($closing_dates) === 1) {
+    $end_date = $closing_dates[0];
+    $period_label = '17.07.2025 – ' . date('d.m.Y', strtotime($end_date));
 
-    foreach ($historical_table as $username => $data) {
+    $stmt_hist = mysqli_prepare($conn, "
-        $historical_table[$username]['year_label'] = implode('/', $data['years']);
+        SELECT u.username, COUNT(*) AS penalty_count
+        FROM meeting_teilnehmer mt
+        JOIN meetings m ON mt.meeting_id = m.id
+        JOIN users u ON mt.user_id = u.id
+        WHERE m.meeting_date <= ?
+          AND mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1
+        GROUP BY u.username
+    ");
+    mysqli_stmt_bind_param($stmt_hist, "s", $end_date);
+    mysqli_stmt_execute($stmt_hist);
+    $result_hist = mysqli_stmt_get_result($stmt_hist);
+    while ($row = mysqli_fetch_assoc($result_hist)) {
+        $historical_periods[] = [
+            'username' => $row['username'],
+            'period'   => $period_label,
+            'count'    => (int)$row['penalty_count']
+        ];
     }
+    mysqli_stmt_close($stmt_hist);
 }
 
+// --- Rechnungs-Statistik (unverändert) ---
 $paid_stats = [];
 $sql_paid = "
     SELECT u.username, COUNT(mt.user_id) AS paid_count
@@ -308,12 +362,11 @@ require_once 'inc/header.php';
         </div>
         <div class="card-body">
             <p class="fs-5 fw-bold text-center">
-                Strafen gesamt: <span class="badge bg-danger"><?= $total_penalties ?></span><br>
+                Strafkasse: <span class="text-danger fw-bold"><?= number_format($total_due, 2, ',', '.') ?> €</span>
-                offener Betrag: <span class="text-danger fw-bold"><?= number_format($total_due, 2, ',', '.') ?> €</span>
             </p>
 
             <?php if (empty($penalties_data)): ?>
-                <div class="alert alert-info text-center">Keine Strafen erfasst.</div>
+                <div class="alert alert-info text-center">Keine Mitglieder gefunden.</div>
             <?php else: ?>
                 <div class="table-responsive">
                     <table class="table table-striped table-hover">
@@ -349,17 +402,17 @@ require_once 'inc/header.php';
                     <thead>
                         <tr>
                             <th>Benutzer</th>
-                            <th>Jahr(e)</th>
+                            <th>Zeitraum</th>
                             <th>Strafen</th>
                         </tr>
                     </thead>
                     <tbody>
-                        <?php if (!empty($historical_table)): ?>
+                        <?php if (!empty($historical_periods)): ?>
-                            <?php foreach ($historical_table as $username => $data): ?>
+                            <?php foreach ($historical_periods as $item): ?>
                                 <tr>
-                                    <td><?= htmlspecialchars($username) ?></td>
+                                    <td><?= htmlspecialchars($item['username']) ?></td>
-                                    <td><?= htmlspecialchars($data['year_label']) ?></td>
+                                    <td><?= htmlspecialchars($item['period']) ?></td>
-                                    <td><?= htmlspecialchars($data['total']) ?></td>
+                                    <td><?= htmlspecialchars($item['count']) ?></td>
                                 </tr>
                             <?php endforeach; ?>
                         <?php else: ?>
@@ -390,8 +443,8 @@ require_once 'inc/header.php';
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 <script>
     document.addEventListener('DOMContentLoaded', function() {
-        const rawLabels = <?php echo json_encode(array_column($paid_stats, 'username') ?: []); ?>;
+        const rawLabels = <?= json_encode(array_column($paid_stats, 'username') ?: []) ?>;
-        const rawData = <?php echo json_encode(array_map('intval', array_column($paid_stats, 'paid_count') ?: [])); ?>;
+        const rawData = <?= json_encode(array_map('intval', array_column($paid_stats, 'paid_count') ?: [])) ?>;
 
         const ctx = document.getElementById('paidChart').getContext('2d');
 

planning.php

@@ -9,18 +9,18 @@ $message_type = '';
 $edit_mode = false;
 $edit_meeting = null;
 
-// --- Funktion: Zufallsfarbe mit inverser Gewichtung (alle Termine, keine Sonderfarben) ---
+// --- Funktion: Zufallsfarbe mit inverser Gewichtung – OHNE übersprungene Termine ---
 function get_weighted_random_color($conn)
 {
-    // Zählt ALLE Termine (vergangen + geplant) für jede reguläre Farbe
     $colors = [];
+    // 🔥 Wichtig: Nur nicht-übersprungene Termine zählen
     $result = mysqli_query($conn, "
         SELECT 
             c.id, 
             c.name, 
             COUNT(m.id) AS usage_count
         FROM colors c
-        LEFT JOIN meetings m ON c.id = m.color_id
+        LEFT JOIN meetings m ON c.id = m.color_id AND m.is_skipped = 0
         WHERE c.is_special = 0
         GROUP BY c.id, c.name
     ");
@@ -73,7 +73,8 @@ if ($is_admin && isset($_GET['action']) && $_GET['action'] == 'delete' && isset(
 // --- Nur Admins: Bearbeiten ---
 if ($is_admin && isset($_GET['action']) && $_GET['action'] == 'edit' && isset($_GET['id'])) {
     $id = (int)$_GET['id'];
-    $stmt = mysqli_prepare($conn, "SELECT id, meeting_date, color_id, reason FROM meetings WHERE id = ?");
+    // 🔥 is_skipped mit abfragen
+    $stmt = mysqli_prepare($conn, "SELECT id, meeting_date, color_id, reason, is_skipped FROM meetings WHERE id = ?");
     mysqli_stmt_bind_param($stmt, "i", $id);
     mysqli_stmt_execute($stmt);
     $result = mysqli_stmt_get_result($stmt);
@@ -98,6 +99,7 @@ if ($is_admin && $_SERVER["REQUEST_METHOD"] == "POST") {
     $color_id = (int)($_POST['color_id'] ?? 0);
     $reason = trim($_POST['reason'] ?? 'Zufallsfarbe');
     $id = !empty($_POST['id']) ? (int)$_POST['id'] : null;
+    $is_skipped = !empty($_POST['is_skipped']) ? 1 : 0;
 
     if (empty($meeting_date_only) || !$color_id) {
         $message = "Datum und Farbe sind erforderlich.";
@@ -105,11 +107,11 @@ if ($is_admin && $_SERVER["REQUEST_METHOD"] == "POST") {
     } else {
         $meeting_date = $meeting_date_only . ' ' . $meeting_time_only;
         if ($id) {
-            $stmt = mysqli_prepare($conn, "UPDATE meetings SET meeting_date = ?, color_id = ?, reason = ? WHERE id = ?");
+            $stmt = mysqli_prepare($conn, "UPDATE meetings SET meeting_date = ?, color_id = ?, reason = ?, is_skipped = ? WHERE id = ?");
-            mysqli_stmt_bind_param($stmt, "sisi", $meeting_date, $color_id, $reason, $id);
+            mysqli_stmt_bind_param($stmt, "sisis", $meeting_date, $color_id, $reason, $is_skipped, $id);
         } else {
-            $stmt = mysqli_prepare($conn, "INSERT INTO meetings (meeting_date, color_id, reason) VALUES (?, ?, ?)");
+            $stmt = mysqli_prepare($conn, "INSERT INTO meetings (meeting_date, color_id, reason, is_skipped) VALUES (?, ?, ?, ?)");
-            mysqli_stmt_bind_param($stmt, "sis", $meeting_date, $color_id, $reason);
+            mysqli_stmt_bind_param($stmt, "sisi", $meeting_date, $color_id, $reason, $is_skipped);
         }
 
         if (mysqli_stmt_execute($stmt)) {
@@ -125,20 +127,21 @@ if ($is_admin && $_SERVER["REQUEST_METHOD"] == "POST") {
     }
 }
 
-// --- 🔁 Automatische Planung: 4 Donnerstage, max. 1 pro Woche ---
+// --- 🔁 Automatische Planung: 4 Donnerstage, max. 1 pro Woche – für ALLE Nutzer ---
-if ($is_admin) {
+$today = new DateTime('today');
-    $today = new DateTime('today');
+
-    $existing_weeks = [];
+// Nur nicht-übersprungene Termine zählen
-    $result_existing = mysqli_query($conn, "SELECT meeting_date FROM meetings");
+$existing_weeks = [];
-    while ($row = mysqli_fetch_assoc($result_existing)) {
+$result_existing = mysqli_query($conn, "SELECT meeting_date FROM meetings WHERE is_skipped = 0");
+while ($row = mysqli_fetch_assoc($result_existing)) {
     $dt = new DateTime($row['meeting_date']);
     $year = $dt->format('o');
     $week = $dt->format('W');
     $existing_weeks["$year-$week"] = true;
-    }
+}
 
-    $date = clone $today;
+$date = clone $today;
-    for ($i = 0; $i < 4; $i++) {
+for ($i = 0; $i < 4; $i++) {
     $date->modify($i === 0 ? 'next thursday' : 'next thursday');
     $year = $date->format('o');
     $week = $date->format('W');
@@ -148,6 +151,7 @@ if ($is_admin) {
         $new_date = $date->format('Y-m-d') . ' 12:00:00';
         $color_id = get_weighted_random_color($conn);
         if ($color_id) {
+            // Prüfen, ob überhaupt ein Termin (auch übersprungener) existiert → keine Duplikate
             $check = mysqli_prepare($conn, "SELECT id FROM meetings WHERE meeting_date = ?");
             mysqli_stmt_bind_param($check, "s", $new_date);
             mysqli_stmt_execute($check);
@@ -156,7 +160,7 @@ if ($is_admin) {
 
             if (!$exists) {
                 $default_reason = "Zufallsfarbe";
-                    $ins = mysqli_prepare($conn, "INSERT INTO meetings (meeting_date, color_id, reason) VALUES (?, ?, ?)");
+                $ins = mysqli_prepare($conn, "INSERT INTO meetings (meeting_date, color_id, reason, is_skipped) VALUES (?, ?, ?, 0)");
                 mysqli_stmt_bind_param($ins, "sis", $new_date, $color_id, $default_reason);
                 mysqli_stmt_execute($ins);
                 mysqli_stmt_close($ins);
@@ -164,7 +168,6 @@ if ($is_admin) {
             }
         }
     }
-    }
 }
 
 // --- Daten für Anzeige laden ---
@@ -176,9 +179,10 @@ if ($is_admin) {
     }
 }
 
+// 🔥 Alle Termine laden (auch übersprungene), für alle Nutzer
 $meetings = [];
 $result_meetings = mysqli_query($conn, "
-    SELECT m.id, m.meeting_date, m.reason, c.name AS color_name, c.hex_code 
+    SELECT m.id, m.meeting_date, m.reason, m.is_skipped, c.name AS color_name, c.hex_code 
     FROM meetings m 
     JOIN colors c ON m.color_id = c.id 
     WHERE m.is_completed = 0 
@@ -227,7 +231,7 @@ require_once 'inc/header.php';
                                 <label class="form-label">Farbe</label>
                                 <select class="form-select" name="color_id" required>
                                     <?php foreach ($all_colors as $color): ?>
-                                        <option value="<?= $color['id'] ?>" <?= (($edit_meeting['color_id'] ?? 0) == $color['id']) ? 'selected' : '' ?>>
+                                        <option value="<?= (int)$color['id'] ?>" <?= (($edit_meeting['color_id'] ?? 0) == $color['id']) ? 'selected' : '' ?>>
                                             <?= htmlspecialchars($color['name']) ?>
                                         </option>
                                     <?php endforeach; ?>
@@ -238,6 +242,15 @@ require_once 'inc/header.php';
                                 <input type="text" class="form-control" name="reason" value="<?= htmlspecialchars($edit_meeting['reason'] ?? ''); ?>">
                                 <div class="form-text">Wenn leer, wird „Zufallsfarbe“ eingetragen.</div>
                             </div>
+                            <div class="col-12">
+                                <div class="form-check">
+                                    <input class="form-check-input" type="checkbox" id="is_skipped" name="is_skipped" value="1"
+                                        <?= (!empty($edit_meeting['is_skipped'])) ? 'checked' : '' ?>>
+                                    <label class="form-check-label" for="is_skipped">
+                                        Termin bewusst aussetzen (wird in Grau angezeigt und nicht für Farbstatistik genutzt)
+                                    </label>
+                                </div>
+                            </div>
                             <div class="col-12 d-flex justify-content-start">
                                 <button type="submit" class="btn btn-sm btn-outline-<?= $edit_mode ? 'success' : 'primary' ?> me-2">
                                     <?= $edit_mode ? 'Speichern' : 'Hinzufügen' ?>
@@ -266,12 +279,22 @@ require_once 'inc/header.php';
             <?php else: ?>
                 <div class="list-group list-group-flush">
                     <?php foreach ($meetings as $m): ?>
-                        <div class="list-group-item">
+                        <?php
+                        $is_skipped = (bool)$m['is_skipped'];
+                        $date_str = date('d.m.Y H:i', strtotime($m['meeting_date']));
+                        ?>
+                        <div class="list-group-item <?= $is_skipped ? 'opacity-75' : '' ?>">
                             <div class="d-flex justify-content-between align-items-start">
                                 <div>
-                                    <p class="fw-bold mb-1"><?= date('d.m.Y H:i', strtotime($m['meeting_date'])) ?></p>
+                                    <p class="fw-bold mb-1 <?= $is_skipped ? 'text-muted text-decoration-line-through' : '' ?>">
+                                        <?= htmlspecialchars($date_str) ?>
+                                        <?php if ($is_skipped): ?>
+                                            <span class="badge bg-light text-dark ms-2">übersprungen</span>
+                                        <?php endif; ?>
+                                    </p>
                                     <div class="d-flex align-items-center mb-1">
-                                        <div class="me-2" style="background-color: <?= htmlspecialchars($m['hex_code']); ?>; width: 20px; height: 20px; border: 1px solid #ccc; border-radius: 2px;"></div> <span><?= htmlspecialchars($m['color_name']); ?></span>
+                                        <div class="me-2" style="background-color: <?= htmlspecialchars($m['hex_code']); ?>; width: 20px; height: 20px; border: 1px solid #ccc; border-radius: 2px;"></div>
+                                        <span><?= htmlspecialchars($m['color_name']); ?></span>
                                     </div>
                                     <p class="text-muted small mb-0">Grund: <?= htmlspecialchars($m['reason']); ?></p>
                                 </div>
@@ -282,12 +305,12 @@ require_once 'inc/header.php';
                                         </a>
                                         <ul class="dropdown-menu dropdown-menu-end">
                                             <li>
-                                                <a class="dropdown-item d-flex align-items-center" href="planning.php?action=edit&id=<?= $m['id'] ?>">
+                                                <a class="dropdown-item d-flex align-items-center" href="planning.php?action=edit&id=<?= (int)$m['id'] ?>">
                                                     <span class="material-icons me-2">mode_edit_outline</span> Bearbeiten
                                                 </a>
                                             </li>
                                             <li>
-                                                <a class="dropdown-item d-flex align-items-center text-danger" href="planning.php?action=delete&id=<?= $m['id'] ?>" onclick="return confirm('Wirklich löschen?')">
+                                                <a class="dropdown-item d-flex align-items-center text-danger" href="planning.php?action=delete&id=<?= (int)$m['id'] ?>" onclick="return confirm('Wirklich löschen?')">
                                                     <span class="material-icons me-2">delete_outline</span> Löschen
                                                 </a>
                                             </li>