From 8aadcfab538c3009d1c2de0d9f8bf19b06c693b9 Mon Sep 17 00:00:00 2001
From: Luciano Carneiro Guedes <luciano.carneiroguedes@ess.eu>
Date: Wed, 23 Oct 2024 10:28:24 +0200
Subject: [PATCH 1/2] ICSHWI-19543: Fix macro issue of ODH

---
 99-Shared/blockicon/ODHDS_blockicon_horizontal.bob | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/99-Shared/blockicon/ODHDS_blockicon_horizontal.bob b/99-Shared/blockicon/ODHDS_blockicon_horizontal.bob
index 503593c..6be5739 100644
--- a/99-Shared/blockicon/ODHDS_blockicon_horizontal.bob
+++ b/99-Shared/blockicon/ODHDS_blockicon_horizontal.bob
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2024-10-21 10:42:50 by luciano-->
+<!--Saved on 2024-10-23 10:27:22 by luciano-->
 <display version="2.0.0">
   <name>ODHDS Blockicon horizontal</name>
-  <macros>
-    <P>loc://PV</P>
-  </macros>
   <width>179</width>
   <height>92</height>
   <background_color>
-- 
GitLab


From 4060cc976132dc1296c00e042ab36a193c2752ca Mon Sep 17 00:00:00 2001
From: Luciano Carneiro Guedes <luciano.carneiroguedes@ess.eu>
Date: Wed, 23 Oct 2024 10:42:24 +0200
Subject: [PATCH 2/2] ICSHWI-19543: Create and Overview btn

---
 99-Shared/area_maps/ODHDS_ACC.bob          | 97 +++++++++++++---------
 99-Shared/area_maps/ODHDS_CTLG.bob         | 52 ++++++++----
 99-Shared/area_maps/ODHDS_CXH.bob          | 48 +++++++----
 99-Shared/area_maps/ODHDS_HCB_DOG-SHED.bob | 76 ++++++++++-------
 99-Shared/area_maps/ODHDS_TS2.bob          | 50 +++++++----
 5 files changed, 212 insertions(+), 111 deletions(-)

diff --git a/99-Shared/area_maps/ODHDS_ACC.bob b/99-Shared/area_maps/ODHDS_ACC.bob
index d8cd5bd..8776b64 100644
--- a/99-Shared/area_maps/ODHDS_ACC.bob
+++ b/99-Shared/area_maps/ODHDS_ACC.bob
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Saved on 2024-10-23 10:32:43 by luciano-->
 <display version="2.0.0">
   <name>ODHDS ACC</name>
   <macros>
@@ -6,7 +7,7 @@
     <P>AccODH-AT:</P>
   </macros>
   <width>2550</width>
-  <height>1290</height>
+  <height>1320</height>
   <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
     <name>Titlebar</name>
@@ -422,14 +423,14 @@
     <name>ODH Monitor</name>
     <actions execute_as_one="true">
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://O2Mon</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://Devices</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
     </actions>
     <text></text>
@@ -486,14 +487,14 @@
     <name>Alarm-Device</name>
     <actions execute_as_one="true">
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://Devices</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://O2Mon</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
     </actions>
     <text></text>
@@ -512,9 +513,9 @@
     <name>Open Trend</name>
     <actions>
       <action type="open_display">
+        <description>Open Display</description>
         <file>../popups/ODHACC_Trend.bob</file>
         <target>window</target>
-        <description>Open Display</description>
       </action>
     </actions>
     <text>Open Trend</text>
@@ -531,9 +532,9 @@
     <name>Diagnostics</name>
     <actions>
       <action type="open_display">
+        <description>Open Display</description>
         <file>../diagnostics/ACC_ODHDS_Diagnostics.bob</file>
         <target>tab</target>
-        <description>Open Display</description>
       </action>
     </actions>
     <text>Diagnostics</text>
@@ -2261,14 +2262,14 @@ Exit 1</text>
     <name>Legend</name>
     <actions>
       <action type="open_display">
+        <description>Open Display</description>
         <file>Area_Map_Legend.bob</file>
         <target>window</target>
-        <description>Open Display</description>
       </action>
     </actions>
     <text>Legend</text>
     <x>2400</x>
-    <y>1220</y>
+    <y>1279</y>
     <font>
       <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
       </font>
