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

show granted SEB connection in detail view

Browse source
This commit is contained in:
anhefti 2023-04-18 15:20:26 +02:00
parent ba5c644041
commit 3d817d82ae
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionDetails.java
View file

@ -65,6 +65,8 @@ public class ClientConnectionDetails implements MonitoringEntry {
new LocTextKey("sebserver.monitoring.connection.form.status"); new LocTextKey("sebserver.monitoring.connection.form.status");
private final static LocTextKey WRONG_SEB_CLIENT_TOOLTIP = private final static LocTextKey WRONG_SEB_CLIENT_TOOLTIP =
new LocTextKey("sebserver.finished.connection.form.info.wrong.client.tooltip"); new LocTextKey("sebserver.finished.connection.form.info.wrong.client.tooltip");
private final static LocTextKey GRANTED_TEXT =
new LocTextKey("sebserver.monitoring.exam.connection.status.GRANTED");
private static final int NUMBER_OF_NONE_INDICATOR_ROWS = 3; private static final int NUMBER_OF_NONE_INDICATOR_ROWS = 3;
@ -277,6 +279,9 @@ public class ClientConnectionDetails implements MonitoringEntry {
if (this.missingChanged || this.statusChanged) { if (this.missingChanged || this.statusChanged) {
// update status // update status
String stateName = this.localizedClientConnectionStatusNameFunction.apply(this); String stateName = this.localizedClientConnectionStatusNameFunction.apply(this);
if (stateName != null && getStatus().clientActiveStatus && this.grantChecked && !this.grantDenied) {
stateName = stateName + pageContext.getI18nSupport().getText(GRANTED_TEXT);
}
if (stateName != null) { if (stateName != null) {
stateName = stateName.replace(" ", " "); stateName = stateName.replace(" ", " ");
} }

1
src/main/resources/messages.properties
View file

@ -2234,6 +2234,7 @@ sebserver.monitoring.exam.connection.status.DISABLED=Canceled
sebserver.monitoring.exam.connection.status.MISSING_PING=Missing sebserver.monitoring.exam.connection.status.MISSING_PING=Missing
sebserver.monitoring.exam.connection.status.MISSING_GRANT=  (No ASK Grant) sebserver.monitoring.exam.connection.status.MISSING_GRANT=  (No ASK Grant)
sebserver.monitoring.exam.connection.status.GRANT_DENIED= - ASK Grant Denied sebserver.monitoring.exam.connection.status.GRANT_DENIED= - ASK Grant Denied
sebserver.monitoring.exam.connection.status.GRANTED=  (Granted)
sebserver.monitoring.exam.connection.info=SEB Version: {0}<br/>Operating System: {1}<br/>IP Address: {2} sebserver.monitoring.exam.connection.info=SEB Version: {0}<br/>Operating System: {1}<br/>IP Address: {2}