reports api

WEBROOT/api/get.php

@@ -13,9 +13,15 @@ if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
     exit();
 }
 
-$validTokens = [
-    "15a437d128c918633e57dc7d18118a073b807644f21731ed5a7ebcf3eca9e242",
-];
+// $validTokens = [
+//     "15a437d128c918633e57dc7d18118a073b807644f21731ed5a7ebcf3eca9e242",
+// ];
+$validTokens = DatabaseShow(
+    "API_Credentials",
+    "TOKEN"
+);
+
+$validTokens = array_column($validTokens, 'TOKEN');
 
 $headers = getallheaders();
 $token = $headers['Authorization'] ?? $headers['authorization'] ?? $_SERVER['HTTP_AUTHORIZATION'] ?? '';
@@ -28,18 +34,35 @@ if (!in_array($token, $validTokens)) {
         "debug_received_token" => $token,
         "debug_all_headers" => $headers
     ]);
+
+    DatabaseInsert(
+        "API_LOGS",
+        "CLIENT_IP, TOKEN, API, FUNKTION, JSON",
+        (new getSpecificData())->getClientIP(),
+        $token,
+        (new getSpecificData())->getRequestURL(),
+        $function,
+        $error
+    );
+
     errorMail(
         "API Login failed",
         $error,
         true,
     );
