lok3 ILIAS-eLearning#14

Modules/Course/classes/Objectives/class.ilLOTestQuestionAdapter.php

@@ -58,12 +58,12 @@ public function prepareTestPass(ilTestSession $a_test_session, ilTestSequence $a
 		$this->updateQuestions($a_test_session, $a_test_sequence);
 
 		// TODO: following if requires real condition
-		if($markQuestionsOptionalWhenRelatedToPassedObjective = true)
+		if($markQuestionsOptionalWhenRelatedToPassedObjective = false)
 		{
 			$this->setQuestionsOptional($a_test_sequence);
 		}
 		// TODO: following if requires real condition
-		elseif($hideQuestionsWhenRelatedToPassedObjective = false)
+		elseif($hideQuestionsWhenRelatedToPassedObjective = true)
 		{
 			$this->hideQuestions($a_test_sequence);
 		}
@@ -82,21 +82,37 @@ public function prepareTestPass(ilTestSession $a_test_session, ilTestSequence $a
 	 * @param ilTestSequence $a_test_sequence
 	 * @param ilTestQuestionRelatedObjectivesList $a_objectives_list
 	 */
-	public function buildQuestionRelatedObjectiveList(ilTestQuestionRelatedObjectivesList $a_objectives_list)
+	public function buildQuestionRelatedObjectiveList(ilTestSequence $a_test_sequence, ilTestQuestionRelatedObjectivesList $a_objectives_list)
 	{
-		foreach( $a_objectives_list->getQuestionIds() as $qid )
+		foreach( $a_test_sequence->getQuestionIds() as $questionId )
 		{
-			foreach( $this->run as $run )
+			if( $a_test_sequence instanceof ilTestSequenceFixedQuestionSet )
 			{
-				/* @var ilLOTestRun $run */
-
-				if( $run->questionExists($qid) )
-				{
-					$a_objectives_list->addQuestionRelatedObjective($qid, $run->getObjectiveId());
-				}
+				$objectiveId = $this->lookupObjectiveIdByFixedQuestionId($questionId);
 			}
+			elseif( $a_test_sequence instanceof ilTestSequenceRandomQuestionSet )
+			{
+				$definitionId = $a_test_sequence->getResponsibleSourcePoolDefinitionId($questionId);
+				$objectiveId = $this->lookupObjectiveIdByRandomQuestionSelectionDefinitionId($definitionId);
+			}
+
+			$a_objectives_list->addQuestionRelatedObjective($questionId, $objectiveId);
 		}
 	}
+
+	protected function lookupObjectiveIdByFixedQuestionId($a_question_id)
+	{
+		// TODO: determine objective id related to fixed question id
+		$objectiveId = 0;
+		return $objectiveId;
+	}
+
+	protected function addRandomQuestionRelatedObjective($a_definition_id)
+	{
+		// TODO: determine objective id related to random question selection definition id
+		$objectiveId = 0;
+		return $objectiveId;
+	}
 
 	protected function getUserId()
 	{

Modules/Test/classes/class.ilObjTest.php

@@ -4213,7 +4213,7 @@ function pcArrayShuffle($array)
 	* @return array An array containing the test results for the given user
 	* @access public
 	*/
-	function &getTestResult($active_id, $pass = NULL, $ordered_sequence = FALSE)
+	function &getTestResult($active_id, $pass = NULL, $ordered_sequence = FALSE, $considerHiddenQuestions = true)
 	{
 		global $tree, $ilDB, $lng, $ilPluginAdmin;
 
@@ -4245,6 +4245,8 @@ function &getTestResult($active_id, $pass = NULL, $ordered_sequence = FALSE)
 		}
 		else
 		{
+			$testSequence->setConsiderHiddenQuestionsEnabled($considerHiddenQuestions);
+
 			$testSequence->loadFromDb();
 			$testSequence->loadQuestions();
 

Modules/Test/classes/class.ilTestEvaluationGUI.php

@@ -1069,6 +1069,8 @@ function outUserPassDetails()
 
 		$this->ctrl->saveParameter($this, "pass");
 		$pass = $_GET["pass"];
+
+		$considerHiddenQuestions = true;
 
 		require_once 'Modules/Test/classes/class.ilTestResultHeaderLabelBuilder.php';
 		$testResultHeaderLabelBuilder = new ilTestResultHeaderLabelBuilder($this->lng, $ilObjDataCache);
@@ -1094,9 +1096,11 @@ function outUserPassDetails()
 			$testResultHeaderLabelBuilder->setTestObjId($this->object->getId());
 			$testResultHeaderLabelBuilder->setTestRefId($this->object->getRefId());
 			$testResultHeaderLabelBuilder->initObjectiveOrientedMode();
+
+			$considerHiddenQuestions = false;
 		}
 
-		$result_array = $this->getFilteredTestResult($active_id, $pass);
+		$result_array = $this->getFilteredTestResult($active_id, $pass, $considerHiddenQuestions);
 
 		$command_solution_details = "";
 		if ($this->object->getShowSolutionDetails())
@@ -1917,7 +1921,7 @@ public function performDeletePass()
 		$this->redirectToPassDeletionContext($_POST['context']);
 	}
 
-	protected function getFilteredTestResult($active_id, $pass)
+	protected function getFilteredTestResult($active_id, $pass, $considerHiddenQuestions)
 	{
 		global $ilDB, $ilPluginAdmin;
 
@@ -1955,7 +1959,9 @@ protected function getFilteredTestResult($active_id, $pass)
 
 		$filteredTestResult = array();
 
-		foreach($this->object->getTestResult($active_id, $pass) as $resultItemKey => $resultItemValue)
+		$resultData = $this->object->getTestResult($active_id, $pass, false, $considerHiddenQuestions);
+
+		foreach($resultData as $resultItemKey => $resultItemValue)
 		{
 			if($resultItemKey === 'test' || $resultItemKey === 'pass')
 			{

Modules/Test/classes/class.ilTestOutputGUI.php

@@ -495,7 +495,6 @@ protected function outWorkingForm($sequence = "", $test_id, $postpone_allowed, $
 
 		$is_postponed = $this->testSequence->isPostponedQuestion($question_gui->object->getId());
 		$is_optional = $this->testSequence->isQuestionOptional($question_gui->object->getId());
-		$this->ctrl->setParameter($this, "sequence", "$sequence");
 		$formaction = $this->ctrl->getFormAction($this, "gotoQuestion");
 
 		$question_gui->setSequenceNumber($this->testSequence->getPositionOfSequence($sequence));

Modules/Test/classes/class.ilTestPlayerAbstractGUI.php

@@ -1190,14 +1190,12 @@ function outTestPage($directfeedback)
 			$this->endingTimeReached();
 			return;
 		}
-
+
+		$this->ctrl->setParameter($this, "sequence", $this->sequence);
+
 		if( $this->isOptionalQuestionAnsweringConfirmationRequired($this->sequence) )
 		{
 			$this->showAnswerOptionalQuestionsConfirmation();
-
-			vd($this->testSequence->questions);
-			vd($this->testSequence->sequencedata);
-			vd($this->sequence);
 			return;
 		}
 

Modules/Test/classes/class.ilTestQuestionRelatedObjectivesList.php

@@ -10,11 +10,6 @@
  */
 class ilTestQuestionRelatedObjectivesList
 {
-	/**
-	 * @var array
-	 */
-	protected $questionIds;
-
 	/**
 	 * @var array
 	 */
@@ -27,27 +22,10 @@ class ilTestQuestionRelatedObjectivesList
 
 	public function __construct()
 	{
-		$this->questionIds = array();
 		$this->objectivesByQuestion = array();
 		$this->objectivesTitles = array();
 	}
 
-	/**
-	 * @return array
-	 */
-	public function getQuestionIds()
-	{
-		return $this->questionIds;
-	}
-
-	/**
-	 * @param array $questionIds
-	 */
-	public function setQuestionIds($questionIds)
-	{
-		$this->questionIds = $questionIds;
-	}
-
 	/**
 	 * @param integer $questionId
 	 * @param string $objectiveTitle

Modules/Test/classes/class.ilTestSequence.php

@@ -66,6 +66,11 @@ class ilTestSequence
 	 * @var bool
 	 */
 	private $answeringOptionalQuestionsConfirmed;
+
+	/**
+	 * @var bool
+	 */
+	private $considerHiddenQuestionsEnabled;
 
 	/**
 	* ilTestSequence constructor
@@ -92,6 +97,8 @@ function ilTestSequence($active_id, $pass, $randomtest)
 
 		$this->optionalQuestions = array();
 		$this->answeringOptionalQuestionsConfirmed = false;
+
+		$this->considerHiddenQuestionsEnabled = false;
 	}
 
 	function getActiveId()
@@ -407,22 +414,42 @@ function getUserQuestionCount()
 
 	function getOrderedSequence()
 	{
-		return array_keys($this->questions);
+		$sequenceKeys = array();
+
+		foreach(array_keys($this->questions) as $sequenceKey)
+		{
+			if( $this->isConsiderHiddenQuestionsEnabled() || !$this->isHiddenSequence($sequenceKey) )
+			{
+				$sequenceKeys[] = $sequenceKey;
+			}
+		}
+
+		return $sequenceKeys;
 	}
 
 	function getOrderedSequenceQuestions()
 	{
-		return $this->questions;
+		$questions = array();
+
+		foreach($this->questions as $questionId)
+		{
+			if( $this->isConsiderHiddenQuestionsEnabled() || !$this->isHiddenQuestion($questionId) )
+			{
+				$questions[] = $questionId;
+			}
+		}
+
+		return $questions;
 	}
 
 	function getUserSequence()
 	{
-		return $this->getCorrectedSequence(TRUE);
+		return $this->getCorrectedSequence();
 	}
 
 	function getUserSequenceQuestions()
 	{
-		$seq = $this->getCorrectedSequence(TRUE);
+		$seq = $this->getCorrectedSequence();
 		$found = array();
 		foreach ($seq as $sequence)
 		{
@@ -431,10 +458,10 @@ function getUserSequenceQuestions()
 		return $found;
 	}
 
-	protected function getCorrectedSequence($with_hidden_questions = FALSE)
+	protected function getCorrectedSequence()
 	{
 		$correctedsequence = $this->sequencedata["sequence"];
-		if (!$with_hidden_questions)
+		if( !$this->isConsiderHiddenQuestionsEnabled() )
 		{
 			if (is_array($this->sequencedata["hidden"]))
 			{
@@ -761,6 +788,22 @@ public function setAnsweringOptionalQuestionsConfirmed($answeringOptionalQuestio
 	{
 		$this->answeringOptionalQuestionsConfirmed = $answeringOptionalQuestionsConfirmed;
 	}
+
+	/**
+	 * @return boolean
+	 */
+	public function isConsiderHiddenQuestionsEnabled()
+	{
+		return $this->considerHiddenQuestionsEnabled;
+	}
+
+	/**
+	 * @param boolean $considerHiddenQuestionsEnabled
+	 */
+	public function setConsiderHiddenQuestionsEnabled($considerHiddenQuestionsEnabled)
+	{
+		$this->considerHiddenQuestionsEnabled = $considerHiddenQuestionsEnabled;
+	}
 }
 
 ?>

Modules/Test/classes/class.ilTestServiceGUI.php

@@ -195,13 +195,17 @@ public function getPassOverview(ilTestSession $testSession, $targetclass = "", $
 			$short ? ilTestPassOverviewTableGUI::CONTEXT_SHORT : ilTestPassOverviewTableGUI::CONTEXT_LONG,
 			(isset($_GET['pdf']) && $_GET['pdf'] == 1)
 		);
+
+		$considerHiddenQuestions = true;
 
 		if( $this->objectiveOrientedPresentationRequired() )
 		{
 			$table->setObjectiveOrientedPresentationEnabled(true);
 
 			require_once 'Modules/Course/classes/Objectives/class.ilLOTestQuestionAdapter.php';
 			$objectivesAdapter = ilLOTestQuestionAdapter::getInstance($testSession);
+
+			$considerHiddenQuestions = false;
 		}
 
 		$table->init();
@@ -226,15 +230,13 @@ public function getPassOverview(ilTestSession $testSession, $targetclass = "", $
 				$testSequence = $this->testSequenceFactory->getSequenceByPass($testSession, $pass);
 				$testSequence->loadFromDb();
 				$testSequence->loadQuestions();
-				$row['objectivesList'] = $this->buildQuestionRelatedObjectivesList(
-					$objectivesAdapter, $testSequence->getQuestionIds()
-				);
+				$row['objectivesList'] = $this->buildQuestionRelatedObjectivesList($objectivesAdapter, $testSequence);
 				$row['objectivesList']->loadObjectivesTitles();
 			}
 
 				if(!$short)
 				{
-					$result_array =& $this->object->getTestResult($active_id, $pass);
+					$result_array =& $this->object->getTestResult($active_id, $pass, false, $considerHiddenQuestions);
 					if(!$result_array['pass']['total_max_points'])
 					{
 						$percentage = 0;
@@ -959,14 +961,12 @@ protected function getGradingMessage($activeId)
 		return $gradingMessageBuilder->getMessage();
 	}
 
-	protected function buildQuestionRelatedObjectivesList(ilLOTestQuestionAdapter $objectivesAdapter, $questionIds)
+	protected function buildQuestionRelatedObjectivesList(ilLOTestQuestionAdapter $objectivesAdapter, ilTestSequence $testSequence)
 	{
 		require_once 'Modules/Test/classes/class.ilTestQuestionRelatedObjectivesList.php';
 		$questionRelatedObjectivesList = new ilTestQuestionRelatedObjectivesList();
-
-		$questionRelatedObjectivesList->setQuestionIds($questionIds);
 
-		$objectivesAdapter->buildQuestionRelatedObjectiveList($questionRelatedObjectivesList);
+		$objectivesAdapter->buildQuestionRelatedObjectiveList($testSequence, $questionRelatedObjectivesList);
 
 		return $questionRelatedObjectivesList;
 	}