From 966ed2690c4aee6af3f52f96e0d9555bc47e505b Mon Sep 17 00:00:00 2001 From: Bruno Eckhardt Date: Wed, 25 Mar 2026 07:28:36 +0100 Subject: [PATCH 1/3] =?UTF-8?q?new:=20auf=20und=20abbau=20von=20stunden=20?= =?UTF-8?q?m=C3=B6glich?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WEBROOT/services/zeiterfassung.php | 117 +++-------------------------- 1 file changed, 10 insertions(+), 107 deletions(-) diff --git a/WEBROOT/services/zeiterfassung.php b/WEBROOT/services/zeiterfassung.php index b8ec170..f26c921 100644 --- a/WEBROOT/services/zeiterfassung.php +++ b/WEBROOT/services/zeiterfassung.php @@ -12,59 +12,23 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_overtime'])) { $conn->query($insert_sql); } -// --- Daten laden --- -$daten = []; -$sql = "SELECT `DATUM`, `PROZESS_1`, `PROZESS_2`, `PROZESS_3`, `PROZESS_4`, `BEGINN`, `ENDE_REAL`, `OVERTIME` FROM Firmenberichte ORDER BY `DATUM` DESC"; -if ($erg = $conn->query($sql)) { - while ($datensatz = $erg->fetch_object()) { $daten[] = $datensatz; } - $erg->free(); -} - // --- Gesamtsumme berechnen --- $minuten_berichte = 0; $res1 = $conn->query("SELECT SUM(OVERTIME) AS summe FROM Firmenberichte"); if ($row = $res1->fetch_object()) { $minuten_berichte = intval($row->summe); } -$minuten_extra = 0; -$res2 = $conn->query("SELECT SUM(MINUTEN) AS summe FROM Ueberstunden"); -if ($row = $res2->fetch_object()) { $minuten_extra = intval($row->summe); } +$minuten_abbau = 0; +$res2 = $conn->query("SELECT SUM(MINUTEN) AS summe FROM Ueberstunden WHERE GRUND = 'Abbau'"); +if ($row = $res2->fetch_object()) { $minuten_abbau = intval($row->summe); } -$gesamt_minuten = $minuten_berichte - $minuten_extra; +$minuten_aufbau = 0; +$res2 = $conn->query("SELECT SUM(MINUTEN) AS summe FROM Ueberstunden WHERE GRUND = 'Aufbau'"); +if ($row = $res2->fetch_object()) { $minuten_aufbau = intval($row->summe); } + +$gesamt_minuten = $minuten_berichte - $minuten_abbau + $minuten_aufbau; ?>
-
- - - - - - -
- - -
-

Überstunden Rechner

- - - - -
-

Überstunden / Restzeit:

-
0:00
-
-
- -
@@ -89,7 +53,7 @@ $gesamt_minuten = $minuten_berichte - $minuten_extra;
-
- - - -
- - \ No newline at end of file + \ No newline at end of file From 63373ac90c30133fc1baf59aac7c2738ce80d477 Mon Sep 17 00:00:00 2001 From: Bruno Eckhardt Date: Wed, 25 Mar 2026 07:45:03 +0100 Subject: [PATCH 2/3] dropdown --- WEBROOT/services/zeiterfassung.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/WEBROOT/services/zeiterfassung.php b/WEBROOT/services/zeiterfassung.php index f26c921..478d257 100644 --- a/WEBROOT/services/zeiterfassung.php +++ b/WEBROOT/services/zeiterfassung.php @@ -51,10 +51,15 @@ $gesamt_minuten = $minuten_berichte - $minuten_abbau + $minuten_aufbau; -
+
- + +