From b188602f2b06cd89fc2db074919d6ea8a6f24857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Wed, 20 Jan 2021 16:10:52 +0100
Subject: [PATCH] Added service information

---
 .../DEVICES/vacuum/COMMON/service_bar.bob     |  66 +++++
 .../DEVICES/vacuum/COMMON/service_button.bob  |  41 +++
 .../DEVICES/vacuum/COMMON/service_config.bob  | 275 ++++++++++++++++++
 NON-APPROVED/lebt-010_vac/LEBT.bob            |  43 +--
 NON-APPROVED/mebt-010_vac/MEBT.bob            |  71 ++---
 NON-APPROVED/rfq-010_vac/RFQ.bob              |  43 +--
 6 files changed, 468 insertions(+), 71 deletions(-)
 create mode 100644 NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_bar.bob
 create mode 100644 NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_button.bob
 create mode 100644 NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_config.bob

diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_bar.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_bar.bob
new file mode 100644
index 00000000..4be906b7
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_bar.bob
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>ServiceBar</name>
+  <width>406</width>
+  <height>80</height>
+  <widget type="group" version="2.0.0">
+    <name>Group</name>
+    <width>406</width>
+    <height>80</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="True">
+          <expression>pvInt0</expression>
+        </exp>
+        <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvStat-RB</pv_name>
+      </rule>
+    </rules>
+    <widget type="label" version="2.0.0">
+      <name>InService</name>
+      <text>Section in Service</text>
+      <width>406</width>
+      <height>80</height>
+      <font>
+        <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="RED-TEXT" red="255" green="255" blue="255">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="ERROR" red="252" green="13" blue="27">
+        </color>
+      </background_color>
+      <transparent>false</transparent>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Responsible</name>
+      <text>Responsible:</text>
+      <x>23</x>
+      <y>50</y>
+      <height>25</height>
+      <font>
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="RED-TEXT" red="255" green="255" blue="255">
+        </color>
+      </foreground_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>SrvResp-RB</name>
+      <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvResp-RB</pv_name>
+      <x>129</x>
+      <y>50</y>
+      <width>250</width>
+      <height>25</height>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_button.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_button.bob
new file mode 100644
index 00000000..886e6571
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_button.bob
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>ServiceButton</name>
+  <width>156</width>
+  <height>66</height>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions execute_as_one="true">
+      <action type="open_display">
+        <file>service_config.bob</file>
+        <target>window</target>
+        <description>Open Service</description>
+      </action>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <pv_name>VacS-ACCV::as-is-system-expert</pv_name>
+    <text>Open
+Service</text>
+    <x>3</x>
+    <y>3</y>
+    <width>150</width>
+    <height>60</height>
+    <font>
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+      </font>
+    </font>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="True">
+          <expression>not pvs[0].isReadonly()</expression>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <tooltip>Open Service Configuration</tooltip>
+  </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_config.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_config.bob
new file mode 100644
index 00000000..58cb57e2
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_config.bob
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>$(SERVICE_SECTION) Section Service Config</name>
+  <width>660</width>
+  <height>320</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>Title Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>660</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Title</name>
+    <class>TITLE</class>
+    <text>$(SERVICE_SECTION) section service</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>450</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Current State</name>
+    <x>30</x>
+    <y>80</y>
+    <width>280</width>
+    <height>140</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>CS-titlebar</name>
+      <width>280</width>
+      <height>140</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>CS-background</name>
+      <x>10</x>
+      <y>30</y>
+      <width>260</width>
+      <height>100</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="BACKGROUND" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <corner_width>5</corner_width>
+      <corner_height>5</corner_height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>CS-title</name>
+      <text>Current State</text>
+      <x>10</x>
+      <width>260</width>
+      <height>30</height>
+      <font>
+        <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>CS-content-group</name>
+      <x>10</x>
+      <y>30</y>
+      <width>260</width>
+      <height>100</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <widget type="textupdate" version="2.0.0">
+        <name>SrvStat-RB</name>
+        <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvStat-RB</pv_name>
+        <x>20</x>
+        <y>20</y>
+        <width>220</width>
+        <height>25</height>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="textupdate" version="2.0.0">
+        <name>SrvResp-RB</name>
+        <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvResp-RB</pv_name>
+        <x>20</x>
+        <y>60</y>
+        <width>220</width>
+        <height>25</height>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>New State</name>
+    <x>350</x>
+    <y>80</y>
+    <width>280</width>
+    <height>140</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>NS-titlebar</name>
+      <width>280</width>
+      <height>140</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>NS-background</name>
+      <x>10</x>
+      <y>30</y>
+      <width>260</width>
+      <height>100</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="BACKGROUND" red="220" green="225" blue="221">
+        </color>
+      </background_color>
+      <corner_width>5</corner_width>
+      <corner_height>5</corner_height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>NS-title</name>
+      <text>New State</text>
+      <x>10</x>
+      <width>260</width>
+      <height>30</height>
+      <font>
+        <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>NS-content-group</name>
+      <x>10</x>
+      <y>30</y>
+      <width>260</width>
+      <height>100</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <widget type="choice" version="2.0.0">
+        <name>SrvStatS</name>
+        <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvStatS</pv_name>
+        <x>20</x>
+        <y>20</y>
+        <width>220</width>
+        <height>25</height>
+        <items>
+          <item>In Operation</item>
+          <item>In Service</item>
+        </items>
+      </widget>
+      <widget type="combo" version="2.0.0">
+        <name>SrvRespS</name>
+        <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvRespS</pv_name>
+        <x>20</x>
+        <y>60</y>
+        <width>220</width>
+        <height>25</height>
+        <rules>
+          <rule name="Enabled" prop_id="enabled" out_exp="true">
+            <exp bool_exp="True">
+              <expression>pvInt0</expression>
+            </exp>
+            <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvStatS</pv_name>
+          </rule>
+        </rules>
+        <items>
+          <item>Mattias Malmstrom</item>
+          <item>Niklas Cerovina</item>
+          <item>Fredrik Svensson</item>
+          <item>Ralf Huber</item>
+          <item>Thomas Cornes</item>
+          <item>Delphine Hardion</item>
+          <item>Marcelo Juni Ferreira</item>
+          <item>Hilko Spoelstra</item>
+          <item>Laurence Page</item>
+          <item>Artur Gevorgyan</item>
+          <item>Adrien Besson</item>
+          <item>Yong Kian Sin</item>
+        </items>
+        <items_from_pv>false</items_from_pv>
+        <editable>true</editable>
+        <enabled>false</enabled>
+      </widget>
+    </widget>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>CommitSrvChangeS</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+        <description>Commit</description>
+      </action>
+      <action type="execute">
+        <script file="EmbeddedPy">
+          <text><![CDATA[from org.csstudio.display.builder.runtime.script import ScriptUtil
+ScriptUtil.closeDisplay(widget)]]></text>
+        </script>
+        <description>Close window</description>
+      </action>
+    </actions>
+    <pv_name>VacS-ACCV::$(SERVICE_SECTION)CommitSrvChangeS</pv_name>
+    <text>Commit</text>
+    <x>400</x>
+    <y>260</y>
+    <width>230</width>
+    <rules>
+      <rule name="Enabled" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pvInt0 == 0 or pvStr1 != &quot;&quot;">
+          <value>true</value>
+        </exp>
+        <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvStatS</pv_name>
+        <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvRespS</pv_name>
+      </rule>
+    </rules>
+    <tooltip>Commit change</tooltip>
+    <enabled>false</enabled>
+    <show_confirm_dialog>true</show_confirm_dialog>
+  </widget>
+</display>
diff --git a/NON-APPROVED/lebt-010_vac/LEBT.bob b/NON-APPROVED/lebt-010_vac/LEBT.bob
index 5d661d83..7f98f6bf 100644
--- a/NON-APPROVED/lebt-010_vac/LEBT.bob
+++ b/NON-APPROVED/lebt-010_vac/LEBT.bob
@@ -5,6 +5,7 @@
     <DIS>Vac</DIS>
     <ROOT>$(ESS_OPIS=/ess-opis)/NON-APPROVED</ROOT>
     <SEC>LEBT</SEC>
