fixed the export not working for the status tab

This commit is contained in:
Salijoghli 2025-09-29 17:13:17 +04:00
parent 2ae3e7087b
commit 3691f71565
22 changed files with 130 additions and 43 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -633,7 +633,7 @@
"enabled": true, "enabled": true,
"rate": "3" "rate": "3"
}, },
"queryPath": "Alarms-autStand/GetActiveAlarms" "queryPath": "autStand/Alarms/GetActiveAlarms"
}, },
"transforms": [ "transforms": [
{ {
@ -1611,7 +1611,7 @@
"enabled": true, "enabled": true,
"rate": "3" "rate": "3"
}, },
"queryPath": "Alarms-autStand/GetAlarmsWithCount" "queryPath": "autStand/Alarms/GetAlarmsWithCount"
}, },
"transforms": [ "transforms": [
{ {
@ -3184,7 +3184,7 @@
"$": [ "$": [
"ts", "ts",
192, 192,
1759044922618 1759143973125
], ],
"$ts": 1755606669646 "$ts": 1755606669646
}, },
@ -3192,7 +3192,7 @@
"$": [ "$": [
"ts", "ts",
192, 192,
1759044922618 1759143973125
], ],
"$ts": 1755608469646 "$ts": 1755608469646
} }
@ -3256,7 +3256,7 @@
"enabled": true, "enabled": true,
"rate": "3" "rate": "3"
}, },
"queryPath": "Alarms-autStand/GetAlarms" "queryPath": "autStand/Alarms/GetAlarms"
}, },
"transforms": [ "transforms": [
{ {
@ -4334,7 +4334,7 @@
"$": [ "$": [
"ts", "ts",
192, 192,
1759044922619 1759143973124
], ],
"$ts": 1755606669646 "$ts": 1755606669646
}, },
@ -4342,7 +4342,7 @@
"$": [ "$": [
"ts", "ts",
192, 192,
1759044922618 1759143973124
], ],
"$ts": 1755608469646 "$ts": 1755608469646
}, },
@ -4601,6 +4601,7 @@
"contentStyle": { "contentStyle": {
"classes": "Background-Styles/Grey-Background" "classes": "Background-Styles/Grey-Background"
}, },
"currentTabIndex": 2,
"menuType": "modern", "menuType": "modern",
"style": { "style": {
"classes": "Background-Styles/Grey-Background" "classes": "Background-Styles/Grey-Background"

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -0,0 +1,66 @@
-- Generate all lanes 101-124 excluding 102, 104, 106
WITH DesiredLanes AS (
SELECT 101 + n AS lane_number
FROM (
SELECT a.N + b.N * 10 AS n
FROM (SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4
UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) a,
(SELECT 0 AS N UNION SELECT 1 UNION SELECT 2) b
) numbers
WHERE n <= 23 -- 101 to 124
AND (101 + n) NOT IN (102, 104, 106)
),
-- Aggregate Full alarms per lane
FullAlarms AS (
SELECT
aed.strValue AS myLocation,
COUNT(*) AS FullCount,
SUM(TIMESTAMPDIFF(SECOND, ae.eventtime, COALESCE(ae_clear.eventtime, NOW()))) AS FullDuration
FROM alarm_events ae
LEFT JOIN alarm_events ae_clear
ON ae.eventid = ae_clear.eventid AND ae_clear.eventtype = 1
JOIN alarm_event_data aed
ON aed.id = ae.id AND aed.propname = 'myLocation'
WHERE ae.eventtype = 0
AND ae.source LIKE '%Full%'
AND ae.source LIKE '%Chute%'
AND ae.eventtime BETWEEN :startDate AND :endDate
GROUP BY aed.strValue
),
-- Aggregate Jammed alarms per lane
JammedAlarms AS (
SELECT
aed.strValue AS myLocation,
COUNT(*) AS JamCount,
SUM(TIMESTAMPDIFF(SECOND, ae.eventtime, COALESCE(ae_clear.eventtime, NOW()))) AS JamDuration
FROM alarm_events ae
LEFT JOIN alarm_events ae_clear
ON ae.eventid = ae_clear.eventid AND ae_clear.eventtype = 1
JOIN alarm_event_data aed
ON aed.id = ae.id AND aed.propname = 'myLocation'
WHERE ae.eventtype = 0
AND ae.source LIKE '%Jammed%'
AND ae.source LIKE '%Chute%'
AND ae.eventtime BETWEEN :startDate AND :endDate
GROUP BY aed.strValue
),
-- Combine Full and Jammed
Aggregated AS (
SELECT
dl.lane_number,
COALESCE(f.FullCount, 0) AS FullCount,
COALESCE(j.JamCount, 0) AS JamCount,
COALESCE(f.FullDuration, 0) AS FullDuration,
COALESCE(j.JamDuration, 0) AS JamDuration
FROM DesiredLanes dl
LEFT JOIN FullAlarms f ON f.myLocation = CONCAT('S03_CH', dl.lane_number)
LEFT JOIN JammedAlarms j ON j.myLocation = CONCAT('S03_CH', dl.lane_number)
)
SELECT
CONCAT('S03_CH', lane_number) AS Lane,
FullCount,
JamCount,
FullDuration,
JamDuration
FROM Aggregated
ORDER BY lane_number;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

View File

@ -9,8 +9,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "admin", "actor": "admin",
"timestamp": "2025-09-29T10:28:18Z" "timestamp": "2025-09-29T13:03:45Z"
}, },
"lastModificationSignature": "f815df1ccfa23f21cd859c691d61cc83643a3654a1c4c8c6d88be701b5c474b0" "lastModificationSignature": "1522202a7aeaaf110b164a96f656d592f4442a5c03bb5ab1239eeb2cc0f6bfd9"
} }
} }