@@ -2286,29 +2287,29 @@ Exit 1</text>
     <name>Details 5</name>
     <actions execute_as_one="true">
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var5</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var1</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var2</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var3</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var4</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
     </actions>
     <text>Details</text>
@@ -2326,29 +2327,29 @@ Exit 1</text>
     <name>Details 4</name>
     <actions execute_as_one="true">
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var1</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var2</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var3</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var4</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var5</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
     </actions>
     <text>Details</text>
@@ -2366,29 +2367,29 @@ Exit 1</text>
     <name>Details 3</name>
     <actions execute_as_one="true">
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var1</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var2</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var3</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var4</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var5</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
     </actions>
     <text>Details</text>
@@ -2406,29 +2407,29 @@ Exit 1</text>
     <name>Details 2</name>
     <actions execute_as_one="true">
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var1</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var2</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var3</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var4</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var5</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
     </actions>
     <text>Details</text>
@@ -2446,29 +2447,29 @@ Exit 1</text>
     <name>Details 1</name>
     <actions execute_as_one="true">
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var1</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var2</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var3</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var4</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>loc://var5</pv_name>
         <value>0</value>
-        <description>WritePV</description>
       </action>
     </actions>
     <text>Details</text>
@@ -2482,7 +2483,7 @@ Exit 1</text>
     </font>
     <tooltip>$(actions)</tooltip>
   </widget>
-  <widget type="group" version="2.0.0">
+  <widget type="group" version="3.0.0">
     <name>Group</name>
     <macros>
       <P>AccODH-AT:ODH-Area-001</P>
@@ -2990,9 +2991,9 @@ Failure</fallback_label>
     <name>Acknowledge Alarm</name>
     <actions>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>$(pv_name)</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
     </actions>
     <pv_name>$(P):ZoneCmd_ResetAlarm</pv_name>
@@ -3068,9 +3069,9 @@ $(pv_value)</tooltip>
     <name>Unmute Alarm</name>
     <actions>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>$(pv_name)</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
     </actions>
     <pv_name>$(P):ZoneCmd_UnmuteAlarm</pv_name>
@@ -3109,9 +3110,9 @@ $(pv_value)</tooltip>
     <name>Mute Alarm</name>
     <actions>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>$(pv_name)</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
     </actions>
     <pv_name>$(P):ZoneCmd_MuteAlarm</pv_name>
@@ -3143,4 +3144,24 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <enabled>false</enabled>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>PSS Overview</name>
+    <actions>
+      <action type="open_display">
+        <description>Open Display</description>
+        <file>../../10-Top/overview.bob</file>
+        <target>replace</target>
+      </action>
+    </actions>
+    <text>GDS Overview</text>
+    <x>2269</x>
+    <y>1279</y>
+    <width>120</width>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="18.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
 </display>
diff --git a/99-Shared/area_maps/ODHDS_CTLG.bob b/99-Shared/area_maps/ODHDS_CTLG.bob
index 350b2e2..cb30dab 100644
--- a/99-Shared/area_maps/ODHDS_CTLG.bob
+++ b/99-Shared/area_maps/ODHDS_CTLG.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2023-09-15 08:12:43 by lucianocarneiro-->
+<!--Saved on 2024-10-23 10:35:01 by luciano-->
 <display version="2.0.0">
   <name>ODHDS_CTLG</name>
   <macros>
@@ -123,12 +123,12 @@ Failure</fallback_label>
     <name>Open Trend_1</name>
     <actions>
       <action type="open_display">
+        <description>Open Display</description>
         <file>../popups/ODHACC_Trend.bob</file>
         <macros>
           <PLT>ODH_Trend_CTL.plt</PLT>
         </macros>
         <target>window</target>
-        <description>Open Display</description>
       </action>
     </actions>
     <text>Open Trend</text>
@@ -146,9 +146,9 @@ Failure</fallback_label>
     <name>Diagnostics_1</name>
     <actions>
       <action type="open_display">
+        <description>Open Display</description>
         <file>../diagnostics/CB_ODHDS_Diagnostics.bob</file>
         <target>tab</target>
-        <description>Open Display</description>
       </action>
     </actions>
     <text>Diagnostics</text>
@@ -510,7 +510,7 @@ Muted</fallback_label>
     </states>
     <fallback_label>Reset Required</fallback_label>
   </widget>