+    <SERVICE_SECTION>$(SEC)</SERVICE_SECTION>
     <SUBSEC>010</SUBSEC>
     <WIDGET_ROOT>$(ROOT)/COMMON/DEVICES/vacuum</WIDGET_ROOT>
     <vacSYMBOLS>$(ROOT)/COMMON/DEVICES/vacuum/symbols</vacSYMBOLS>
@@ -29,13 +30,22 @@
       </color>
     </foreground_color>
     <background_color>
-      <color name="Primary Blue" red="0" green="148" blue="202">
+      <color name="PRIMARY" red="0" green="148" blue="202">
       </color>
     </background_color>
     <transparent>false</transparent>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
   </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>ServiceBar</name>
+    <file>$(WIDGET_ROOT)/COMMON/service_bar.bob</file>
+    <x>600</x>
+    <width>406</width>
+    <height>80</height>
+    <resize>2</resize>
+    <transparent>true</transparent>
+  </widget>
   <widget type="action_button" version="3.0.0">
     <name>Open VGC Trends Action</name>
     <actions>
@@ -52,14 +62,9 @@ VGC Trends</text>
     <width>150</width>
     <height>60</height>
     <font>
-      <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
       </font>
     </font>
-    <foreground_color>
-      <color name="BLACK-TEXT" red="255" green="255" blue="255">
-      </color>
-    </foreground_color>
-    <transparent>true</transparent>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -78,14 +83,9 @@ Diagnostics</text>
     <width>150</width>
     <height>60</height>
     <font>
