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

🔔 User Notifications v0.5

Browse Source
This commit is contained in:
jokob-sk
2024-06-01 20:59:54 +10:00
parent cb3c0ecee7
commit d14fc6586a
4 changed files with 78 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/php/templates/header.php
View File

@@ -273,7 +273,7 @@ if ($ENABLED_DARKMODE === True) {
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu " style="display: <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('presence.php', 'report.php', 'events.php' ) ) ){ echo 'block'; } else {echo 'none';} ?>;">
<ul class="treeview-menu " style="display: <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('presence.php', 'report.php', 'events.php', 'userNotifications.php' ) ) ){ echo 'block'; } else {echo 'none';} ?>;">
<li>
<a href="presence.php"> <?= lang("Navigation_Presence");?> </a>
</li>

2
front/php/templates/language/en_us.json
View File

@@ -456,7 +456,7 @@
"Navigation_Notifications": "Notifications",
"Navigation_Plugins": "Plugins",
"Navigation_Presence": "Presence",
"Navigation_Report": "Report",
"Navigation_Report": "Sent Reports",
"Navigation_Settings": "Settings",
"Navigation_SystemInfo": "System info",
"Navigation_Workflows": "Workflows",

34
front/userNotifications.php
View File

@@ -10,6 +10,7 @@ require 'php/templates/header.php';
<script src="lib/AdminLTE/bower_components/datatables.net/js/dataTables.select.min.js"></script>
<div id="notifications" class="content-wrapper">
<div class="box-body table-responsive">
<table id="notificationsTable" class="table table-bordered table-hover table-striped display">
<thead>
<tr>
@@ -25,10 +26,12 @@ require 'php/templates/header.php';
</tbody>
</table>
</div>
<button id="clearNotificationsBtn" class="btn btn-danger">Clear All Notifications</button>
</div>
<script>
function fetchData(callback) {
$.ajax({
url: '/api/user_notifications.json',
url: '/api/user_notifications.json?nocache=' + Date.now(),
method: 'GET',
dataType: 'json',
success: function(response) {
@@ -62,7 +65,12 @@ require 'php/templates/header.php';
{
"data": "content",
"render": function(data, type, row) {
return `<span class="btn-show-message">${data}</span>`;
if (data.includes("Report:")) {
var guid = data.split(":")[1].trim();
return `<a href="/report.php?guid=${guid}">Click to see Sent Report</a>`;
} else {
return data;
}
}
}
],
@@ -77,6 +85,28 @@ require 'php/templates/header.php';
fetchData(function(data) {
table.clear().rows.add(data).draw();
});
const phpEndpoint = 'php/server/utilNotification.php';
// Function to clear all notifications
$('#clearNotificationsBtn').click(function() {
$.ajax({
url: phpEndpoint,
type: 'GET',
data: {
action: 'notifications_clear'
},
success: function(response) {
// Clear the table and reload data
table.clear().draw();
},
error: function(xhr, status, error) {
console.log("An error occurred while clearing notifications: " + error);
// You can display an error message here if needed
}
});
});
});
</script>

74
server/notification.py
View File

@@ -1,4 +1,6 @@
import datetime
import os
import _io
import json
import uuid
import socket
@@ -183,7 +185,7 @@ class Notification_obj:
self.HTML = final_html
# Notify frontend
write_notification("Report:" + self.GUID, "alert")
write_notification(f'Report:{self.GUID}', "alert", self.DateTimeCreated )
self.upsert()
@@ -238,37 +240,7 @@ class Notification_obj:
self.save()
def write_notification(content, level="interrupt"):
NOTIFICATION_API_FILE = apiPath + 'user_notifications.json'
# Generate GUID
guid = str(uuid.uuid4())
# Generate timestamp
timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
# Prepare notification dictionary
notification = {
'timestamp': timestamp,
'guid': guid,
'read': 0,
'level': level,
'content': content
}
# If file exists, load existing data, otherwise initialize as empty list
if os.path.exists(NOTIFICATION_API_FILE):
with open(NOTIFICATION_API_FILE, 'r') as file:
notifications = json.load(file)
else:
notifications = []
# Append new notification
notifications.append(notification)
# Write updated data back to file
with open(NOTIFICATION_API_FILE, 'w') as file:
json.dump(notifications, file, indent=4)
def clearPendingEmailFlag(self):
@@ -309,6 +281,46 @@ class Notification_obj:
# Reporting
#-------------------------------------------------------------------------------
# Handle Frontend User Notifications
def write_notification(content, level, timestamp):
NOTIFICATION_API_FILE = apiPath + 'user_notifications.json'
# Generate GUID
guid = str(uuid.uuid4())
# Prepare notification dictionary
notification = {
'timestamp': str(timestamp),
'guid': guid,
'read': 0,
'level': level,
'content': content
}
# If file exists, load existing data, otherwise initialize as empty list
if os.path.exists(NOTIFICATION_API_FILE):
with open(NOTIFICATION_API_FILE, 'r') as file:
# Check if the file object is of type _io.TextIOWrapper
if isinstance(file, _io.TextIOWrapper):
file_contents = file.read() # Read file contents
if file_contents == '':
file_contents = '[]' # If file is empty, initialize as empty list
mylog('debug', ['[Notification] User Notifications file: ', file_contents])
notifications = json.loads(file_contents) # Parse JSON data
else:
mylog('error', 'File is not of type _io.TextIOWrapper')
notifications = []
else:
notifications = []
# Append new notification
notifications.append(notification)
# Write updated data back to file
with open(NOTIFICATION_API_FILE, 'w') as file:
json.dump(notifications, file, indent=4)
#-------------------------------------------------------------------------------
def construct_notifications(JSON, section):