Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java =================================================================== diff -u -rff8c13adfeaacdee873b39fedc822e304e1f4cff -r61ba91daf34855e5d8abbae23949a215396900a4 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision ff8c13adfeaacdee873b39fedc822e304e1f4cff) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision 61ba91daf34855e5d8abbae23949a215396900a4) @@ -367,14 +367,14 @@ } // shuffling - if (assessment.isShuffled()) { + if (!showResults && assessment.isShuffled()) { ArrayList shuffledList = new ArrayList<>(questionDtos); Collections.shuffle(shuffledList); questionDtos = new LinkedList<>(shuffledList); } for (QuestionDTO questionDto : questionDtos) { - if (assessment.isShuffledAnswers() || questionDto.isShuffle() || (questionDto.getType() - == QbQuestion.TYPE_ORDERING)) { + if (!showResults && (assessment.isShuffledAnswers() || questionDto.isShuffle() || (questionDto.getType() + == QbQuestion.TYPE_ORDERING))) { ArrayList shuffledList = new ArrayList<>(questionDto.getOptionDtos()); Collections.shuffle(shuffledList); questionDto.setOptionDtos(new LinkedHashSet<>(shuffledList));