From ad09b4f6a2aa59bb8c5795843a25c5a9128d47b4 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 13:48:59 +0200
Subject: [PATCH 01/32] srv/poe_manager/templates/devices.html aktualisiert

---
 srv/poe_manager/templates/devices.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srv/poe_manager/templates/devices.html b/srv/poe_manager/templates/devices.html
index 4172023..613120d 100644
--- a/srv/poe_manager/templates/devices.html
+++ b/srv/poe_manager/templates/devices.html
@@ -89,11 +89,12 @@
             </div>
             <div class="mb-3">
                 <label>Port</label>
-                <input type="text" name="port" class="form-control" required placeholder="z.B. 3">
+                <input type="text" name="port" class="form-control" placeholder="z.B. 3">
             </div>
             <div class="mb-3">
-                <label>Switch</label>
-                <select name="switch_hostname" class="form-select" required>
+                <label>Switch (optional)</label>
+                <select name="switch_hostname" class="form-select">
+                    <option value="">Kein Switch</option>
                     {% for sw in switches %}
                         <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
                     {% endfor %}
@@ -137,7 +138,7 @@
             </div>
             <div class="mb-3">
                 <label>Port</label>
-                <input type="text" name="port" id="edit_port" class="form-control" required placeholder="z.B. 3">
+                <input type="text" name="port" id="edit_port" class="form-control" placeholder="z.B. 3">
             </div>
         </div>
         <div class="modal-footer">
@@ -161,7 +162,8 @@
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
-            <select name="switch_hostname" id="switch_select" class="form-select" required>
+            <select name="switch_hostname" id="switch_select" class="form-select">
+                <option value="">Kein Switch</option>
                 {% for sw in switches %}
                     <option value="{{ sw['hostname'] }}">{{ sw['hostname'] }}</option>
                 {% endfor %}
-- 
2.49.1