-  <widget type="group" version="2.0.0">
+  <widget type="group" version="3.0.0">
     <name>Group</name>
     <macros>
       <P>CTLG-CS:</P>
@@ -621,9 +621,9 @@ Muted</fallback_label>
       <name>Legend</name>
       <actions>
         <action type="open_display">
+          <description>Open Display</description>
           <file>../area_maps/Area_Map_Legend.bob</file>
           <target>window</target>
-          <description>Open Display</description>
         </action>
       </actions>
       <text>Legend</text>
@@ -635,7 +635,7 @@ Muted</fallback_label>
       </font>
       <tooltip>$(actions)</tooltip>
     </widget>
-    <widget type="group" version="2.0.0">
+    <widget type="group" version="3.0.0">
       <name>Group_1</name>
       <x>10</x>
       <y>1055</y>
@@ -682,14 +682,14 @@ Muted</fallback_label>
         <name>ODH Monitor_2</name>
         <actions execute_as_one="true">
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>loc://O2Mon</pv_name>
             <value>1</value>
-            <description>WritePV</description>
           </action>
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>loc://Devices</pv_name>
             <value>0</value>
-            <description>WritePV</description>
           </action>
         </actions>
         <text></text>
@@ -703,7 +703,7 @@ Muted</fallback_label>
         <tooltip>$(actions)</tooltip>
       </widget>
     </widget>
-    <widget type="group" version="2.0.0">
+    <widget type="group" version="3.0.0">
       <name>Group_2</name>
       <x>10</x>
       <y>1125</y>
@@ -750,14 +750,14 @@ Muted</fallback_label>
         <name>Alarm-Device_1</name>
         <actions execute_as_one="true">
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>loc://Devices</pv_name>
             <value>1</value>
-            <description>WritePV</description>
           </action>
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>loc://O2Mon</pv_name>
             <value>0</value>
-            <description>WritePV</description>
           </action>
         </actions>
         <text></text>
@@ -771,8 +771,28 @@ Muted</fallback_label>
         <tooltip>$(actions)</tooltip>
       </widget>
     </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>PSS Overview</name>
+      <actions>
+        <action type="open_display">
+          <description>Open Display</description>
+          <file>../../10-Top/overview.bob</file>
+          <target>replace</target>
+        </action>
+      </actions>
+      <text>GDS Overview</text>
+      <x>2030</x>
+      <y>1150</y>
+      <width>120</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="18.0">
+        </font>
+      </font>
+      <tooltip>$(actions)</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
   </widget>
-  <widget type="group" version="2.0.0">
+  <widget type="group" version="3.0.0">
     <name>Group_4</name>
     <macros>
       <P_AREA>CTLG-CS:</P_AREA>
@@ -787,9 +807,9 @@ Muted</fallback_label>
       <name>Acknowledge Alarm_1</name>
       <actions>
         <action type="write_pv">
+          <description>WritePV</description>
           <pv_name>$(pv_name)</pv_name>
           <value>1</value>
-          <description>WritePV</description>
         </action>
       </actions>
       <pv_name>$(P_AREA):ZoneCmd_ResetAlarm</pv_name>
@@ -813,7 +833,7 @@ $(pv_value)</tooltip>
       <border_alarm_sensitive>false</border_alarm_sensitive>
       <enabled>false</enabled>
     </widget>
-    <widget type="group" version="2.0.0">
+    <widget type="group" version="3.0.0">
       <name>Group_5</name>
       <y>70</y>
       <width>120</width>
@@ -868,9 +888,9 @@ $(pv_value)</tooltip>
         <name>Unmute Alarm_1</name>
         <actions>
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>$(pv_name)</pv_name>
             <value>1</value>
-            <description>WritePV</description>
           </action>
         </actions>
         <pv_name>$(P_AREA):ZoneCmd_UnmuteAlarm</pv_name>
@@ -907,9 +927,9 @@ $(pv_value)</tooltip>
         <name>Mute Alarm_1</name>
         <actions>
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>$(pv_name)</pv_name>
             <value>1</value>
-            <description>WritePV</description>
           </action>
         </actions>
         <pv_name>$(P_AREA):ZoneCmd_MuteAlarm</pv_name>