-    echo $error;
+
+    echo json_encode(
+        [
+            "error" => "Unauthorized",
+            "Contact" => "bruno.eckhardt07@gmail.com",
+        ]
+    );
     exit;
 }
 
 if (in_array($token, $validTokens)) {
     DatabaseInsert(
-        "API",
+        "API_LOGS",
         "CLIENT_IP, TOKEN, API, FUNKTION",
         (new getSpecificData())->getClientIP(),
         $token,
@@ -61,6 +84,13 @@ if (in_array($token, $validTokens)) {
         );
     }
 
+    if ($function === "Berichte") {
+        $data = DatabaseShowWithFK(
+            "Berufsschulberichte",
+            $Berufsschulberichte,
+        );
+    }
+    
     echo json_encode(
         [
             "success" => true,

WEBROOT/api/reports.php

@@ -0,0 +1,28 @@
+<?php
+
+include_once(__DIR__ . '/../controller/DatabaseController.php');
+include_once(__DIR__ . '/../controller/DataController.php');
+
+header('Content-Type: application/json');
+
+try {
+    $data = DatabaseShowWithFK(
+        "Berufsschulberichte",
+        $Berufsschulberichte,
+    );
+
+    echo json_encode(
+        [
+            'status' => 'success',
+            'data' => $data,
+        ], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE
+    );
+} catch (Exception $e) {
+    echo json_encode(
+        [
+            'status' => 'failed',
+            'data' => 'none',
+            'error' => $e,
+        ], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE
+    );
+}

WEBROOT/controller/DataController.php

@@ -3,7 +3,7 @@
 class getSpecificData {
 
     public function getWeather() {
-        $url = "https://api.openweathermap.org/data/2.5/weather?q=Berlin,DE&APPID=5bc3e1a438c58fca444c4370ac0517b2&units=metric";
+        $url = "https://api.openweathermap.org/data/2.5/weather?q=Jena,DE&APPID=5bc3e1a438c58fca444c4370ac0517b2&units=metric";
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);

WEBROOT/controller/DatabaseController.php

@@ -147,10 +147,37 @@ function DatabaseUpdate($table, $set, $where, ...$values) {
     return true;
 }
 
+function getFKValue($conn, $table, $key, $value, $id, &$cache) {
+    if ($id === null) return null;
+
+    $cacheKey = $table . "_" . $id;
+
+    if (isset($cache[$cacheKey])) {
+        return $cache[$cacheKey];
+    }
+
+    $stmt = $conn->prepare("SELECT `$value` FROM `$table` WHERE `$key` = ? LIMIT 1");
+    if (!$stmt) {
+        die("FK Prepare Fehler: " . $conn->error);
+    }
+
+    $stmt->bind_param("i", $id);
+    $stmt->execute();
+
+    $result = $stmt->get_result()->fetch_assoc();
+    $valueResult = $result[$value] ?? null;
+
+    $cache[$cacheKey] = $valueResult;
+
+    return $valueResult;
+}
+
 function DatabaseShowWithFK($table, $fkMap = [], $columns = "*", $where = "", ...$values) {
     include_once 'DatabaseConnect.php';
     $conn = db_connect();
 
+    $cache = [];
+
     $select = is_array($columns) ? implode(", ", $columns) : $columns;
 
     $sql = "SELECT $select FROM `$table`";
@@ -161,33 +188,32 @@ function DatabaseShowWithFK($table, $fkMap = [], $columns = "*", $where = "", ..
     $stmt = $conn->prepare($sql);
     if (!$stmt) die("Fehler beim Prepare: " . $conn->error);
 
-    if (!$stmt->execute($values)) die("Fehler beim Execute: " . $stmt->error);
+    if (!empty($values)) {
+        $stmt->execute($values);
+    } else {
+        $stmt->execute();
+    }
 
     $result = $stmt->get_result();
-    if (!$result) die("Fehler beim get_result: " . $stmt->error);
-
-    $columnsResult = [];
-    while ($fieldinfo = $result->fetch_field()) {
-        $columnsResult[] = $fieldinfo->name;
-    }
+    if (!$result) die("Fehler beim get_result: " . $conn->error);
 
     $rows = $result->fetch_all(MYSQLI_ASSOC);
 
     foreach ($rows as &$row) {
         foreach ($fkMap as $fkColumn => $fkInfo) {
-            if (isset($row[$fkColumn]) && $row[$fkColumn] !== null) {
-                $fkStmt = $conn->prepare(
-                    "SELECT {$fkInfo['value']} FROM `{$fkInfo['table']}` WHERE {$fkInfo['key']} = ?"
-                );
-                if (!$fkStmt) die("Fehler beim Prepare FK: " . $conn->error);
 
-                $fkStmt->bind_param("i", $row[$fkColumn]);
-                $fkStmt->execute();
-                $fkResult = $fkStmt->get_result();
-                $fkRow = $fkResult->fetch_assoc();
-
-                $row[$fkColumn] = $fkRow ? $fkRow[$fkInfo['value']] : null;
+            if (!isset($row[$fkColumn]) || $row[$fkColumn] === null) {
+                continue;
             }
+
+            $row[$fkColumn] = getFKValue(
+                $conn,
+                $fkInfo['table'],
+                $fkInfo['key'],
+                $fkInfo['value'],
+                $row[$fkColumn],
+                $cache
+            );
         }
     }
 

WEBROOT/services/weather_chart.php

@@ -42,7 +42,7 @@ $conn->close();
                 data: <?php echo json_encode($data); ?>,
                 borderColor: 'rgba(75, 192, 192, 1)',
                 backgroundColor: 'rgba(75, 192, 192, 0.2)',
-                fill: true,
+                fill: false,
                 tension: 0
             }]
         },
@@ -82,7 +82,7 @@ $conn->close();
                     }
                 },
                 y: {
-                    min: 0,
+                    min: -10,
                     max: 40,
                     title: {
                         display: true,

WEBROOT/services/zeiterfassung.php

@@ -1,4 +1,7 @@
 <?php
+include_once __DIR__ . '/../controller/DatabaseController.php';
+include_once __DIR__ . '/../controller/RoutesController.php';
+
 $conn = db_connect();
 $view = $_GET['view'] ?? 'show'; 
 $selectedService = $_GET['service']; 
@@ -8,8 +11,17 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_overtime'])) {
     $datum = $_POST['ot_date'];
     $minuten = intval($_POST['ot_minutes']); 
     $grund = $conn->real_escape_string($_POST['ot_reason']);
-    $insert_sql = "INSERT INTO Ueberstunden (DATUM, MINUTEN, GRUND) VALUES ('$datum', $minuten, '$grund')";
-    $conn->query($insert_sql);
+
+    DatabaseInsert(
+        "Ueberstunden", 
+        "DATUM, MINUTEN, GRUND", 
+        $datum, 
+        $minuten, 
+        $grund
+    );
+
+    redirectToWebsite((new getSpecificData())->getReferer());
+    exit;
 }
 
 // --- Gesamtsumme berechnen ---
@@ -59,6 +71,7 @@ $gesamt_minuten = $minuten_berichte - $minuten_abbau + $minuten_aufbau;
                     <option value="">Bitte wählen</option>
                     <option value="Abbau">Abbau</option>
                     <option value="Aufbau">Aufbau</option>
+                    <option value="Anderes">Anderes</option>
                 </select>
             </div>
             <button type="submit"