View File

@ -10,8 +10,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "admin", "actor": "admin",
"timestamp": "2025-09-29T08:46:06Z" "timestamp": "2025-09-29T11:07:41Z"
}, },
"lastModificationSignature": "2496b5edaafb62e00cd54e902bafb4e30c13ce2dc47d8831c096df8da00ae2c4" "lastModificationSignature": "7ba1e0d93bca5f2069f3880599875d9738c62805928c301a075c7a15802b6dd9"
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -10,8 +10,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "admin", "actor": "admin",
"timestamp": "2025-09-26T10:19:50Z" "timestamp": "2025-09-29T13:12:37Z"
}, },
"lastModificationSignature": "93c63fd63638a67f140721b81f3f89b2009184c2083eae7ae4b8951b5e51e5c6" "lastModificationSignature": "389f01fd13a9dafc5f002b77858a2fd7e170339f81d14bd17047549c9ad04f40"
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 36 KiB

File diff suppressed because one or more lines are too long

View File

@ -9,8 +9,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "admin", "actor": "admin",
"timestamp": "2025-09-29T10:28:28Z" "timestamp": "2025-09-29T13:12:37Z"
}, },
"lastModificationSignature": "28f5b01c63c3194c6ff55c5f3f35965b921daf960e232e3b77ea707a36736d98" "lastModificationSignature": "a69ec02dca3e11e6e956ab40df1d3b03738d7acdcf3e912d7000e7b86107c67e"
} }
} }

View File

@ -9,8 +9,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "admin", "actor": "admin",
"timestamp": "2025-09-29T10:28:28Z" "timestamp": "2025-09-29T13:12:37Z"
}, },
"lastModificationSignature": "99cafe4619a9a2da252e3d2debb1fc8a7ca3f4f343f1f1734891608cd8c85b47" "lastModificationSignature": "417448126696558992635ed6e66340279b255b794c7b15c249bc3318e19437b0"
} }
} }

View File

@ -18,7 +18,7 @@
"cacheEnabled": false, "cacheEnabled": false,
"database": "MariaDB", "database": "MariaDB",
"fallbackEnabled": false, "fallbackEnabled": false,
"lastModificationSignature": "22697fcb07aba0cc8e56b7f3628c108f5ff13f9ea2bf5ceb062d7869b4a812e8", "lastModificationSignature": "e21931e78403e7d61d02415d95a07521861f1a620abea231875105f77528507f",
"permissions": [ "permissions": [
{ {
"zone": "default", "zone": "default",
@ -27,7 +27,7 @@
], ],
"lastModification": { "lastModification": {
"actor": "admin", "actor": "admin",
"timestamp": "2025-09-26T09:30:18Z" "timestamp": "2025-09-29T11:23:02Z"
}, },
"parameters": [ "parameters": [
{ {

View File

@ -18,7 +18,7 @@
"cacheEnabled": false, "cacheEnabled": false,
"database": "MariaDB", "database": "MariaDB",
"fallbackEnabled": false, "fallbackEnabled": false,
"lastModificationSignature": "1418025101fbcc1f57385c728f9c585bd7372f06d38259e15e0d88e31f626211", "lastModificationSignature": "01d12d7223e2fef498ff9a0521f8b104af97f9f0ab3e55a6a415fd262b85eccb",
"permissions": [ "permissions": [
{ {
"zone": "", "zone": "",
@ -27,7 +27,7 @@
], ],
"lastModification": { "lastModification": {
"actor": "admin", "actor": "admin",
"timestamp": "2025-09-26T09:30:10Z" "timestamp": "2025-09-29T11:58:58Z"
}, },
"parameters": [ "parameters": [
{ {