Skip to content

Commit f01c3b4

Browse files
committed
CSSTUDIO-2964 Always display the full date and time for when an alarm will automatically be enabled again.
1 parent f9741b1 commit f01c3b4

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeViewCell.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,7 @@ protected void updateItem(final AlarmTreeItem<?> item, final boolean empty)
111111
} else {
112112
if (leaf.getEnabled().enabled_date != null) {
113113
LocalDateTime enabledDate = leaf.getEnabled().enabled_date;
114-
String enabledDateString;
115-
116-
LocalDateTime now = LocalDateTime.now();
117-
if (!(now.getDayOfMonth() == enabledDate.getDayOfMonth() &&
118-
now.getMonthValue() == enabledDate.getMonthValue() &&
119-
now.getYear() == enabledDate.getYear())) {
120-
enabledDateString = DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(enabledDate);
121-
}
122-
else {
123-
enabledDateString = DateTimeFormatter.ISO_LOCAL_TIME.format(enabledDate);
124-
}
114+
String enabledDateString = DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(enabledDate);
125115
disabledTimerIndicator.setText("(" + Messages.disabledUntil + " " + enabledDateString + ")");
126116
} else {
127117
disabledTimerIndicator.setText("(" + Messages.disabled + ")");

0 commit comments

Comments
 (0)