Merge branch 'freetext-learningprogress' into 'master'

Use preexisting questionValue instead of freeTextScore

There is no need for a separate property. `questionValue` is used by
learning progress views.

See merge request !26

src/main/java/de/thm/arsnova/dao/CouchDBDao.java

@@ -1415,7 +1415,6 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
 		a.put("questionValue", answer.getQuestionValue());
 		a.put("answerText", answer.getAnswerText());
 		a.put("answerTextRaw", answer.getAnswerTextRaw());
-		a.put("freeTextScore", answer.getFreeTextScore());
 		a.put("successfulFreeTextAnswer", answer.isSuccessfulFreeTextAnswer());
 		a.put("timestamp", answer.getTimestamp());
 		a.put("user", user.getUsername());
@@ -1470,7 +1469,6 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
 			a.put("answerSubject", answer.getAnswerSubject());
 			a.put("answerText", answer.getAnswerText());
 			a.put("answerTextRaw", answer.getAnswerTextRaw());
-			a.put("freeTextScore", answer.getFreeTextScore());
 			a.put("successfulFreeTextAnswer", answer.isSuccessfulFreeTextAnswer());
 			a.put("timestamp", answer.getTimestamp());
 			a.put("abstention", answer.isAbstention());
@@ -2166,7 +2164,6 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
 					answerDoc.put("questionValue", a.getQuestionValue());
 					answerDoc.put("answerText", a.getAnswerText());
 					answerDoc.put("answerTextRaw", a.getAnswerTextRaw());
-					answerDoc.put("freeTextScore", a.getFreeTextScore());
 					answerDoc.put("timestamp", a.getTimestamp());
 					answerDoc.put("piRound", a.getPiRound());
 					answerDoc.put("abstention", a.isAbstention());

src/main/java/de/thm/arsnova/entities/Answer.java

@@ -39,7 +39,6 @@ public class Answer implements Serializable {
 	private String answerText;
 	private String answerTextRaw;
 	private String answerSubject;
-	private double freeTextScore;
 	private boolean successfulFreeTextAnswer;
 	private String questionVariant;
 	private int questionValue;
@@ -128,14 +127,6 @@ public class Answer implements Serializable {
 		this.answerSubject = answerSubject;
 	}
 
-	public final double getFreeTextScore() {
-		return this.freeTextScore;
-	}
-
-	public final void setFreeTextScore(final double freeTextScore) {
-		this.freeTextScore = freeTextScore;
-	}
-
 	public final boolean isSuccessfulFreeTextAnswer() {
 		return this.successfulFreeTextAnswer;
 	}

src/main/java/de/thm/arsnova/entities/Question.java

@@ -60,7 +60,7 @@ public class Question implements Serializable {
 	private boolean ignorePunctuation;
 	private boolean fixedAnswer;
 	private boolean strictMode;
-	private double rating;
+	private int rating;
 	private String correctAnswer;
 	private String _id;
 	private String _rev;
@@ -357,11 +357,11 @@ public class Question implements Serializable {
 		this.strictMode = strictMode;
 	}
 
-	public final double getRating() {
+	public final int getRating() {
 		return this.rating;
 	}
 
-	public final void setRating(final double rating) {
+	public final void setRating(final int rating) {
 		this.rating = rating;
 	}
 
@@ -690,7 +690,7 @@ public class Question implements Serializable {
 		answer.setAnswerTextRaw(this.checkWhitespaces(answer.getAnswerTextRaw()));
 	}
 
-	public double evaluateCorrectAnswerFixedText(String answerTextRaw) {
+	public int evaluateCorrectAnswerFixedText(String answerTextRaw) {
 		if (answerTextRaw != null) {
 			if (answerTextRaw.equals(this.getCorrectAnswer())) {
 				return this.getRating();

src/main/java/de/thm/arsnova/services/QuestionService.java

@@ -738,7 +738,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
 				question.checkTextStricktOptions(theAnswer);
 			}
 			if (question.isFixedAnswer()) {
-				theAnswer.setFreeTextScore(question.evaluateCorrectAnswerFixedText(theAnswer.getAnswerTextRaw()));
+				theAnswer.setQuestionValue(question.evaluateCorrectAnswerFixedText(theAnswer.getAnswerTextRaw()));
 				theAnswer.setSuccessfulFreeTextAnswer(question.isSuccessfulFreeTextAnswer(theAnswer.getAnswerTextRaw()));
 			}
 		}