Automated merge from dev to live

# Conflicts:
#	WEBROOT/controller/DatabaseConnect.php

WEBROOT/config.php

@@ -32,12 +32,14 @@ $serviceGroups = array (
       1 => 'zeiterfassung',
       2 => 'berichte_arbeit_gen',
       3 => 'berichte',
+      4 => 'firmenberichte',
+      5 => 'berufsschulberichte',
     ),
   ),
   'Logs' => 
   array (
     'label' => 'Webserver',
-    'defaultOpen' => true,
+    'defaultOpen' => false,
     'services' => 
     array (
       0 => 'public_request_logs',
@@ -206,6 +208,18 @@ $services = array (
     'active' => true,
     'adminOnly' => false,
   ),
+  'firmenberichte' => 
+  array (
+    'name' => 'Firmenberichte',
+    'active' => true,
+    'adminOnly' => false,
+  ),
+  'berufsschulberichte' => 
+  array (
+    'name' => 'Berufsschulberichte',
+    'active' => true,
+    'adminOnly' => false,
+  ),
 );
 
 $linkGroups = array (

WEBROOT/controller/ApiController.php

@@ -1,21 +1,23 @@
 <?php
 
-require(__DIR__ . '/DatabaseController.php');
+include_once(__DIR__ . '/DatabaseController.php');
+
+class ApiController
+{
 
-class ApiController {
-    
     /**
      * method for pretty jsonsuccess output
      *
      * @param array $data
      * @return string
      */
-    public function jsonSuccess($data) {
+    public function jsonSuccess($data)
+    {
         return json_encode(
             [
                 'status' => 'success',
                 'data' => $data,
-            ], 
+            ],
             JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE
         );
     }
@@ -26,13 +28,14 @@ class ApiController {
      * @param array $error
      * @return string
      */
-    public function jsonError ($error) {
+    public function jsonError($error)
+    {
         echo json_encode(
             [
                 'status' => 'failed',
                 'data' => 'none',
                 'error' => $error
-            ], 
+            ],
             JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE
         );
     }
@@ -42,7 +45,8 @@ class ApiController {
      *
      * @return array
      */
-    private function getAuthKey () {
+    private function getAuthKey()
+    {
         $validTokens = DatabaseShow(
             "API_Credentials",
             "TOKEN"
@@ -58,7 +62,8 @@ class ApiController {
      * @param string $function
      * @return void
      */
-    public function urlAuth ($token, $function = '') {
+    public function urlAuth($token, $function = '')
+    {
 
         $validTokens = $this->getAuthKey();
         if (!in_array($token, $validTokens)) {
@@ -90,7 +95,8 @@ class ApiController {
         return true;
     }
 
-    public function requestSave($function = '') {
+    public function requestSave($function = '')
+    {
         DatabaseInsert(
             "API_LOGS",
             "CLIENT_IP, TOKEN, API, FUNKTION, JSON",
@@ -106,7 +112,8 @@ class ApiController {
      * create new api token
      *
      */
-    private function createToken() {
+    private function createToken()
+    {
         return bin2hex(random_bytes(32));
     }
 
@@ -115,8 +122,9 @@ class ApiController {
      *
      * @return bool
      */
-    public function saveToken() {
-        try {    
+    public function saveToken()
+    {
+        try {
             DatabaseInsert(
                 "API_Credentials",
                 "TOKEN, BENUTZER",
@@ -128,4 +136,4 @@ class ApiController {
         }
         return true;
     }
-}
+}

WEBROOT/controller/DatabaseConnect.php

@@ -44,7 +44,7 @@ function db_connect() {
         ]
     ];
 
-    $enviroment = 'vpn';
+    $enviroment = 'live';
 
     mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 

WEBROOT/modules/Mail.php

@@ -3,7 +3,7 @@
 include_once __DIR__ . '/../controller/DatabaseController.php';
 include_once __DIR__ . '/../controller/DataController.php';
 
-function sendMail($subject, $message, $url, bool $log, $to = "bruno.eckhardt07 qmail.com")
+function sendMail($subject, $message, $url, bool $log, $to = "bruno.eckhardt07@gmail.com")
 {
     $headers = "From: bruno.eckhardt07@gmail.com\r\n";
     mail(

WEBROOT/services/berufsschulberichte.php

@@ -0,0 +1,212 @@
+<?php
+include_once(__DIR__ . '/../controller/DataController.php');
+include_once(__DIR__ . '/../controller/DatabaseController.php');
+
+$alleFaecher = DatabaseShow("Fach", "ID, FACH");
+$alleRaeume  = DatabaseShow("Raum", "ID, RAUM_NR");
+$alleLehrer  = DatabaseShow("Lehrer", "ID, NAME");
+
+/*
+1 => ["fach_id" => 1, "raum_id" => 5, "lehrer_id" => 8], // LF1
+1 => ["fach_id" => 2, "raum_id" => 4, "lehrer_id" => 11], // LF2
+1 => ["fach_id" => 3, "raum_id" => 1, "lehrer_id" => 2], // LF3
+1 => ["fach_id" => 4, "raum_id" => 1, "lehrer_id" => 5], // LF4
+6 => ["fach_id" => 5, "raum_id" => 3, "lehrer_id" => 1], // LF5
+1 => ["fach_id" => 6, "raum_id" => 5, "lehrer_id" => 4], // Sozi
+1 => ["fach_id" => 8, "raum_id" => 5, "lehrer_id" => 7], // VWL
+1 => ["fach_id" => 9, "raum_id" => 5, "lehrer_id" => 3], // DE
+1 => ["fach_id" => 10, "raum_id" => 5, "lehrer_id" => 3], // ENG
+*/
+
+$Stundenplan = [
+    "MO" => [
+        1 => ["fach_id" => 3, "raum_id" => 1, "lehrer_id" => 2], // LF3
+        2 => ["fach_id" => 3, "raum_id" => 1, "lehrer_id" => 2], // LF3
+        3 => ["fach_id" => 3, "raum_id" => 1, "lehrer_id" => 2], // LF3
+        4 => ["fach_id" => 6, "raum_id" => 5, "lehrer_id" => 4], // Sozi
+        5 => ["fach_id" => 10, "raum_id" => 5, "lehrer_id" => 3], // Eng
+        6 => ["fach_id" => 10, "raum_id" => 5, "lehrer_id" => 3], // Eng
+        7 => ["fach_id" => 2, "raum_id" => 3, "lehrer_id" => 11], // LF2
+        8 => ["fach_id" => 2, "raum_id" => 3, "lehrer_id" => 11], // LF2
+    ],
+    "DI" => [
+        1 => ["fach_id" => 5, "raum_id" => 3, "lehrer_id" => 1], // LF5
+        2 => ["fach_id" => 5, "raum_id" => 3, "lehrer_id" => 1], // LF5
+        3 => ["fach_id" => 5, "raum_id" => 1, "lehrer_id" => 5], // LF5
+        4 => ["fach_id" => 2, "raum_id" => 3, "lehrer_id" => 6], // LF2
+        5 => ["fach_id" => 2, "raum_id" => 3, "lehrer_id" => 6], // LF2
+    ],
+    "MI" => [
+        1 => ["fach_id" => 8, "raum_id" => 5, "lehrer_id" => 7], // VWL
+        2 => ["fach_id" => 8, "raum_id" => 5, "lehrer_id" => 7], // VWL
+        3 => ["fach_id" => 9, "raum_id" => 5, "lehrer_id" => 3], // DE
+        4 => ["fach_id" => 9, "raum_id" => 5, "lehrer_id" => 3], // DE
+        5 => ["fach_id" => 2, "raum_id" => 4, "lehrer_id" => 6], // LF2
+        6 => ["fach_id" => 2, "raum_id" => 4, "lehrer_id" => 6], // LF2
+        7 => ["fach_id" => 8, "raum_id" => 5, "lehrer_id" => 7], // VWL
+    ],
+    "DO" => [
+        1 => ["fach_id" => 3, "raum_id" => 1, "lehrer_id" => 2], // LF3
+        2 => ["fach_id" => 3, "raum_id" => 1, "lehrer_id" => 2], // LF3
+        3 => ["fach_id" => 3, "raum_id" => 1, "lehrer_id" => 2], // LF3
+        4 => ["fach_id" => 6, "raum_id" => 5, "lehrer_id" => 4], // Sozi
+        5 => ["fach_id" => 6, "raum_id" => 5, "lehrer_id" => 4], // Sozi
+        6 => ["fach_id" => 4, "raum_id" => 1, "lehrer_id" => 5], // LF4
+        7 => ["fach_id" => 4, "raum_id" => 1, "lehrer_id" => 5], // LF4
+        8 => ["fach_id" => 4, "raum_id" => 1, "lehrer_id" => 5], // LF4
+    ],
+    "FR" => [
+        1 => ["fach_id" => 1, "raum_id" => 5, "lehrer_id" => 8], // LF1
+        2 => ["fach_id" => 1, "raum_id" => 5, "lehrer_id" => 8], // LF1
+        3 => ["fach_id" => 1, "raum_id" => 5, "lehrer_id" => 8], // LF1
+        4 => ["fach_id" => 5, "raum_id" => 3, "lehrer_id" => 1], // LF5
+        5 => ["fach_id" => 5, "raum_id" => 3, "lehrer_id" => 1], // LF5
+        6 => ["fach_id" => 5, "raum_id" => 3, "lehrer_id" => 1], // LF5
+    ]
+];
+?>
+
+<!DOCTYPE html>
+<html lang="de">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Berufsschulbericht</title>
+    <link rel="stylesheet" href="style.css">
+</head>
+
+<body>
+
+    <div class="main">
+        <div class="content" style="max-width: 1100px; margin: 0 auto; padding: 20px;">
+
+            <div class="form-container">
+                <h3 style="margin-top: 0;">Berufsschulbericht erfassen</h3>
+
+                <form method="post">
+                    <div class="form-group" style="max-width: 220px; margin-bottom: 25px;">
+                        <label for="datum">Datum auswählen</label>
+                        <input type="date" name="datum" id="datum" required>
+                    </div>
+
+                    <div class="vergabe-grid"
+                        style="font-weight: bold; padding-bottom: 8px; margin-bottom: 12px; border-bottom: 1px solid var(--card-border);">
+                        <div>Stunde</div>
+                        <div>Fach</div>
+                        <div>Raum</div>
+                        <div>Lehrer</div>
+                        <div>Inhalt / Thema</div>
+                    </div>
+
+                    <?php for ($i = 1; $i <= 8; $i++): ?>
+                    <div class="vergabe-grid" style="margin-bottom: 10px; align-items: center;">
+
+                        <div>
+                            <span class="badge"
+                                style="display: inline-block; min-width: 90px; text-align: center; padding: 8px 12px; font-weight: bold;">Stunde
+                                <?= $i ?></span>
+                        </div>
+
+                        <div class="form-group">
+                            <select name="stunden[<?= $i ?>][fach_id]" data-stunde="<?= $i ?>" data-type="fach_id">
+                                <option value="">-- Fach --</option>
+                                <?php foreach ($alleFaecher as $row): ?>
+                                <option value="<?= $row['ID'] ?>"><?= htmlspecialchars($row['FACH']) ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <select name="stunden[<?= $i ?>][raum_id]" data-stunde="<?= $i ?>" data-type="raum_id">
+                                <option value="">-- Raum --</option>
+                                <?php foreach ($alleRaeume as $row): ?>
+                                <option value="<?= $row['ID'] ?>"><?= htmlspecialchars($row['RAUM_NR']) ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <select name="stunden[<?= $i ?>][lehrer_id]" data-stunde="<?= $i ?>" data-type="lehrer_id">
+                                <option value="">-- Lehrer --</option>
+                                <?php foreach ($alleLehrer as $row): ?>
+                                <option value="<?= $row['ID'] ?>"><?= htmlspecialchars($row['NAME']) ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <input type="text" name="stunden[<?= $i ?>][inhalt_text]" placeholder="Inhalt der Stunde..."
+                                style="margin: 0; padding: 10px;">
+                        </div>
+
+                    </div>
+                    <?php endfor; ?>
+
+                    <div style="margin-top: 25px; text-align: right;">
+                        <button type="submit" class="btn-submit-vergabe"
+                            style="width: 220px; display: inline-flex; font-weight: bold;">
+                            Bericht speichern
+                        </button>
+                    </div>
+                </form>
+            </div>
+
+        </div>
+    </div>
+
+    <script>
+    const stundenplan = <?= json_encode($Stundenplan) ?>;
+    const wochentage = ["SO", "MO", "DI", "MI", "DO", "FR", "SA"];
+
+    document.getElementById('datum').addEventListener('change', function() {
+        const gewaehltesDatum = new Date(this.value);
+        if (isNaN(gewaehltesDatum)) return;
+
+        let tagKey = wochentage[gewaehltesDatum.getDay()];
+
+        if (tagKey === "SO" || tagKey === "SA") {
+            tagKey = "MO";
+        }
+
+        const tagesPlan = stundenplan[tagKey] || {};
+
+        document.querySelectorAll('.vergabe-grid select').forEach(select => {
+            const stunde = select.getAttribute('data-stunde');
+            const type = select.getAttribute('data-type');
+
+            const vordefinierteId = (tagesPlan[stunde] && tagesPlan[stunde][type]) ? tagesPlan[stunde][
+                type
+            ] : "";
+
+            select.value = vordefinierteId;
+        });
+    });
+    </script>
+
+    <?php
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $datum = $_POST['datum'] ?? null;
+    $werte = [$datum];
+
+    for ($i = 1; $i <= 8; $i++) {
+        $stunde = $_POST['stunden'][$i] ?? [];
+        $werte[] = !empty($stunde['fach_id'])   ? $stunde['fach_id']   : null;
+        $werte[] = !empty($stunde['lehrer_id']) ? $stunde['lehrer_id'] : null;
+        $werte[] = !empty($stunde['raum_id'])   ? $stunde['raum_id']   : null;
+        $werte[] = !empty($stunde['inhalt_text']) ? $stunde['inhalt_text'] : null;
+    }
+
+    DatabaseInsert(
+        "Berufsschulberichte",
+        "DATUM, FACH_S1, LEHRER_S1, RAUM_S1, INHALT_S1, FACH_S2, LEHRER_S2, RAUM_S2, INHALT_S2, FACH_S3, LEHRER_S3, RAUM_S3, INHALT_S3, FACH_S4, LEHRER_S4, RAUM_S4, INHALT_S4, FACH_S5, LEHRER_S5, RAUM_S5, INHALT_S5, FACH_S6, LEHRER_S6, RAUM_S6, INHALT_S6, FACH_S7, LEHRER_S7, RAUM_S7, INHALT_S7, FACH_S8, LEHRER_S8, RAUM_S8, INHALT_S8",
+        ...$werte
+    );
+
+    echo "<div class='status-msg' style='position: fixed; bottom: 20px; right: 20px; z-index: 10000;'>Bericht gespeichert!</div>";
+}
+?>
+
+</body>
+
+</html>

WEBROOT/services/firmenberichte.php

@@ -0,0 +1,97 @@
+<?php
+
+include_once(__DIR__ . '/../controller/DataController.php');
+include_once(__DIR__ . '/../controller/DatabaseController.php');
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_bericht'])) {
+    $prozess1 = $_POST['prozess1'];
+    $prozess2 = $_POST['prozess2'];
+    $prozess3 = $_POST['prozess3'];
+    $prozess4 = $_POST['prozess4'];
+    $startzeit = $_POST['startzeit'];
+    $endzeit = $_POST['endzeit'];
+    $datum = $_POST['datum'];
+
+    // IHK konforme zeiten berechnen und Überstunden berechnen
+    $soll = new DateTime($startzeit);
+    $soll->modify("+8 hours 30 minutes");
+
+    $randomMin = rand(1, 15);
+    $endePublicDt = clone $soll;
+    $endePublicDt->modify("+{$randomMin} minutes");
+    $endePublic = $endePublicDt->format("H:i");
+
+    $real = DateTime::createFromFormat("H:i", $endzeit);
+
+    $beginnDt = new DateTime($startzeit);
+    $arbeitsDiff = $beginnDt->diff($real);
+    $arbeitsMinuten = ($arbeitsDiff->h * 60) + $arbeitsDiff->i;
+    $sollMinuten = 8 * 60 + 30;
+
+    if ($arbeitsMinuten <= $sollMinuten) {
+        $overtime = 0;
+    } else {
+        $diff = $soll->diff($real);
+        $overtime = ($diff->h * 60) + $diff->i;
+    }
+
+    DatabaseInsert(
+        "Firmenberichte",
+            "DATUM, PROZESS_1, PROZESS_2, PROZESS_3, PROZESS_4, BEGINN, ENDE_REAL, ENDE_PUBLIC, OVERTIME",
+            $datum,
+            $prozess1,
+            $prozess2,
+            $prozess3,
+            $prozess4,
+            $startzeit,
+            $endzeit,
+            $endePublic,
+            $overtime
+    );
+
+    redirectToWebsite((new getSpecificData())->getReferer());
+    exit;
+}
+
+?>
+
+<div>
+    <div class="berichte-container">
+        <form method="POST" class="berichte-form">
+
+            <div class="form-group">
+                <label>Prozess 1</label>
+                <input type="text" name="prozess1" required>
+            </div>
+            <div class="form-group">
+                <label>Prozess 2</label>
+                <input type="text" name="prozess2" required>
+            </div>
+            <div class="form-group">
+                <label>Prozess 3</label>
+                <input type="text" name="prozess3" required>
+            </div>
+            <div class="form-group">
+                <label>Prozess 4</label>
+                <input type="text" name="prozess4" required>
+            </div>
+            <div class="form-group">
+                <label>Startzeit</label>
+                <input type="time" name="startzeit" required>
+            </div>
+            <div class="form-group">
+                <label>Endzeit</label>
+                <input type="time" name="endzeit" required>
+            </div>
+            <div class="form-group">
+                <label>Datum</label>
+                <input type="date" name="datum" required>
+            </div>
+
+            <button type="submit" name="add_bericht" class="btn-submit-bericht">
+                Bericht Speichern
+            </button>
+
+        </form>
+    </div>
+</div>

WEBROOT/services/vergabe.php

@@ -1,10 +1,15 @@
 <?php
 include_once __DIR__ . '/../controller/DatabaseController.php';
 include_once __DIR__ . '/../controller/RoutesController.php';
+include_once __DIR__ . '/../modules/ConsoleLog.php';
 
 $conn = db_connect();
-$view = $_GET['view'] ?? 'show'; 
-$selectedService = $_GET['service'] ?? null; 
+$view = $_GET['view'] ?? 'show';
+$selectedService = $_GET['service'] ?? null;
+
+// --- Suchfilter auslesen ---
+$searchWer = $_GET['search_wer'] ?? '';
+$searchWas = $_GET['search_was'] ?? '';
 
 // --- LOGIK: Überstunden-Eintrag (Abbau) speichern ---
 if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_entry'])) {
@@ -14,10 +19,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_entry'])) {
     $rueckgabe = $_POST['rueckgabe'];
 
     DatabaseInsert(
-        "Vergabe", 
-        "WAS, WER, WANN, RUECKGABE", 
-        $was, 
-        $wer, 
+        "Vergabe",
+        "WAS, WER, WANN, RUECKGABE",
+        $was,
+        $wer,
         $wann,
         $rueckgabe
     );
@@ -29,16 +34,47 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_entry'])) {
 if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['delete_entry'])) {
     $id = $_POST['id'];
 
-    DatabaseDelete("Vergabe", "ID = ?", $id);
+    ConsoleLog("$id");
+
+    DatabaseUpdate(
+        "Vergabe",
+        "STATUS = ?",
+        "ID = ?",
+        1,
+        $id
+    );
 
     redirectToWebsite((new getSpecificData())->getReferer());
     exit;
 }
 
+// --- Dynamic Query mit kombiniertem Suchfilter ---
+$whereClause = "STATUS IS NULL";
+if (!empty($searchWer)) {
+    $whereClause .= " AND WER LIKE '%" . $conn->real_escape_string($searchWer) . "%'";
+}
+if (!empty($searchWas)) {
+    $whereClause .= " AND WAS LIKE '%" . $conn->real_escape_string($searchWas) . "%'";
+}
+
 $entries = DatabaseShow(
-    "Vergabe"
+    "Vergabe",
+    "ID, WAS, WER, WANN, RUECKGABE",
+    $whereClause
 );
 
+$searchEntries = DatabaseShow(
+    "Vergabe",
+);
+
+$existingWas = [];
+$existingWer = [];
+foreach ($searchEntries as $entry) {
+    if (!empty($entry['WAS'])) $existingWas[$entry['WAS']] = true;
+    if (!empty($entry['WER'])) $existingWer[$entry['WER']] = true;
+}
+$existingWas = array_keys($existingWas);
+$existingWer = array_keys($existingWer);
 ?>
 
 <div class="arbeitsberichte-wrapper">
@@ -55,25 +91,73 @@ $entries = DatabaseShow(
                 <input type="date" name="rueckgabe" value="<?= date('Y-m-d') ?>" required>
             </div>
 
-            <div class="form-group">
+            <div class="form-group autocomplete-wrapper">
                 <label>An wen</label>
-                <input type="text" name="wer" placeholder="Name eingeben" required>
+                <input type="text" name="wer" id="wer-input" placeholder="Name eingeben" required autocomplete="off">
+                <div class="autocomplete-suggestions" id="wer-suggestions"></div>
             </div>
 
-            <div class="form-group">
+            <div class="form-group autocomplete-wrapper">
                 <label>Was</label>
-                <input type="text" name="was" placeholder="Gegenstand eingeben" required>
+                <input type="text" name="was" id="was-input" placeholder="Gegenstand eingeben" required autocomplete="off">
+                <div class="autocomplete-suggestions" id="was-suggestions"></div>
             </div>
 
             <button type="submit" name="add_entry" class="btn-submit-vergabe">
-                💾 Speichern
+                Speichern
             </button>
 
         </form>
     </div>
+
+    <div class="vergabe-form" style="margin-top: 30px;">
+        <form method="GET" action="" class="vergabe-grid" id="search-form">
+            <input type="hidden" name="view" value="<?= htmlspecialchars($view) ?>">
+            <?php if ($selectedService): ?>
+                <input type="hidden" name="service" value="<?= htmlspecialchars($selectedService) ?>">
+            <?php endif; ?>
+
+            <div class="form-group autocomplete-wrapper">
+                <label for="search-wer-input">Nach Person filtern</label>
+                <input type="text" name="search_wer" id="search-wer-input" value="<?= htmlspecialchars($searchWer) ?>" placeholder="Name eingeben..." autocomplete="off">
+                <div class="autocomplete-suggestions" id="search-wer-suggestions"></div>
+            </div>
+
+            <div class="form-group autocomplete-wrapper">
+                <label for="search-was-input">Nach Gegenstand filtern</label>
+                <input type="text" name="search_was" id="search-was-input" value="<?= htmlspecialchars($searchWas) ?>" placeholder="Gegenstand eingeben..." autocomplete="off">
+                <div class="autocomplete-suggestions" id="search-was-suggestions"></div>
+            </div>
+
+            <div style="display: flex; gap: 10px; align-items: flex-end;">
+                <button type="submit" class="btn-submit-vergabe" style="margin: 0; flex-grow: 1;">
+                    Suchen
+                </button>
+
+                <?php if (!empty($searchWer) || !empty($searchWas)): ?>
+                    <a href="?view=<?= urlencode($view) ?><?= $selectedService ? '&service=' . urlencode($selectedService) : '' ?>" class="btn-delete" style="text-decoration: none; padding: 10px; display: inline-block; text-align: center; white-space: nowrap; margin: 0;">
+                        Zurücksetzen
+                    </a>
+                <?php endif; ?>
+            </div>
+        </form>
+    </div>
+
     <div class="table-container" style="margin-top: 30px;">
-        <h3>Aktuelle Vergaben</h3>
-        
+        <h3>
+            <?php
+            if (!empty($searchWer) && !empty($searchWas)) {
+                echo "Gefiltert nach: " . htmlspecialchars($searchWer) . " ➔ " . htmlspecialchars($searchWas);
+            } elseif (!empty($searchWer)) {
+                echo "Vergaben für: " . htmlspecialchars($searchWer);
+            } elseif (!empty($searchWas)) {
+                echo "Ausgeliehene Gegenstände: " . htmlspecialchars($searchWas);
+            } else {
+                echo "Aktuelle Vergaben";
+            }
+            ?>
+        </h3>
+
         <?php if (!empty($entries)): ?>
             <table class="db-table mobile-responsive-table">
                 <thead>
@@ -96,7 +180,7 @@ $entries = DatabaseShow(
                                 <form method="POST" onsubmit="return confirm('Möchtest du diesen Eintrag wirklich löschen?');" style="margin: 0;">
                                     <input type="hidden" name="id" value="<?= $entry['ID'] ?? '' ?>">
                                     <button type="submit" name="delete_entry" class="btn-delete">
-                                        🗑️ Löschen
+                                        Löschen
                                     </button>
                                 </form>
                             </td>
@@ -108,4 +192,108 @@ $entries = DatabaseShow(
             <p>Keine Einträge vorhanden.</p>
         <?php endif; ?>
     </div>
-</div>
+</div>
+
+<script>
+    // Parameter `submitOnSelect` hinzugefügt (Standard: false)
+    function setupAutocomplete(inputId, suggestionsId, data, submitOnSelect = false) {
+        const input = document.getElementById(inputId);
+        const box = document.getElementById(suggestionsId);
+        if (!input || !box) return;
+
+        let items = [];
+        let activeIndex = -1;
+
+        function render(list) {
+            box.innerHTML = '';
+            items = list;
+            activeIndex = -1;
+            if (list.length === 0) {
+                box.style.display = 'none';
+                return;
+            }
+            list.forEach((val, i) => {
+                const div = document.createElement('div');
+                div.textContent = val;
+                div.addEventListener('mousedown', (e) => {
+                    e.preventDefault();
+                    selectItem(i);
+                });
+                box.appendChild(div);
+            });
+            box.style.display = 'block';
+        }
+
+        function updateActive() {
+            [...box.children].forEach((el, i) => {
+                el.classList.toggle('active', i === activeIndex);
+            });
+            if (activeIndex >= 0) {
+                box.children[activeIndex].scrollIntoView({
+                    block: 'nearest'
+                });
+            }
+        }
+
+        function selectItem(i) {
+            if (items[i] !== undefined) {
+                input.value = items[i];
+            }
+            box.style.display = 'none';
+            activeIndex = -1;
+
+            // NEU: Wenn gewünscht, schicke das übergeordnete Formular sofort ab
+            if (submitOnSelect) {
+                const form = input.closest('form');
+                if (form) form.submit();
+            }
+        }
+
+        input.addEventListener('input', () => {
+            const val = input.value.toLowerCase();
+            if (val.length === 0) {
+                box.style.display = 'none';
+                return;
+            }
+            const filtered = data.filter(d => d.toLowerCase().includes(val));
+            render(filtered);
+        });
+
+        input.addEventListener('keydown', (e) => {
+            if (box.style.display !== 'block') return;
+
+            if (e.key === 'ArrowDown') {
+                e.preventDefault();
+                activeIndex = Math.min(activeIndex + 1, items.length - 1);
+                updateActive();
+            } else if (e.key === 'ArrowUp') {
+                e.preventDefault();
+                activeIndex = Math.max(activeIndex - 1, 0);
+                updateActive();
+            } else if (e.key === 'Tab' || e.key === 'Enter') {
+                if (activeIndex >= 0) {
+                    e.preventDefault();
+                    selectItem(activeIndex);
+                } else {
+                    box.style.display = 'none';
+                }
+            } else if (e.key === 'Escape') {
+                box.style.display = 'none';
+            }
+        });
+
+        document.addEventListener('click', (e) => {
+            if (e.target !== input) {
+                box.style.display = 'none';
+            }
+        });
+    }
+
+    // 1. Normales Autocomplete für das Eintragungs-Formular (schickt nicht automatisch ab)
+    setupAutocomplete('was-input', 'was-suggestions', <?= json_encode($existingWas) ?>);
+    setupAutocomplete('wer-input', 'wer-suggestions', <?= json_encode($existingWer) ?>);
+
+    // 2. Such-Autocomplete: Hier wird als 4. Parameter `true` übergeben, damit sofort abgesendet wird!
+    setupAutocomplete('search-wer-input', 'search-wer-suggestions', <?= json_encode($existingWer) ?>, true);
+    setupAutocomplete('search-was-input', 'search-was-suggestions', <?= json_encode($existingWas) ?>, true);
+</script>

WEBROOT/style.css

@@ -1280,4 +1280,160 @@ body.dark-mode input[type="date"] {
         padding: 10px;
         font-size: 1rem;
     }
+}
+
+/* ===== Optimiertes Firmenberichte Erfassungsformular ===== */
+
+.berichte-container {
+    background: var(--card-bg);
+    border: 1px solid var(--card-border);
+    border-top: 4px solid #007bff;
+    /* Eleganter blauer Akzentstreifen oben statt links */
+    border-radius: 12px;
+    padding: 30px;
+    max-width: 500px;
+    /* Kompakt und perfekt lesbar auf Monitoren */
+    margin: 40px auto;
+    /* Schön zentriert mit Luft nach oben/unten */
+    box-shadow: 0 10px 25px rgba(0, 0, 0, 0.08);
+    transition: all 0.3s ease;
+}
+
+/* Tiefenwirkung für den Dark Mode */
+body.dark-mode .berichte-container {
+    box-shadow: 0 10px 30px rgba(0, 0, 0, 0.5);
+    background: #161616;
+    /* Passt sich perfekt deiner CSS-Variable an */
+}
+
+.berichte-form {
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+}
+
+.berichte-form .form-group {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    width: 100%;
+}
+
+.berichte-form .form-group label {
+    font-size: 0.85rem;
+    font-weight: 700;
+    color: var(--text);
+    text-transform: uppercase;
+    letter-spacing: 0.8px;
+    opacity: 0.85;
+}
+
+/* Einheitlicher, moderner Look für ALLE Input-Typen */
+.berichte-form input[type="text"],
+.berichte-form input[type="time"],
+.berichte-form input[type="date"] {
+    width: 100%;
+    padding: 12px 16px;
+    background: var(--input-bg);
+    border: 1px solid var(--input-border);
+    color: var(--input-text);
+    border-radius: 8px;
+    font-size: 0.95rem;
+    box-sizing: border-box;
+    transition: border-color 0.2s, box-shadow 0.2s;
+}
+
+/* Behebt das Problem mit den grellweißen Zeit/Datumsfeldern im Dark Mode */
+body.dark-mode .berichte-form input[type="time"],
+body.dark-mode .berichte-form input[type="date"] {
+    color-scheme: dark;
+    /* Zwingt den Browser, das native Dropdown dunkel zu machen */
+    background: #222;
+    border-color: #444;
+    color: #fff;
+}
+
+/* Fokus-Effekt (weicher blauer Schein) */
+.berichte-form input:focus {
+    outline: none;
+    border-color: #007bff;
+    box-shadow: 0 0 0 4px rgba(0, 123, 255, 0.15);
+}
+
+body.dark-mode .berichte-form input:focus {
+    box-shadow: 0 0 0 4px rgba(0, 123, 255, 0.3);
+}
+
+/* Vollbreiter, moderner Absende-Button */
+.btn-submit-bericht {
+    width: 100%;
+    background: #28a745;
+    /* Kräftiges Success-Grün */
+    color: white;
+    border: none;
+    padding: 14px;
+    font-size: 1rem;
+    font-weight: 600;
+    border-radius: 8px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 10px;
+    margin-top: 10px;
+    box-shadow: 0 4px 12px rgba(40, 167, 69, 0.2);
+    transition: all 0.2s ease;
+}
+
+.btn-submit-bericht:hover {
+    background: #218838;
+    transform: translateY(-1px);
+    box-shadow: 0 6px 15px rgba(40, 167, 69, 0.3);
+}
+
+.btn-submit-bericht:active {
+    transform: scale(0.98);
+}
+
+/* Kleine Bildschirme (Smartphones) */
+@media (max-width: 600px) {
+    .berichte-container {
+        margin: 15px;
+        padding: 20px;
+    }
+}
+
+.autocomplete-wrapper {
+    position: relative;
+}
+
+.autocomplete-suggestions {
+    display: none;
+    position: absolute;
+    top: 100%;
+    left: 0;
+    right: 0;
+    background: var(--card-bg);
+    color: var(--text);
+    border: 1px solid var(--input-border);
+    border-top: none;
+    max-height: 180px;
+    overflow-y: auto;
+    z-index: 1000;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+}
+
+.autocomplete-suggestions div {
+    padding: 8px 10px;
+    cursor: pointer;
+}
+
+.autocomplete-suggestions div:hover,
+.autocomplete-suggestions div.active {
+    background: rgba(0, 123, 255, 0.15);
+}
+
+body.dark-mode .autocomplete-suggestions div:hover,
+body.dark-mode .autocomplete-suggestions div.active {
+    background: rgba(0, 123, 255, 0.25);
 }

merge.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Erzwingt den Abbruch des Skripts, sobald ein Befehl fehlschlägt
+set -e
+
+echo "🚀 Starte automatischen Merge- und Tag-Prozess..."
+
+# 1. Sicherstellen, dass wir die neuesten Stände vom Server haben
+echo "🔄 Aktualisiere lokale Branches vom Remote..."
+git fetch --all
+
+# 2. Main aktualisieren
+echo "🌿 Prüfe main..."
+git checkout main
+git pull origin main
+
+# 3. Main in Dev mergen
+echo "🔀 Merge: main -> dev..."
+git checkout dev
+git pull origin dev || true # Falls dev lokal noch nicht existiert
+git merge main --no-ff -m "Automated merge from main to dev"
+git push origin dev
+
+# 4. Dev in Live mergen
+echo "🔀 Merge: dev -> live..."
+git checkout live
+git pull origin live || true # Falls live lokal noch nicht existiert
+git merge dev --no-ff -m "Automated merge from dev to live"
+git push origin live
+
+# 5. Tag erstellen und pushen
+# Format: vYYYY.MM.DD-HHMM (z. B. v2026.07.13-1430)
+TAG_NAME="v$(date +'%Y.%m.%d-%H%M')"
+
+echo "🏷️ Erstelle Tag: $TAG_NAME..."
+git tag -a "$TAG_NAME" -m "Automated release tag $TAG_NAME"
+git push origin "$TAG_NAME"
+
+# Zurück auf den Ausgangs-Branch (main) wechseln
+git checkout main
+
+echo "✅ Fertig! Alles erfolgreich gemergt und Tag $TAG_NAME wurde gepusht."