diff --git a/99-Shared/area_maps/ODHDS_CXH.bob b/99-Shared/area_maps/ODHDS_CXH.bob
index 3b042a5..fea1a51 100644
--- a/99-Shared/area_maps/ODHDS_CXH.bob
+++ b/99-Shared/area_maps/ODHDS_CXH.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2023-09-18 10:55:54 by lucianocarneiro-->
+<!--Saved on 2024-10-23 10:34:24 by luciano-->
 <display version="2.0.0">
   <name>ODHDS CXH</name>
   <macros>
@@ -97,12 +97,12 @@ Failure</fallback_label>
     <name>Open Trend_1</name>
     <actions>
       <action type="open_display">
+        <description>Open Display</description>
         <file>../popups/ODHACC_Trend.bob</file>
         <macros>
           <PLT>ODH_Trend_CXB.plt</PLT>
         </macros>
         <target>window</target>
-        <description>Open Display</description>
       </action>
     </actions>
     <text>Open Trend</text>
@@ -119,9 +119,9 @@ Failure</fallback_label>
     <name>Diagnostics_1</name>
     <actions>
       <action type="open_display">
+        <description>Open Display</description>
         <file>../diagnostics/CB_ODHDS_Diagnostics.bob</file>
         <target>tab</target>
-        <description>Open Display</description>
       </action>
     </actions>
     <text>Diagnostics</text>
@@ -496,7 +496,7 @@ Muted</fallback_label>
     </states>
     <fallback_label>Reset Required</fallback_label>
   </widget>
-  <widget type="group" version="2.0.0">
+  <widget type="group" version="3.0.0">
     <name>Group</name>
     <macros>
       <P>CXB-CXH:</P>
@@ -601,9 +601,9 @@ Muted</fallback_label>
       <name>Legend</name>
       <actions>
         <action type="open_display">
+          <description>Open Display</description>
           <file>../area_maps/Area_Map_Legend.bob</file>
           <target>window</target>
-          <description>Open Display</description>
         </action>
       </actions>
       <text>Legend</text>
@@ -657,14 +657,14 @@ Muted</fallback_label>
       <name>ODH Monitor_3</name>
       <actions execute_as_one="true">
         <action type="write_pv">
+          <description>WritePV</description>
           <pv_name>loc://O2Mon</pv_name>
           <value>1</value>
-          <description>WritePV</description>
         </action>
         <action type="write_pv">
+          <description>WritePV</description>
           <pv_name>loc://Devices</pv_name>
           <value>0</value>
-          <description>WritePV</description>
         </action>
       </actions>
       <text></text>
@@ -721,14 +721,14 @@ Muted</fallback_label>
       <name>Alarm-Device_1</name>
       <actions execute_as_one="true">
         <action type="write_pv">
+          <description>WritePV</description>
           <pv_name>loc://Devices</pv_name>
           <value>1</value>
-          <description>WritePV</description>
         </action>
         <action type="write_pv">
+          <description>WritePV</description>
           <pv_name>loc://O2Mon</pv_name>
           <value>0</value>
-          <description>WritePV</description>
         </action>
       </actions>
       <text></text>
@@ -743,8 +743,28 @@ Muted</fallback_label>
       <transparent>true</transparent>
       <tooltip>$(actions)</tooltip>
     </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>PSS Overview</name>
+      <actions>
+        <action type="open_display">
+          <description>Open Display</description>
+          <file>../../10-Top/overview.bob</file>
+          <target>replace</target>
+        </action>
+      </actions>
+      <text>GDS Overview</text>
+      <x>2250</x>
+      <y>1065</y>
+      <width>120</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="18.0">
+        </font>
+      </font>
+      <tooltip>$(actions)</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
   </widget>
-  <widget type="group" version="2.0.0">
+  <widget type="group" version="3.0.0">
     <name>Group_1</name>
     <macros>
       <P_AREA>CXB-CXH:</P_AREA>
@@ -759,9 +779,9 @@ Muted</fallback_label>
       <name>Acknowledge Alarm</name>
       <actions>
         <action type="write_pv">
+          <description>WritePV</description>
           <pv_name>$(pv_name)</pv_name>
           <value>1</value>
-          <description>WritePV</description>
         </action>
       </actions>
       <pv_name>$(P_AREA):ZoneCmd_ResetAlarm</pv_name>
