participants results sub tab // moved all code from ilobjtestgui to d…

…edicated ilparticipantsresultsgui
nicoroeser · Apr 3, 2018 · 27bebea · 27bebea
1 parent d6210eb
commit 27bebea
Show file tree

Hide file tree

Showing 10 changed files with 552 additions and 454 deletions.
diff --git a/Modules/Test/classes/class.ilAssQuestionPageCommandForwarder.php b/Modules/Test/classes/class.ilAssQuestionPageCommandForwarder.php
@@ -0,0 +1,88 @@
+<?php
+
+/* Copyright (c) 1998-2013 ILIAS open source, Extended GPL, see docs/LICENSE */
+
+/**
+ * Class ilTestCtrlForwarder
+ *
+ * @author    Björn Heyser <[email protected]>
+ * @version    $Id$
+ *
+ * @package    Modules/Test
+ */
+class ilAssQuestionPageCommandForwarder
+{
+	/**
+	 * @var ilObjTest
+	 */
+	protected $testObj;
+
+	/**
+	 * @return ilObjTest
+	 */
+	public function getTestObj()
+	{
+		return $this->testObj;
+	}
+
+	/**
+	 * @param ilObjTest $testObj
+	 */
+	public function setTestObj($testObj)
+	{
+		$this->testObj = $testObj;
+	}
+
+	public function forward()
+	{
+		global $DIC; /* @var ILIAS\DI\Container $DIC */
+
+		require_once "./Modules/TestQuestionPool/classes/class.ilAssQuestionPageGUI.php";
+		//echo $_REQUEST['prev_qid'];
+		if($_REQUEST['prev_qid'])
+		{
+			$DIC->ctrl()->setParameter($this, 'prev_qid', $_REQUEST['prev_qid']);
+		}
+
+		//global $___test_express_mode;
+		//$___test_express_mode = true;
+		$_GET['calling_test'] = $this->getTestObj()->getRefId();
+		include_once("./Services/Style/Content/classes/class.ilObjStyleSheet.php");
+		$DIC->ui()->mainTemplate()->setCurrentBlock("ContentStyle");
+		$DIC->ui()->mainTemplate()->setVariable("LOCATION_CONTENT_STYLESHEET",
+			ilObjStyleSheet::getContentStylePath(0));
+		$DIC->ui()->mainTemplate()->parseCurrentBlock();
+
+		// syntax style
+		$DIC->ui()->mainTemplate()->setCurrentBlock("SyntaxStyle");
+		$DIC->ui()->mainTemplate()->setVariable("LOCATION_SYNTAX_STYLESHEET",
+			ilObjStyleSheet::getSyntaxStylePath());
+		$DIC->ui()->mainTemplate()->parseCurrentBlock();
+		require_once "./Modules/TestQuestionPool/classes/class.assQuestionGUI.php";
+		$q_gui = assQuestionGUI::_getQuestionGUI("", $_GET["q_id"]);
+		$q_gui->setRenderPurpose(assQuestionGUI::RENDER_PURPOSE_PREVIEW);
+		$q_gui->setQuestionTabs();
+		$q_gui->outAdditionalOutput();
+		$q_gui->object->setObjId($this->getTestObj()->getId());
+		$question =& $q_gui->object;
+		$DIC->ctrl()->saveParameter($this, "q_id");
+		$DIC->language()->loadLanguageModule("content");
+		$DIC->ctrl()->setReturnByClass("ilAssQuestionPageGUI", "view");
+		$DIC->ctrl()->setReturn($this, "questions");
+		$page_gui = new ilAssQuestionPageGUI($_GET["q_id"]);
+		$page_gui->setEditPreview(true);
+		if(strlen($DIC->ctrl()->getCmd()) == 0)
+		{
+			$DIC->ctrl()->setCmdClass(get_class($page_gui));
+			$DIC->ctrl()->setCmd("preview");
+		}
+		$page_gui->setQuestionHTML(array($q_gui->object->getId() => $q_gui->getPreview(TRUE)));
+		$page_gui->setTemplateTargetVar("ADM_CONTENT");
+		$page_gui->setOutputMode($this->getTestObj()->evalTotalPersons() == 0 ? "edit" : 'preview');
+		$page_gui->setHeader($question->getTitle());
+		$page_gui->setPresentationTitle($question->getTitle() . ' ['. $DIC->language()->txt('question_id_short') . ': ' . $question->getId()  . ']');
+
+		$html = $DIC->ctrl()->forwardCommand($page_gui);
+		$DIC->ui()->mainTemplate()->setContent($html);
+	}
+}
diff --git a/Modules/Test/classes/class.ilObjTest.php b/Modules/Test/classes/class.ilObjTest.php
@@ -7587,19 +7587,23 @@ function getQuestiontext($question_id)
 	/**
 	 * @return ilTestParticipantList
 	 */
-	public function getParticipantList()
+	public function getInvitedParticipantList()
 	{
 		require_once 'Modules/Test/classes/class.ilTestParticipantList.php';
 		$participantList = new ilTestParticipantList($this);
+		$participantList->initializeFromDbRows( $this->getInvitedUsers() );
 
-		if( $this->getFixedParticipants() )
-		{
-			$participantList->initializeFromDbRows( $this->getInvitedUsers() );
-		}
-		else
-		{
-			$participantList->initializeFromDbRows( $this->getTestParticipants() );
-		}
+		return $participantList;
+	}
+
+	/**
+	 * @return ilTestParticipantList
+	 */
+	public function getActiveParticipantList()
+	{
+		require_once 'Modules/Test/classes/class.ilTestParticipantList.php';
+		$participantList = new ilTestParticipantList($this);
+		$participantList->initializeFromDbRows( $this->getTestParticipants() );
 
 		return $participantList;
 	}