diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index 991d5bb6c4ef38f00012563d5242c07cb6499e8b..657d193f94151eea7570fa623c5fbd955427bbb1 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -35,6 +35,24 @@
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Permits</name>
+ <text>PSS Permits</text>
+ <x>654</x>
+ <y>31</y>
+ <width>346</width>
+ <height>30</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_1</name>
<x>20</x>
@@ -63,6 +81,77 @@
<corner_width>5</corner_width>
<corner_height>5</corner_height>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>LB Blue Lights</name>
+ <text>BLUE Lights:</text>
+ <x>325</x>
+ <y>73</y>
+ <width>90</width>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>BlueLightsOn</name>
+ <pv_name>AccPSS:PSS-Area-1:BlueLightsOn</pv_name>
+ <x>360</x>
+ <y>93</y>
+ <off_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="PRIMARY" red="0" green="148" blue="202">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Acks</name>
+ <x>30</x>
+ <y>70</y>
+ <width>280</width>
+ <height>55</height>
+ <style>3</style>
+ <widget type="led" version="2.0.0">
+ <name>PSSAckRequired</name>
+ <pv_name>AccPSS:PSS-Area-1:PSS1resetRequired</pv_name>
+ <x>10</x>
+ <y>3</y>
+ <off_color>
+ <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_PSSAckRequired</name>
+ <text>PSS Acknowledgement Required</text>
+ <x>36</x>
+ <y>3</y>
+ <width>225</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Occupancy</name>
+ <text>Current occupancy:</text>
+ <x>10</x>
+ <y>29</y>
+ <width>131</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>AccPSS:PSS-Area-1:Occupancy</name>
+ <pv_name>AccPSS:PSS-Area-1:Occupancy</pv_name>
+ <x>147</x>
+ <y>29</y>
+ <width>110</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ </widget>
<widget type="group" version="2.0.0">
<name>Permits</name>
<x>654</x>
@@ -416,33 +505,51 @@
</widget>
</widget>
<widget type="group" version="2.0.0">
- <name>Acks</name>
+ <name>HMI Usage</name>
<x>30</x>
- <y>70</y>
+ <y>155</y>
<width>280</width>
- <height>26</height>
+ <height>45</height>
<style>3</style>
- <widget type="led" version="2.0.0">
- <name>PSSAckRequired</name>
- <pv_name>AccPSS:PSS-Area-1:PSS1resetRequired</pv_name>
- <x>10</x>
- <y>3</y>
- <off_color>
- <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvInt0 == 0">
+ <value>false</value>
+ </exp>
+ <pv_name>AccPSS:PSS-Area-1:HMI_User</pv_name>
+ </rule>
+ </rules>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle_29</name>
+ <width>280</width>
+ <height>45</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="MINOR" red="252" green="242" blue="17">
</color>
- </off_color>
- <on_color>
- <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </line_color>
+ <background_color>
+ <color name="Button_Background" red="236" green="236" blue="236">
</color>
- </on_color>
+ </background_color>
</widget>
- <widget type="label" version="2.0.0">
- <name>LB_PSSAckRequired</name>
- <text>PSS Acknowledgement Required</text>
- <x>36</x>
- <y>3</y>
- <width>225</width>
- <vertical_alignment>1</vertical_alignment>
+ <widget type="text-symbol" version="2.0.0">
+ <name>HMI_User</name>
+ <pv_name>AccPSS:PSS-Area-1:HMI_User</pv_name>
+ <symbols>
+ <symbol>No User</symbol>
+ <symbol>PSS HMI in use - Operator</symbol>
+ <symbol>PSS HMI in use - Admin</symbol>
+ <symbol>PSS HMI in use - RF Team</symbol>
+ </symbols>
+ <x>10</x>
+ <y>5</y>
+ <width>260</width>
+ <height>35</height>
+ <font>
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
</widget>
</widget>
<widget type="action_button" version="3.0.0">
@@ -490,6 +597,15 @@
</rules>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>Operation Mode</name>
+ <file>embedded_displays/operation_mode.bob</file>
+ <x>35</x>
+ <y>213</y>
+ <width>960</width>
+ <height>56</height>
+ <resize>2</resize>
+ </widget>
<widget type="group" version="2.0.0">
<name>Zone 2 Searched Group</name>
<x>103</x>
@@ -2154,24 +2270,6 @@ Door</text>
</rule>
</rules>
</widget>
- <widget type="label" version="2.0.0">
- <name>Permits</name>
- <text>PSS Permits</text>
- <x>654</x>
- <y>31</y>
- <width>346</width>
- <height>30</height>
- <font>
- <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
- </font>
- </font>
- <foreground_color>
- <color name="TEXT-LIGHT" red="230" green="230" blue="230">
- </color>
- </foreground_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
<widget type="group" version="2.0.0">
<name>Keys</name>
<x>588</x>
@@ -2216,29 +2314,6 @@ Door</text>
<tooltip>$(actions)</tooltip>
</widget>
</widget>
- <widget type="label" version="2.0.0">
- <name>LB Blue Lights</name>
- <text>BLUE Lights:</text>
- <x>325</x>
- <y>73</y>
- <width>90</width>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="led" version="2.0.0">
- <name>BlueLightsOn</name>
- <pv_name>AccPSS:PSS-Area-1:BlueLightsOn</pv_name>
- <x>360</x>
- <y>93</y>
- <off_color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </off_color>
- <on_color>
- <color name="PRIMARY" red="0" green="148" blue="202">
- </color>
- </on_color>
- </widget>
<widget type="group" version="2.0.0">
<name>AMM $(RM)</name>
<macros>
@@ -2378,54 +2453,6 @@ Door</text>
<transparent>true</transparent>
</widget>
</widget>
- <widget type="group" version="2.0.0">
- <name>HMI Usage</name>
- <x>30</x>
- <y>130</y>
- <width>280</width>
- <height>45</height>
- <style>3</style>
- <rules>
- <rule name="Visibility" prop_id="visible" out_exp="false">
- <exp bool_exp="pvInt0 == 0">
- <value>false</value>
- </exp>
- <pv_name>AccPSS:PSS-Area-1:HMI_User</pv_name>
- </rule>
- </rules>
- <widget type="rectangle" version="2.0.0">
- <name>Rectangle_29</name>
- <width>280</width>
- <height>45</height>
- <line_width>2</line_width>
- <line_color>
- <color name="MINOR" red="252" green="242" blue="17">
- </color>
- </line_color>
- <background_color>
- <color name="Button_Background" red="236" green="236" blue="236">
- </color>
- </background_color>
- </widget>
- <widget type="text-symbol" version="2.0.0">
- <name>HMI_User</name>
- <pv_name>AccPSS:PSS-Area-1:HMI_User</pv_name>
- <symbols>
- <symbol>No User</symbol>
- <symbol>PSS HMI in use - Operator</symbol>
- <symbol>PSS HMI in use - Admin</symbol>
- <symbol>PSS HMI in use - RF Team</symbol>
- </symbols>
- <x>10</x>
- <y>5</y>
- <width>260</width>
- <height>35</height>
- <font>
- <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
- </font>
- </font>
- </widget>
- </widget>
<widget type="symbol" version="2.0.0">
<name>MiniMAS1Stat - Locked</name>
<pv_name>FEB-090:PSS-PAS-1:MiniMAS1Stat</pv_name>
@@ -2527,15 +2554,6 @@ Door</text>
</rule>
</rules>
</widget>
- <widget type="embedded" version="2.0.0">
- <name>Operation Mode</name>
- <file>embedded_displays/operation_mode.bob</file>
- <x>35</x>
- <y>213</y>
- <width>960</width>
- <height>56</height>
- <resize>2</resize>
- </widget>
<widget type="group" version="2.0.0">
<name>Grly_ConnectedToGround</name>
<x>749</x>
@@ -2686,4 +2704,68 @@ $(pv_value)</tooltip>
</rule>
</rules>
</widget>
+ <widget type="group" version="2.0.0">
+ <name>Occupancy warning</name>
+ <x>588</x>
+ <y>290</y>
+ <width>400</width>
+ <height>120</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvInt0 < 10">
+ <value>false</value>
+ </exp>
+ <pv_name>AccPSS:PSS-Area-1:Occupancy</pv_name>
+ </rule>
+ </rules>
+ <widget type="rectangle" version="2.0.0">
+ <name>Background</name>
+ <width>400</width>
+ <height>120</height>
+ <line_width>5</line_width>
+ <line_color>
+ <color name="ERROR" red="252" green="13" blue="27">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="RED-BACKGROUND" red="225" green="192" blue="188">
+ </color>
+ </background_color>
+ <corner_width>5</corner_width>
+ <corner_height>5</corner_height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Warning</name>
+ <text>The occupancy number in the PSS1 controlled area is >= 10</text>
+ <x>40</x>
+ <y>10</y>
+ <width>320</width>
+ <height>60</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Hide Button</name>
+ <actions>
+ <action type="execute">
+ <script file="EmbeddedPy">
+ <text><![CDATA[from org.csstudio.display.builder.runtime.script import ScriptUtil
+ScriptUtil.findWidgetByName(widget, "Occupancy warning").setPropertyValue("visible", False)]]></text>
+ </script>
+ <description>Execute Script</description>
+ </action>
+ </actions>
+ <text>Hide</text>
+ <x>150</x>
+ <y>80</y>
+ <height>25</height>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ </widget>
</display>