diff --git a/front/events.php b/front/events.php index 72cc3f92..8df16c1b 100755 --- a/front/events.php +++ b/front/events.php @@ -1,337 +1,234 @@ - - - -
+
+
- -
- - -
+ +
+ 'eventsAll', 'type' => 'all', 'label' => 'Events_Shortcut_AllEvents', 'color' => 'aqua', 'icon' => 'fa-bolt'], + ['id' => 'eventsSessions', 'type' => 'sessions', 'label' => 'Events_Shortcut_Sessions', 'color' => 'green', 'icon' => 'fa-plug'], + ['id' => 'eventsMissing', 'type' => 'missing', 'label' => 'Events_Shortcut_MissSessions', 'color' => 'yellow', 'icon' => 'fa-exchange'], + ['id' => 'eventsVoided', 'type' => 'voided', 'label' => 'Events_Shortcut_VoidSessions', 'color' => 'yellow', 'icon' => 'fa-exclamation-circle'], + ['id' => 'eventsNewDevices', 'type' => 'new', 'label' => 'Events_Shortcut_NewDevices', 'color' => 'yellow', 'icon' => 'fa-circle-plus'], + ['id' => 'eventsDown', 'type' => 'down', 'label' => 'Events_Shortcut_DownAlerts', 'color' => 'red', 'icon' => 'fa-warning'] + ]; + foreach ($eventBoxes as $box) : + ?>
- - - -
- -
-

--

-

-
-
+ +
+
+ - - - -
-
- -
- - -
-

Events

-
- -
- -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
N/AMAC
-
- -
- + +
+ + + + + + + + + + + + + + + + + + + + +
N/AMAC
+
-
- +
- -
- -
- + +
+ - - - - diff --git a/front/js/common.js b/front/js/common.js index 2ea86506..060c4adf 100755 --- a/front/js/common.js +++ b/front/js/common.js @@ -1218,7 +1218,12 @@ let spinnerTimeout = null; let animationTime = 300 function showSpinner(stringKey = 'Loading') { - const text = isEmpty(stringKey) ? "Loading" : getString(stringKey || "Loading"); + let text = isEmpty(stringKey) ? "Loading..." : getString(stringKey || "Loading"); + + if (text == ""){ + text = "Loading" + } + const spinner = $("#loadingSpinner"); const target = $(".spinnerTarget").first(); // Only use the first one if multiple exist diff --git a/server/api_server/sessions_endpoint.py b/server/api_server/sessions_endpoint.py index 8bf16e38..2c10fd62 100755 --- a/server/api_server/sessions_endpoint.py +++ b/server/api_server/sessions_endpoint.py @@ -341,7 +341,8 @@ def get_session_events(event_type, period_date): NULL, ses_AdditionalInfo, ses_StillConnected, - devMac + devMac, + 0 AS ses_PendingAlertEmail FROM Sessions_Devices """