cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge commit 3df87f6f36

Browse Source
This commit is contained in:
leiweibau
2022-07-24 16:15:59 +02:00
parent a5a3507667
commit 337dec8ec3
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
front/php/server/events.php
View File

@@ -267,7 +267,7 @@ function getDevicePresence() {
// SQL // SQL
$SQL = 'SELECT ses_EventTypeConnection, ses_DateTimeConnection, $SQL = 'SELECT ses_EventTypeConnection, ses_DateTimeConnection,
ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_IP, ses_AdditionalInfo, ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_IP, ses_AdditionalInfo, ses_StillConnected,
CASE CASE
WHEN ses_EventTypeConnection = "<missing event>" THEN WHEN ses_EventTypeConnection = "<missing event>" THEN
@@ -290,11 +290,13 @@ function getDevicePresence() {
// arrays of rows // arrays of rows
while ($row = $result -> fetchArray (SQLITE3_ASSOC)) { while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
// Event color // Event color
if ($row['ses_EventTypeConnection'] == '<missing event>' || $row['ses_EventTypeDisconnection'] == '<missing event>') { if ($row['ses_EventTypeConnection'] == '<missing event>' || $row['ses_EventTypeDisconnection'] == '<missing event>') {
$color = '#f39c12'; $color = '#f39c12';
} else { } elseif ($row['ses_StillConnected'] == 1 ) {
$color = '#0073b7'; $color = '#00a659';
} } else {
$color = '#0073b7';
}
// tooltip // tooltip
$tooltip = 'Connection: ' . formatEventDate ($row['ses_DateTimeConnection'], $row['ses_EventTypeConnection']) . chr(13) . $tooltip = 'Connection: ' . formatEventDate ($row['ses_DateTimeConnection'], $row['ses_EventTypeConnection']) . chr(13) .
@@ -333,7 +335,7 @@ function getEventsCalendar() {
// SQL // SQL
$SQL = 'SELECT ses_MAC, ses_EventTypeConnection, ses_DateTimeConnection, $SQL = 'SELECT ses_MAC, ses_EventTypeConnection, ses_DateTimeConnection,
ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_IP, ses_AdditionalInfo, ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_IP, ses_AdditionalInfo, ses_StillConnected,
CASE CASE
WHEN ses_EventTypeConnection = "<missing event>" THEN WHEN ses_EventTypeConnection = "<missing event>" THEN
@@ -356,10 +358,12 @@ function getEventsCalendar() {
while ($row = $result -> fetchArray (SQLITE3_ASSOC)) { while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
// Event color // Event color
if ($row['ses_EventTypeConnection'] == '<missing event>' || $row['ses_EventTypeDisconnection'] == '<missing event>') { if ($row['ses_EventTypeConnection'] == '<missing event>' || $row['ses_EventTypeDisconnection'] == '<missing event>') {
$color = '#f39c12'; $color = '#f39c12';
} else { } elseif ($row['ses_StillConnected'] == 1 ) {
$color = '#0073b7'; $color = '#00a659';
} } else {
$color = '#0073b7';
}
// tooltip // tooltip
$tooltip = 'Connection: ' . formatEventDate ($row['ses_DateTimeConnection'], $row['ses_EventTypeConnection']) . chr(13) . $tooltip = 'Connection: ' . formatEventDate ($row['ses_DateTimeConnection'], $row['ses_EventTypeConnection']) . chr(13) .