diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java index d1ab8cd622e55588cba47880930d58949dd9218d..0872a35ec80127a7ec9850c73bf78e5267ff8e1e 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 fe571d923c7f2ab111434631ce15bbaea3e6cd89..ffbbf7100c0b90b9b0aaed7a23c727099b9296ed 100644 --- a/src/main/java/de/thm/arsnova/entities/Question.java +++ b/src/main/java/de/thm/arsnova/entities/Question.java @@ -70,7 +70,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; @@ -444,8 +444,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 535bd5a339388395bc1e44ffdd6ac7f1776d7a09..b2f5f393c74edbc285d6ebf1b90127876fdc9969 100644 --- a/src/main/java/de/thm/arsnova/services/QuestionService.java +++ b/src/main/java/de/thm/arsnova/services/QuestionService.java @@ -114,6 +114,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())) {