-      <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
       </font>
     </font>
-    <foreground_color>
-      <color name="BLACK-TEXT" red="255" green="255" blue="255">
-      </color>
-    </foreground_color>
-    <transparent>true</transparent>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -104,16 +104,21 @@ Legend</text>
     <width>150</width>
     <height>60</height>
     <font>
-      <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
       </font>
     </font>
-    <foreground_color>
-      <color name="BLACK-TEXT" red="255" green="255" blue="255">
-      </color>
-    </foreground_color>
-    <transparent>true</transparent>
     <tooltip>$(actions)</tooltip>
   </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Open Service Action</name>
+    <file>$(WIDGET_ROOT)/COMMON/service_button.bob</file>
+    <x>1900</x>
+    <y>7</y>
+    <width>156</width>
+    <height>66</height>
+    <resize>2</resize>
+    <transparent>true</transparent>
+  </widget>
   <widget type="label" version="2.0.0">
     <name>ISRC-010</name>
     <text>ISRC-010</text>
diff --git a/NON-APPROVED/mebt-010_vac/MEBT.bob b/NON-APPROVED/mebt-010_vac/MEBT.bob
index d3c14f17..969a602a 100644
--- a/NON-APPROVED/mebt-010_vac/MEBT.bob
+++ b/NON-APPROVED/mebt-010_vac/MEBT.bob
@@ -5,6 +5,7 @@
     <DIS>Vac</DIS>
     <ROOT>$(ESS_OPIS=/ess-opis)/NON-APPROVED</ROOT>
     <SEC>MEBT</SEC>
+    <SERVICE_SECTION>$(SEC)</SERVICE_SECTION>
     <SUBSEC>010</SUBSEC>
     <WIDGET_ROOT>$(ROOT)/COMMON/DEVICES/vacuum</WIDGET_ROOT>
   </macros>
@@ -28,13 +29,22 @@
       </color>
     </foreground_color>
     <background_color>
-      <color name="Primary Blue" red="0" green="148" blue="202">
+      <color name="PRIMARY" red="0" green="148" blue="202">
       </color>
     </background_color>
     <transparent>false</transparent>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
   </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>ServiceBar</name>
+    <file>$(WIDGET_ROOT)/COMMON/service_bar.bob</file>
+    <x>600</x>
+    <width>406</width>
+    <height>80</height>
+    <resize>2</resize>
+    <transparent>true</transparent>
+  </widget>
   <widget type="action_button" version="3.0.0">
     <name>Open VGC Trends Action</name>
     <actions>
@@ -46,19 +56,14 @@
     </actions>
     <text>Open
 VGC Trends</text>
-    <x>1100</x>
+    <x>1034</x>
     <y>10</y>
     <width>150</width>
     <height>60</height>
     <font>
-      <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
       </font>
     </font>
-    <foreground_color>
-      <color name="BLACK-TEXT" red="255" green="255" blue="255">
-      </color>
-    </foreground_color>
-    <transparent>true</transparent>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -72,19 +77,14 @@ VGC Trends</text>
     </actions>
     <text>Open
 Diagnostics</text>
-    <x>1300</x>
+    <x>1234</x>
     <y>10</y>
     <width>150</width>
     <height>60</height>
     <font>
-      <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
       </font>
     </font>
-    <foreground_color>
-      <color name="BLACK-TEXT" red="255" green="255" blue="255">
-      </color>
-    </foreground_color>
-    <transparent>true</transparent>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -98,32 +98,25 @@ Diagnostics</text>
     </actions>
     <text>Open
 Legend</text>
-    <x>1500</x>
+    <x>1434</x>
     <y>10</y>
     <width>150</width>
     <height>60</height>
     <font>
