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 Packages Projects Releases Wiki Activity

BE/PLG: TZ timestamp work #1251

Browse Source 
Signed-off-by: jokob-sk <jokob.sk@gmail.com>
This commit is contained in:
jokob-sk
2025-11-04 19:24:13 +11:00
parent 6dd7251c84
commit 59477e7b38
67 changed files with 164 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/messaging/in_app.py
View File

@@ -20,7 +20,7 @@ sys.path.extend([f"{INSTALL_PATH}/server"])
import conf
from const import applicationPath, logPath, apiPath, confFileName, reportTemplatesPath
from logger import logResult, mylog
from helper import generate_mac_links, removeDuplicateNewLines, timeNowTZ, get_file_content, write_file, get_setting_value, get_timezone_offset
from helper import generate_mac_links, removeDuplicateNewLines, timeNowDB, get_file_content, write_file, get_setting_value, get_timezone_offset
NOTIFICATION_API_FILE = apiPath + 'user_notifications.json'
@@ -39,7 +39,7 @@ def write_notification(content, level='alert', timestamp=None):
None
"""
if timestamp is None:
timestamp = timeNowTZ()
timestamp = timeNowDB()
# Generate GUID
guid = str(uuid.uuid4())

5
server/messaging/reporting.py
View File

@@ -20,7 +20,7 @@ sys.path.extend([f"{INSTALL_PATH}/server"])
import conf
from const import applicationPath, logPath, apiPath, confFileName
from helper import timeNowTZ, get_file_content, write_file, get_timezone_offset, get_setting_value
from helper import get_file_content, write_file, get_timezone_offset, get_setting_value
from logger import logResult, mylog
from db.sql_safe_builder import create_safe_condition_builder
@@ -123,6 +123,9 @@ def get_notifications (db):
)
ORDER BY down_events.eve_DateTime;
"""
mylog("none", sqlQuery)
# Get the events as JSON
json_obj = db.get_table_as_json(sqlQuery)