From f2f8a561a804faa30eb989cd02fd6033763c02f3 Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 11 Jul 2024 15:41:08 +0200 Subject: [PATCH] SEBSERV-565 added new Status Filter for Ready status --- .../gui/content/action/ActionDefinition.java | 11 +++++++++++ .../gui/content/monitoring/MonitoringRunningExam.java | 8 ++++++++ src/main/resources/messages.properties | 6 ++++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java index 277c8e85..78887fbd 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java @@ -1013,6 +1013,17 @@ public enum ActionDefinition { PageStateDefinitionImpl.MONITORING_RUNNING_EXAM, ActionCategory.STATE_FILTER), + MONITOR_EXAM_HIDE_READY_CONNECTION( + new LocTextKey("sebserver.monitoring.exam.connection.action.hide.ready"), + ImageIcon.TOGGLE_OFF, + PageStateDefinitionImpl.MONITORING_RUNNING_EXAM, + ActionCategory.STATE_FILTER), + MONITOR_EXAM_SHOW_READY_CONNECTION( + new LocTextKey("sebserver.monitoring.exam.connection.action.show.ready"), + ImageIcon.TOGGLE_ON, + PageStateDefinitionImpl.MONITORING_RUNNING_EXAM, + ActionCategory.STATE_FILTER), + MONITOR_EXAM_HIDE_ACTIVE_CONNECTION( new LocTextKey("sebserver.monitoring.exam.connection.action.hide.active"), ImageIcon.TOGGLE_OFF, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java index b5c7a658..b8654332 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java @@ -439,6 +439,14 @@ public class MonitoringRunningExam implements TemplateComposer { ConnectionStatus.CONNECTION_REQUESTED, ActionDefinition.MONITOR_EXAM_SHOW_REQUESTED_CONNECTION, ActionDefinition.MONITOR_EXAM_HIDE_REQUESTED_CONNECTION); + addFilterAction( + monitoringStatus, + statusFilterGUIUpdate, + actionBuilder, + clientTable, + ConnectionStatus.READY, + ActionDefinition.MONITOR_EXAM_SHOW_READY_CONNECTION, + ActionDefinition.MONITOR_EXAM_HIDE_READY_CONNECTION); addFilterAction( monitoringStatus, statusFilterGUIUpdate, diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 2686e59b..963d9937 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -2326,8 +2326,10 @@ sebserver.monitoring.exam.connection.action.instruction.lock.confirm=Are you sur sebserver.monitoring.exam.connection.action.instruction.disable.selected.confirm=Are you sure to disable all selected SEB client connections? sebserver.monitoring.exam.connection.action.instruction.disable.all.confirm=Are you sure to disable all active SEB client connections? sebserver.monitoring.exam.connection.action.disable=Mark As Canceled -sebserver.monitoring.exam.connection.action.hide.requested=Hide Requested ( {0} ) -sebserver.monitoring.exam.connection.action.show.requested=Show Requested ( {0} ) +sebserver.monitoring.exam.connection.action.hide.requested=Hide Connecting ( {0} ) +sebserver.monitoring.exam.connection.action.show.requested=Show Connecting ( {0} ) +sebserver.monitoring.exam.connection.action.hide.ready=Hide Ready ( {0} ) +sebserver.monitoring.exam.connection.action.show.ready=Show Ready ( {0} ) sebserver.monitoring.exam.connection.action.hide.active=Hide Active ( {0} ) sebserver.monitoring.exam.connection.action.show.active=Show Active ( {0} ) sebserver.monitoring.exam.connection.action.hide.closed=Hide Closed ( {0} )