diff --git a/css/style.css b/css/style.css index d9e27b6..555afb7 100755 --- a/css/style.css +++ b/css/style.css @@ -62,12 +62,4 @@ pre { /* Optional: Kleiner Abstand für bessere Lesbarkeit */ .collapse:not(.show) { display: none; -} - -.meeting-actions { - max-width: 500px; - margin-left: auto; - margin-right: auto; - flex-direction: column; - align-items: center; } \ No newline at end of file diff --git a/inc/header.php b/inc/header.php index a686d06..c7e3d70 100755 --- a/inc/header.php +++ b/inc/header.php @@ -20,10 +20,10 @@ - + - + diff --git a/index.php b/index.php index 09690e6..7ba6bc3 100755 --- a/index.php +++ b/index.php @@ -37,10 +37,14 @@ function auto_decline_if_on_vacation($conn, $meeting_id, $user_id, $meeting_date $existing = mysqli_fetch_assoc(mysqli_stmt_get_result($check_stmt)); mysqli_stmt_close($check_stmt); - if ($existing && $existing['rsvp_status'] === 'accepted') { - return 'accepted'; + $current_status = $existing ? $existing['rsvp_status'] : null; + + // Wenn explizit "accepted" oder "maybe" gewählt wurde → NICHT überschreiben! + if ($current_status === 'accepted' || $current_status === 'maybe') { + return $current_status; } + // Nur wenn Status "declined" oder NULL → auf "declined" setzen if ($existing) { $upd = mysqli_prepare($conn, "UPDATE meeting_teilnehmer SET rsvp_status = 'declined', attended = 0 WHERE meeting_id = ? AND user_id = ?"); mysqli_stmt_bind_param($upd, "ii", $meeting_id, $user_id); @@ -270,7 +274,7 @@ $german_weekdays = [ mysqli_stmt_execute($color_stmt); $color_row = mysqli_fetch_assoc(mysqli_stmt_get_result($color_stmt)); ?> -
+

@@ -306,7 +310,10 @@ $german_weekdays = [
-
+ +
+ +

Du hast zugesagt!

Absagen @@ -455,24 +462,28 @@ $german_weekdays = [
- -
- - - -
- - Bereits abgestimmt: - - - +
+ +
+ + + +
+ + Bereits abgestimmt: + + + +
-
- - - -
+
+
+ + + +
+
diff --git a/sw.js b/sw.js index 7f59567..e7dd664 100755 --- a/sw.js +++ b/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'domili-v' + new Date().getTime(); +const CACHE_NAME = 'domili-v1' + new Date().getTime(); const urlsToCache = [ '/', //'/index.php',