@@ -785,7 +805,7 @@ $(pv_value)</tooltip>
       <border_alarm_sensitive>false</border_alarm_sensitive>
       <enabled>false</enabled>
     </widget>
-    <widget type="group" version="2.0.0">
+    <widget type="group" version="3.0.0">
       <name>Group_2</name>
       <x>130</x>
       <width>120</width>
@@ -840,9 +860,9 @@ $(pv_value)</tooltip>
         <name>Unmute Alarm</name>
         <actions>
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>$(pv_name)</pv_name>
             <value>1</value>
-            <description>WritePV</description>
           </action>
         </actions>
         <pv_name>$(P_AREA):ZoneCmd_UnmuteAlarm</pv_name>
@@ -879,9 +899,9 @@ $(pv_value)</tooltip>
         <name>Mute Alarm</name>
         <actions>
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>$(pv_name)</pv_name>
             <value>1</value>
-            <description>WritePV</description>
           </action>
         </actions>
         <pv_name>$(P_AREA):ZoneCmd_MuteAlarm</pv_name>
diff --git a/99-Shared/area_maps/ODHDS_HCB_DOG-SHED.bob b/99-Shared/area_maps/ODHDS_HCB_DOG-SHED.bob
index ca403d8..d5ea473 100644
--- a/99-Shared/area_maps/ODHDS_HCB_DOG-SHED.bob
+++ b/99-Shared/area_maps/ODHDS_HCB_DOG-SHED.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2023-09-28 13:42:43 by lucianocarneiro-->
+<!--Saved on 2024-10-23 10:35:28 by luciano-->
 <display version="2.0.0">
   <name>ODHDS HCB Dog Shed</name>
   <macros>
@@ -124,9 +124,9 @@ Failure</fallback_label>
     <name>Open Trend_2</name>
     <actions>
       <action type="open_display">
+        <description>Open Display</description>
         <file>../popups/ODHACC_Trend.bob</file>
         <target>window</target>
-        <description>Open Display</description>
       </action>
     </actions>
     <text>Open Trend</text>
@@ -146,9 +146,9 @@ Failure</fallback_label>
     <name>Diagnostics_2</name>
     <actions>
       <action type="open_display">
+        <description>Open Display</description>
         <file>../../10-Top/ODHDS_PSS_Diagnostics.bob</file>
         <target>tab</target>
-        <description>Open Display</description>
       </action>
     </actions>
     <text>Diagnostics</text>
@@ -512,7 +512,7 @@ Muted</fallback_label>
     </states>
     <fallback_label>Reset Required</fallback_label>
   </widget>
-  <widget type="group" version="2.0.0">
+  <widget type="group" version="3.0.0">
     <name>Group</name>
     <macros>
       <P>HCB-ACH:</P>
@@ -865,7 +865,7 @@ Dog Shed</text>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
-    <widget type="group" version="2.0.0">
+    <widget type="group" version="3.0.0">
       <name>Group</name>
       <macros>
         <P>HCB-DogSh:ODH-Area</P>
@@ -1282,9 +1282,9 @@ Muted</fallback_label>
         <name>Acknowledge Alarm_1</name>
         <actions>
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>$(pv_name)</pv_name>
             <value>1</value>
-            <description>WritePV</description>
           </action>
         </actions>
         <pv_name>$(P_AREA):ZoneCmd_ResetAlarm</pv_name>
@@ -1310,7 +1310,7 @@ $(pv_value)</tooltip>
         <border_alarm_sensitive>false</border_alarm_sensitive>
         <enabled>false</enabled>
       </widget>
-      <widget type="group" version="2.0.0">
+      <widget type="group" version="3.0.0">
         <name>Group_2</name>
         <x>20</x>
         <y>728</y>
@@ -1366,9 +1366,9 @@ $(pv_value)</tooltip>
           <name>Unmute Alarm_1</name>
           <actions>
             <action type="write_pv">
+              <description>WritePV</description>
               <pv_name>$(pv_name)</pv_name>
               <value>1</value>
-              <description>WritePV</description>
             </action>
           </actions>
           <pv_name>$(P_AREA):ZoneCmd_UnmuteAlarm</pv_name>
@@ -1405,9 +1405,9 @@ $(pv_value)</tooltip>
           <name>Mute Alarm_1</name>
           <actions>
             <action type="write_pv">
