vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix HRS_TO_KEEP_NEWDEV #777

Browse Source
This commit is contained in:
jokob-sk
2024-08-31 12:56:46 +10:00
parent 3473fabdbf
commit 955472ef5c
7 changed files with 85 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
front/css/app.css
View File

@@ -1079,6 +1079,23 @@ input[readonly] {
margin-bottom:20px;
}
#settingsPage .select2-selection
{
width: initial;
display: inline-block;
}
#settingsPage .select2-selection
{
background-color: rgb(96, 96, 96);
}
#settingsPage .select2-container
{
width: 100% !important;
}
/* ----------------------------------------------------------------- */
/* Devices page */
/* ----------------------------------------------------------------- */
@@ -1110,18 +1127,18 @@ input[readonly] {
cursor: -webkit-grab;
}
.db_info_table_row .select2-container--default .select2-selection--multiple .select2-selection__choice
.select2-container--default .select2-selection--multiple .select2-selection__choice
{
background-color:#258744;
background-color:#258744 !important;
}
.db_info_table_row .select2-container--default .select2-selection--multiple
.select2-container--default .select2-selection--multiple
{
background-color:#606060;
background-color:#606060 !important;
}
.select2-container .select2-dropdown
{
background-color:#606060;
background-color:#606060 !important;
}
.networkPageHelp{

8
front/js/settings_utils.js
View File

@@ -568,6 +568,10 @@ function applyTransformers(val, transformers) {
val = btoa(val);
}
break;
case "getString":
// no change
val = val;
break;
default:
console.warn(`Unknown transformer: ${transformer}`);
}
@@ -590,6 +594,10 @@ function reverseTransformers(val, transformers) {
val = atob(val);
}
break;
case "getString":
// retrieve string
val = getString(val);
break;
default:
console.warn(`Unknown transformer: ${transformer}`);
}

2
front/js/ui_components.js
View File

@@ -286,7 +286,7 @@ function initSelect2() {
// try to initialize select2
setTimeout(() => {
initSelect2()
}, 500);
}, 1000);
console.log("init ui_components.js")

5
front/plugins/db_cleanup/script.py
View File

@@ -147,8 +147,9 @@ def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP
# Cleanup New Devices
if HRS_TO_KEEP_NEWDEV != 0:
mylog('verbose', [f'[{pluginName}] Devices: Delete all New Devices older than {str(HRS_TO_KEEP_NEWDEV)} hours (HRS_TO_KEEP_NEWDEV setting)'])
cursor.execute (f"""DELETE FROM Devices
WHERE dev_NewDevice = 1 AND dev_FirstConnection < date('now', '+{str(HRS_TO_KEEP_NEWDEV)} hour')""")
query = f"""DELETE FROM Devices WHERE dev_NewDevice = 1 AND dev_FirstConnection < date('now', '-{str(HRS_TO_KEEP_NEWDEV)} hour')"""
mylog('verbose', [f'[{pluginName}] Query: {query} '])
cursor.execute (query)
# -----------------------------------------------------
# Cleanup Pholus_Scan

60
front/plugins/ui_settings/config.json
View File

@@ -34,43 +34,43 @@
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"transformers": []
"transformers": ["getString"]
}
]
},
"maxLength": 50,
"default_value": [
"getString-Device_TableHead_Icon-value-3",
"getString-Device_TableHead_Name-value-0",
"getString-Device_TableHead_Type-value-2",
"getString-Device_TableHead_LastIP-value-8",
"getString-Device_TableHead_Status-value-10",
"getString-Device_TableHead_MAC_full-value-11"
"Device_TableHead_Icon",
"Device_TableHead_Name",
"Device_TableHead_Type",
"Device_TableHead_LastIP",
"Device_TableHead_Status",
"Device_TableHead_MAC_full"
],
"options": [
"getString-Device_TableHead_Name-value-0",
"getString-Device_TableHead_Owner-value-1",
"getString-Device_TableHead_Type-value-2",
"getString-Device_TableHead_Icon-value-3",
"getString-Device_TableHead_Favorite-value-4",
"getString-Device_TableHead_Group-value-5",
"getString-Device_TableHead_FirstSession-value-6",
"getString-Device_TableHead_LastSession-value-7",
"getString-Device_TableHead_LastIP-value-8",
"getString-Device_TableHead_MAC-value-9",
"getString-Device_TableHead_Status-value-10",
"getString-Device_TableHead_MAC_full-value-11",
"getString-Device_TableHead_LastIPOrder-value-12",
"getString-Device_TableHead_Rowid-value-13",
"getString-Device_TableHead_Parent_MAC-value-14",
"getString-Device_TableHead_Connected_Devices-value-15",
"getString-Device_TableHead_Location-value-16",
"getString-Device_TableHead_Vendor-value-17",
"getString-Device_TableHead_Port-value-18",
"getString-Device_TableHead_GUID-value-19",
"getString-Device_TableHead_SyncHubNodeName-value-20",
"getString-Device_TableHead_NetworkSite-value-21",
"getString-Device_TableHead_SSID-value-22"
"Device_TableHead_Name",
"Device_TableHead_Owner",
"Device_TableHead_Type",
"Device_TableHead_Icon",
"Device_TableHead_Favorite",
"Device_TableHead_Group",
"Device_TableHead_FirstSession",
"Device_TableHead_LastSession",
"Device_TableHead_LastIP",
"Device_TableHead_MAC",
"Device_TableHead_Status",
"Device_TableHead_MAC_full",
"Device_TableHead_LastIPOrder",
"Device_TableHead_Rowid",
"Device_TableHead_Parent_MAC",
"Device_TableHead_Connected_Devices",
"Device_TableHead_Location",
"Device_TableHead_Vendor",
"Device_TableHead_Port",
"Device_TableHead_GUID",
"Device_TableHead_SyncHubNodeName",
"Device_TableHead_NetworkSite",
"Device_TableHead_SSID"
],
"localized": ["name", "description"],
"name": [

27
front/settings.php
View File

@@ -676,17 +676,24 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX
settingsArray.push([prefix, setCodeName, dataType, value]);
} else if (dataType === "array" ) {
// make sure to collect all if set as "editable" or selected only otherwise
$(`#${setCodeName}`).attr("my-editable") == "true" ? additionalSelector = "" : additionalSelector = ":selected"
const temps = [];
$(`#${setCodeName} option${additionalSelector}`).each(function() {
const vl = $(this).val();
if (vl !== '') {
temps.push(applyTransformers(vl, transformers));
}
});
let temps = [];
if(isOrdeable)
{
temps = $(`#${setCodeName}`).val()
} else
{
// make sure to collect all if set as "editable" or selected only otherwise
$(`#${setCodeName}`).attr("my-editable") == "true" ? additionalSelector = "" : additionalSelector = ":selected";
$(`#${setCodeName} option${additionalSelector}`).each(function() {
const vl = $(this).val();
if (vl !== '') {
temps.push(applyTransformers(vl, transformers));
}
});
}
value = JSON.stringify(temps);
settingsArray.push([prefix, setCodeName, dataType, value]);