From f0acb33e062f26fdd42c643c2b4b919c3cf63052 Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 1 Jun 2023 15:54:03 +0200 Subject: [PATCH 1/3] SEBSERV-447 fixed --- .../sebserver/gui/service/session/ClientConnectionTable.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java index 9e766723..c33793d3 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java @@ -371,7 +371,6 @@ public final class ClientConnectionTable implements FullPageMonitoringGUIUpdate } public void updateGUI() { - if (this.needsSort) { sortTable(); } @@ -725,10 +724,12 @@ public final class ClientConnectionTable implements FullPageMonitoringGUIUpdate this.indicatorWeights[i] = -1; } } + + this.monitoringData = monitoringData; + if (this.indicatorValueChanged) { updateIndicatorWeight(); } - this.monitoringData = monitoringData; return this.staticData == null || this.staticData == ClientStaticData.NULL_DATA From 3dec2f337284587419e04fc69421ff9f266bce7f Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 1 Jun 2023 15:56:56 +0200 Subject: [PATCH 2/3] SEBSERV-446 fixed --- .../servicelayer/dao/impl/ClientConnectionDAOImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java index 27406d9c..ba0abd37 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java @@ -814,10 +814,13 @@ public class ClientConnectionDAOImpl implements ClientConnectionDAO { .selectByExample() .where( ClientConnectionRecordDynamicSqlSupport.status, - SqlBuilder.isIn(ClientConnection.SECURE_CHECK_STATES)) + SqlBuilder.isEqualTo(ConnectionStatus.ACTIVE.name())) .and( ClientConnectionRecordDynamicSqlSupport.examId, SqlBuilder.isEqualTo(examId)) + .and( + ClientConnectionRecordDynamicSqlSupport.clientVersion, + SqlBuilder.isNotNull()) .and( ClientConnectionRecordDynamicSqlSupport.clientVersionGranted, SqlBuilder.isNull()) From 9d7ef0452fca37d3343526f7e8ed165c2d056551 Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 1 Jun 2023 16:02:24 +0200 Subject: [PATCH 3/3] code cleanup --- .../gui/service/i18n/impl/PolyglotPageServiceImpl.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java index e4a2cd3d..1ddf4989 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java @@ -30,8 +30,6 @@ import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -51,8 +49,6 @@ import ch.ethz.seb.sebserver.gui.widget.Selection; @GuiProfile public final class PolyglotPageServiceImpl implements PolyglotPageService { - private static final Logger log = LoggerFactory.getLogger(PolyglotPageServiceImpl.class); - private final I18nSupport i18nSupport; public PolyglotPageServiceImpl(final I18nSupport i18nSupport) { @@ -97,11 +93,7 @@ public final class PolyglotPageServiceImpl implements PolyglotPageService { @Override public void injectI18n(final Label label, final LocTextKey locTextKey) { - try { - injectI18n(label, locTextKey, null); - } catch (final Exception e) { - log.error("Failed to injectI18n: {}", e.getMessage()); - } + injectI18n(label, locTextKey, null); } @Override