From 44fdeae0fe331fc8f91c1b1f7a4077e138f9c3d6 Mon Sep 17 00:00:00 2001
From: paflov <paf@titelfrei.de>
Date: Fri, 9 Apr 2021 13:08:00 +0200
Subject: [PATCH] renames the testMode-option "isMonitorable" to
"receiveRemoteCommands", since it means precisely that and to distinguish it
from the backend's mode capabality 'monitorable'.
---
src/app/config/mode-options.json | 2 +-
src/app/config/test-mode.ts | 4 ++--
src/app/config/test-modes.json | 10 +++++-----
src/app/test-controller/command.service.ts | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/app/config/mode-options.json b/src/app/config/mode-options.json
index 2d70276c..75db0a24 100644
--- a/src/app/config/mode-options.json
+++ b/src/app/config/mode-options.json
@@ -6,5 +6,5 @@
"presetCode": "Sollte ein Testabschnitt mit einem Freigabewort geschützt sein, wird dieses bei der Eingabebox schon eingetragen.",
"showTimeLeft": "Sollte eine Maximalzeit für einen Testabschnitt festgelegt sein, wird die verbleibende Zeit angezeigt, auch wenn die Booklet-Konfiguration dies unterbindet.",
"showUnitMenu": "Die Seite mit der Aufgaben-Ãœbersicht wird erlaubt, auch wenn das Booklet dies unterbindet.",
- "isMonitorable": "Kann aus dem Gruppen-Monitor aus gesteuert werden"
+ "receiveRemoteCommands": "Kann aus dem Gruppen-Monitor aus gesteuert werden"
}
diff --git a/src/app/config/test-mode.ts b/src/app/config/test-mode.ts
index fb591585..3354b072 100644
--- a/src/app/config/test-mode.ts
+++ b/src/app/config/test-mode.ts
@@ -12,7 +12,7 @@ export class TestMode {
presetCode: true;
showTimeLeft: true;
showUnitMenu: false;
- isMonitorable: false;
+ receiveRemoteCommands: false;
modeLabel: "Nur Ansicht (Demo)";
modeId: string = "DEMO";
@@ -29,7 +29,7 @@ export class TestMode {
this.presetCode = modeConfig.config.presetCode;
this.showTimeLeft = modeConfig.config.showTimeLeft;
this.showUnitMenu = modeConfig.config.showUnitMenu;
- this.isMonitorable = modeConfig.config.isMonitorable;
+ this.receiveRemoteCommands = modeConfig.config.receiveRemoteCommands;
this.modeLabel = modeConfig.label;
this.modeId = mode;
} else {
diff --git a/src/app/config/test-modes.json b/src/app/config/test-modes.json
index f1c07009..99a766e1 100644
--- a/src/app/config/test-modes.json
+++ b/src/app/config/test-modes.json
@@ -9,7 +9,7 @@
"presetCode": true,
"showTimeLeft": true,
"showUnitMenu": false,
- "isMonitorable": false
+ "receiveRemoteCommands": false
}
},
"MONITOR-GROUP": {
@@ -22,7 +22,7 @@
"presetCode": true,
"showTimeLeft": true,
"showUnitMenu": false,
- "isMonitorable": false
+ "receiveRemoteCommands": false
}
},
"HOT": {
@@ -35,7 +35,7 @@
"presetCode": false,
"showTimeLeft": false,
"showUnitMenu": false,
- "isMonitorable": true
+ "receiveRemoteCommands": true
}
},
"REVIEW": {
@@ -48,7 +48,7 @@
"presetCode": true,
"showTimeLeft": true,
"showUnitMenu": true,
- "isMonitorable": false
+ "receiveRemoteCommands": false
}
},
"TRIAL": {
@@ -61,7 +61,7 @@
"presetCode": true,
"showTimeLeft": false,
"showUnitMenu": false,
- "isMonitorable": false
+ "receiveRemoteCommands": false
}
}
}
diff --git a/src/app/test-controller/command.service.ts b/src/app/test-controller/command.service.ts
index 0e4151e0..97f9aa75 100644
--- a/src/app/test-controller/command.service.ts
+++ b/src/app/test-controller/command.service.ts
@@ -108,7 +108,7 @@ export class CommandService extends WebsocketBackendService<Command[]> implement
distinctUntilChanged(),
map(CommandService.testStartedOrStopped),
filter(testStartedOrStopped => testStartedOrStopped !== ''),
- map(testStartedOrStopped => (((testStartedOrStopped === 'started') && (this.tcs.testMode.isMonitorable)) ? `test/${this.tcs.testId}/commands` : '')),
+ map(testStartedOrStopped => (((testStartedOrStopped === 'started') && (this.tcs.testMode.receiveRemoteCommands)) ? `test/${this.tcs.testId}/commands` : '')),
filter(newPollingEndpoint => newPollingEndpoint !== this.pollingEndpoint),
switchMap((pollingEndpoint: string) => {
this.pollingEndpoint = pollingEndpoint;
--
GitLab