From 653a4b3a8b191517a213d48bfc389c3663856bb3 Mon Sep 17 00:00:00 2001 From: georgweiss Date: Thu, 11 Dec 2025 09:58:12 +0100 Subject: [PATCH 1/2] Send to log/email from alarm ui bug fix (acknowledged list same as active) --- .../org/phoebus/applications/alarm/ui/table/AlarmTableUI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/table/AlarmTableUI.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/table/AlarmTableUI.java index 624bd8f5a8..70c2c2a8da 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/table/AlarmTableUI.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/table/AlarmTableUI.java @@ -597,7 +597,7 @@ private String list_alarms() buf.append("Acknowledged Alarms\n"); buf.append("===================\n"); - for (AlarmInfoRow row : active_rows) + for (AlarmInfoRow row : acknowledged_rows) buf.append(row).append("\n"); return buf.toString(); From 6350631af5d82259d12c054c1839fbcccb361778 Mon Sep 17 00:00:00 2001 From: georgweiss Date: Thu, 11 Dec 2025 13:16:48 +0100 Subject: [PATCH 2/2] Fix line break for log entries created from Alarm Table UI --- .../applications/alarm/ui/table/AlarmInfoRow.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/table/AlarmInfoRow.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/table/AlarmInfoRow.java index cabb3e3209..9b3db017dd 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/table/AlarmInfoRow.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/table/AlarmInfoRow.java @@ -114,14 +114,14 @@ public String toString() { final StringBuilder buf = new StringBuilder(); - buf.append("PV: ").append(pv.get()).append("\n"); - buf.append("Description: ").append(description.get()).append("\n"); - buf.append("Alarm Time: ").append(time.get()).append("\n"); + buf.append("PV: ").append(pv.get()).append(" \n"); + buf.append("Description: ").append(description.get()).append(" \n"); + buf.append("Alarm Time: ").append(time.get()).append(" \n"); buf.append("Alarm Severity: ").append(severity.get()); buf.append(", Status: ").append(status.get()); - buf.append(", Value: ").append(value.get()).append("\n"); + buf.append(", Value: ").append(value.get()).append(" \n"); buf.append("Current PV Severity: ").append(pv_severity.get()); - buf.append(", Status: ").append(pv_status.get()).append("\n"); + buf.append(", Status: ").append(pv_status.get()).append(" \n"); return buf.toString(); }