+              <description>WritePV</description>
               <pv_name>$(pv_name)</pv_name>
               <value>1</value>
-              <description>WritePV</description>
             </action>
           </actions>
           <pv_name>$(P_AREA):ZoneCmd_MuteAlarm</pv_name>
@@ -1443,9 +1443,9 @@ $(pv_value)</tooltip>
       <name>Legend</name>
       <actions>
         <action type="open_display">
+          <description>Open Display</description>
           <file>../area_maps/Area_Map_Legend.bob</file>
           <target>window</target>
-          <description>Open Display</description>
         </action>
       </actions>
       <text>Legend</text>
@@ -1457,7 +1457,7 @@ $(pv_value)</tooltip>
       </font>
       <tooltip>$(actions)</tooltip>
     </widget>
-    <widget type="group" version="2.0.0">
+    <widget type="group" version="3.0.0">
       <name>Group</name>
       <x>10</x>
       <y>1060</y>
@@ -1465,7 +1465,7 @@ $(pv_value)</tooltip>
       <height>126</height>
       <style>3</style>
       <transparent>true</transparent>
-      <widget type="group" version="2.0.0">
+      <widget type="group" version="3.0.0">
         <name>Group_4</name>
         <width>120</width>
         <height>60</height>
@@ -1510,14 +1510,14 @@ $(pv_value)</tooltip>
           <name>ODH Monitor_4</name>
           <actions execute_as_one="true">
             <action type="write_pv">
+              <description>WritePV</description>
               <pv_name>loc://O2Mon</pv_name>
               <value>1</value>
-              <description>WritePV</description>
             </action>
             <action type="write_pv">
+              <description>WritePV</description>
               <pv_name>loc://Devices</pv_name>
               <value>0</value>
-              <description>WritePV</description>
             </action>
           </actions>
           <text></text>
@@ -1531,7 +1531,7 @@ $(pv_value)</tooltip>
           <tooltip>$(actions)</tooltip>
         </widget>
       </widget>
-      <widget type="group" version="2.0.0">
+      <widget type="group" version="3.0.0">
         <name>Group_5</name>
         <y>70</y>
         <width>120</width>
@@ -1577,14 +1577,14 @@ $(pv_value)</tooltip>
           <name>Alarm-Device_2</name>
           <actions execute_as_one="true">
             <action type="write_pv">
+              <description>WritePV</description>
               <pv_name>loc://Devices</pv_name>
               <value>1</value>
-              <description>WritePV</description>
             </action>
             <action type="write_pv">
+              <description>WritePV</description>
               <pv_name>loc://O2Mon</pv_name>
               <value>0</value>
-              <description>WritePV</description>
             </action>
           </actions>
           <text></text>
@@ -1599,7 +1599,7 @@ $(pv_value)</tooltip>
         </widget>
       </widget>
     </widget>
-    <widget type="group" version="2.0.0">
+    <widget type="group" version="3.0.0">
       <name>Group_3</name>
       <x>2143</x>
       <y>1060</y>
@@ -1611,12 +1611,12 @@ $(pv_value)</tooltip>
         <name>Open Trend_1</name>
         <actions>
           <action type="open_display">
+            <description>Open Display</description>
             <file>../popups/ODHACC_Trend.bob</file>
             <macros>
               <PLT>ODH_Trend_Dog.plt</PLT>
             </macros>
             <target>replace</target>
-            <description>Open Display</description>
           </action>
         </actions>
         <text>Open Trend</text>
@@ -1631,9 +1631,9 @@ $(pv_value)</tooltip>
         <name>Diagnostics_1</name>
         <actions>
           <action type="open_display">
+            <description>Open Display</description>
             <file>../diagnostics/CB_ODHDS_Diagnostics.bob</file>
             <target>tab</target>
-            <description>Open Display</description>
           </action>
         </actions>
         <text>Diagnostics</text>
@@ -1646,8 +1646,28 @@ $(pv_value)</tooltip>
         <tooltip>$(actions)</tooltip>
       </widget>
     </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>PSS Overview</name>
