Skip to content
Snippets Groups Projects
Commit 91368675 authored by Tom Käsler's avatar Tom Käsler
Browse files

#14875 first realisation of the new saveQuestion

parent b7359750
No related merge requests found
...@@ -549,6 +549,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware ...@@ -549,6 +549,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
q.put("gridType", question.getGridType()); q.put("gridType", question.getGridType());
q.put("scaleFactor", question.getScaleFactor()); q.put("scaleFactor", question.getScaleFactor());
q.put("gridScaleFactor", question.getGridScaleFactor()); q.put("gridScaleFactor", question.getGridScaleFactor());
q.put("sequenceNr", question.getSequenceNr());
return q; return q;
} }
......
...@@ -66,7 +66,7 @@ public class Question { ...@@ -66,7 +66,7 @@ public class Question {
private String gridType; private String gridType;
private String scaleFactor; private String scaleFactor;
private String gridScaleFactor; private String gridScaleFactor;
private int sequenceNr; private int sequenceNo;
public final String getType() { public final String getType() {
return type; return type;
...@@ -416,8 +416,8 @@ public class Question { ...@@ -416,8 +416,8 @@ public class Question {
this.sequenceNr = sequenceNr; this.sequenceNr = sequenceNr;
} }
public int getSequenceNr() { public int getSequenceNo() {
return this.sequenceNr; return sequenceNr;
} }
@Override @Override
......
...@@ -107,6 +107,17 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis ...@@ -107,6 +107,17 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
} else if (question.getPiRound() < 1 || question.getPiRound() > 2) { } else if (question.getPiRound() < 1 || question.getPiRound() > 2) {
question.setPiRound(1); 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 // convert imageurl to base64 if neccessary
if ("grid".equals(question.getQuestionType())) { if ("grid".equals(question.getQuestionType())) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment