diff --git a/html/assets/css/style.css b/html/assets/css/style.css index d2855d6..fd9e837 100644 --- a/html/assets/css/style.css +++ b/html/assets/css/style.css @@ -223,6 +223,10 @@ th, td { border-bottom: 1px solid #eee; } +td.align-right { + text-align: right; +} + th { background: var(--primary-color); color: white; @@ -251,8 +255,8 @@ tr:hover { /* Button */ .btn-xr { position: fixed; - bottom: 20px; - right: 20px; + bottom: 30px; + right: 30px; background: var(--primary-color); color: white; padding: 12px 20px; diff --git a/html/assets/js/script.js b/html/assets/js/script.js index 5804812..4713551 100644 --- a/html/assets/js/script.js +++ b/html/assets/js/script.js @@ -18,7 +18,7 @@ function hideDataNotice(delay = 5000) { const dataNotice = document.getElementById('data-notice'); if (!dataNotice) return; // Wenn das Element nicht existiert, abbrechen - alert(dataNotice); + // alert(dataNotice); // Timer starten setTimeout(() => { dataNotice.classList.add('hidden'); // Klasse für Ausblenden hinzufügen diff --git a/html/dashboard.php b/html/dashboard.php index 688bf52..b905572 100644 --- a/html/dashboard.php +++ b/html/dashboard.php @@ -21,7 +21,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { } // Daten abrufen -$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;"; +$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 order by date desc;"; $stmt = $pdo->prepare($sql); $stmt->execute(); $entries = $stmt->fetchAll(); @@ -35,6 +35,15 @@ $entries = $stmt->fetchAll();
+ +