-      <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
       </font>
     </font>
-    <foreground_color>
-      <color name="BLACK-TEXT" red="255" green="255" blue="255">
-      </color>
-    </foreground_color>
-    <transparent>true</transparent>
     <tooltip>$(actions)</tooltip>
   </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Pipe Main</name>
-    <y>350</y>
-    <width>1800</width>
-    <height>1</height>
-    <points>
-      <point x="0.0" y="0.0">
-      </point>
-      <point x="1800.0" y="0.0">
-      </point>
-    </points>
+  <widget type="embedded" version="2.0.0">
+    <name>Open Service Action</name>
+    <file>$(WIDGET_ROOT)/COMMON/service_button.bob</file>
+    <x>1634</x>
+    <y>7</y>
+    <width>156</width>
+    <height>66</height>
+    <resize>2</resize>
+    <transparent>true</transparent>
   </widget>
   <widget type="group" version="2.0.0">
     <name>$(SEC)-$(SECTOR)</name>
@@ -740,6 +733,18 @@ Legend</text>
       <resize>2</resize>
     </widget>
   </widget>
+  <widget type="polyline" version="2.0.0">
+    <name>Pipe Main</name>
+    <y>350</y>
+    <width>1800</width>
+    <height>1</height>
+    <points>
+      <point x="0.0" y="0.0">
+      </point>
+      <point x="1800.0" y="0.0">
+      </point>
+    </points>
+  </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
     <macros>
diff --git a/NON-APPROVED/rfq-010_vac/RFQ.bob b/NON-APPROVED/rfq-010_vac/RFQ.bob
index e866ff8d..f6deba14 100644
--- a/NON-APPROVED/rfq-010_vac/RFQ.bob
+++ b/NON-APPROVED/rfq-010_vac/RFQ.bob
@@ -5,6 +5,7 @@
     <DIS>Vac</DIS>
     <ROOT>$(ESS_OPIS=/ess-opis)/NON-APPROVED</ROOT>
     <SEC>RFQ</SEC>
+    <SERVICE_SECTION>$(SEC)</SERVICE_SECTION>
     <SUBSEC>010</SUBSEC>
     <WIDGET_ROOT>$(ROOT)/COMMON/DEVICES/vacuum</WIDGET_ROOT>
   </macros>
@@ -28,13 +29,22 @@
       </color>
     </foreground_color>
     <background_color>
-      <color name="Primary Blue" red="0" green="148" blue="202">
+      <color name="PRIMARY" red="0" green="148" blue="202">
       </color>
     </background_color>
     <transparent>false</transparent>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
   </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>ServiceBar</name>
+    <file>$(WIDGET_ROOT)/COMMON/service_bar.bob</file>
+    <x>600</x>
+    <width>406</width>
+    <height>80</height>
+    <resize>2</resize>
+    <transparent>true</transparent>
+  </widget>
   <widget type="action_button" version="3.0.0">
     <name>Open VGC Trends Action</name>
     <actions>
@@ -51,14 +61,9 @@ VGC Trends</text>
     <width>150</width>
     <height>60</height>
     <font>
-      <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
       </font>
     </font>
-    <foreground_color>
-      <color name="BLACK-TEXT" red="255" green="255" blue="255">
-      </color>
-    </foreground_color>
-    <transparent>true</transparent>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -77,14 +82,9 @@ Diagnostics</text>
     <width>150</width>
     <height>60</height>
     <font>
-      <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
       </font>
     </font>
-    <foreground_color>
-      <color name="BLACK-TEXT" red="255" green="255" blue="255">
-      </color>
-    </foreground_color>
-    <transparent>true</transparent>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -103,16 +103,21 @@ Legend</text>
     <width>150</width>
     <height>60</height>
     <font>
-      <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
       </font>
     </font>
-    <foreground_color>
-      <color name="BLACK-TEXT" red="255" green="255" blue="255">
-      </color>
-    </foreground_color>
-    <transparent>true</transparent>
     <tooltip>$(actions)</tooltip>
   </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Open Service Action</name>
+    <file>$(WIDGET_ROOT)/COMMON/service_button.bob</file>
+    <x>1900</x>
+    <y>7</y>
+    <width>156</width>
+    <height>66</height>
+    <resize>2</resize>
+    <transparent>true</transparent>
+  </widget>
   <widget type="polyline" version="2.0.0">
     <name>Pipe Main</name>
     <y>350</y>
-- 
GitLab