From 63b8e33434072acd5c8c57ed0bf1ded074755814 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 13:50:22 +0200
Subject: [PATCH 02/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 7a8b50e..b00e1a2 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -179,7 +179,7 @@ def devices():
             switch_hostname = request.form.get('switch_hostname')
             is_active = 1 if 'is_active' in request.form else 0
 
-            if not all([mac, rpi_ip, port, name, switch_hostname]):
+            if not all([mac, rpi_ip, name]):
                 flash("Alle Felder müssen ausgefüllt sein!")
                 return redirect(url_for('devices'))
 
-- 
2.49.1


From f27e73ae7297cb84128b22b2b390ff0a5e2aa4f7 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 13:55:40 +0200
Subject: [PATCH 03/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index b00e1a2..8301f7b 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -216,7 +216,7 @@ def devices():
             old_mac = request.form.get('old_mac')
             mac = request.form.get('mac')
             rpi_ip = request.form.get('rpi_ip')
-            port = request.form.get('port')
+            port = request.form.get('port') or None
             name = request.form.get('name')
             switch_hostname = request.form.get('switch_hostname') or None
             is_active = 1 if 'is_active' in request.form else 0
@@ -245,7 +245,7 @@ def devices():
                     flash("Fehler beim Ändern des Switch!")
                 return redirect(url_for('devices'))
 
-                if not all([old_mac, mac, rpi_ip, port, name]):
+                if not all([old_mac, mac, rpi_ip, name]):
                     flash("Alle Felder müssen ausgefüllt sein!")
                     return redirect(url_for('devices'))
 
-- 
2.49.1


From fe921254c8268337a714a91bd0e0856cdea78317 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 13:58:25 +0200
Subject: [PATCH 04/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 8301f7b..54c1559 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -245,9 +245,9 @@ def devices():
                     flash("Fehler beim Ändern des Switch!")
                 return redirect(url_for('devices'))
 
-                if not all([old_mac, mac, rpi_ip, name]):
-                    flash("Alle Felder müssen ausgefüllt sein!")
-                    return redirect(url_for('devices'))
+            if not all([old_mac, mac, rpi_ip, name]):
+                flash("Alle Felder müssen ausgefüllt sein!")
+                return redirect(url_for('devices'))
 
             # Prüfen auf doppelte IP außer das aktuelle Gerät
             ip_device = conn.execute("SELECT name FROM devices WHERE rpi_ip=? AND mac<>?", (rpi_ip, old_mac)).fetchone()
-- 
2.49.1


From d1e43a1220a17b4071302dddc60d0caff44bdf33 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 14:03:06 +0200
Subject: [PATCH 05/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 54c1559..79d8e2a 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -221,9 +221,8 @@ def devices():
             switch_hostname = request.form.get('switch_hostname') or None
             is_active = 1 if 'is_active' in request.form else 0
 
-            # --- Prüfen, ob es sich um eine Switch-Änderung handelt ---
+            # --- Prüfen, ob nur der Switch geändert wurde ---
             if mac is None and rpi_ip is None and port is None and name is None and switch_hostname:
-                # Nur den Switch ändern
                 device = conn.execute("SELECT name, switch_hostname FROM devices WHERE mac=?", (old_mac,)).fetchone()
 
                 if not device:
@@ -245,17 +244,18 @@ def devices():
                     flash("Fehler beim Ändern des Switch!")
                 return redirect(url_for('devices'))
 
+            # --- Nur Pflichtfelder prüfen ---
             if not all([old_mac, mac, rpi_ip, name]):
-                flash("Alle Felder müssen ausgefüllt sein!")
+                flash("Felder 'MAC', 'IP' und 'Name' müssen ausgefüllt sein!")
                 return redirect(url_for('devices'))
 
-            # Prüfen auf doppelte IP außer das aktuelle Gerät
+            # --- Prüfung auf doppelte IP ---
             ip_device = conn.execute("SELECT name FROM devices WHERE rpi_ip=? AND mac<>?", (rpi_ip, old_mac)).fetchone()
             if ip_device:
                 flash(f"IP-Adresse existiert bereits für Gerät '{ip_device['name']}'!")
                 return redirect(url_for('devices'))
 
-            # Prüfen auf doppelte MAC außer das aktuelle Gerät
+            # --- Prüfung auf doppelte MAC ---
             mac_device = conn.execute("SELECT name FROM devices WHERE mac=? AND mac<>?", (mac, old_mac)).fetchone()
             if mac_device:
                 flash(f"MAC-Adresse existiert bereits für Gerät '{mac_device['name']}'!")
@@ -264,14 +264,16 @@ def devices():
             try:
                 conn.execute("""
                     UPDATE devices
-                    SET mac=?, rpi_ip=?, port=?, name=?, is_active=?
+                    SET mac=?, rpi_ip=?, port=?, name=?, switch_hostname=?, is_active=?
                     WHERE mac=?
-                """, (mac, rpi_ip, port, name, is_active, old_mac))
+                """, (mac, rpi_ip, port, name, switch_hostname, is_active, old_mac))
                 conn.commit()
                 flash(f"Gerät {name} aktualisiert.")
             except sqlite3.IntegrityError:
                 flash("Fehler beim Aktualisieren des Geräts!")
 
+            return redirect(url_for('devices'))
+
         # -----------------------
         # Gerät löschen
         # -----------------------
-- 
2.49.1


From 2f1c7b5653a283c6de15205bcf570b8f452f5424 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 14:10:10 +0200
Subject: [PATCH 06/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 79d8e2a..1251012 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -221,10 +221,9 @@ def devices():
             switch_hostname = request.form.get('switch_hostname') or None
             is_active = 1 if 'is_active' in request.form else 0
 
-            # --- Prüfen, ob nur der Switch geändert wurde ---
-            if mac is None and rpi_ip is None and port is None and name is None and switch_hostname:
+            # --- Nur Switch ändern ---
+            if switch_hostname is not None and not any([mac, rpi_ip, name]):
                 device = conn.execute("SELECT name, switch_hostname FROM devices WHERE mac=?", (old_mac,)).fetchone()
-
                 if not device:
                     flash("Gerät nicht gefunden!")
                     return redirect(url_for('devices'))
@@ -244,18 +243,18 @@ def devices():
                     flash("Fehler beim Ändern des Switch!")
                 return redirect(url_for('devices'))
 
-            # --- Nur Pflichtfelder prüfen ---
+            # --- Normales Gerät bearbeiten ---
             if not all([old_mac, mac, rpi_ip, name]):
                 flash("Felder 'MAC', 'IP' und 'Name' müssen ausgefüllt sein!")
                 return redirect(url_for('devices'))
 
-            # --- Prüfung auf doppelte IP ---
+            # Prüfen auf doppelte IP außer das aktuelle Gerät
             ip_device = conn.execute("SELECT name FROM devices WHERE rpi_ip=? AND mac<>?", (rpi_ip, old_mac)).fetchone()
             if ip_device:
                 flash(f"IP-Adresse existiert bereits für Gerät '{ip_device['name']}'!")
                 return redirect(url_for('devices'))
 
-            # --- Prüfung auf doppelte MAC ---
+            # Prüfen auf doppelte MAC außer das aktuelle Gerät
             mac_device = conn.execute("SELECT name FROM devices WHERE mac=? AND mac<>?", (mac, old_mac)).fetchone()
             if mac_device:
                 flash(f"MAC-Adresse existiert bereits für Gerät '{mac_device['name']}'!")
@@ -264,16 +263,14 @@ def devices():
             try:
                 conn.execute("""
                     UPDATE devices
-                    SET mac=?, rpi_ip=?, port=?, name=?, switch_hostname=?, is_active=?
+                    SET mac=?, rpi_ip=?, port=?, name=?, is_active=?
                     WHERE mac=?
-                """, (mac, rpi_ip, port, name, switch_hostname, is_active, old_mac))
+                """, (mac, rpi_ip, port, name, is_active, old_mac))
                 conn.commit()
                 flash(f"Gerät {name} aktualisiert.")
             except sqlite3.IntegrityError:
                 flash("Fehler beim Aktualisieren des Geräts!")
 
-            return redirect(url_for('devices'))
-
         # -----------------------
         # Gerät löschen
         # -----------------------
-- 
2.49.1


From 7a1e9d88e5bd3c991fb3066b3936711d8a3a48ca Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 14:29:02 +0200
Subject: [PATCH 07/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 1251012..1a199c4 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -222,7 +222,8 @@ def devices():
             is_active = 1 if 'is_active' in request.form else 0
 
             # --- Nur Switch ändern ---
-            if switch_hostname is not None and not any([mac, rpi_ip, name]):
+            # Prüfen, ob nur das Switch-Feld gesendet wurde und die anderen Felder leer sind
+            if 'switch_hostname' in request.form and all(not f for f in [mac, rpi_ip, name]):
                 device = conn.execute("SELECT name, switch_hostname FROM devices WHERE mac=?", (old_mac,)).fetchone()
                 if not device:
                     flash("Gerät nicht gefunden!")
@@ -244,22 +245,30 @@ def devices():
                 return redirect(url_for('devices'))
 
             # --- Normales Gerät bearbeiten ---
+            # Pflichtfelder prüfen
             if not all([old_mac, mac, rpi_ip, name]):
                 flash("Felder 'MAC', 'IP' und 'Name' müssen ausgefüllt sein!")
                 return redirect(url_for('devices'))
 
             # Prüfen auf doppelte IP außer das aktuelle Gerät
-            ip_device = conn.execute("SELECT name FROM devices WHERE rpi_ip=? AND mac<>?", (rpi_ip, old_mac)).fetchone()
+            ip_device = conn.execute(
+                "SELECT name FROM devices WHERE rpi_ip=? AND mac<>?",
+                (rpi_ip, old_mac)
+            ).fetchone()
             if ip_device:
                 flash(f"IP-Adresse existiert bereits für Gerät '{ip_device['name']}'!")
                 return redirect(url_for('devices'))
 
             # Prüfen auf doppelte MAC außer das aktuelle Gerät
-            mac_device = conn.execute("SELECT name FROM devices WHERE mac=? AND mac<>?", (mac, old_mac)).fetchone()
+            mac_device = conn.execute(
+                "SELECT name FROM devices WHERE mac=? AND mac<>?",
+                (mac, old_mac)
+            ).fetchone()
             if mac_device:
                 flash(f"MAC-Adresse existiert bereits für Gerät '{mac_device['name']}'!")
                 return redirect(url_for('devices'))
 
+            # Update durchführen
             try:
                 conn.execute("""
                     UPDATE devices
@@ -271,6 +280,7 @@ def devices():
             except sqlite3.IntegrityError:
                 flash("Fehler beim Aktualisieren des Geräts!")
 
+
         # -----------------------
         # Gerät löschen
         # -----------------------
-- 
2.49.1


From d6c15d3d498938a074bb14211fc46364c977e59c Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 14:32:37 +0200
Subject: [PATCH 08/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 1a199c4..9f0c26b 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -239,7 +239,7 @@ def devices():
                         WHERE mac=?
                     """, (switch_hostname, old_mac))
                     conn.commit()
-                    flash(f"Switch von {device_name} geändert: {old_switch} → {switch_hostname}")
+                    flash(f"Switch von {device_name} geändert: {old_switch} → {switch_hostname} or 'kein Switch'")
                 except sqlite3.IntegrityError:
                     flash("Fehler beim Ändern des Switch!")
                 return redirect(url_for('devices'))
-- 
2.49.1


From f05936226d6247f0afc362387179f5c4d1d7677f Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 14:33:49 +0200
Subject: [PATCH 09/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 9f0c26b..52596c4 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -177,6 +177,8 @@ def devices():
             port = request.form.get('port')
             name = request.form.get('name')
             switch_hostname = request.form.get('switch_hostname')
+            if switch_hostname == "":
+                switch_hostname = None
             is_active = 1 if 'is_active' in request.form else 0
 
             if not all([mac, rpi_ip, name]):
-- 
2.49.1


From 34eae3ca9d0f729d739504c6cfbad7f6422bc195 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 14:35:18 +0200
Subject: [PATCH 10/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 52596c4..1b5464e 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -241,7 +241,7 @@ def devices():
                         WHERE mac=?
                     """, (switch_hostname, old_mac))
                     conn.commit()
-                    flash(f"Switch von {device_name} geändert: {old_switch} → {switch_hostname} or 'kein Switch'")
+                    flash(f"Switch von {device_name} geändert: {old_switch} → {switch_hostname or 'Kein Switch'}")
                 except sqlite3.IntegrityError:
                     flash("Fehler beim Ändern des Switch!")
                 return redirect(url_for('devices'))
-- 
2.49.1


From d88135fc121ea2d7ee0d90e6f42d5b60ce276634 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 14:37:34 +0200
Subject: [PATCH 11/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 1b5464e..25c48ea 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -177,8 +177,6 @@ def devices():
             port = request.form.get('port')
             name = request.form.get('name')
             switch_hostname = request.form.get('switch_hostname')
-            if switch_hostname == "":
-                switch_hostname = None
             is_active = 1 if 'is_active' in request.form else 0
 
             if not all([mac, rpi_ip, name]):
@@ -233,7 +231,9 @@ def devices():
 
                 old_switch = device['switch_hostname'] or "unbekannt"
                 device_name = device['name']
-
+                switch_hostname = request.form.get('switch_hostname')
+                if switch_hostname == "":
+                    switch_hostname = None
                 try:
                     conn.execute("""
                         UPDATE devices
-- 
2.49.1


From 9f98d240ca9774d1819460dccbc28516cdcf36ed Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 14:43:58 +0200
Subject: [PATCH 12/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 25c48ea..1c74d68 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -231,9 +231,8 @@ def devices():
 
                 old_switch = device['switch_hostname'] or "unbekannt"
                 device_name = device['name']
-                switch_hostname = request.form.get('switch_hostname')
-                if switch_hostname == "":
-                    switch_hostname = None
+                switch_hostname = request.form.get('switch_hostname') or ""
+                
                 try:
                     conn.execute("""
                         UPDATE devices
-- 
2.49.1


From d3f209941bfa356e3ddb0e7ed2d5b74460b009ea Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 14:51:08 +0200
Subject: [PATCH 13/32] srv/poe_manager/generate_ips.py aktualisiert

---
 srv/poe_manager/generate_ips.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srv/poe_manager/generate_ips.py b/srv/poe_manager/generate_ips.py
index a299564..25f0fd1 100644
--- a/srv/poe_manager/generate_ips.py
+++ b/srv/poe_manager/generate_ips.py
@@ -14,13 +14,20 @@ def generate_ips_list():
     """).fetchall()
     conn.close()
 
-    for dev in devices:
+for dev in devices:
+        # Switchdaten holen, falls vorhanden
         switch = switches.get(dev['switch_hostname'])
-        if not switch:
-            continue
-        password = decrypt_password(switch['password'])
+        if switch:
+            switch_ip = switch['ip']
+            switch_user = switch['username']
+            switch_pass = decrypt_password(switch['password'])
+        else:
+            switch_ip = ""
+            switch_user = ""
+            switch_pass = ""
+
         port = dev['port'] or ""
-        print(f"{dev['rpi_ip']}:{dev['name']}:{switch['ip']}:{switch['hostname']}:{port}:{switch['username']}:{password}")
+        print(f"{dev['rpi_ip']}:{dev['name']}:{switch_ip}:{dev['switch_hostname'] or ''}:{port}:{switch_user}:{switch_pass}")
 
 if __name__ == "__main__":
-    generate_ips_list()
+    generate_ips_list()
\ No newline at end of file
-- 
2.49.1


From 78ed058d69035fb353b9d697b0ded5a666c83003 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 14:53:59 +0200
Subject: [PATCH 14/32] srv/poe_manager/generate_ips.py aktualisiert

---
 srv/poe_manager/generate_ips.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srv/poe_manager/generate_ips.py b/srv/poe_manager/generate_ips.py
index 25f0fd1..0a46f66 100644
--- a/srv/poe_manager/generate_ips.py
+++ b/srv/poe_manager/generate_ips.py
@@ -6,7 +6,10 @@ def generate_ips_list():
     conn = sqlite3.connect(DB_PATH)
     conn.row_factory = sqlite3.Row
 
-    switches = {row['hostname']: row for row in conn.execute("SELECT hostname, ip, username, password FROM switches")}
+    switches = {row['hostname']: row for row in conn.execute(
+        "SELECT hostname, ip, username, password FROM switches"
+    )}
+
     devices = conn.execute("""
         SELECT mac, rpi_ip, port, name, switch_hostname 
         FROM devices 
@@ -14,8 +17,7 @@ def generate_ips_list():
     """).fetchall()
     conn.close()
 
-for dev in devices:
-        # Switchdaten holen, falls vorhanden
+    for dev in devices:
         switch = switches.get(dev['switch_hostname'])
         if switch:
             switch_ip = switch['ip']
@@ -27,7 +29,7 @@ for dev in devices:
             switch_pass = ""
 
         port = dev['port'] or ""
-        print(f"{dev['rpi_ip']}:{dev['name']}:{switch_ip}:{dev['switch_hostname'] or ''}:{port}:{switch_user}:{switch_pass}")
+        print(f"{dev['rpi_ip']}:{dev['name']}:{switch_ip}:{dev['switch_hostname'] or 'kein Switch'}:{port}:{switch_user}:{switch_pass}")
 
 if __name__ == "__main__":
-    generate_ips_list()
\ No newline at end of file
+    generate_ips_list()
-- 
2.49.1


From 3dc554e16580cf822716e4e5bdc6ee880d949428 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 14:58:56 +0200
Subject: [PATCH 15/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 43 ++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 1c74d68..865ce6a 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -444,36 +444,43 @@ def logs():
     return render_template('logs.html', log_content=log_content, log_name=os.path.basename(latest_log), interval=interval)
 
 def load_device_status():
-    """
-    Liest das aktuellste rpi-Logfile und extrahiert den letzten Status jedes Devices.
-    Gibt ein Dictionary zurück: {Device-Name: 'online'/'offline'}
-    """
     status = {}
+
+    # Devices aus DB laden (Name → MAC)
+    conn = sqlite3.connect("sqlite.db")
+    conn.row_factory = sqlite3.Row
+    devices = conn.execute("SELECT mac, name FROM devices").fetchall()
+    name_to_mac = {d['name']: d['mac'] for d in devices}
+    conn.close()
+
+    # Logfile
     log_files = glob.glob("/var/log/rpi-*.log")
     if not log_files:
         return status
-
     latest_log = max(log_files, key=os.path.getctime)
 
-    # Jede Zeile des Logs lesen
-    with open(latest_log, "r") as f:
-        lines = f.readlines()
-
-    # Regex für Ping-Ergebnisse
     online_re = re.compile(r"(\S+) ist erreichbar!")
     offline_re = re.compile(r"(\S+) ist nicht erreichbar!")
 
-    for line in lines:
-        line = line.strip()
-        m_online = online_re.search(line)
-        m_offline = offline_re.search(line)
-        if m_online:
-            status[m_online.group(1)] = 'online'
-        elif m_offline:
-            status[m_offline.group(1)] = 'offline'
+    with open(latest_log, "r") as f:
+        for line in f:
+            line = line.strip()
+            m_online = online_re.search(line)
+            m_offline = offline_re.search(line)
+            if m_online:
+                name = m_online.group(1)
+                mac = name_to_mac.get(name)
+                if mac:
+                    status[mac] = 'online'
+            elif m_offline:
+                name = m_offline.group(1)
+                mac = name_to_mac.get(name)
+                if mac:
+                    status[mac] = 'offline'
 
     return status
 
+
 @app.route("/users", methods=["GET", "POST"])
 @login_required
 def users():
-- 
2.49.1


From 466f3615ed4621fea5825d16cfe4d1105c60b3b0 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 15:09:22 +0200
Subject: [PATCH 16/32] usr/local/bin/custom/poe.sh aktualisiert

---
 usr/local/bin/custom/poe.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/bin/custom/poe.sh b/usr/local/bin/custom/poe.sh
index 30f630a..77d1326 100644
--- a/usr/local/bin/custom/poe.sh
+++ b/usr/local/bin/custom/poe.sh
@@ -96,7 +96,7 @@ while true; do
             echo "$(date '+%Y-%m-%d %H:%M:%S') $dev_name ist nicht erreichbar!" >> "$LOGFILE"
 
             # Nur PoE neu starten, wenn Port vorhanden ist
-            if [ -n "$switch_port" ]; then
+            if [ -n "$switch_port" ] && [ "$switch_port" != "None" ]; then
                 disable_poe "$switch_ip" "$switch_port" "$switch_user" "$switch_pass"
                 echo "$(date '+%Y-%m-%d %H:%M:%S') $dev_name PoE auf Port $switch_port am Switch $switch_hostname deaktiviert." >> "$LOGFILE"
                 sleep 2
-- 
2.49.1


From ef548b9532a6be5a723e584466247497893f3f6d Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 15:14:10 +0200
Subject: [PATCH 17/32] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 105ace2..eb003e7 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -15,13 +15,14 @@
             <div class="card-body">
                 <span class="fw-bold" style="color: 
                     {% if d[2] == 0 %}gray
-                    {% elif status[d[0]]=='online' %}green
-                    {% else %}red
+                    {% elif status[d[1]] == 'online' %}green
+                    {% elif status[d[1]] == 'offline' %}red
+                    {% else %}black
                     {% endif %};">
                     {% if d[2] == 0 %}
                         Deaktiviert
                     {% else %}
-                        {% if status[d[0]] %}{{ status[d[0]]|capitalize }}{% else %}Unbekannt{% endif %}
+                        {% if status[d[1]] %}{{ status[d[1]]|capitalize }}{% else %}Unbekannt{% endif %}
                     {% endif %}
                 </span>
             </div>
@@ -30,6 +31,7 @@
     {% endfor %}
 </div>
 
+
 <script>
 document.addEventListener("DOMContentLoaded", () => {
     const intervalMinutes = {{ interval | int }}; // aus DB
-- 
2.49.1


From a26a91ec5ac02616370e0e3e2c9e389ef02ac41b Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 15:17:21 +0200
Subject: [PATCH 18/32] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index eb003e7..135a496 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -11,18 +11,18 @@
     {% for d in devices %}
     <div class="col">
         <div class="card text-center p-2">
-            <div class="card-header">{{ d[1] }}</div>
+            <div class="card-header">{{ d[1] }}</div> <!-- Name -->
             <div class="card-body">
                 <span class="fw-bold" style="color: 
                     {% if d[2] == 0 %}gray
-                    {% elif status[d[1]] == 'online' %}green
-                    {% elif status[d[1]] == 'offline' %}red
+                    {% elif status[d[0]] == 'online' %}green
+                    {% elif status[d[0]] == 'offline' %}red
                     {% else %}black
                     {% endif %};">
                     {% if d[2] == 0 %}
                         Deaktiviert
                     {% else %}
-                        {% if status[d[1]] %}{{ status[d[1]]|capitalize }}{% else %}Unbekannt{% endif %}
+                        {% if status[d[0]] %}{{ status[d[0]]|capitalize }}{% else %}Unbekannt{% endif %}
                     {% endif %}
                 </span>
             </div>
@@ -31,7 +31,6 @@
     {% endfor %}
 </div>
 
-
 <script>
 document.addEventListener("DOMContentLoaded", () => {
     const intervalMinutes = {{ interval | int }}; // aus DB
-- 
2.49.1


From 34ef2c4e2ad42052f1cd81ec4b03b111927dccb0 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 15:20:21 +0200
Subject: [PATCH 19/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 865ce6a..2cd71a9 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -104,9 +104,13 @@ def index():
         latest_log = max(log_files, key=os.path.getctime)
         with open(latest_log, "r") as f:
             for line in f:
+                line = line.strip()
                 for dev in devices:
-                    if dev[1] in line:
-                        status_dict[dev[0]] = "online" if "erreichbar" in line else "offline"
+                    # exakte Prüfung, Name gefolgt von 'ist erreichbar!' oder 'ist nicht erreichbar!'
+                    if line.startswith(f"{dev[1]} ist erreichbar!"):
+                        status_dict[dev[0]] = "online"
+                    elif line.startswith(f"{dev[1]} ist nicht erreichbar!"):
+                        status_dict[dev[0]] = "offline"
 
     # Template rendern mit Devices, Status und Intervall
     return render_template("index.html", devices=devices, status=status_dict, interval=interval)
-- 
2.49.1


From 0d784a0530af3060fbe3d21baf30092f24a8b633 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 15:22:08 +0200
Subject: [PATCH 20/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 2cd71a9..1696a07 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -106,10 +106,10 @@ def index():
             for line in f:
                 line = line.strip()
                 for dev in devices:
-                    # exakte Prüfung, Name gefolgt von 'ist erreichbar!' oder 'ist nicht erreichbar!'
-                    if line.startswith(f"{dev[1]} ist erreichbar!"):
+                    # prüfen, ob Name enthalten ist und Statusphrase
+                    if f"{dev[1]} ist erreichbar!" in line:
                         status_dict[dev[0]] = "online"
-                    elif line.startswith(f"{dev[1]} ist nicht erreichbar!"):
+                    elif f"{dev[1]} ist nicht erreichbar!" in line:
                         status_dict[dev[0]] = "offline"
 
     # Template rendern mit Devices, Status und Intervall
-- 
2.49.1


From b4cc41c272d8a401e7d0cffcc0726ad48920f41b Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 13:35:39 +0000
Subject: [PATCH 21/32] v1.2

---
 srv/poe_manager/sqlite.db | Bin 49152 -> 49152 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/srv/poe_manager/sqlite.db b/srv/poe_manager/sqlite.db
index 33d7fba92dadaf70fdde149e0514547a310163d2..2852c0da54fdda0bd272f6f4fe6e51490707e1c5 100644
GIT binary patch
delta 328
zcmZo@U~Xt&o*>OQVWNyP<AjX~oA{Y{j%-#`FyY<oA$y96iGRsv!GwkUleg;oNb+ei
zaPsbE;XlUT!~2?FfbSCD6uvP2Xx`mG^$U3o^f=k|HF+6iIUOCXoSdwjovmD4tWs00
z($Wkqjr0u7Ec7f4^o&eR+%k(&!xM9ICi~gjvGDsbXic1`IXTSkhaCe011}ImfF1|C
zzACS%B*-+NQ9uKMrn$OWxw#>m=9izB8k$#>n3=*bxyQbOgOlHyf!~@xa5IO4KEIAA
zvpyq+V>qFrsD^TEPWPW>zzwvUiT@5G|117Gn*}Fa<X2*1mgUdPD@iRXOUyA8W@OeB
UOwLG6&W?wPnHg;U-_K|O0Qf6a_y7O^

delta 175
zcmZo@U~Xt&o*>PbG*QNxF==DMCjQNe3TC{UJ!DTYZ5B*e%s+XnzK<va0|Pr>7z6(?
z{vLimegVEqd{g+sfC?S>CWqPmnEcw-ZgP)(1q(ZWI>Tlj2YvpD3k)`=`_D4q=6}V&
z#D9ztsPPWav|ap`B8<$M!pRw_$=UIlc_pbuWr;b4Mg}}g%(DD2z7fzikd3Hd^Z$NE
F0{|^{Fo*yE

-- 
2.49.1


From cef96cd7cde5518fcb12f109ef34ae3462843324 Mon Sep 17 00:00:00 2001
From: Master <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 16:39:42 +0200
Subject: [PATCH 22/32] Devices DB

---
 srv/poe_manager/app.py    |   2 +-
 srv/poe_manager/sqlite.db | Bin 49152 -> 49152 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 1696a07..1a135b7 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -314,7 +314,7 @@ def devices():
                switches.hostname AS switch_hostname
         FROM devices
         LEFT JOIN switches ON devices.switch_hostname = switches.hostname
-        ORDER BY switches.hostname ASC
+        ORDER BY switches.hostname ASC, devices.name ASC
     """).fetchall()
 
     conn.close()
diff --git a/srv/poe_manager/sqlite.db b/srv/poe_manager/sqlite.db
index 2852c0da54fdda0bd272f6f4fe6e51490707e1c5..5644d9b0973d9cd1e0897b6c83f4dbac9cf37566 100644
GIT binary patch
delta 3132
zcmZveOK4nW6vs1-WHNJKX`5-9Ch0rrW4<Kc<35jyCTU|_^r5u|x@m9jow1@;kf;Qe
z8+0R7sG%YVZWN)^jh29dSlnnAf*^_@C_*tCo0V?VjrBWsW;*lTxmirepWmFEdmjID
zS66#iS9{+cDQv8b&J{LpT=-}@rhPZ>vu;^$8JpIC`Gfh6`J}aId}&-ULc=!t^q=*Q
z^;h+i`d;lX?Q88_?V<*nUjD88Y5Dc?6Xl80Kc#O=@0Tu>9xiR`-{}9W|IPk${iOI`
z@%!S3#pU9BacAG1zMD7J&h{l$TAZ#LMx_+{AVP>^5F7#yG-LsvVy-{MIF-NIiPMyk
z=@cGn!_0%ogD_TMI{)|y%E?rduG!$!fiegK@O-eHHl4`Wwpf@sZ3{Bl3LZh|Vj8>-
zF$d<iaY+kD(!wDm8@w(cbf6w7G<PM<T~f``VFXJau%xcwHp5gHIhu#N5K@)qNON+e
zi%y@@wH2ECn2JvhchX6_EY6aOdx(4FP$%A|nVO2QB`s_+kw<&5<SMZRrXqYYUQDq0
zLnWm{9=Ke^1H=PzFekXn!C?x`u|eD+2lD78@RY$y7{?-VPWI>Hkvduo`^j9gFQ0Y-
zB^8Q^(}3*FqeGw(OFD;~Vp*t9_T=M%T5^i1P?zk^qa(;Ph~kh_LB^VN+!*qNgYAMV
zw@&Ro#UfINjH-BJCj>Y`c}{_|B0MsZM|1E!g{DYTkL;3kg57WC(g;prN!<y7nF~RN
zv%v$|Oa@UV6^b+^JF_${GXq<V%@gbp56DnH?sr&)+<lHy&TX<IOZ&0(AmHkhb6jT5
zNTo@)huj69NrRD9N!k`?W9Bv`gW2E>8_G;M!^BxYw&&0R1Fj~{u;k1m+p=^bgNHP;
z6pZ0cFiy5+@kSAax^NU}X}1G;G=*AC>ApZ(aAKu&qIMr!suoe;lna-bdBGVlbv-GT
zT;2&IhsGYMsW7&X$me8LJ;mh>>U4evv6@N{ES!<CwQOwaLEVN(^(=-{%S5%@49z2m
z>fm}{hq5B_3^j`KK=Zx@zKks<ODR2^y>FhnKrUaLJv+B>W_|O)dI3s3_{010tCf+`
z%nZ!U!R#y?I|j#(!~A?_^|@o8eEw4Hk#M>8a=3E!@<S^z)o%A#<JM!={o3E!ZEMrA
z%-_xP=I7>%#y92%=6B|0<4@}=vuIs4|J4tej~bs?PZ{qSZ<u4&PsT5%(El)Ij76iW
z-?d&dD#mmAkNQphnr`T8`YU=(KcxrO_4R!ND_T<Noi21;d8(+bb3Tn~dtaJodn#o+
zdxY0{Qej(Hm?$b<+eDt*dbLZ&t9n#bo7eM5j_NEO&QTdX)TQFlo9I-N^z{Re+jysp
zYI?*DcBy!*4&<m&ygx^Ef_+^o-k7~jHM#c=<c1K?JzX%~jNPc-TZ7hV7*kX<0XzYt
zT`F4rNSBI^zN^xkbOdf$_iz`C7QHh^^_?L_Z8`1^RNIr%bk>T(HViaz*kD#popO6t
zO$~8dR+ZO7u&rGx8r(ouO?}K#)g(PYEH+iS4yiF2SyleK*wq!aWi%S9U4~Ll+16Wh
zW0O3uglg&u>*r2gqndT6XNz^KAm8nOUEg})3o95b^d8wBU93gVoPYY#a_xne!e`|h
Zx4xx!%xeA3rN2~Cm+Aaizk8)X{|6MfxBLJA

delta 255
zcmZo@U~Xt&o*>OQVWNyP<AjX~OZ3G!d3Uq$ALH-gea$bxcZqKbUl@Nh@9xct3JZA+
z^f=k|HF+6iIUOCXoSdwjovmD4tWs00($Wkqjr0u7Ec7f4^o&eR+%k(&!xM9IHovw_
zV-(_LfB`)Yc70V|QOU{i_ELNxrGEK&siApAiJ2*ryX`B*IQgv^_^tT^`Cs$z=by}<
z&VQA^mVYJCZbg1kQD%Kc3~M(B_-{1e1{%-Ae}|F(75|;hf)g(CD={(4@@M9iq!yJW
b<`@byGHVJZXQU=)$HT<T3^xDoXEXo+*K9@(

-- 
2.49.1


From 7c81f3a299acb426573da23084671d34cb8b9ea3 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 16:52:24 +0200
Subject: [PATCH 23/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 47 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 1a135b7..07b295b 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -81,6 +81,38 @@ def logout():
     logout_user()
     return redirect(url_for('login'))
 
+import glob
+from datetime import datetime
+
+def get_last_seen(dev_name: str):
+    """Letztes Mal, dass ein Gerät erreichbar war."""
+    log_files = glob.glob("/var/log/rpi-*.log")
+    if not log_files:
+        return None
+
+    latest_time = None
+
+    # alle Logs durchgehen
+    for logfile in sorted(log_files):
+        with open(logfile, "r") as f:
+            for line in f:
+                line = line.strip()
+                if f"{dev_name} ist erreichbar!" in line:
+                    try:
+                        ts_str = line.split(" ")[0] + " " + line.split(" ")[1]  # "YYYY-MM-DD HH:MM:SS"
+                        ts = datetime.strptime(ts_str, "%Y-%m-%d %H:%M:%S")
+                        if latest_time is None or ts > latest_time:
+                            latest_time = ts
+                    except Exception:
+                        continue
+
+    if latest_time:
+        date_str = latest_time.strftime("Zuletzt Online am %d.%m.%Y")
+        time_str = latest_time.strftime("um %H:%M Uhr")
+        return date_str, time_str
+
+    return None
+
 @app.route("/")
 @login_required
 def index():
@@ -112,8 +144,21 @@ def index():
                     elif f"{dev[1]} ist nicht erreichbar!" in line:
                         status_dict[dev[0]] = "offline"
 
+    last_seen_dict = {}
+
+    for dev in devices:
+        # Status aus Log ermitteln
+        status_dict[dev[0]] = "offline" if f"{dev[1]} ist nicht erreichbar!" in open(max(glob.glob('/var/log/rpi-*.log'), key=os.path.getctime)).read() else "online"
+
+        # Last Seen nur, wenn offline
+        if status_dict[dev[0]] == "offline":
+            last_seen = get_last_seen(dev[1])  # dev[1] = Device Name
+            if last_seen:
+                last_seen_dict[dev[0]] = last_seen
+
+
     # Template rendern mit Devices, Status und Intervall
-    return render_template("index.html", devices=devices, status=status_dict, interval=interval)
+    return render_template("index.html", devices=devices, status=status_dict, last_seen=last_seen_dict, interval=interval)
 
 @app.route("/settings", methods=["GET", "POST"])
 @login_required
-- 
2.49.1


From aa2895ccf594792b7b0ce76ad20f4b873ed3e504 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 16:53:23 +0200
Subject: [PATCH 24/32] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 135a496..f68abab 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -22,7 +22,17 @@
                     {% if d[2] == 0 %}
                         Deaktiviert
                     {% else %}
-                        {% if status[d[0]] %}{{ status[d[0]]|capitalize }}{% else %}Unbekannt{% endif %}
+                        {% if status[d[0]] == 'online' %}
+                            Online
+                        {% elif status[d[0]] == 'offline' %}
+                            Offline<br>
+                            {% if last_seen[d[0]] %}
+                                {{ last_seen[d[0]][0] }}<br>
+                                {{ last_seen[d[0]][1] }}
+                            {% endif %}
+                        {% else %}
+                            Unbekannt
+                        {% endif %}
                     {% endif %}
                 </span>
             </div>
-- 
2.49.1


From 4ae255b67f09600969ade1fb7efb4455ed895ac1 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 17:00:36 +0200
Subject: [PATCH 25/32] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index f68abab..1de5c6f 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -10,29 +10,19 @@
 <div class="row row-cols-1 row-cols-md-6 g-3">
     {% for d in devices %}
     <div class="col">
-        <div class="card text-center p-2">
-            <div class="card-header">{{ d[1] }}</div> <!-- Name -->
+        <div class="card text-center p-2"
+             {% if last_seen[d[0]] %} title="{{ last_seen[d[0]][0] }}&#10;{{ last_seen[d[0]][1] }}" {% endif %}>
+            <div class="card-header">{{ d[1] }}</div>
             <div class="card-body">
                 <span class="fw-bold" style="color: 
                     {% if d[2] == 0 %}gray
                     {% elif status[d[0]] == 'online' %}green
-                    {% elif status[d[0]] == 'offline' %}red
-                    {% else %}black
+                    {% else %}red
                     {% endif %};">
                     {% if d[2] == 0 %}
                         Deaktiviert
                     {% else %}
-                        {% if status[d[0]] == 'online' %}
-                            Online
-                        {% elif status[d[0]] == 'offline' %}
-                            Offline<br>
-                            {% if last_seen[d[0]] %}
-                                {{ last_seen[d[0]][0] }}<br>
-                                {{ last_seen[d[0]][1] }}
-                            {% endif %}
-                        {% else %}
-                            Unbekannt
-                        {% endif %}
+                        {% if status[d[0]] %}{{ status[d[0]]|capitalize }}{% else %}Unbekannt{% endif %}
                     {% endif %}
                 </span>
             </div>
@@ -41,6 +31,7 @@
     {% endfor %}
 </div>
 
+
 <script>
 document.addEventListener("DOMContentLoaded", () => {
     const intervalMinutes = {{ interval | int }}; // aus DB
-- 
2.49.1


From ad9dfcee7a002aebbac2105c7795602f8e26be4d Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 17:03:00 +0200
Subject: [PATCH 26/32] revert 4ae255b67f09600969ade1fb7efb4455ed895ac1

revert srv/poe_manager/templates/index.html aktualisiert
---
 srv/poe_manager/templates/index.html | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 1de5c6f..f68abab 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -10,19 +10,29 @@
 <div class="row row-cols-1 row-cols-md-6 g-3">
     {% for d in devices %}
     <div class="col">
-        <div class="card text-center p-2"
-             {% if last_seen[d[0]] %} title="{{ last_seen[d[0]][0] }}&#10;{{ last_seen[d[0]][1] }}" {% endif %}>
-            <div class="card-header">{{ d[1] }}</div>
+        <div class="card text-center p-2">
+            <div class="card-header">{{ d[1] }}</div> <!-- Name -->
             <div class="card-body">
                 <span class="fw-bold" style="color: 
                     {% if d[2] == 0 %}gray
                     {% elif status[d[0]] == 'online' %}green
-                    {% else %}red
+                    {% elif status[d[0]] == 'offline' %}red
+                    {% else %}black
                     {% endif %};">
                     {% if d[2] == 0 %}
                         Deaktiviert
                     {% else %}
-                        {% if status[d[0]] %}{{ status[d[0]]|capitalize }}{% else %}Unbekannt{% endif %}
+                        {% if status[d[0]] == 'online' %}
+                            Online
+                        {% elif status[d[0]] == 'offline' %}
+                            Offline<br>
+                            {% if last_seen[d[0]] %}
+                                {{ last_seen[d[0]][0] }}<br>
+                                {{ last_seen[d[0]][1] }}
+                            {% endif %}
+                        {% else %}
+                            Unbekannt
+                        {% endif %}
                     {% endif %}
                 </span>
             </div>
@@ -31,7 +41,6 @@
     {% endfor %}
 </div>
 
-
 <script>
 document.addEventListener("DOMContentLoaded", () => {
     const intervalMinutes = {{ interval | int }}; // aus DB
-- 
2.49.1


From d73fda1935ef45758a309abd0a58de1679a9361d Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 17:03:52 +0200
Subject: [PATCH 27/32] revert aa2895ccf594792b7b0ce76ad20f4b873ed3e504

revert srv/poe_manager/templates/index.html aktualisiert
---
 srv/poe_manager/templates/index.html | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index f68abab..135a496 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -22,17 +22,7 @@
                     {% if d[2] == 0 %}
                         Deaktiviert
                     {% else %}
-                        {% if status[d[0]] == 'online' %}
-                            Online
-                        {% elif status[d[0]] == 'offline' %}
-                            Offline<br>
-                            {% if last_seen[d[0]] %}
-                                {{ last_seen[d[0]][0] }}<br>
-                                {{ last_seen[d[0]][1] }}
-                            {% endif %}
-                        {% else %}
-                            Unbekannt
-                        {% endif %}
+                        {% if status[d[0]] %}{{ status[d[0]]|capitalize }}{% else %}Unbekannt{% endif %}
                     {% endif %}
                 </span>
             </div>
-- 
2.49.1


From 4ef10fc39d44b67b25d120f0bb45e93c5de3a17c Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 17:06:04 +0200
Subject: [PATCH 28/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 48 ++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 07b295b..8672e16 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -122,44 +122,46 @@ def index():
     c.execute("SELECT mac, name, is_active FROM devices ORDER BY name ASC")
     devices = c.fetchall()
 
-    # Intervall aus DB (Minuten) laden
+    # Intervall laden
     c.execute("SELECT value FROM settings WHERE key='interval'")
     row = c.fetchone()
-    interval = int(row[0]) if row else 5  # Default 5 Minuten
+    interval = int(row[0]) if row else 5
     conn.close()
 
-    # Status aus letztem Log ermitteln
-    import glob, os
+    # Neu: Status und "zuletzt online" ermitteln
     log_files = glob.glob("/var/log/rpi-*.log")
     status_dict = {}
+    last_seen_dict = {}
+
     if log_files:
         latest_log = max(log_files, key=os.path.getctime)
         with open(latest_log, "r") as f:
-            for line in f:
-                line = line.strip()
-                for dev in devices:
-                    # prüfen, ob Name enthalten ist und Statusphrase
-                    if f"{dev[1]} ist erreichbar!" in line:
-                        status_dict[dev[0]] = "online"
-                    elif f"{dev[1]} ist nicht erreichbar!" in line:
-                        status_dict[dev[0]] = "offline"
+            lines = f.readlines()
 
-    last_seen_dict = {}
+        for dev in devices:
+            last_status = None
+            last_time = None
 
-    for dev in devices:
-        # Status aus Log ermitteln
-        status_dict[dev[0]] = "offline" if f"{dev[1]} ist nicht erreichbar!" in open(max(glob.glob('/var/log/rpi-*.log'), key=os.path.getctime)).read() else "online"
+            for line in reversed(lines):  # von unten nach oben lesen
+                if f"{dev[1]} ist erreichbar!" in line:
+                    last_status = "online"
+                    last_time = line.split(" ")[0] + " " + line.split(" ")[1]
+                    break
+                elif f"{dev[1]} ist nicht erreichbar!" in line:
+                    last_status = "offline"
+                    last_time = line.split(" ")[0] + " " + line.split(" ")[1]
+                    break
 
-        # Last Seen nur, wenn offline
-        if status_dict[dev[0]] == "offline":
-            last_seen = get_last_seen(dev[1])  # dev[1] = Device Name
-            if last_seen:
-                last_seen_dict[dev[0]] = last_seen
+            if last_status:
+                status_dict[dev[0]] = last_status
+                if last_status == "offline":
+                    last_seen_dict[dev[0]] = [f"Zuletzt online: {last_time}", dev[1]]
+            else:
+                status_dict[dev[0]] = "unbekannt"
 
-
-    # Template rendern mit Devices, Status und Intervall
     return render_template("index.html", devices=devices, status=status_dict, last_seen=last_seen_dict, interval=interval)
 
+
 @app.route("/settings", methods=["GET", "POST"])
 @login_required
 def settings():
-- 
2.49.1


From bb07a598d7f1d0c35fb442459d497f3dd69582fe Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 17:06:38 +0200
Subject: [PATCH 29/32] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 135a496..2d7e5b4 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -10,14 +10,14 @@
 <div class="row row-cols-1 row-cols-md-6 g-3">
     {% for d in devices %}
     <div class="col">
-        <div class="card text-center p-2">
-            <div class="card-header">{{ d[1] }}</div> <!-- Name -->
+        <div class="card text-center p-2"
+             {% if last_seen[d[0]] %} title="{{ last_seen[d[0]][0] }}&#10;{{ last_seen[d[0]][1] }}" {% endif %}>
+            <div class="card-header">{{ d[1] }}</div>
             <div class="card-body">
                 <span class="fw-bold" style="color: 
                     {% if d[2] == 0 %}gray
                     {% elif status[d[0]] == 'online' %}green
-                    {% elif status[d[0]] == 'offline' %}red
-                    {% else %}black
+                    {% else %}red
                     {% endif %};">
                     {% if d[2] == 0 %}
                         Deaktiviert
@@ -30,7 +30,6 @@
     </div>
     {% endfor %}
 </div>
-
 <script>
 document.addEventListener("DOMContentLoaded", () => {
     const intervalMinutes = {{ interval | int }}; // aus DB
-- 
2.49.1


From 09ee8c245e9e2fa410efa3f4a379ac6accb9991f Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 17:09:43 +0200
Subject: [PATCH 30/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 8672e16..121b1fd 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -122,13 +122,13 @@ def index():
     c.execute("SELECT mac, name, is_active FROM devices ORDER BY name ASC")
     devices = c.fetchall()
 
-    # Intervall laden
+    # Intervall aus DB laden
     c.execute("SELECT value FROM settings WHERE key='interval'")
     row = c.fetchone()
     interval = int(row[0]) if row else 5
     conn.close()
 
-    # Neu: Status und "zuletzt online" ermitteln
+    # Status aus Logdateien ermitteln
     log_files = glob.glob("/var/log/rpi-*.log")
     status_dict = {}
     last_seen_dict = {}
@@ -140,28 +140,23 @@ def index():
 
         for dev in devices:
             last_status = None
-            last_time = None
-
-            for line in reversed(lines):  # von unten nach oben lesen
+            for line in reversed(lines):
                 if f"{dev[1]} ist erreichbar!" in line:
                     last_status = "online"
-                    last_time = line.split(" ")[0] + " " + line.split(" ")[1]
                     break
                 elif f"{dev[1]} ist nicht erreichbar!" in line:
                     last_status = "offline"
-                    last_time = line.split(" ")[0] + " " + line.split(" ")[1]
                     break
 
             if last_status:
                 status_dict[dev[0]] = last_status
                 if last_status == "offline":
-                    last_seen_dict[dev[0]] = [f"Zuletzt online: {last_time}", dev[1]]
+                    last_seen_dict[dev[0]] = get_last_seen(dev[1])
             else:
                 status_dict[dev[0]] = "unbekannt"
 
     return render_template("index.html", devices=devices, status=status_dict, last_seen=last_seen_dict, interval=interval)
 
-
 @app.route("/settings", methods=["GET", "POST"])
 @login_required
 def settings():
-- 
2.49.1


From 7ae131b5f455e9828e370943755a414c81dd14d0 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 17:12:40 +0200
Subject: [PATCH 31/32] srv/poe_manager/app.py aktualisiert

---
 srv/poe_manager/app.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 121b1fd..f29a430 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -3,8 +3,8 @@ from flask import Flask, render_template, request, redirect, url_for, flash
 from flask_login import LoginManager, login_user, login_required, logout_user, UserMixin, current_user
 from flask_bcrypt import Bcrypt
 from cryptography.fernet import Fernet
-import sqlite3
-import glob, os, re
+from datetime import datetime
+import sqlite3, glob, os, re
 
 app = Flask(__name__)
 app.secret_key = "309cc4d5ce1fe7486ae25cbd232bbdfe6a72539c03f0127d372186dbdc0fc928"
@@ -81,9 +81,6 @@ def logout():
     logout_user()
     return redirect(url_for('login'))
 
-import glob
-from datetime import datetime
-
 def get_last_seen(dev_name: str):
     """Letztes Mal, dass ein Gerät erreichbar war."""
     log_files = glob.glob("/var/log/rpi-*.log")
@@ -109,7 +106,7 @@ def get_last_seen(dev_name: str):
     if latest_time:
         date_str = latest_time.strftime("Zuletzt Online am %d.%m.%Y")
         time_str = latest_time.strftime("um %H:%M Uhr")
-        return date_str, time_str
+        return f"{date_str}\n{time_str}"
 
     return None
 
-- 
2.49.1


From 4e10fe8ac06f9476a92e6721491861e26586d527 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <tim@eertmoed.de>
Date: Sun, 12 Oct 2025 17:16:23 +0200
Subject: [PATCH 32/32] srv/poe_manager/templates/index.html aktualisiert

---
 srv/poe_manager/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/poe_manager/templates/index.html b/srv/poe_manager/templates/index.html
index 2d7e5b4..3178095 100644
--- a/srv/poe_manager/templates/index.html
+++ b/srv/poe_manager/templates/index.html
@@ -11,7 +11,7 @@
     {% for d in devices %}
     <div class="col">
         <div class="card text-center p-2"
-             {% if last_seen[d[0]] %} title="{{ last_seen[d[0]][0] }}&#10;{{ last_seen[d[0]][1] }}" {% endif %}>
+             {% if last_seen[d[0]] %} title="{{ last_seen[d[0]][0] }}&#10;{{ last_seen[d[0]][1] }}" {% elif status[d[0]] == 'offline' %} title="Noch nie online" {% endif %}>
             <div class="card-header">{{ d[1] }}</div>
             <div class="card-body">
                 <span class="fw-bold" style="color: 
-- 
2.49.1