diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java index dc00c2d449c61a2342aff4f7d190c5dd3c50a040..e2ead4eeccfe711f11c42ae762af62234c8b9412 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 4ea0ef20facf5fd4cda3f737c40071b91aa86d31..3a86a5b2cf0e09c7c5b737d94b884cf0a74d8bc2 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 9db7d05d5fb508420e6d74f257a954a6e54720c3..21102540fabf3503481d36c4b9faa13df0ee3086 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())) {