From 3e4d26a5c1fb8e2810af79709a0c7e58b5f1420b Mon Sep 17 00:00:00 2001
From: milenaschedle <milena.schedle@ess.eu>
Date: Mon, 13 Jul 2026 09:32:45 +0200
Subject: [PATCH] added date of disabled pvs to structural element

---
 .../applications/alarm/ui/Messages.java       |  1 +
 .../alarm/ui/tree/AlarmTreeViewCell.java      | 19 +++++++++++--------
 .../applications/alarm/ui/messages.properties |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java
index 19a8c1f2c0..68ed30e6e6 100644
--- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java
+++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java
@@ -43,6 +43,7 @@ public class Messages
     public static String removeComponentFailed;
     public static String renameItemFailed;
     public static String timer;
+    public static String timers;
     public static String unacknowledgeFailed;
     public static String withEnableDate;
 
diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeViewCell.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeViewCell.java
index a2646d2e10..4d6ee742cb 100644
--- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeViewCell.java
+++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeViewCell.java
@@ -26,9 +26,7 @@
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 /** TreeCell for AlarmTreeItem
  *  @author Kay Kasemir
@@ -127,22 +125,27 @@ protected void updateItem(final AlarmTreeItem<?> item, final boolean empty)
             else
             {
                 final AlarmClientNode node = (AlarmClientNode) item;
-
                 Optional<Pair<LeavesDisabledStatus, Boolean>> maybeLeavesDisabledStatusBooleanPair = leavesDisabledStatus(node);
                 if (maybeLeavesDisabledStatusBooleanPair.isPresent() && !maybeLeavesDisabledStatusBooleanPair.get().getKey().equals(LeavesDisabledStatus.AllEnabled)) {
                     Pair<LeavesDisabledStatus, Boolean> leavesDisabledStatusBooleanPair = maybeLeavesDisabledStatusBooleanPair.get();
 
                     if (leavesDisabledStatusBooleanPair.getKey().equals(LeavesDisabledStatus.AllDisabled)) {
                         if (leavesDisabledStatusBooleanPair.getValue()) {
-                            disabledTimerIndicator.setText("(" + Messages.disabled + "; " + Messages.timer + ")");
-                        }
-                        else {
+                            Set<AlarmClientLeaf> withEnableDate = new HashSet<>();
+                            boolean test = DisableAction.checkEnableDates(node.getChildren(), new HashSet<>(), withEnableDate);
+                            if (test){
+                                disabledTimerIndicator.setText("(" + Messages.disabled + "; " + Messages.timer + ": " + withEnableDate.iterator().next().getEnabledDate() + ")");
+                            } else {
+                                disabledTimerIndicator.setText("(" + Messages.disabled + "; " + Messages.timers + ")");
+                            }
+
+                        } else {
                             disabledTimerIndicator.setText("(" + Messages.disabled + ")");
                         }
                     }
                     else if (leavesDisabledStatusBooleanPair.getKey().equals(LeavesDisabledStatus.SomeEnabledSomeDisabled)) {
                         if (leavesDisabledStatusBooleanPair.getValue()) {
-                            disabledTimerIndicator.setText("(" + Messages.partlyDisabled + "; " + Messages.timer + ")");
+                            disabledTimerIndicator.setText("(" + Messages.partlyDisabled + "; " + Messages.timers + ")");
                         }
                         else {
                             disabledTimerIndicator.setText("(" + Messages.partlyDisabled + ")");
diff --git a/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties b/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties
index a66ace171d..e594b060d9 100644
--- a/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties
+++ b/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties
@@ -73,6 +73,7 @@ relativeDateTooltip=Select a predefined duration for disabling the alarm
 removeComponentFailed=Failed to remove component
 renameItemFailed=Failed to rename item
 timer=Timer
+timers=Timers
 title=Title
 tooltipAddTableItem=Add a new table item
 tooltipDeleteSelectedItems=Delete selected table items