diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/page-config/config.json b/MTN6_SCADA/com.inductiveautomation.perspective/page-config/config.json index 7024077..2d7a87b 100644 --- a/MTN6_SCADA/com.inductiveautomation.perspective/page-config/config.json +++ b/MTN6_SCADA/com.inductiveautomation.perspective/page-config/config.json @@ -81,6 +81,14 @@ "/Tools": { "title": "Tools", "viewPath": "Main-Views/ToolBox" + }, + "/Windows/Statistics": { + "title": "Statistics", + "viewPath": "Windows/Statistics" + }, + "/Windows/Status": { + "title": "Status", + "viewPath": "Windows/Status" } }, "sharedDocks": { diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/config.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/config.json index 59f5b90..4d055fc 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/config.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/config.json @@ -44,6 +44,14 @@ "title": "Tools", "viewPath": "Main-Views/ToolBox" }, + "/Windows/Statistics": { + "title": "", + "viewPath": "" + }, + "/Windows/Status": { + "title": "", + "viewPath": "" + }, "/config": { "title": "", "viewPath": "CommissioningTool/PageConfig" diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/view.json index eae2154..4751af9 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/view.json @@ -195,6 +195,9 @@ "type": "ia.container.flex" }, { + "custom": { + "show": false + }, "events": { "component": { "onActionPerformed": { @@ -631,6 +634,9 @@ "type": "ia.input.button" }, { + "custom": { + "show": false + }, "events": { "component": { "onActionPerformed": { @@ -689,11 +695,14 @@ "type": "ia.input.button" }, { + "custom": { + "show": false + }, "events": { "component": { "onActionPerformed": { "config": { - "script": "\turl \u003d self.session.custom.download_url\n\tself.session.custom.download_url \u003d None\n\tsystem.perspective.navigate(url \u003d url , newTab \u003d True)" + "script": "\tsystem.perspective.navigate(\"/Windows/Statistics\")" }, "scope": "G", "type": "script" @@ -716,6 +725,7 @@ "config": { "expression": "if(isNull({session.custom.download_url}), False, True)" }, + "enabled": false, "type": "expr" } } @@ -755,7 +765,7 @@ } }, "meta": { - "name": "Status", + "name": "Downloads", "tooltip": { "enabled": true, "text": "Notifications" @@ -774,6 +784,64 @@ } } }, + "props": { + "image": { + "height": 32, + "icon": { + "color": "#FFFAF1", + "path": "material/cloud_download" + }, + "position": "top", + "width": 32 + }, + "style": { + "classes": "Buttons/Button-Menu", + "color": "#FFFFFF", + "margin": 1 + }, + "text": "Download", + "textStyle": { + "classes": "Text-Styles/Docked-Buttons" + } + }, + "type": "ia.input.button" + }, + { + "custom": { + "show": false + }, + "events": { + "component": { + "onActionPerformed": { + "config": { + "script": "\tsystem.perspective.navigate(\"/Windows/Status\")" + }, + "scope": "G", + "type": "script" + } + } + }, + "meta": { + "name": "Status", + "tooltip": { + "enabled": true, + "text": "Notifications" + } + }, + "position": { + "basis": "70px" + }, + "propConfig": { + "position.display": { + "binding": { + "config": { + "expression": "" + }, + "enabled": false, + "type": "expr" + } + } + }, "props": { "image": { "height": 32, @@ -853,60 +921,6 @@ } }, "type": "ia.input.button" - }, - { - "events": { - "component": { - "onActionPerformed": { - "config": { - "script": "\turl \u003d self.session.custom.download_url\n\tself.session.custom.download_url \u003d None\n\tsystem.perspective.navigate(url \u003d url , newTab \u003d True)" - }, - "scope": "G", - "type": "script" - } - } - }, - "meta": { - "name": "Downloads", - "tooltip": { - "enabled": true, - "text": "Notifications" - } - }, - "position": { - "basis": "70px" - }, - "propConfig": { - "position.display": { - "binding": { - "config": { - "expression": "if(isNull({session.custom.download_url}), False, True)" - }, - "type": "expr" - } - } - }, - "props": { - "image": { - "height": 32, - "icon": { - "color": "#FFFAF1", - "path": "material/cloud_download" - }, - "position": "top", - "width": 32 - }, - "style": { - "classes": "Buttons/Button-Menu", - "color": "#FFFFFF", - "margin": 1 - }, - "text": "Download", - "textStyle": { - "classes": "Text-Styles/Docked-Buttons" - } - }, - "type": "ia.input.button" } ], "custom": {