From 7d439940915e21cb1baac9913c09251d192f9725 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Wed, 11 Feb 2015 20:24:09 +0100
Subject: [PATCH] Ignore questions not answered in calculation
---
.../de/thm/arsnova/domain/QuestionBasedLearningProgress.java | 3 +++
src/main/java/de/thm/arsnova/domain/QuestionScore.java | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/src/main/java/de/thm/arsnova/domain/QuestionBasedLearningProgress.java b/src/main/java/de/thm/arsnova/domain/QuestionBasedLearningProgress.java
index 81dab008..d1ea2d45 100644
--- a/src/main/java/de/thm/arsnova/domain/QuestionBasedLearningProgress.java
+++ b/src/main/java/de/thm/arsnova/domain/QuestionBasedLearningProgress.java
@@ -50,6 +50,9 @@ public class QuestionBasedLearningProgress implements LearningProgress {
int numQuestionsCorrect = 0;
for (QuestionScore questionScore : courseScore) {
int requiredScore = questionScore.getMaximum();
+ if (!questionScore.hasScores()) {
+ continue;
+ }
boolean allCorrect = true;
for (UserScore userScore : questionScore) {
if (!userScore.hasScore(requiredScore)) {
diff --git a/src/main/java/de/thm/arsnova/domain/QuestionScore.java b/src/main/java/de/thm/arsnova/domain/QuestionScore.java
index 4584d509..457c84ed 100644
--- a/src/main/java/de/thm/arsnova/domain/QuestionScore.java
+++ b/src/main/java/de/thm/arsnova/domain/QuestionScore.java
@@ -46,6 +46,10 @@ public class QuestionScore implements Iterable<UserScore> {
return this.userScores.iterator();
}
+ public boolean hasScores() {
+ return this.userScores.size() > 0;
+ }
+
public void add(String username, int userscore) {
userScores.add(new UserScore(username, userscore));
}
--
GitLab