diff --git a/MTN6_Simulation/com.inductiveautomation.perspective/page-config/config.json b/MTN6_Simulation/com.inductiveautomation.perspective/page-config/config.json index 44c75e0..88b3f0c 100644 --- a/MTN6_Simulation/com.inductiveautomation.perspective/page-config/config.json +++ b/MTN6_Simulation/com.inductiveautomation.perspective/page-config/config.json @@ -23,6 +23,10 @@ "/Device-manager": { "viewPath": "Main-Views/Device-Manager/DeviceManager" }, + "/Field_Devices": { + "title": "", + "viewPath": "Simulations/Field_Devices" + }, "/Help": { "title": "Help", "viewPath": "Main-Views/Help" @@ -145,6 +149,34 @@ "size": 400, "viewParams": {}, "viewPath": "PopUp-Views/Controller-Equipment/Information-Docked-East-VFD" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-DS", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 400, + "viewParams": {}, + "viewPath": "PopUp-Views/Controller-Equipment/Information-Docked-East-Device-Status" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-SNP", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 150, + "viewParams": {}, + "viewPath": "PopUp-Views/Controller-Equipment/Information-Docked-East-StatusNonPowered" } ], "top": [ diff --git a/MTN6_Simulation/com.inductiveautomation.perspective/session-props/props.json b/MTN6_Simulation/com.inductiveautomation.perspective/session-props/props.json index 969a853..74550a9 100644 --- a/MTN6_Simulation/com.inductiveautomation.perspective/session-props/props.json +++ b/MTN6_Simulation/com.inductiveautomation.perspective/session-props/props.json @@ -3,6 +3,7 @@ "alarm_filter": { "magnificaiton": "x2", "orderby": false, + "show_buttons": true, "show_camera_jams": true, "show_diagnostic": true, "show_fio": true, diff --git a/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Nav/view.json b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Nav/view.json index dd10d8c..ce7a8e8 100644 --- a/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Nav/view.json +++ b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Nav/view.json @@ -100,8 +100,7 @@ "dom": { "onClick": { "config": { - "params": {}, - "view": "Simulations/Field_Devices" + "page": "/Field_Devices" }, "scope": "C", "type": "nav" 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 8b7235c..a6cfc9a 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 @@ -147,6 +147,20 @@ "size": 400, "viewParams": {}, "viewPath": "PopUp-Views/Controller-Equipment/Information-Docked-East-StatusNonPowered" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-DS", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 400, + "viewParams": {}, + "viewPath": "PopUp-Views/Controller-Equipment/Information-Docked-East-Device-Status" } ], "top": [