added new log column "take_date"

Also removed unnesesarry code notes
changed docs accordingly
2025-08-19 21:24:41 +02:00 · 2025-08-19 21:23:54 +02:00 · 2025-08-19 21:23:29 +02:00 · 2025-08-19 21:23:15 +02:00
6 changed files with 144 additions and 97 deletions
--- a/Docs/backend_API_docs/README.md
+++ b/Docs/backend_API_docs/README.md
@@ -78,9 +78,51 @@ POST /apiV2/controlInSafe/your_admin_key/5/0
 #### Example Response

 ```
-{
-  "message": "Item state updated successfully"
-}
+{}
+```
+
+---
+
+### 3. Set Return Date
+
+**POST** `/apiV2/setReturnDate/:key/:loan_code`
+
+Sets the `returned_date` of a loan to the current server time.
+
+- `loan_code`: The unique code of the loan.
+
+#### Example Request
+
+```
+POST /apiV2/setReturnDate/your_admin_key/123456
+```
+
+#### Example Response
+
+```
+{}
+```
+
+---
+
+### 4. Set Take Date
+
+**POST** `/apiV2/setTakeDate/:key/:loan_code`
+
+Sets the `take_date` of a loan to the current server time.
+
+- `loan_code`: The unique code of the loan.
+
+#### Example Request
+
+```
+POST /apiV2/setTakeDate/your_admin_key/123456
+```
+
+#### Example Response
+
+```
+{}
 ```

 ---
--- a/backend/routes/apiV2.js
+++ b/backend/routes/apiV2.js
@@ -3,16 +3,19 @@ import dotenv from "dotenv";
 import {
  getItemsFromDatabaseV2,
  changeInSafeStateV2,
+  setReturnDateV2,
+  setTakeDateV2,
 } from "../services/database.js";

 dotenv.config();
 const router = express.Router();

