mirror of
https://github.com/jokob-sk/NetAlertX.git
synced 2026-04-15 06:31:44 -07:00
Merge pull request #1572 from netalertx/next_release
BE: lazy SQL execution caused devIsSleeping to be missing and tiles n…
This commit is contained in:
@@ -96,20 +96,20 @@ def get_sql_devices_tiles():
|
|||||||
WHERE setKey = 'UI_MY_DEVICES'
|
WHERE setKey = 'UI_MY_DEVICES'
|
||||||
),
|
),
|
||||||
MyDevicesFilter AS (
|
MyDevicesFilter AS (
|
||||||
SELECT devMac
|
SELECT devMac, devIsSleeping
|
||||||
FROM Devices
|
FROM DevicesView
|
||||||
WHERE
|
WHERE
|
||||||
{my_devices_clauses}
|
{my_devices_clauses}
|
||||||
)
|
)
|
||||||
SELECT
|
SELECT
|
||||||
(SELECT COUNT(*) FROM Devices WHERE {f('connected')}) AS connected,
|
(SELECT COUNT(*) FROM DevicesView WHERE {f('connected')}) AS connected,
|
||||||
(SELECT COUNT(*) FROM Devices WHERE {f('offline')}) AS offline,
|
(SELECT COUNT(*) FROM DevicesView WHERE {f('offline')}) AS offline,
|
||||||
(SELECT COUNT(*) FROM Devices WHERE {f('down')}) AS down,
|
(SELECT COUNT(*) FROM DevicesView WHERE {f('down')}) AS down,
|
||||||
(SELECT COUNT(*) FROM Devices WHERE {f('new')}) AS new,
|
(SELECT COUNT(*) FROM DevicesView WHERE {f('new')}) AS new,
|
||||||
(SELECT COUNT(*) FROM Devices WHERE {f('archived')}) AS archived,
|
(SELECT COUNT(*) FROM DevicesView WHERE {f('archived')}) AS archived,
|
||||||
(SELECT COUNT(*) FROM Devices WHERE {f('favorites')}) AS favorites,
|
(SELECT COUNT(*) FROM DevicesView WHERE {f('favorites')}) AS favorites,
|
||||||
(SELECT COUNT(*) FROM Devices WHERE {f('all')}) AS "all",
|
(SELECT COUNT(*) FROM DevicesView WHERE {f('all')}) AS "all",
|
||||||
(SELECT COUNT(*) FROM Devices) AS "all_devices",
|
(SELECT COUNT(*) FROM DevicesView) AS "all_devices",
|
||||||
(SELECT COUNT(*) FROM MyDevicesFilter) AS my_devices
|
(SELECT COUNT(*) FROM MyDevicesFilter) AS my_devices
|
||||||
FROM Statuses;
|
FROM Statuses;
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user