+      <actions>
+        <action type="open_display">
+          <description>Open Display</description>
+          <file>../../10-Top/overview.bob</file>
+          <target>replace</target>
+        </action>
+      </actions>
+      <text>GDS Overview</text>
+      <x>1800</x>
+      <y>1140</y>
+      <width>120</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="18.0">
+        </font>
+      </font>
+      <tooltip>$(actions)</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
   </widget>
-  <widget type="group" version="2.0.0">
+  <widget type="group" version="3.0.0">
     <name>Group</name>
     <macros>
       <P_AREA>HCB-ACH:</P_AREA>
@@ -1662,9 +1682,9 @@ $(pv_value)</tooltip>
       <name>Acknowledge Alarm</name>
       <actions>
         <action type="write_pv">
+          <description>WritePV</description>
           <pv_name>$(pv_name)</pv_name>
           <value>1</value>
-          <description>WritePV</description>
         </action>
       </actions>
       <pv_name>$(P_AREA):ZoneCmd_ResetAlarm</pv_name>
@@ -1688,7 +1708,7 @@ $(pv_value)</tooltip>
       <border_alarm_sensitive>false</border_alarm_sensitive>
       <enabled>false</enabled>
     </widget>
-    <widget type="group" version="2.0.0">
+    <widget type="group" version="3.0.0">
       <name>Group_1</name>
       <y>70</y>
       <width>120</width>
@@ -1743,9 +1763,9 @@ $(pv_value)</tooltip>
         <name>Unmute Alarm</name>
         <actions>
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>$(pv_name)</pv_name>
             <value>1</value>
-            <description>WritePV</description>
           </action>
         </actions>
         <pv_name>$(P_AREA):ZoneCmd_UnmuteAlarm</pv_name>
@@ -1782,9 +1802,9 @@ $(pv_value)</tooltip>
         <name>Mute Alarm</name>
         <actions>
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>$(pv_name)</pv_name>
             <value>1</value>
-            <description>WritePV</description>
           </action>
         </actions>
         <pv_name>$(P_AREA):ZoneCmd_MuteAlarm</pv_name>
@@ -1816,7 +1836,7 @@ $(pv_value)</tooltip>
       </widget>
     </widget>
   </widget>
-  <widget type="group" version="2.0.0">
+  <widget type="group" version="3.0.0">
     <name>Group</name>
     <x>73</x>
     <y>1130</y>
@@ -1828,12 +1848,12 @@ $(pv_value)</tooltip>
       <name>Open Trend</name>
       <actions>
         <action type="open_display">
+          <description>Open Display</description>
           <file>../popups/ODHACC_Trend.bob</file>
           <macros>
             <PLT>ODH_Trend_HCB.plt</PLT>
           </macros>
           <target>replace</target>
-          <description>Open Display</description>
         </action>
       </actions>
       <text>Open Trend</text>
@@ -1848,9 +1868,9 @@ $(pv_value)</tooltip>
       <name>Diagnostics</name>
       <actions>
         <action type="open_display">
+          <description>Open Display</description>
           <file>../diagnostics/CB_ODHDS_Diagnostics.bob</file>
           <target>tab</target>
-          <description>Open Display</description>
         </action>
       </actions>
       <text>Diagnostics</text>
diff --git a/99-Shared/area_maps/ODHDS_TS2.bob b/99-Shared/area_maps/ODHDS_TS2.bob
index e8ff42e..34f52f5 100644
--- a/99-Shared/area_maps/ODHDS_TS2.bob
+++ b/99-Shared/area_maps/ODHDS_TS2.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2023-09-22 10:53:17 by lucianocarneiro-->
+<!--Saved on 2024-10-23 10:33:37 by luciano-->
 <display version="2.0.0">
   <name>ODHDS TS2</name>
   <macros>
@@ -99,9 +99,9 @@ Failure</fallback_label>
     <name>Acknowledge Alarm</name>
     <actions>
       <action type="write_pv">
+        <description>WritePV</description>
         <pv_name>$(pv_name)</pv_name>
         <value>1</value>
-        <description>WritePV</description>
       </action>
     </actions>
     <pv_name>$(P_AREA):ZoneCmd_ResetAlarm</pv_name>
@@ -131,12 +131,12 @@ $(pv_value)</tooltip>
     <name>Open Trend</name>
     <actions>
       <action type="open_display">
+        <description>Open Display</description>
         <file>../popups/ODHACC_Trend.bob</file>
         <macros>
           <PLT>ODH_Trend_TS2.plt</PLT>
         </macros>
         <target>window</target>
