vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-06 17:15:38 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

css fixes, CurrentScan removed mac uniqueness check
Some checks failed
Deploy MkDocs / deploy (push) Has been cancelled
Details
Code checks / check-url-paths (push) Has been cancelled
Details
docker / docker_dev (push) Has been cancelled
Details

Browse Source
This commit is contained in:
jokob-sk
2025-08-13 08:22:30 +10:00
parent cbe71cc203
commit f33ef9861b
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
front/css/dark-patch.css
View File

@@ -419,6 +419,12 @@ td.highlight {
border: 1px solid #353c42; border: 1px solid #353c42;
} }
.btn-outline {
border: 1px solid var(--color-black);
background: transparent;
color: var(--color-white);
}
/* Used in debug log page */ /* Used in debug log page */
.log-red { .log-red {
color: #ff4038; color: #ff4038;

6
front/css/system-dark-patch.css
View File

@@ -422,6 +422,12 @@
border: 1px solid #353c42; border: 1px solid #353c42;
} }
.btn-outline {
border: 1px solid var(--color-black);
background: transparent;
color: var(--color-white);
}
/* Used in debug log page */ /* Used in debug log page */
.log-red { .log-red {
color: #ff4038; color: #ff4038;

3
server/db/db_upgrade.py
View File

@@ -230,8 +230,7 @@ def ensure_CurrentScan(sql) -> bool:
cur_SSID STRING(250), cur_SSID STRING(250),
cur_NetworkNodeMAC STRING(250), cur_NetworkNodeMAC STRING(250),
cur_PORT STRING(250), cur_PORT STRING(250),
cur_Type STRING(250), cur_Type STRING(250)
UNIQUE(cur_MAC)
); );
""") """)

21
server/scan/device_handling.py
View File

@@ -68,10 +68,23 @@ def update_devices_data_from_scan (db):
# Update IP # Update IP
mylog('debug', '[Update Devices] - cur_IP -> devLastIP (always updated)') mylog('debug', '[Update Devices] - cur_IP -> devLastIP (always updated)')
sql.execute("""UPDATE Devices sql.execute("""UPDATE Devices
SET devLastIP = (SELECT cur_IP FROM CurrentScan SET devLastIP = (
WHERE devMac = cur_MAC) SELECT cur_IP
WHERE EXISTS (SELECT 1 FROM CurrentScan FROM CurrentScan
WHERE devMac = cur_MAC) """) 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 # Update only devices with empty, NULL or (u(U)nknown) vendors
mylog('debug', '[Update Devices] - cur_Vendor -> (if empty) devVendor') mylog('debug', '[Update Devices] - cur_Vendor -> (if empty) devVendor')