From 913686755253e3bab0bb95f3571d35f8c0fdad73 Mon Sep 17 00:00:00 2001
From: tekay <tom.kaesler@mni.thm.de>
Date: Wed, 4 Mar 2015 16:09:16 +0100
Subject: [PATCH] #14875 first realisation of the new saveQuestion
---
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 1 +
src/main/java/de/thm/arsnova/entities/Question.java | 6 +++---
.../java/de/thm/arsnova/services/QuestionService.java | 11 +++++++++++
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index dc00c2d44..e2ead4eec 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -549,6 +549,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
q.put("gridType", question.getGridType());
q.put("scaleFactor", question.getScaleFactor());
q.put("gridScaleFactor", question.getGridScaleFactor());
+ q.put("sequenceNr", question.getSequenceNr());
return q;
}
diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java
index 4ea0ef20f..3a86a5b2c 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -66,7 +66,7 @@ public class Question {
private String gridType;
private String scaleFactor;
private String gridScaleFactor;
- private int sequenceNr;
+ private int sequenceNo;
public final String getType() {
return type;
@@ -416,8 +416,8 @@ public class Question {
this.sequenceNr = sequenceNr;
}
- public int getSequenceNr() {
- return this.sequenceNr;
+ public int getSequenceNo() {
+ return sequenceNr;
}
@Override
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 9db7d05d5..21102540f 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -107,6 +107,17 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
} else if (question.getPiRound() < 1 || question.getPiRound() > 2) {
question.setPiRound(1);
}
+
+ // if SortIndex false, list is sorted so new question is appended to sorted list with (highest sequenceNr)++
+ if ("lecture".equals(question.getQuestionVariant()) {
+ if(session.getSortLectureQuestions()) {
+ question.setSequenceNr();
+ }
+ } else if ("preparation".equals(question.getQuestionVariant()) {
+ if(session.getSortPreparationQuestions()) {
+ question.setSequenceNr();
+ }
+ }
// convert imageurl to base64 if neccessary
if ("grid".equals(question.getQuestionType())) {
--
GitLab