From df60830ce4eb17281b49e6a5743a5f208fd6086e Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Fri, 15 Feb 2013 15:46:26 +0100
Subject: [PATCH] Fixed creating ABCD questions
---
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 2 +-
.../java/de/thm/arsnova/entities/PossibleAnswer.java | 11 ++++++++++-
src/main/java/de/thm/arsnova/entities/Question.java | 7 +++----
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index a7ad2d80..9dfdaffa 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -558,7 +558,7 @@ public class CouchDBDao implements IDatabaseDao {
q.put("showStatistic", question.isShowStatistic());
q.put("showAnswer", question.isShowAnswer());
try {
- database.saveDocument(q, null);
+ database.saveDocument(q);
question.set_id(q.getId());
question.set_rev(q.getRev());
return question;
diff --git a/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java b/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java
index f0c01e1f..acfea0d3 100644
--- a/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java
+++ b/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java
@@ -20,9 +20,18 @@ package de.thm.arsnova.entities;
public class PossibleAnswer {
+ private String id;
private String text;
private boolean correct;
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
public String getText() {
return text;
}
@@ -41,6 +50,6 @@ public class PossibleAnswer {
@Override
public String toString() {
- return "PossibleAnswer [text=" + text + ", correct=" + correct + "]";
+ return "PossibleAnswer [id=" + id + ", text=" + text + ", correct=" + correct + "]";
}
}
diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java
index cb50a5ad..5e4249f3 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -120,11 +120,11 @@ public class Question {
public final void setSession(final String session) {
this.sessionId = session;
}
-
+
public final String getSessionKeyword() {
return this.sessionKeyword;
}
-
+
public final void setSessionKeyword(final String keyword) {
this.sessionKeyword = keyword;
}
@@ -187,7 +187,6 @@ public class Question {
@Override
public final String toString() {
- return "Question type '" + this.type + "': " + this.subject + ";\n"
- + this.text + this.possibleAnswers;
+ return "Question type '" + this.type + "': " + this.subject + ";\n" + this.text + this.possibleAnswers;
}
}
--
GitLab