zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add conditions to hide/display issue filters

Browse source
This commit is contained in:
Nadim Ritter 2024-01-26 15:54:25 +01:00
parent 8f0f6918f1
commit c662636cc2
1 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java
View file

@ -12,12 +12,14 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.BooleanSupplier;
import java.util.function.Consumer;
import java.util.function.Function;
import ch.ethz.seb.sebserver.gbl.model.exam.AllowedSEBVersion;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.eclipse.swt.SWT;
@ -276,7 +278,9 @@ public class MonitoringRunningExam implements TemplateComposer {
fullPageMonitoringUpdate,
actionBuilder,
clientTable,
isExamSupporter));
isExamSupporter,
exam.checkASK,
exam.allowedSEBVersions));
final ProctoringServiceSettings proctoringSettings = new ProctoringServiceSettings(exam);
final ScreenProctoringSettings screenProctoringSettings = new ScreenProctoringSettings(exam);
@ -400,7 +404,9 @@ public class MonitoringRunningExam implements TemplateComposer {
final MonitoringFilter monitoringStatus,
final PageActionBuilder actionBuilder,
final ClientConnectionTable clientTable,
final BooleanSupplier isExamSupporter) {
final BooleanSupplier isExamSupporter,
final boolean isAskCheckEnabled,
final List<AllowedSEBVersion> allowedSEBVersions) {
final FilterGUIUpdate statusFilterGUIUpdate =
new FilterGUIUpdate(this.pageService.getPolyglotPageService());
@ -438,6 +444,7 @@ public class MonitoringRunningExam implements TemplateComposer {
ActionDefinition.MONITOR_EXAM_SHOW_DISABLED_CONNECTION,
ActionDefinition.MONITOR_EXAM_HIDE_DISABLED_CONNECTION);
if(isAskCheckEnabled){
addIssueFilterAction(
monitoringStatus,
statusFilterGUIUpdate,
@ -446,6 +453,9 @@ public class MonitoringRunningExam implements TemplateComposer {
ConnectionIssueStatus.ASK_GRANTED,
ActionDefinition.MONITOR_EXAM_SHOW_ASK_GRANTED,
ActionDefinition.MONITOR_EXAM_HIDE_ASK_GRANTED);
}
if(allowedSEBVersions != null) {
addIssueFilterAction(
monitoringStatus,
statusFilterGUIUpdate,
@ -454,6 +464,7 @@ public class MonitoringRunningExam implements TemplateComposer {
ConnectionIssueStatus.SEB_VERSION_GRANTED,
ActionDefinition.MONITOR_EXAM_SHOW_SEB_VERSION_GRANTED,
ActionDefinition.MONITOR_EXAM_HIDE_SEB_VERSION_GRANTED);
}
if (clientGroups != null && !clientGroups.isEmpty()) {
clientGroups.forEach(clientGroup -> {