diff --git a/html/assets/css/style.css b/html/assets/css/style.css index 8491663..d2855d6 100644 --- a/html/assets/css/style.css +++ b/html/assets/css/style.css @@ -30,6 +30,9 @@ h1 { color: var(--dark-color); } +.debug_hidden { + display: none; +} /* Container */ .container { max-width: 1600px; @@ -295,6 +298,14 @@ tr:hover { overflow: hidden; } +.data-notice { + background-color: lightgreen; +} + +.data-notice.error { + background-color: LightCoral; +} + #cookie-notice.hidden { opacity: 0; max-height: 0; diff --git a/html/dashboard.php b/html/dashboard.php index 63f1dcb..688bf52 100644 --- a/html/dashboard.php +++ b/html/dashboard.php @@ -21,7 +21,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { } // Daten abrufen -$stmt = $pdo->prepare("SELECT * FROM entries WHERE MONTH(date) = MONTH(CURDATE()) AND YEAR(date) = YEAR(CURDATE())"); +$sql="WITH user_names AS (SELECT p.id,b_single.username AS zahler,GROUP_CONCAT(b_array.username) AS personen FROM entries p LEFT JOIN users b_single ON p.user_id = b_single.id JOIN JSON_TABLE(p.person,'$[*]' COLUMNS(id INT PATH '$')) AS jt LEFT JOIN users b_array ON jt.id = b_array.id GROUP BY p.id, b_single.username) SELECT e.*, un.zahler, un.personen FROM entries e JOIN user_names un ON e.id = un.id;"; +$stmt = $pdo->prepare($sql); $stmt->execute(); $entries = $stmt->fetchAll(); ?> @@ -53,6 +54,7 @@ $entries = $stmt->fetchAll(); Datum +Zahler Person Kategorie Zahlweise @@ -64,7 +66,8 @@ $entries = $stmt->fetchAll(); - + + diff --git a/html/new_entry.php b/html/new_entry.php index 7cecd6c..8e82b54 100644 --- a/html/new_entry.php +++ b/html/new_entry.php @@ -22,39 +22,54 @@ $users = []; $categories = []; // save-Logik -if (!empty($_POST) && isset($DEBUG)) { // $_SERVER['REQUEST_METHOD'] === 'POST') { - echo "

Empfangene POST-Daten:

"; - echo "