LCI/MTN6
10
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Docked South alarm footer is funcitonal now. Minor adjustments in the Realtime View. Added missing recource file for the GetAlarmsWithCount sql query.' (#138) from guga into main

Browse Source 
Reviewed-on: #138
This commit is contained in:
gigi.mamaladze 2025-06-24 11:56:44 +00:00
commit 38a0aa27cb
6 changed files with 2567 additions and 3024 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/HistoricalAlarms/resource.json
View File

@ -1,17 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"view.json",
"thumbnail.png"
],
"attributes": {
"lastModification": {
"actor": "external",
"timestamp": "2025-04-08T09:28:16Z"
},
"lastModificationSignature": "520ca9154983ebd5e278483cb1f1ad256993cf1f3e781a27554bff0679845a8c"
}
}

BIN
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/HistoricalAlarms/thumbnail.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 45 KiB

2897
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/HistoricalAlarms/view.json
View File

File diff suppressed because it is too large Load Diff

9
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/RealTime/view.json
View File

@ -488,7 +488,6 @@
],
"custom": {
"priorities": {
"critical": false,
"diagnostic": false,
"high": false,
"low": false,
@ -2901,7 +2900,7 @@
"$": [
"ts",
192,
1750674251724
1750755617512
],
"$ts": 1750435156149
},
@ -2909,7 +2908,7 @@
"$": [
"ts",
192,
1750674251724
1750755617511
],
"$ts": 1750436956149
}
@ -3857,7 +3856,7 @@
"$": [
"ts",
192,
1750674251724
1750755617512
],
"$ts": 1750435156149
},
@ -3865,7 +3864,7 @@
"$": [
"ts",
192,
1750674251724
1750755617511
],
"$ts": 1750436956149
},

2589
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-South/view.json
View File

File diff suppressed because it is too large Load Diff

33
SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/named-query/GetAlarmsWithCount/resource.json Normal file
View File

@ -0,0 +1,33 @@
{
"scope": "DG",
"version": 2,
"restricted": false,
"overridable": true,
"files": [
"query.sql"
],
"attributes": {
"useMaxReturnSize": false,
"autoBatchEnabled": false,
"fallbackValue": "",
"maxReturnSize": 100,
"cacheUnit": "SEC",
"type": "Query",
"enabled": true,
"cacheAmount": 1,
"cacheEnabled": false,
"database": "MariaDB",
"fallbackEnabled": false,
"lastModificationSignature": "7c75636782a866dd1e5158a5d0cc022609a60c6330b03adac3e67b017c7eda76",
"permissions": [
{
"zone": "default",
"role": ""
}
],
"lastModification": {
"actor": "external",
"timestamp": "2025-06-23T14:58:24Z"
}
}
}