Skip to content

Commit 72b8cc9

Browse files
shroffkshroffk
authored
Merge pull request #3170 from jeonghanlee/alarm-log-table-refactor
Alarm log table refactor
2 parents 64d7db5 + 2a92aa6 commit 72b8cc9

File tree

5 files changed

+41
-22
lines changed

5 files changed

+41
-22
lines changed

‎app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableController.java‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public AlarmLogTableController(WebResource client) {
150150
public void initialize() {
151151
resize.setText("<");
152152
tableView.getColumns().clear();
153-
configCol = new TableColumn<>("Config");
153+
154154
configCol.setCellValueFactory(
155155
alarmMessage -> new SimpleStringProperty(alarmMessage.getValue().getConfig()));
156156
tableView.getColumns().add(configCol);
@@ -159,7 +159,6 @@ public void initialize() {
159159
pvCol.setCellValueFactory(alarmMessage -> new SimpleStringProperty(alarmMessage.getValue().getPv()));
160160
tableView.getColumns().add(pvCol);
161161

162-
severityCol = new TableColumn<>("Severity");
163162
severityCol.setCellValueFactory(
164163
alarmMessage -> new SimpleStringProperty(alarmMessage.getValue().getSeverity()));
165164
severityCol.setCellFactory(alarmLogTableTypeStringTableColumn -> new TableCell<>() {
@@ -179,12 +178,17 @@ protected void updateItem(String item, boolean empty) {
179178
});
180179
tableView.getColumns().add(severityCol);
181180

182-
messageCol = new TableColumn<>("Message");
183181
messageCol.setCellValueFactory(
184182
alarmMessage -> new SimpleStringProperty(alarmMessage.getValue().getMessage()));
185183
tableView.getColumns().add(messageCol);
186184

187-
timeCol = new TableColumn<>("Time");
185+
valueCol.setCellValueFactory(
186+
alarmMessage -> {
187+
String value = alarmMessage.getValue().getValue();
188+
return new SimpleStringProperty(value);
189+
});
190+
tableView.getColumns().add(valueCol);
191+
188192
timeCol.setCellValueFactory(
189193
alarmMessage -> {
190194
if (alarmMessage.getValue().getTime() != null) {
@@ -195,25 +199,21 @@ protected void updateItem(String item, boolean empty) {
195199
});
196200
tableView.getColumns().add(timeCol);
197201

198-
msgTimeCol = new TableColumn<>("Message Time");
199202
msgTimeCol.setCellValueFactory(
200203
alarmMessage -> {
201204
String time = TimestampFormats.MILLI_FORMAT.format(alarmMessage.getValue().getMessage_time());
202205
return new SimpleStringProperty(time);
203206
});
204207
tableView.getColumns().add(msgTimeCol);
205208

206-
deltaTimeCol = new TableColumn<>("Time Delta");
207209
deltaTimeCol.setCellValueFactory(
208210
alarmMessage -> {
209211
java.time.Duration delta = java.time.Duration.between(alarmMessage.getValue().getMessage_time(), Instant.now());
210212
return new SimpleStringProperty(delta.toHours() + ":" + delta.toMinutesPart() + ":" + delta.toSecondsPart()
211213
+ "." + delta.toMillisPart());
212214
});
213-
deltaTimeCol.setVisible(false);
214215
tableView.getColumns().add(deltaTimeCol);
215216

216-
currentSeverityCol = new TableColumn<>("Current Severity");
217217
currentSeverityCol.setCellValueFactory(
218218
alarmMessage -> new SimpleStringProperty(alarmMessage.getValue().getCurrent_severity()));
219219
currentSeverityCol.setCellFactory(alarmLogTableTypeStringTableColumn -> new TableCell<>() {
@@ -234,12 +234,10 @@ protected void updateItem(String item, boolean empty) {
234234
});
235235
tableView.getColumns().add(currentSeverityCol);
236236

237-
currentMessageCol = new TableColumn<>("Current Message");
238237
currentMessageCol.setCellValueFactory(
239238
alarmMessage -> new SimpleStringProperty(alarmMessage.getValue().getCurrent_message()));
240239
tableView.getColumns().add(currentMessageCol);
241240

242-
commandCol = new TableColumn<>("Command");
243241
commandCol.setCellValueFactory(
244242
alarmMessage -> {
245243
String action = alarmMessage.getValue().getCommand();
@@ -258,12 +256,10 @@ protected void updateItem(String item, boolean empty) {
258256
});
259257
tableView.getColumns().add(commandCol);
260258

261-
userCol = new TableColumn<>("User");
262259
userCol.setCellValueFactory(
263260
alarmMessage -> new SimpleStringProperty(alarmMessage.getValue().getUser()));
264261
tableView.getColumns().add(userCol);
265262

266-
hostCol = new TableColumn<>("Host");
267263
hostCol.setCellValueFactory(
268264
alarmMessage -> new SimpleStringProperty(alarmMessage.getValue().getHost()));
269265
tableView.getColumns().add(hostCol);

‎app/alarm/logging-ui/src/main/resources/org/phoebus/applications/alarm/logging/ui/AdvancedSearchView.fxml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<TextField fx:id="searchHost" GridPane.columnSpan="2" GridPane.rowIndex="13" />
4949
<Label text="%Command" GridPane.rowIndex="14" />
5050
<TextField fx:id="searchCommand" GridPane.columnSpan="2" GridPane.rowIndex="15" />
51-
<Label text="%Time" GridPane.columnSpan="2" GridPane.rowIndex="16">
51+
<Label text="%MessageTime" GridPane.columnSpan="2" GridPane.rowIndex="16">
5252
<GridPane.margin>
5353
<Insets top="5.0" />
5454
</GridPane.margin>

‎app/alarm/logging-ui/src/main/resources/org/phoebus/applications/alarm/logging/ui/AlarmLogTable.fxml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,20 @@
6868
</VBox>
6969
<TableView fx:id="tableView" onContextMenuRequested="#createContextMenu" prefHeight="591.0" prefWidth="1000.0" tableMenuButtonVisible="true">
7070
<columns>
71-
<TableColumn fx:id="configCol" minWidth="50.0" prefWidth="75.0" text="%Config" />
71+
<TableColumn fx:id="configCol" minWidth="50.0" prefWidth="75.0" text="%Config" visible="%ConfigVisible" />
7272
<TableColumn fx:id="pvCol" minWidth="50.0" prefWidth="75.0" text="PV" />
7373
<TableColumn fx:id="severityCol" minWidth="50.0" prefWidth="75.0" text="%Severity" />
7474
<TableColumn fx:id="messageCol" minWidth="50.0" prefWidth="75.0" text="%Message" />
75-
<TableColumn fx:id="valueCol" minWidth="50.0" prefWidth="75.0" text="%Value" />
75+
<TableColumn fx:id="valueCol" minWidth="50.0" prefWidth="75.0" text="%Value" visible="%ValueVisible" />
7676
<TableColumn fx:id="timeCol" minWidth="50.0" prefWidth="75.0" text="%Time" />
77-
<TableColumn fx:id="msgTimeCol" minWidth="50.0" prefWidth="75.0" text="%MessageTime" />
78-
<TableColumn fx:id="currentSeverityCol" minWidth="50.0" prefWidth="75.0" text="%CurrentSeverity" />
79-
<TableColumn fx:id="currentMessageCol" minWidth="50.0" prefWidth="75.0" text="%CurrentMessage" />
77+
<TableColumn fx:id="msgTimeCol" minWidth="50.0" prefWidth="75.0" text="%MessageTime" visible="%MTimeVisible"/>
78+
<TableColumn fx:id="deltaTimeCol" minWidth="50.0" prefWidth="75.0" text="%TimeDelta" visible="%TimeDeltaVisible"/>
79+
<TableColumn fx:id="currentSeverityCol" minWidth="50.0" prefWidth="75.0" text="%CurrentSeverity" visible="%CSeverityVisible" />
80+
<TableColumn fx:id="currentMessageCol" minWidth="50.0" prefWidth="75.0" text="%CurrentMessage" visible="%CMessageVisible" />
8081
<TableColumn fx:id="mode" minWidth="50.0" prefWidth="75.0" text="%Mode" />
81-
<TableColumn fx:id="commandCol" minWidth="50.0" prefWidth="75.0" text="%Command" />
82-
<TableColumn fx:id="userCol" minWidth="50.0" prefWidth="75.0" text="%User" />
83-
<TableColumn fx:id="hostCol" minWidth="50.0" prefWidth="75.0" text="%Host" />
82+
<TableColumn fx:id="commandCol" minWidth="50.0" prefWidth="75.0" text="%Command" visible="%CommandVisible" />
83+
<TableColumn fx:id="userCol" minWidth="50.0" prefWidth="75.0" text="%User" visible="%UserVisible" />
84+
<TableColumn fx:id="hostCol" minWidth="50.0" prefWidth="75.0" text="%Host" visible="%HostVisible" />
8485
</columns>
8586
<columnResizePolicy>
8687
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />

‎app/alarm/logging-ui/src/main/resources/org/phoebus/applications/alarm/logging/ui/messages.properties‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,15 @@ Severity=Severity
3636
StartTime=Start Time
3737
Time=Time
3838
User=User
39-
Value=Value
39+
Value=Value
40+
TimeDelta=Time Delta
41+
ConfigVisible=true
42+
ValueVisible=false
43+
MTimeVisible=true
44+
TimeDeltaVisible=false
45+
CSeverityVisible=true
46+
CMessageVisible=true
47+
CommandVisible=true
48+
UserVisible=true
49+
HostVisible=true
50+

‎app/alarm/logging-ui/src/main/resources/org/phoebus/applications/alarm/logging/ui/messages_fr.properties‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,14 @@ StartTime=Heure de début
2020
Time=Heure
2121
User=Utilisateur
2222
Value=Valeur
23+
TimeDelta=Heure Delta
24+
ConfigVisible=true
25+
ValueVisible=false
26+
MTimeVisible=true
27+
TimeDeltaVisible=false
28+
CSeverityVisible=true
29+
CMessageVisible=true
30+
CommandVisible=true
31+
UserVisible=true
32+
HostVisible=true
33+

0 commit comments

Comments
 (0)