diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/stylesheet/stylesheet.css b/MTN6_SCADA/com.inductiveautomation.perspective/stylesheet/stylesheet.css index 72ca2a6..412f1a5 100644 --- a/MTN6_SCADA/com.inductiveautomation.perspective/stylesheet/stylesheet.css +++ b/MTN6_SCADA/com.inductiveautomation.perspective/stylesheet/stylesheet.css @@ -83,4 +83,20 @@ div[data-component="ia.input.fileupload"] .ia_button--primary { .psc-rotate { animation: rotation 2s infinite linear; -} \ No newline at end of file +} + +#popup-errorPopup .ia_popup__header { + color: red; + font-weight: bold; + font-size: 16px; +} + +#popup-errorPopup .ia_popup__header:before { + color: red; + content: "⛔ "; + font-weight: bold; + font-size: 16px; + padding-right: 4px; +} + + diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/view.json index bfdbd20..c559ea8 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/view.json @@ -6,9 +6,9 @@ "$": [ "ts", 192, - 1747672706122 + 1747730947188 ], - "$ts": 1747672706122 + "$ts": 1747730947187 } } }, @@ -506,13 +506,13 @@ }, "onChange": { "enabled": null, - "script": " db_tag_path \u003d \"[System]Gateway/Database/MariaDB/Available\"\n\t\n if not (system.tag.readBlocking([db_tag_path])[0].value):\n \tsystem.perspective.openPopup(\"errorPopup\",\u0027PopUp-Views/ErrorPopup\u0027)\n\t" + "script": " db_tag_path \u003d \"[System]Gateway/Database/MariaDB/Available\"\n\t\n if not (system.tag.readBlocking([db_tag_path])[0].value):\n \tsystem.perspective.openPopup(\"errorPopup\",\u0027PopUp-Views/DatabaseError\u0027, title\u003d\"Database Error\")\n\t" }, "persistent": true } }, "props": { - "color": "#47FF47", + "color": "#FF0000", "path": "material/table_chart" }, "type": "ia.display.icon" diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/DatabaseError/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/DatabaseError/resource.json index 1cf75bf..b44b07b 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/DatabaseError/resource.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/DatabaseError/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-05-19T16:51:36Z" + "timestamp": "2025-05-20T09:49:07Z" }, - "lastModificationSignature": "c96d5c63ec36ffa6e324173215ee03ed2ae751c82423c5716df1bba9e089940d" + "lastModificationSignature": "cb7026f671f17bc4ef7ebb50ab9735c971cb50752a412e2a4e14d784891500f5" } } \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/DatabaseError/thumbnail.png b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/DatabaseError/thumbnail.png index 2403bbd..5344c87 100644 Binary files a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/DatabaseError/thumbnail.png and b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/DatabaseError/thumbnail.png differ diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/DatabaseError/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/DatabaseError/view.json index 5e9aa3e..a75de09 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/DatabaseError/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/DatabaseError/view.json @@ -3,45 +3,12 @@ "params": {}, "props": { "defaultSize": { - "height": 208, - "width": 450 + "height": 165, + "width": 400 } }, "root": { "children": [ - { - "meta": { - "name": "Label" - }, - "position": { - "height": 40, - "width": 360, - "x": 90 - }, - "props": { - "text": "Database Error", - "textStyle": { - "color": "#FF0000", - "fontFamily": "Arial", - "fontSize": "22px" - } - }, - "type": "ia.display.label" - }, - { - "meta": { - "name": "Icon" - }, - "position": { - "height": 40, - "width": 90 - }, - "props": { - "color": "#FF1D00", - "path": "material/error" - }, - "type": "ia.display.icon" - }, { "children": [ { @@ -73,9 +40,7 @@ "name": "FlexContainer" }, "position": { - "height": 99, - "width": 450, - "y": 48 + "grow": 1 }, "props": { "alignItems": "flex-start", @@ -103,14 +68,11 @@ "meta": { "name": "Button" }, - "position": { - "height": 34, - "width": 206, - "x": 106, - "y": 158 - }, "props": { "primary": false, + "style": { + "marginTop": 3 + }, "text": "Dismiss" }, "type": "ia.input.button" @@ -119,6 +81,11 @@ "meta": { "name": "root" }, - "type": "ia.container.coord" + "props": { + "alignContent": "flex-start", + "direction": "column", + "justify": "space-around" + }, + "type": "ia.container.flex" } } \ No newline at end of file