From 6f150152502d2cc5be8f5db700b64ad7351f6363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Wed, 31 Oct 2018 19:21:49 +0100
Subject: [PATCH] compare enum values
See merge request !96
---
.../arsnova/persistence/couchdb/CouchDbContentRepository.java | 3 ++-
src/main/java/de/thm/arsnova/service/TimerServiceImpl.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbContentRepository.java b/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbContentRepository.java
index 02928a5d9..73aa0550e 100644
--- a/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbContentRepository.java
+++ b/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbContentRepository.java
@@ -228,7 +228,8 @@ public class CouchDbContentRepository extends CouchDbCrudRepository<Content> imp
final List<String> unanswered = new ArrayList<>();
for (final Content content : contents) {
- if (!"slide".equals(content.getFormat()) && (!answeredQuestions.containsKey(content.getId())
+ // TODO: Set correct format for slides, which currently aren't implemented
+ if (Content.Format.TEXT != content.getFormat() && (!answeredQuestions.containsKey(content.getId())
|| (answeredQuestions.containsKey(content.getId()) && answeredQuestions.get(content.getId()) != content.getState().getRound()))) {
unanswered.add(content.getId());
}
diff --git a/src/main/java/de/thm/arsnova/service/TimerServiceImpl.java b/src/main/java/de/thm/arsnova/service/TimerServiceImpl.java
index 386a49c3b..40b07f175 100644
--- a/src/main/java/de/thm/arsnova/service/TimerServiceImpl.java
+++ b/src/main/java/de/thm/arsnova/service/TimerServiceImpl.java
@@ -115,7 +115,7 @@ public class TimerServiceImpl implements TimerService, ApplicationEventPublisher
final Room room = roomRepository.findOne(content.getRoomId());
cancelDelayedRoundChange(contentId);
- if ("freetext".equals(content.getFormat())) {
+ if (Content.Format.TEXT == content.getFormat()) {
content.getState().setRound(0);
} else {
content.getState().setRound(1);
--
GitLab