lok3 ILIAS-eLearning#10

ILIAS-Verein · Aug 21, 2015 · 41d1301 · 41d1301
1 parent 5810d11
commit 41d1301
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/Modules/Test/classes/class.ilTestOutputGUI.php b/Modules/Test/classes/class.ilTestOutputGUI.php
@@ -329,6 +329,9 @@ protected function redirectQuestionCmd()
 					if( $this->testSequence->hasOptionalQuestions() )
 					{
 						$this->adoptUserSolutionsFromPreviousPass();
+
+						$this->testSequence->reorderOptionalQuestionsToSequenceEnd();
+						$this->testSequence->saveToDb();
 					}
 				}
 

diff --git a/Modules/Test/classes/class.ilTestSequence.php b/Modules/Test/classes/class.ilTestSequence.php
@@ -717,6 +717,25 @@ public function clearOptionalQuestions()
 	{
 		$this->optionalQuestions = array();
 	}
+
+	public function reorderOptionalQuestionsToSequenceEnd()
+	{
+		$optionalSequenceKeys = array();
+
+		foreach($this->sequencedata['sequence'] as $index => $sequenceKey)
+		{
+			if( $this->isQuestionOptional($this->getQuestionForSequence($sequenceKey)) )
+			{
+				$optionalSequenceKeys[$index] = $sequenceKey;
+				unset($this->sequencedata['sequence'][$index]);
+			}
+		}
+
+		foreach($optionalSequenceKeys as $index => $sequenceKey)
+		{
+			$this->sequencedata['sequence'][$index] = $sequenceKey;
+		}
+	}
 }
 
 ?>