+// Route for API to get ALL items from the database
 router.get("/items/:key", async (req, res) => {
  if (req.params.key === process.env.ADMIN_ID) {
    const result = await getItemsFromDatabaseV2();
    if (result.success) {
-      res.status(200).json(result.data);
+      res.status(200).json({ data: result.data });
    } else {
      res.status(500).json({ message: "Failed to fetch items" });
    }
@@ -21,6 +24,7 @@ router.get("/items/:key", async (req, res) => {
  }
 });

+// Route for API to control the position of an item
 router.post("/controlInSafe/:key/:itemId/:state", async (req, res) => {
  if (req.params.key === process.env.ADMIN_ID) {
    const itemId = req.params.itemId;
@@ -28,7 +32,7 @@ router.post("/controlInSafe/:key/:itemId/:state", async (req, res) => {
    if (state === "1" || state === "0") {
      const result = await changeInSafeStateV2(itemId, state);
      if (result.success) {
-        res.status(200).json({ message: "Item state updated successfully" });
+        res.status(200).json({ data: result.data });
      } else {
        res.status(500).json({ message: "Failed to update item state" });
      }
@@ -40,4 +44,36 @@ router.post("/controlInSafe/:key/:itemId/:state", async (req, res) => {
  }
 });

+// Route for API to set the return date
+router.post("/setReturnDate/:key/:loan_code", async (req, res) => {
+  if (req.params.key === process.env.ADMIN_ID) {
+    const loanCode = req.params.loan_code;
+
+    const result = await setReturnDateV2(loanCode);
+    if (result.success) {
+      res.status(200).json({ data: result.data });
+    } else {
+      res.status(500).json({ message: "Failed to set return date" });
+    }
+  } else {
+    res.status(403).json({ message: "Access denied" });
+  }
+});
+
+// Route for API to set the take away date
+router.post("/setTakeDate/:key/:loan_code", async (req, res) => {
+  if (req.params.key === process.env.ADMIN_ID) {
+    const loanCode = req.params.loan_code;
+
+    const result = await setTakeDateV2(loanCode);
+    if (result.success) {
+      res.status(200).json({ data: result.data });
+    } else {
+      res.status(500).json({ message: "Failed to set take date" });
+    }
+  } else {
+    res.status(403).json({ message: "Access denied" });
+  }
+});
+
 export default router;
--- a/backend/scheme.sql
+++ b/backend/scheme.sql
@@ -7,6 +7,7 @@ CREATE TABLE `users` (
  `username` varchar(100) NOT NULL,
  `password` varchar(255) NOT NULL,
  `role` int DEFAULT NULL,
+  `entry_created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
  PRIMARY KEY (`id`),
  UNIQUE KEY `username` (`username`)
 );
@@ -17,6 +18,7 @@ CREATE TABLE `loans` (
  `loan_code` int NOT NULL,
  `start_date` timestamp NOT NULL,
  `end_date` timestamp NOT NULL,
+  `take_date` timestamp NULL DEFAULT NULL,
  `returned_date` timestamp NULL DEFAULT NULL,
  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
  `loaned_items_id` json NOT NULL DEFAULT ('[]'),
@@ -30,6 +32,7 @@ CREATE TABLE `items` (
  `item_name` varchar(255) NOT NULL,
  `can_borrow_role` INT NOT NULL,
  `inSafe` tinyint(1) NOT NULL DEFAULT '1',
+  `entry_created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
  PRIMARY KEY (`id`),
  UNIQUE KEY `item_name` (`item_name`)
 );
@@ -38,100 +41,40 @@ CREATE TABLE `lockers` (
  `id` int NOT NULL AUTO_INCREMENT,
  `item` varchar(255) NOT NULL,
  `locker_number` int NOT NULL,
+  `entry_created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
  PRIMARY KEY (`id`),
  UNIQUE KEY `item` (`item`),
  UNIQUE KEY `locker_number` (`locker_number`)
 );

-- Mock data for users
-INSERT INTO `users` (`username`, `password`, `role`) VALUES
-('alice', 'password1', 1),
-('bob', 'password2', 2),
-('carol', 'password3', 1),
-('dave', 'password4', 3),
-('eve', 'password5', 2),
-('frank', 'password6', 1),
-('grace', 'password7', 2),
-('heidi', 'password8', 3),
-('ivan', 'password9', 1),
-('judy', 'password10', 2),
-('mallory', 'password11', 1),
-('oscar', 'password12', 3),
-('peggy', 'password13', 2),
-('trent', 'password14', 1),
-('victor', 'password15', 2),
-('wendy', 'password16', 3),
-('zoe', 'password17', 1),
-('quinn', 'password18', 2),
-('ruth', 'password19', 1),
-('sam', 'password20', 3);
-
-- Mock data for loans
-INSERT INTO `loans` (`username`, `loan_code`, `start_date`, `end_date`, `returned_date`, `loaned_items_id`, `loaned_items_name`)
-VALUES
-('alice', 1001, '2025-08-01 09:00:00', '2025-08-10 09:00:00', NULL, '[1,2]', '["Laptop","Projector"]'),
-('bob', 1002, '2025-08-02 10:00:00', '2025-08-12 10:00:00', NULL, '[3]', '["Tablet"]'),
-('carol', 1003, '2025-08-03 11:00:00', '2025-08-13 11:00:00', NULL, '[4,5]', '["Camera","Tripod"]'),
-('dave', 1004, '2025-08-04 12:00:00', '2025-08-14 12:00:00', NULL, '[6]', '["Microphone"]'),
-('eve', 1005, '2025-08-05 13:00:00', '2025-08-15 13:00:00', NULL, '[7,8]', '["Speaker","Monitor"]'),
-('frank', 1006, '2025-08-06 14:00:00', '2025-08-16 14:00:00', NULL, '[9]', '["Keyboard"]'),
-('grace', 1007, '2025-08-07 15:00:00', '2025-08-17 15:00:00', NULL, '[10,11]', '["Mouse","Printer"]'),
-('heidi', 1008, '2025-08-08 16:00:00', '2025-08-18 16:00:00', NULL, '[12]', '["Scanner"]'),
-('ivan', 1009, '2025-08-09 17:00:00', '2025-08-19 17:00:00', NULL, '[13,14]', '["Router","Switch"]'),
-('judy', 1010, '2025-08-10 18:00:00', '2025-08-20 18:00:00', NULL, '[15]', '["Projector"]'),
-('mallory', 1011, '2025-08-11 09:00:00', '2025-08-21 09:00:00', NULL, '[16,17]', '["Laptop","Tablet"]'),
-('oscar', 1012, '2025-08-12 10:00:00', '2025-08-22 10:00:00', NULL, '[18]', '["Camera"]'),
-('peggy', 1013, '2025-08-13 11:00:00', '2025-08-23 11:00:00', NULL, '[19,20]', '["Tripod","Microphone"]'),
-('trent', 1014, '2025-08-14 12:00:00', '2025-08-24 12:00:00', NULL, '[1]', '["Laptop"]'),
-('victor', 1015, '2025-08-15 13:00:00', '2025-08-25 13:00:00', NULL, '[2,3]', '["Projector","Tablet"]'),
-('wendy', 1016, '2025-08-16 14:00:00', '2025-08-26 14:00:00', NULL, '[4]', '["Camera"]'),
-('zoe', 1017, '2025-08-17 15:00:00', '2025-08-27 15:00:00', NULL, '[5,6]', '["Tripod","Microphone"]'),
-('quinn', 1018, '2025-08-18 16:00:00', '2025-08-28 16:00:00', NULL, '[7]', '["Speaker"]'),
-('ruth', 1019, '2025-08-19 17:00:00', '2025-08-29 17:00:00', NULL, '[8,9]', '["Monitor","Keyboard"]'),
-('sam', 1020, '2025-08-20 18:00:00', '2025-08-30 18:00:00', NULL, '[10]', '["Mouse"]');
-
-- Mock data for items
 INSERT INTO `items` (`item_name`, `can_borrow_role`, `inSafe`) VALUES
-('Laptop', 1, 1),
-('Projector', 2, 1),
-('Tablet', 1, 1),
-('Camera', 2, 1),
-('Tripod', 1, 1),
-('Microphone', 3, 1),
-('Speaker', 2, 1),
-('Monitor', 1, 1),
-('Keyboard', 2, 1),
-('Mouse', 1, 1),
-('Printer', 3, 1),
-('Scanner', 2, 1),
-('Router', 1, 1),
-('Switch', 2, 1),
-('Charger', 1, 1),
-('USB Cable', 2, 1),
-('HDMI Cable', 1, 1),
-('Webcam', 3, 1),
-('Headphones', 2, 1),
-('Smartphone', 1, 1);
+('DJI 1er Mikro', 4, 1),
+('DJI 2er Mikro 1', 4, 1),
+('DJI 2er Mikro 2', 4, 1),
+('Rode Richt Mikrofon', 2, 1),
+('Kamera Stativ', 1, 0),
+('SONY Kamera - inkl. Akkus und Objektiv', 1, 1),
+('MacBook inkl. Adapter', 2, 0),
+('SD Karten', 3, 0),
+('Kameragimbal', 1, 0),
+('ATEM MINI PRO', 1, 1),
+('Handygimbal', 4, 0),
+('Kameralüfter', 1, 1),
+('Kleine Kamera 1 - inkl. Objektiv', 2, 1),
+('Kleine Kamera 2 - inkl. Objektiv', 2, 1);

-- Mock data for lockers
 INSERT INTO `lockers` (`item`, `locker_number`) VALUES
-('Laptop', 101),
-('Projector', 102),
-('Tablet', 103),
-('Camera', 104),
-('Tripod', 105),
-('Microphone', 106),
-('Speaker', 107),
-('Monitor', 108),
-('Keyboard', 109),
-('Mouse', 110),
-('Printer', 111),
-('Scanner', 112),
-('Router', 113),
-('Switch', 114),
-('Charger', 115),
-('USB Cable', 116),
-('HDMI Cable', 117),
-('Webcam', 118),
-('Headphones', 119),
-('Smartphone', 120);
+('DJI 1er Mikro', 1),
+('DJI 2er Mikro 1', 2),
+('DJI 2er Mikro 2', 3),
+('Rode Richt Mikrofon', 4),
+('Kamera Stativ', 5),
+('SONY Kamera - inkl. Akkus und Objektiv', 6),
+('MacBook inkl. Adapter', 7),
+('SD Karten', 8),
+('Kameragimbal', 9),
+('ATEM MINI PRO', 10),
+('Handygimbal', 11),
+('Kameralüfter', 12),
+('Kleine Kamera 1 - inkl. Objektiv', 13),
+('Kleine Kamera 2 - inkl. Objektiv', 14);
--- a/backend/services/database.js
+++ b/backend/services/database.js
@@ -39,6 +39,28 @@ export const changeInSafeStateV2 = async (itemId, state) => {
  return { success: false };
 };

+export const setReturnDateV2 = async (loanCode) => {
+  const [result] = await pool.query(
+    "UPDATE loans SET returned_date = NOW() WHERE loan_code = ?",
+    [loanCode]
+  );
+  if (result.affectedRows > 0) {
+    return { success: true };
+  }
+  return { success: false };
+};
+
+export const setTakeDateV2 = async (loanCode) => {
+  const [result] = await pool.query(
+    "UPDATE loans SET take_date = NOW() WHERE loan_code = ?",
+    [loanCode]
+  );
+  if (result.affectedRows > 0) {
+    return { success: true };
+  }
+  return { success: false };
+};
+
 export const getItemsFromDatabase = async (role) => {
  const sql =
    role == 0
--- a/frontend/src/components/Form2.tsx
+++ b/frontend/src/components/Form2.tsx
@@ -13,14 +13,12 @@ interface BorrowItem {

 const LOCAL_STORAGE_KEY = "borrowableItems";

-// Einfache Type-Guard/Validierung
 const isBorrowItem = (v: any): v is BorrowItem =>
  v &&
  typeof v.id === "number" &&
  (typeof v.item_name === "string" || typeof v.name === "string") &&
  (typeof v.can_borrow_role === "string" || typeof v.role === "string");

-// Helfer: unterschiedliche Server-Shapes normalisieren
 function normalizeBorrowable(data: any): BorrowItem[] {
  const rawArr = Array.isArray(data)
    ? data
@@ -52,7 +50,6 @@ function normalizeBorrowable(data: any): BorrowItem[] {
    .filter(Boolean) as BorrowItem[];
 }

-// Hook, der automatisch aus dem Local Storage liest und auf Änderungen hört
 function useBorrowableItems() {
  const [items, setItems] = React.useState<BorrowItem[]>([]);

--- a/frontend/src/components/Form4.tsx
+++ b/frontend/src/components/Form4.tsx
@@ -8,6 +8,7 @@ type Loan = {
  loan_code: number;
  start_date: string;
  end_date: string;
+  take_date: string | null;
  returned_date: string | null;
  created_at: string;
  loaned_items_id: number[];
@@ -89,6 +90,9 @@ const Form4: React.FC = () => {
                <th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-gray-600">
                  Ende
                </th>
+                <th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-gray-600">
+                  Abgeholt
+                </th>
                <th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-gray-600">
                  Zurückgegeben
                </th>
@@ -118,6 +122,9 @@ const Form4: React.FC = () => {
                  <td className="px-4 py-3 whitespace-nowrap font-mono tabular-nums text-gray-900">
                    {formatDate(loan.end_date)}
                  </td>
+                  <td className="px-4 py-3 whitespace-nowrap font-mono tabular-nums text-gray-900">
+                    {formatDate(loan.take_date)}
+                  </td>
                  <td className="px-4 py-3 whitespace-nowrap font-mono tabular-nums text-gray-900">
                    {formatDate(loan.returned_date)}
                  </td>
Author	SHA1	Message	Date
theis.gaedigk	c389b38cf5	added new log column "take_date" Also removed unnesesarry code notes	2025-08-19 21:24:41 +02:00
theis.gaedigk	4080d171cf	changed docs accordingly	2025-08-19 21:23:54 +02:00
theis.gaedigk	6d4afa46d7	added more API functions	2025-08-19 21:23:29 +02:00
theis.gaedigk	ffc8fbcefc	adjusted data structure	2025-08-19 21:23:15 +02:00