From f33ef9861b30fc96a24b862510cc0a27d9ff0b40 Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob-sk@gmail.com>
Date: Wed, 13 Aug 2025 08:22:30 +1000
Subject: [PATCH] css fixes, CurrentScan removed mac uniqueness check

---
 front/css/dark-patch.css        |  6 ++++++
 front/css/system-dark-patch.css |  6 ++++++
 server/db/db_upgrade.py         |  3 +--
 server/scan/device_handling.py  | 21 +++++++++++++++++----
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/front/css/dark-patch.css b/front/css/dark-patch.css
index 4b83be74..c3649b65 100755
--- a/front/css/dark-patch.css
+++ b/front/css/dark-patch.css
@@ -419,6 +419,12 @@ td.highlight {
   border: 1px solid #353c42;
 }
 
+.btn-outline {
+  border: 1px solid var(--color-black);
+  background: transparent;
+  color: var(--color-white);
+}
+
 /* Used in debug log page */
 .log-red {
   color: #ff4038;
diff --git a/front/css/system-dark-patch.css b/front/css/system-dark-patch.css
index b1f0671e..87ab4556 100755
--- a/front/css/system-dark-patch.css
+++ b/front/css/system-dark-patch.css
@@ -422,6 +422,12 @@
     border: 1px solid #353c42;
   }
 
+  .btn-outline {
+    border: 1px solid var(--color-black);
+    background: transparent;
+    color: var(--color-white);
+  }
+  
   /* Used in debug log page */
   .log-red {
     color: #ff4038;
diff --git a/server/db/db_upgrade.py b/server/db/db_upgrade.py
index 02bd64a1..5ebfe639 100755
--- a/server/db/db_upgrade.py
+++ b/server/db/db_upgrade.py
@@ -230,8 +230,7 @@ def ensure_CurrentScan(sql) -> bool:
                                 cur_SSID STRING(250),
                                 cur_NetworkNodeMAC STRING(250),
                                 cur_PORT STRING(250),
-                                cur_Type STRING(250),
-                                UNIQUE(cur_MAC)
+                                cur_Type STRING(250)
                             );
                         """)
 
diff --git a/server/scan/device_handling.py b/server/scan/device_handling.py
index b90d1091..7536599b 100755
--- a/server/scan/device_handling.py
+++ b/server/scan/device_handling.py
@@ -68,10 +68,23 @@ def update_devices_data_from_scan (db):
     # Update IP 
     mylog('debug', '[Update Devices] - cur_IP -> devLastIP (always updated)')
     sql.execute("""UPDATE Devices
-                    SET devLastIP = (SELECT cur_IP FROM CurrentScan
-                                      WHERE devMac = cur_MAC)
-                    WHERE EXISTS (SELECT 1 FROM CurrentScan
-                                  WHERE devMac = cur_MAC) """)
+            SET devLastIP = (
+                SELECT cur_IP
+                FROM CurrentScan
+                WHERE devMac = cur_MAC
+                AND cur_IP IS NOT NULL
+                AND cur_IP NOT IN ('', 'null', '(unknown)', '(Unknown)')
+                ORDER BY cur_DateTime DESC
+                LIMIT 1
+            )
+            WHERE EXISTS (
+                SELECT 1
+                FROM CurrentScan
+                WHERE devMac = cur_MAC
+                AND cur_IP IS NOT NULL
+                AND cur_IP NOT IN ('', 'null', '(unknown)', '(Unknown)')
+            )""")
+
 
     # Update only devices with empty, NULL or (u(U)nknown) vendors
     mylog('debug', '[Update Devices] - cur_Vendor -> (if empty) devVendor')