diff --git a/bin b/bin new file mode 160000 index 0000000000000000000000000000000000000000..88fcf22280225ce01409d588839af75e2a1822c5 --- /dev/null +++ b/bin @@ -0,0 +1 @@ +Subproject commit 88fcf22280225ce01409d588839af75e2a1822c5 diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java index e8be244c402037777e449912d21c82a8034c9fdf..dd3eb8409809680d61bb5c9b8c979f12de78db8d 100644 --- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java +++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java @@ -1254,6 +1254,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware a.put("user", user.getUsername()); a.put("piRound", answer.getPiRound()); a.put("abstention", answer.isAbstention()); + a.put("answerImage", answer.getAnswerImage()); AnswerQueueElement answerQueueElement = new AnswerQueueElement(session, question, answer, user); this.answerQueue.offer(new AbstractMap.SimpleEntry<Document, AnswerQueueElement>(a, answerQueueElement)); return answer; @@ -1302,6 +1303,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware a.put("timestamp", answer.getTimestamp()); a.put("abstention", answer.isAbstention()); a.put("questionValue", answer.getQuestionValue()); + a.put("answerImage", answer.getAnswerImage()); database.saveDocument(a); answer.set_rev(a.getRev()); return answer; diff --git a/src/main/java/de/thm/arsnova/entities/Answer.java b/src/main/java/de/thm/arsnova/entities/Answer.java index 55fa104fe89f8aa58a6ab85a2ada0fb82ae01b47..33d5b349ace59663794f50343661b415c3977665 100644 --- a/src/main/java/de/thm/arsnova/entities/Answer.java +++ b/src/main/java/de/thm/arsnova/entities/Answer.java @@ -36,6 +36,7 @@ public class Answer { private int answerCount = 1; private boolean abstention; private int abstentionCount; + private String answerImage; public Answer() { this.type = "skill_question_answer"; @@ -112,6 +113,14 @@ public class Answer { public final String getUser() { return user; } + + public String getAnswerImage() { + return answerImage; + } + + public void setAnswerImage(String answerImage) { + this.answerImage = answerImage; + } public final void setUser(final String user) { this.user = user; diff --git a/src/main/java/de/thm/arsnova/entities/transport/Answer.java b/src/main/java/de/thm/arsnova/entities/transport/Answer.java index b12dde79236ae21993546d4d7d9fc41e7302bf79..31f30e5f46a41c4cf7ae435b1a701f99f2afee1f 100644 --- a/src/main/java/de/thm/arsnova/entities/transport/Answer.java +++ b/src/main/java/de/thm/arsnova/entities/transport/Answer.java @@ -30,6 +30,8 @@ public class Answer { private String answerSubject; private String answerText; + + private String answerImage; private boolean abstention; @@ -71,6 +73,7 @@ public class Answer { theAnswer.setAbstention(this.isAbstention()); // calculate learning progress value after all properties are set theAnswer.setQuestionValue(question.calculateValue(theAnswer)); + theAnswer.setAnswerImage(this.getAnswerImage()); if ("freetext".equals(question.getQuestionType())) { theAnswer.setPiRound(0); @@ -80,4 +83,12 @@ public class Answer { return theAnswer; } + + public String getAnswerImage() { + return answerImage; + } + + public void setAnswerImage(String answerImage) { + this.answerImage = answerImage; + } }