Merge remote-tracking branch 'grid-team/master' into integration

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

@@ -283,6 +283,7 @@ public class CouchDBDao implements IDatabaseDao {
 		q.put("toggleFieldsLeft", question.getToggleFieldsLeft());
 		q.put("numClickableFields", question.getNumClickableFields());
 		q.put("thresholdCorrectAnswers", question.getThresholdCorrectAnswers());
+		q.put("cvIsColored", question.getCvIsColored());
 
 		return q;
 	}
@@ -316,6 +317,7 @@ public class CouchDBDao implements IDatabaseDao {
 			q.put("toggleFieldsLeft", question.getToggleFieldsLeft());
 			q.put("numClickableFields", question.getNumClickableFields());
 			q.put("thresholdCorrectAnswers", question.getThresholdCorrectAnswers());
+			q.put("cvIsColored", question.getCvIsColored());
 			database.saveDocument(q);
 			question.set_rev(q.getRev());
 

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

@@ -59,6 +59,7 @@ public class Question {
 	private boolean toggleFieldsLeft;
 	private int numClickableFields;
 	private int thresholdCorrectAnswers;
+	private boolean cvIsColored;
 
 	public final String getType() {
 		return type;
@@ -196,6 +197,14 @@ public class Question {
 		this.showStatistic = showStatistic;
 	}
 
+	public boolean getCvIsColored() {
+		return cvIsColored;
+	}
+	
+	public void setCvIsColored(boolean cvIsColored) {
+		this.cvIsColored = cvIsColored;
+	}
+
 	public boolean isShowAnswer() {
 		return showAnswer;
 	}
@@ -348,6 +357,7 @@ public class Question {
 		this.thresholdCorrectAnswers = thresholdCorrectAnswers;
 	}
 
+
 	@Override
 	public final String toString() {
 		return "Question type '" + type + "': " + subject + ";\n" + text + possibleAnswers;