-        <description>Open Display</description>
       </action>
     </actions>
     <text>Open Trend</text>
@@ -153,9 +153,9 @@ $(pv_value)</tooltip>
     <name>Diagnostics</name>
     <actions>
       <action type="open_display">
+        <description>Open Display</description>
         <file>../diagnostics/CB_ODHDS_Diagnostics.bob</file>
         <target>tab</target>
-        <description>Open Display</description>
       </action>
     </actions>
     <text>Diagnostics</text>
@@ -516,7 +516,7 @@ Muted</fallback_label>
     </states>
     <fallback_label>Reset required</fallback_label>
   </widget>
-  <widget type="group" version="2.0.0">
+  <widget type="group" version="3.0.0">
     <name>Group</name>
     <macros>
       <P>$(P_AREA)</P>
@@ -621,9 +621,9 @@ Muted</fallback_label>
       <name>Legend</name>
       <actions>
         <action type="open_display">
+          <description>Open Display</description>
           <file>../area_maps/Area_Map_Legend.bob</file>
           <target>window</target>
-          <description>Open Display</description>
         </action>
       </actions>
       <text>Legend</text>
@@ -635,7 +635,7 @@ Muted</fallback_label>
       </font>
       <tooltip>$(actions)</tooltip>
     </widget>
-    <widget type="group" version="2.0.0">
+    <widget type="group" version="3.0.0">
       <name>Group</name>
       <x>10</x>
       <y>970</y>
@@ -682,14 +682,14 @@ Muted</fallback_label>
         <name>ODH Monitor_1</name>
         <actions execute_as_one="true">
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>loc://O2Mon</pv_name>
             <value>1</value>
-            <description>WritePV</description>
           </action>
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>loc://Devices</pv_name>
             <value>0</value>
-            <description>WritePV</description>
           </action>
         </actions>
         <text></text>
@@ -703,7 +703,7 @@ Muted</fallback_label>
         <tooltip>$(actions)</tooltip>
       </widget>
     </widget>
-    <widget type="group" version="2.0.0">
+    <widget type="group" version="3.0.0">
       <name>Group</name>
       <x>10</x>
       <y>1040</y>
@@ -750,14 +750,14 @@ Muted</fallback_label>
         <name>Alarm-Device</name>
         <actions execute_as_one="true">
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>loc://Devices</pv_name>
             <value>1</value>
-            <description>WritePV</description>
           </action>
           <action type="write_pv">
+            <description>WritePV</description>
             <pv_name>loc://O2Mon</pv_name>
             <value>0</value>
-            <description>WritePV</description>
           </action>
         </actions>
         <text></text>
@@ -771,8 +771,28 @@ Muted</fallback_label>
         <tooltip>$(actions)</tooltip>
       </widget>
     </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>PSS Overview</name>
+      <actions>
+        <action type="open_display">
+          <description>Open Display</description>
+          <file>../../10-Top/overview.bob</file>
+          <target>replace</target>
+        </action>
+      </actions>
+      <text>GDS Overview</text>
+      <x>2251</x>
+      <y>1065</y>
+      <width>120</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="18.0">
+        </font>
+      </font>
+      <tooltip>$(actions)</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
   </widget>
-  <widget type="group" version="2.0.0">
+  <widget type="group" version="3.0.0">
     <name>Group</name>
     <x>10</x>
     <y>760</y>
@@ -828,9 +848,9 @@ Muted</fallback_label>
       <name>Unmute Alarm</name>
       <actions>
         <action type="write_pv">
+          <description>WritePV</description>
           <pv_name>$(pv_name)</pv_name>
           <value>1</value>
-          <description>WritePV</description>
         </action>
       </actions>
       <pv_name>$(P_AREA):ZoneCmd_UnmuteAlarm</pv_name>
@@ -867,9 +887,9 @@ $(pv_value)</tooltip>
       <name>Mute Alarm</name>
       <actions>
         <action type="write_pv">
+          <description>WritePV</description>
           <pv_name>$(pv_name)</pv_name>
           <value>1</value>
-          <description>WritePV</description>
         </action>
       </actions>
       <pv_name>$(P_AREA):ZoneCmd_MuteAlarm</pv_name>
-- 
GitLab