';
//Generic feedback
$string .= $solutions["prt"][$prt_name]['status']['message'];
- //$string .= '
';
//Specific feedback
- $string .= $solutions["prt"][$prt_name]["feedback"];
+ $string .= assStackQuestionUtils::_replaceFeedbackPlaceHolders($solutions["prt"][$prt_name]["feedback"]);
$string .= $solutions["prt"][$prt_name]["errors"];
- $string .= '
';
- $specific_feedback = str_replace("[[feedback:" . $prt_name . "]]", $string, $specific_feedback);
+
+ $specific_feedback = str_replace("[[feedback:" . $prt_name . "]]", assStackQuestionUtils::_getFeedbackStyledText($string, "feedback_default"), $specific_feedback);
} else
{
$specific_feedback = str_replace("[[feedback:" . $prt_name . "]]", $this->object->getPlugin()->txt("preview_no_answer"), $specific_feedback);
@@ -910,11 +944,11 @@ public function getSpecificFeedbackOutput($active_id, $pass)
/**
* Returns the answer generic feedback depending on the results of the question
*
- * @deprecated Use getGenericFeedbackOutput instead.
* @param integer $active_id Active ID of the user
* @param integer $pass Active pass
* @return string HTML Code with the answer specific feedback
* @access public
+ * @deprecated Use getGenericFeedbackOutput instead.
*/
function getAnswerFeedbackOutput($active_id, $pass)
{
@@ -1610,6 +1644,14 @@ public function importQuestionFromMoodleForm()
$lng = $DIC->language();
$tabs = $DIC->tabs();
+
+ //#25145
+ if (isset($_REQUEST["test_ref_id"]))
+ {
+ ilUtil::sendFailure($lng->txt("qpl_qst_xqcas_import_in_test_error"), TRUE);
+ $DIC->ctrl()->redirect($this, 'editQuestion');
+ }
+
if ($this->object->getSelfAssessmentEditingMode())
{
$this->getLearningModuleTabs();
diff --git a/classes/class.ilassStackQuestionConfigGUI.php b/classes/class.ilassStackQuestionConfigGUI.php
index 98237ee1..383bdb13 100644
--- a/classes/class.ilassStackQuestionConfigGUI.php
+++ b/classes/class.ilassStackQuestionConfigGUI.php
@@ -16,12 +16,12 @@
*/
class ilassStackQuestionConfigGUI extends ilPluginConfigGUI
{
- /** @var assStackQuestionConfig */
- protected $config;
+ /** @var assStackQuestionConfig */
+ protected $config;
- /** @var ilassStackQuestionPlugin */
- protected $plugin_object = null;
+ /** @var ilassStackQuestionPlugin */
+ protected $plugin_object = null;
/**
*
@@ -40,17 +40,17 @@ public function performCommand($cmd)
$cmd = $ctrl->getCmd($this, "configure");
switch ($cmd)
{
- case 'configure';
- case 'showConnectionSettings':
- case 'saveConnectionSettings':
- case 'showServerList':
- case 'addServer':
- case 'editServer':
- case 'saveConnectionSettings':
- case 'saveServerSettings':
- case 'confirmDeleteServers':
- $this->initTabs('show_connection_settings');
- break;
+ case 'configure';
+ case 'showConnectionSettings':
+ case 'saveConnectionSettings':
+ case 'showServerList':
+ case 'addServer':
+ case 'editServer':
+ case 'saveConnectionSettings':
+ case 'saveServerSettings':
+ case 'confirmDeleteServers':
+ $this->initTabs('show_connection_settings');
+ break;
case 'showOtherSettings':
case 'showDisplaySettings':
@@ -65,21 +65,24 @@ public function performCommand($cmd)
case 'setDefaultSettingsForInputs':
case 'setDefaultSettingsForOptions':
case 'setDefaultSettingsForPRTs':
+ case 'showFeedbackStylesSettings':
+ case 'saveFeedbackStylesSettings':
+ case 'setFeedbackStylesSettings':
$this->initTabs('show_other_settings');
break;
case 'showHealthcheck':
- case 'runHealthcheck':
+ case 'runHealthcheck':
$this->initTabs('show_healthcheck');
break;
}
- $this->$cmd();
+ $this->$cmd();
}
/**
- * Init the tabs
- * @param string $a_active id of the active tab (activates it an adds its sub tabs)
+ * Init the tabs
+ * @param string $a_active id of the active tab (activates it an adds its sub tabs)
*/
public function initTabs($a_active = "")
{
@@ -87,27 +90,28 @@ public function initTabs($a_active = "")
$ctrl = $DIC->ctrl();
$tabs = $DIC->tabs();
- $tabs->addTab("show_connection_settings", $this->plugin_object->txt('show_connection_settings'), $ctrl->getLinkTarget($this, 'showConnectionSettings'));
- $tabs->addTab("show_other_settings", $this->plugin_object->txt('show_other_settings'), $ctrl->getLinkTarget($this, 'showOtherSettings'));
- $tabs->addTab("show_healthcheck", $this->plugin_object->txt('show_healthcheck'), $ctrl->getLinkTarget($this, 'showHealthcheck'));
+ $tabs->addTab("show_connection_settings", $this->plugin_object->txt('show_connection_settings'), $ctrl->getLinkTarget($this, 'showConnectionSettings'));
+ $tabs->addTab("show_other_settings", $this->plugin_object->txt('show_other_settings'), $ctrl->getLinkTarget($this, 'showOtherSettings'));
+ $tabs->addTab("show_healthcheck", $this->plugin_object->txt('show_healthcheck'), $ctrl->getLinkTarget($this, 'showHealthcheck'));
- $tabs->activateTab($a_active);
+ $tabs->activateTab($a_active);
- switch ($a_active)
+ switch ($a_active)
{
- case 'show_connection_settings':
- $tabs->addSubTab('basic_connection_settings', $this->plugin_object->txt('basic_connection_settings'), $ctrl->getLinkTarget($this, 'showConnectionSettings'));
- if ($this->config->get('platform_type') == 'server')
- {
- $tabs->addSubTab('server_configuration', $this->plugin_object->txt('server_configuration'), $ctrl->getLinkTarget($this, 'showServerList'));
- }
- break;
+ case 'show_connection_settings':
+ $tabs->addSubTab('basic_connection_settings', $this->plugin_object->txt('basic_connection_settings'), $ctrl->getLinkTarget($this, 'showConnectionSettings'));
+ if ($this->config->get('platform_type') == 'server')
+ {
+ $tabs->addSubTab('server_configuration', $this->plugin_object->txt('server_configuration'), $ctrl->getLinkTarget($this, 'showServerList'));
+ }
+ break;
case 'show_other_settings':
$tabs->addSubTab('show_display_settings', $this->plugin_object->txt('show_display_settings'), $ctrl->getLinkTargetByClass('ilassStackQuestionConfigGUI', 'showDisplaySettings'));
$tabs->addSubTab('show_default_options_settings', $this->plugin_object->txt('show_default_options_settings'), $ctrl->getLinkTargetByClass('ilassStackQuestionConfigGUI', 'showDefaultOptionsSettings'));
$tabs->addSubTab('show_default_inputs_settings', $this->plugin_object->txt('show_default_inputs_settings'), $ctrl->getLinkTargetByClass('ilassStackQuestionConfigGUI', 'showDefaultInputsSettings'));
$tabs->addSubTab('show_default_prts_settings', $this->plugin_object->txt('show_default_prts_settings'), $ctrl->getLinkTargetByClass('ilassStackQuestionConfigGUI', 'showDefaultPRTsSettings'));
+ $tabs->addSubTab('show_feedback_styles_settings', $this->plugin_object->txt('feedback_styles_settings'), $ctrl->getLinkTargetByClass('ilassStackQuestionConfigGUI', 'showFeedbackStylesSettings'));
break;
}
}
@@ -127,155 +131,151 @@ function configure()
public function showConnectionSettings()
{
- global $DIC, $tpl;
- $tabs = $DIC->tabs();
- $tabs->activateSubTab('basic_connection_settings');
+ global $DIC, $tpl;
+ $tabs = $DIC->tabs();
+ $tabs->activateSubTab('basic_connection_settings');
$form = $this->getConnectionSettingsForm();
$tpl->setContent($form->getHTML());
}
public function showServerList()
- {
- global $DIC, $tpl;
- $DIC->tabs()->activateSubTab('server_configuration');
-
- $button = ilLinkButton::getInstance();
- $button->setCaption($this->plugin_object->txt('add_server'), false);
- $button->setUrl($DIC->ctrl()->getLinkTarget($this, 'addServer'));
- $DIC->toolbar()->addButtonInstance($button);
-
- $this->plugin_object->includeClass('GUI/tables/class.assStackQuestionServerTableGUI.php');
- $table = new assStackQuestionServerTableGUI($this, 'showServerList');
- $tpl->setContent($table->getHTML());
- }
-
- public function addServer()
- {
- global $DIC, $tpl;
- $tabs = $DIC->tabs();
- $tabs->activateSubTab('server_configuration');
-
- $form = $this->getServerSettingsForm();
- $tpl->setContent($form->getHTML());
- }
-
- public function editServer()
- {
- global $DIC, $tpl;
- $tabs = $DIC->tabs();
- $tabs->activateSubTab('server_configuration');
-
- $DIC->ctrl()->setParameter($this, 'server_id', $_GET['server_id']);
- $button = ilLinkButton::getInstance();
- $button->setCaption($this->plugin_object->txt('show_healthcheck'), false);
- $button->setUrl($DIC->ctrl()->getLinkTarget($this, 'runHealthcheck'));
- $DIC->toolbar()->addButtonInstance($button);
-
- $form = $this->getServerSettingsForm($_GET['server_id']);
- $tpl->setContent($form->getHTML());
- }
-
-
- public function activateServers()
- {
- $this->changeServerActivation(true);
- }
-
- public function deactivateServers()
- {
- $this->changeServerActivation(false);
- }
-
- protected function changeServerActivation($active)
- {
- global $DIC;
-
- $this->plugin_object->includeClass("model/configuration/class.assStackQuestionServer.php");
-
- if (isset($_POST['server_id']))
- {
- $server_ids = (array) $_POST['server_id'];
- }
- elseif (isset($_GET['server_id']))
- {
- $server_ids = (array) $_GET['server_id'];
- }
-
- if (empty($server_ids))
- {
- ilUtil::sendFailure($this->plugin_object->txt('no_server_selected'), true);
- }
- else
- {
- foreach ($server_ids as $server_id)
- {
- $server = assStackQuestionServer::getServerById($server_id);
- $server->setActive($active);
- }
- assStackQuestionServer::saveServers();
-
- if (count($server_ids) == 1)
- {
- ilUtil::sendSuccess($this->plugin_object->txt($active ? 'server_activated' : 'server_deactivated'), true);
- }
- else
- {
- ilUtil::sendSuccess($this->plugin_object->txt($active ? 'servers_activated' : 'servers_deactivated'), true);
- }
- }
- $DIC->ctrl()->redirect($this, 'showServerList');
- }
-
- public function confirmDeleteServers()
- {
- global $DIC, $tpl;
-
- $this->plugin_object->includeClass("model/configuration/class.assStackQuestionServer.php");
-
- if (isset($_POST['server_id']))
- {
- $server_ids = (array) $_POST['server_id'];
- }
- elseif (isset($_GET['server_id']))
- {
- $server_ids = (array) $_GET['server_id'];
- }
-
- if (empty($server_ids))
- {
- ilUtil::sendFailure($this->plugin_object->txt('no_server_selected'), true);
- $DIC->ctrl()->redirect($this, 'showServerList');
- }
-
- $gui = new ilConfirmationGUI();
- $gui->setHeaderText($this->plugin_object->txt('confirm_delete_servers'));
- $gui->setFormAction($DIC->ctrl()->getFormAction($this));
- $gui->setConfirm($DIC->language()->txt('delete'), 'deleteServers');
- $gui->setCancel($DIC->language()->txt('cancel'), 'showServerList');
-
- foreach ($server_ids as $server_id)
- {
- $server = assStackQuestionServer::getServerById($server_id);
- $gui->addItem('server_id[]', $server_id, $server->getAddress());
- }
- $tpl->setContent($gui->getHTML());
- }
-
- public function deleteServers()
- {
- global $DIC;
- $this->plugin_object->includeClass("model/configuration/class.assStackQuestionServer.php");
-
- $server_ids = (array) $_POST['server_id'];
- assStackQuestionServer::deleteServers($server_ids);
-
- ilUtil::sendSuccess($this->plugin_object->txt(count($server_ids) == 1 ? 'server_deleted' : 'servers_deleted'), true);
- $DIC->ctrl()->redirect($this, 'showServerList');
- }
-
-
- public function showOtherSettings()
+ {
+ global $DIC, $tpl;
+ $DIC->tabs()->activateSubTab('server_configuration');
+
+ $button = ilLinkButton::getInstance();
+ $button->setCaption($this->plugin_object->txt('add_server'), false);
+ $button->setUrl($DIC->ctrl()->getLinkTarget($this, 'addServer'));
+ $DIC->toolbar()->addButtonInstance($button);
+
+ $this->plugin_object->includeClass('GUI/tables/class.assStackQuestionServerTableGUI.php');
+ $table = new assStackQuestionServerTableGUI($this, 'showServerList');
+ $tpl->setContent($table->getHTML());
+ }
+
+ public function addServer()
+ {
+ global $DIC, $tpl;
+ $tabs = $DIC->tabs();
+ $tabs->activateSubTab('server_configuration');
+
+ $form = $this->getServerSettingsForm();
+ $tpl->setContent($form->getHTML());
+ }
+
+ public function editServer()
+ {
+ global $DIC, $tpl;
+ $tabs = $DIC->tabs();
+ $tabs->activateSubTab('server_configuration');
+
+ $DIC->ctrl()->setParameter($this, 'server_id', $_GET['server_id']);
+ $button = ilLinkButton::getInstance();
+ $button->setCaption($this->plugin_object->txt('show_healthcheck'), false);
+ $button->setUrl($DIC->ctrl()->getLinkTarget($this, 'runHealthcheck'));
+ $DIC->toolbar()->addButtonInstance($button);
+
+ $form = $this->getServerSettingsForm($_GET['server_id']);
+ $tpl->setContent($form->getHTML());
+ }
+
+
+ public function activateServers()
+ {
+ $this->changeServerActivation(true);
+ }
+
+ public function deactivateServers()
+ {
+ $this->changeServerActivation(false);
+ }
+
+ protected function changeServerActivation($active)
+ {
+ global $DIC;
+
+ $this->plugin_object->includeClass("model/configuration/class.assStackQuestionServer.php");
+
+ if (isset($_POST['server_id']))
+ {
+ $server_ids = (array)$_POST['server_id'];
+ } elseif (isset($_GET['server_id']))
+ {
+ $server_ids = (array)$_GET['server_id'];
+ }
+
+ if (empty($server_ids))
+ {
+ ilUtil::sendFailure($this->plugin_object->txt('no_server_selected'), true);
+ } else
+ {
+ foreach ($server_ids as $server_id)
+ {
+ $server = assStackQuestionServer::getServerById($server_id);
+ $server->setActive($active);
+ }
+ assStackQuestionServer::saveServers();
+
+ if (count($server_ids) == 1)
+ {
+ ilUtil::sendSuccess($this->plugin_object->txt($active ? 'server_activated' : 'server_deactivated'), true);
+ } else
+ {
+ ilUtil::sendSuccess($this->plugin_object->txt($active ? 'servers_activated' : 'servers_deactivated'), true);
+ }
+ }
+ $DIC->ctrl()->redirect($this, 'showServerList');
+ }
+
+ public function confirmDeleteServers()
+ {
+ global $DIC, $tpl;
+
+ $this->plugin_object->includeClass("model/configuration/class.assStackQuestionServer.php");
+
+ if (isset($_POST['server_id']))
+ {
+ $server_ids = (array)$_POST['server_id'];
+ } elseif (isset($_GET['server_id']))
+ {
+ $server_ids = (array)$_GET['server_id'];
+ }
+
+ if (empty($server_ids))
+ {
+ ilUtil::sendFailure($this->plugin_object->txt('no_server_selected'), true);
+ $DIC->ctrl()->redirect($this, 'showServerList');
+ }
+
+ $gui = new ilConfirmationGUI();
+ $gui->setHeaderText($this->plugin_object->txt('confirm_delete_servers'));
+ $gui->setFormAction($DIC->ctrl()->getFormAction($this));
+ $gui->setConfirm($DIC->language()->txt('delete'), 'deleteServers');
+ $gui->setCancel($DIC->language()->txt('cancel'), 'showServerList');
+
+ foreach ($server_ids as $server_id)
+ {
+ $server = assStackQuestionServer::getServerById($server_id);
+ $gui->addItem('server_id[]', $server_id, $server->getAddress());
+ }
+ $tpl->setContent($gui->getHTML());
+ }
+
+ public function deleteServers()
+ {
+ global $DIC;
+ $this->plugin_object->includeClass("model/configuration/class.assStackQuestionServer.php");
+
+ $server_ids = (array)$_POST['server_id'];
+ assStackQuestionServer::deleteServers($server_ids);
+
+ ilUtil::sendSuccess($this->plugin_object->txt(count($server_ids) == 1 ? 'server_deleted' : 'servers_deleted'), true);
+ $DIC->ctrl()->redirect($this, 'showServerList');
+ }
+
+
+ public function showOtherSettings()
{
global $DIC;
$tabs = $DIC->tabs();
@@ -324,10 +324,21 @@ public function showDefaultPRTsSettings()
$tpl->setContent($form->getHTML());
}
+ public function showFeedbackStylesSettings()
+ {
+ global $DIC, $tpl;
+ $tabs = $DIC->tabs();
+ $tabs->setTabActive('show_other_settings');
+ $tabs->setSubTabActive('show_feedback_styles_settings');
+
+ $form = $this->getFeedbackStylesSettingsForm();
+ $tpl->setContent($form->getHTML());
+ }
+
/**
* Show the healthcheck screen
- * @param bool $a_run run the healthcheck
+ * @param bool $a_run run the healthcheck
*/
public function showHealthcheck($a_run = false)
{
@@ -351,10 +362,10 @@ public function showHealthcheck($a_run = false)
if ($a_run)
{
- if ($this->config->get('platform_type') == 'server')
- {
- ilUtil::sendInfo($this->plugin_object->txt('srv_address') . ': elements
- * @param ilXmlWriter XML writer
- * @param array name => content
- * @param string tag for the element
+ * @param ilXmlWriter XML writer
+ * @param array name => content
+ * @param string tag for the element
*/
- private function addRTEMedia($a_xml_writer, $a_media, $a_tag = 'file')
+ private function addRTEMedia($a_xml_writer, $a_media, $a_tag = 'file')
{
foreach ($a_media as $name => $content)
{
- $attr = array (
- 'name' => $name,
- 'path' => '/',
- 'encoding' => 'base64'
- );
+ $attr = array('name' => $name, 'path' => '/', 'encoding' => 'base64');
$a_xml_writer->xmlElement('file', $attr, base64_encode($content), false, false);
}
}
diff --git a/classes/model/class.assStackQuestionStackQuestion.php b/classes/model/class.assStackQuestionStackQuestion.php
index ca15248d..fe0064d6 100644
--- a/classes/model/class.assStackQuestionStackQuestion.php
+++ b/classes/model/class.assStackQuestionStackQuestion.php
@@ -271,7 +271,7 @@ public function createSeed($ilias_question, $seed = -1, $authorized = TRUE)
global $DIC;
$lng = $DIC->language();
- switch (sizeof($ilias_question->getDeployedSeeds()))
+ switch (!empty($ilias_question->getDeployedSeeds()))
{
//No deployed seeds for this question.
case 0:
@@ -442,7 +442,7 @@ public function createInputs(assStackQuestion $question)
$stack_inputs[$input_name] = $this->getStackFactory()->get("input_object", $input_parameters);
}
- if (sizeof($stack_inputs))
+ if (!empty($stack_inputs))
{
$this->setInputs($stack_inputs);
}
@@ -469,10 +469,7 @@ public function addTeacherAnswersToSession(assStackQuestion $question)
$response[$name] = $teacher_answer_casstring;
}
}
- $session = $this->getSession();
- $session->add_vars($response);
- $session->instantiate();
- $this->setSession($session);
+ $this->getSession()->add_vars($response);
}
/**
diff --git a/classes/model/configuration/class.assStackQuestionConfig.php b/classes/model/configuration/class.assStackQuestionConfig.php
index a20b400f..daad6db5 100644
--- a/classes/model/configuration/class.assStackQuestionConfig.php
+++ b/classes/model/configuration/class.assStackQuestionConfig.php
@@ -15,11 +15,11 @@
*/
class assStackQuestionConfig
{
- /** @var assStackQuestionServer */
- protected static $server;
+ /** @var assStackQuestionServer */
+ protected static $server;
- /** @var array */
- protected $settings;
+ /** @var array */
+ protected $settings;
public function __construct($plugin_object = "")
@@ -32,19 +32,20 @@ public function __construct($plugin_object = "")
*/
- /**
- * Get a configuration setting
- * @param $name
- * @return mixed
- */
- public function get($name)
- {
- if (!isset($this->settings))
- {
- $this->settings = self::_getStoredSettings('all');
- }
- return $this->settings[$name];
- }
+ /**
+ * Get a configuration setting
+ * @param $name
+ * @return mixed
+ */
+ public function get($name)
+ {
+ if (!isset($this->settings))
+ {
+ $this->settings = self::_getStoredSettings('all');
+ }
+
+ return $this->settings[$name];
+ }
/**
* This class can be called from anywhere to get configuration
@@ -73,64 +74,66 @@ public static function _getStoredSettings($selector)
}
- /**
- * Read the server configuration from a configuration array
- * This avoids a second reading
- * @param $config
- */
+ /**
+ * Read the server configuration from a configuration array
+ * This avoids a second reading
+ * @param $config
+ */
public static function _readServers($config)
- {
- require_once (__DIR__ . '/class.assStackQuestionServer.php');
- assStackQuestionServer::readServersFromConfig($config);
- }
-
-
- /**
- * Get the maxima server address for the current request
- * The chosen server is cached for the request
- *
- * @return string
- */
- public static function _getServerAddress()
- {
- require_once (__DIR__ . '/class.assStackQuestionServer.php');
-
- if (isset(self::$server))
- {
- return self::$server->getAddress();
- }
-
- if (!empty($_REQUEST['server_id']))
- {
- self::$server = assStackQuestionServer::getServerById($_REQUEST['server_id']);
- return self::$server->getAddress();
-
- }
-
- switch (strtolower($_GET['cmdClass']))
- {
- case 'iltestplayerfixedquestionsetgui':
- case 'iltestplayerrandomquestionsetgui':
- case 'iltestplayerdynamicquestionsetgui':
- $purpose = assStackQuestionServer::PURPOSE_RUN;
- break;
-
- default:
- switch (basename($_SERVER['SCRIPT_FILENAME']))
- {
- case 'validation.php':
- case 'instant_validiation.php':
- $purpose= assStackQuestionServer::PURPOSE_RUN;
- break;
- default:
- $purpose = assStackQuestionServer::PURPOSE_EDIT;
- }
- }
-
-
- self::$server = assStackQuestionServer::getServerForPurpose($purpose);
- return self::$server->getAddress();
- }
+ {
+ require_once(__DIR__ . '/class.assStackQuestionServer.php');
+ assStackQuestionServer::readServersFromConfig($config);
+ }
+
+
+ /**
+ * Get the maxima server address for the current request
+ * The chosen server is cached for the request
+ *
+ * @return string
+ */
+ public static function _getServerAddress()
+ {
+ require_once(__DIR__ . '/class.assStackQuestionServer.php');
+
+ if (isset(self::$server))
+ {
+ return self::$server->getAddress();
+ }
+
+ if (!empty($_REQUEST['server_id']))
+ {
+ self::$server = assStackQuestionServer::getServerById($_REQUEST['server_id']);
+
+ return self::$server->getAddress();
+
+ }
+
+ switch (strtolower($_GET['cmdClass']))
+ {
+ case 'iltestplayerfixedquestionsetgui':
+ case 'iltestplayerrandomquestionsetgui':
+ case 'iltestplayerdynamicquestionsetgui':
+ $purpose = assStackQuestionServer::PURPOSE_RUN;
+ break;
+
+ default:
+ switch (basename($_SERVER['SCRIPT_FILENAME']))
+ {
+ case 'validation.php':
+ case 'instant_validiation.php':
+ $purpose = assStackQuestionServer::PURPOSE_RUN;
+ break;
+ default:
+ $purpose = assStackQuestionServer::PURPOSE_EDIT;
+ }
+ }
+
+
+ self::$server = assStackQuestionServer::getServerForPurpose($purpose);
+
+ return self::$server->getAddress();
+ }
/*
@@ -317,6 +320,42 @@ public function saveDefaultInputsSettings()
return TRUE;
}
+ public function saveFeedbackStyleSettings()
+ {
+ //Old settings
+ $saved_feedback_data = self::_getStoredSettings('feedback');
+ //New settings
+ $new_feedback_data = $this->getAdminInput();
+
+ //Check if Content Style has changed, if changed set pther fields to 0, otherwise, save it with new values
+ if ($saved_feedback_data["feedback_stylesheet_id"] != $new_feedback_data["feedback_stylesheet_id"])
+ {
+ //Save to DB
+ foreach ($saved_feedback_data as $parameter_name => $saved_value)
+ {
+ if ($parameter_name != "feedback_stylesheet_id")
+ {
+ $this->saveToDB($parameter_name, "0", 'feedback');
+ } else
+ {
+ $this->saveToDB($parameter_name, $new_feedback_data[$parameter_name], 'feedback');
+ }
+ }
+ } else
+ {
+ //Save to DB modified dat
+ foreach ($saved_feedback_data as $paremeter_name => $saved_value)
+ {
+ if (array_key_exists($paremeter_name, $new_feedback_data) AND $saved_feedback_data[$paremeter_name] != $new_feedback_data[$paremeter_name])
+ {
+ $this->saveToDB($paremeter_name, $new_feedback_data[$paremeter_name], 'feedback');
+ }
+ }
+ }
+
+ return TRUE;
+ }
+
/**
* Saves new default inputs settings to the DB
*/
@@ -390,9 +429,9 @@ public function saveDefaultPRTsSettings()
}
/**
- * Save a configuration setting to the database
- * (needs to be public for assStackQuestionServer::saveServers)
- *
+ * Save a configuration setting to the database
+ * (needs to be public for assStackQuestionServer::saveServers)
+ *
* @param $parameter_name //Is the of the parameter to modify (this is the Primary Key in DB)
* @param $value //Is the value of the parameter
* @param $group_name //Is the selector for different categories of data
@@ -413,7 +452,8 @@ public function saveToDB($parameter_name, $value, $group_name)
*/
public function getAdminInput()
{
- $data = ilUtil::stripSlashesRecursive($_POST);
+ //https://mantis.ilias.de/view.php?id=25290
+ $data = ilUtil::stripSlashesRecursive($_POST, FALSE);
//Clean array
unset($data['cmd']);
diff --git a/classes/model/configuration/class.assStackQuestionHealthcheck.php b/classes/model/configuration/class.assStackQuestionHealthcheck.php
index 706926b0..291b3e54 100644
--- a/classes/model/configuration/class.assStackQuestionHealthcheck.php
+++ b/classes/model/configuration/class.assStackQuestionHealthcheck.php
@@ -80,7 +80,7 @@ public function checkMaximaConnection()
//texdisplaystyle
$this->setMaximaConnectionStatus(html_writer::tag('p', stack_string('texdisplaystyle')), 'texdisplaystyle');
//healthchecksampledisplaytex
- $this->setMaximaConnectionStatus(html_writer::tag('p', stack_string('healthchecksampledisplaytex')), 'healthchecksampledisplaytex');
+ $this->setMaximaConnectionStatus(html_writer::tag('p', assStackQuestionUtils::_solveKeyBracketsBug(stack_string('healthchecksampledisplaytex'))), 'healthchecksampledisplaytex');
//texinlinestyle
$this->setMaximaConnectionStatus(html_writer::tag('p', stack_string('texinlinestyle')), 'texinlinestyle');
//healthchecksampleinlinetex
@@ -88,6 +88,7 @@ public function checkMaximaConnection()
//healthchecklatexmathjax
$this->setMaximaConnectionStatus(html_writer::tag('p', stack_string('healthchecklatexmathjax')), 'healthchecklatexmathjax');
+
//Maxima configuration file
// Try to list available versions of Maxima (linux only, without the DB).
if ($this->config->platform !== 'win')
diff --git a/classes/model/ilias_object/class.assStackQuestionPRTNode.php b/classes/model/ilias_object/class.assStackQuestionPRTNode.php
index c0219af9..16d0f009 100644
--- a/classes/model/ilias_object/class.assStackQuestionPRTNode.php
+++ b/classes/model/ilias_object/class.assStackQuestionPRTNode.php
@@ -442,6 +442,7 @@ public function writePostData($prt_name, $node_name, $new_prt_name = "", $new_no
$this->setTrueNextNode(ilUtil::stripSlashes($_POST[$prefix . '_pos_next']));
$this->setTrueAnswerNote(ilUtil::stripSlashes($_POST[$prefix . '_pos_answernote'] == NULL ? "" : $_POST[$prefix . '_pos_answernote']));
$this->setTrueFeedback(ilUtil::stripSlashes($_POST[$prefix . '_pos_specific_feedback'] == NULL ? "" : $_POST[$prefix . '_pos_specific_feedback'], true, $a_rte_tags));
+ $this->setTrueFeedbackFormat(ilUtil::stripSlashes($_POST[$prefix . '_pos_feedback_class']));
$this->setFalseScore(ilUtil::stripSlashes($_POST[$prefix . '_neg_score']) == NULL ? 0 : ilUtil::stripSlashes($_POST[$prefix . '_neg_score']));
$this->setFalseScoreMode(ilUtil::stripSlashes($_POST[$prefix . '_neg_mod']));
@@ -449,6 +450,7 @@ public function writePostData($prt_name, $node_name, $new_prt_name = "", $new_no
$this->setFalseNextNode(ilUtil::stripSlashes($_POST[$prefix . '_neg_next']));
$this->setFalseAnswerNote(ilUtil::stripSlashes($_POST[$prefix . '_neg_answernote'] == NULL ? "" : $_POST[$prefix . '_neg_answernote']));
$this->setFalseFeedback(ilUtil::stripSlashes($_POST[$prefix . '_neg_specific_feedback'] == NULL ? "" : $_POST[$prefix . '_neg_specific_feedback'], true, $a_rte_tags));
+ $this->setFalseFeedbackFormat(ilUtil::stripSlashes($_POST[$prefix . '_neg_feedback_class']));
if ($new_prt_name) {
diff --git a/classes/model/ilias_object/test/class.assStackQuestionTest.php b/classes/model/ilias_object/test/class.assStackQuestionTest.php
index 776b7851..36974198 100644
--- a/classes/model/ilias_object/test/class.assStackQuestionTest.php
+++ b/classes/model/ilias_object/test/class.assStackQuestionTest.php
@@ -153,7 +153,7 @@ public static function _read($question_id, $test_case = '')
//Reading test data
$test->setTestInputs(assStackQuestionTestInput::_read($question_id, $test->getTestCase()));
$test->setTestExpected(assStackQuestionTestExpected::_read($question_id, $test->getTestCase()));
- $test->setNumberOfTests(sizeof($test->getTestInputs()));
+ $test->setNumberOfTests(!empty($test->getTestInputs()));
$tests[$test->getTestCase()] = $test;
}
@@ -203,7 +203,7 @@ public function checkTest($solve_problems = TRUE)
return false;
}
//Arrays filled in:
- if (sizeof($this->getTestInputs()) AND sizeof($this->getTestExpected())) {
+ if (!empty($this->getTestInputs()) AND sizeof($this->getTestExpected())) {
return true;
}
}
diff --git a/classes/model/import/MoodleXML/class.assStackQuestionMoodleImport.php b/classes/model/import/MoodleXML/class.assStackQuestionMoodleImport.php
index 4a56b987..3ece33cb 100644
--- a/classes/model/import/MoodleXML/class.assStackQuestionMoodleImport.php
+++ b/classes/model/import/MoodleXML/class.assStackQuestionMoodleImport.php
@@ -96,6 +96,13 @@ public function importQuestions($raw_data)
{
$number_of_questions_created = 0;
//For each question in the array
+
+ //Check if is PHP 7.2 in case it is, data need some extra formatting
+ if (assStackQuestionUtils::_isPhP72())
+ {
+ $raw_data = $this->php72Format($raw_data['question']);
+ }
+
foreach ($raw_data['question'] as $data)
{
// start with a new list of media objects for each question
@@ -193,7 +200,7 @@ public function importQuestions($raw_data)
$this->purgeMediaObjects();
}
}
- if (sizeof($this->error_log))
+ if (!empty($this->error_log))
{
ilUtil::sendFailure(implode('', $this->error_log));
}
@@ -286,7 +293,7 @@ private function cleanXML($xml_data)
{
foreach ($xml_data as $array)
{
- if (sizeof($array) > 1)
+ if (!empty($array))
{
return $array;
}
@@ -575,7 +582,13 @@ private function getPRTNodesFromXML($data, $prt_name)
$new_node->setTrueScore(strip_tags($prt_node['truescore']));
$new_node->setTruePenalty(strip_tags($prt_node['truepenalty']));
$new_node->setTrueAnswerNote($prt_node['trueanswernote']);
- $new_node->setTrueFeedbackFormat(1);
+ if (isset($prt_node['truefeedbackformat']))
+ {
+ $new_node->setTrueFeedbackFormat($prt_node['truefeedbackformat']);
+ } else
+ {
+ $new_node->setTrueFeedbackFormat(1);
+ }
$mapping = $this->getMediaObjectsFromXML($prt_node['truefeedback'][0]['file']);
$truefeedback = assStackQuestionUtils::_casTextConverter($this->replaceMediaObjectReferences($prt_node['truefeedback'][0]['text'], $mapping), $this->getQuestion()->getTitle(), TRUE);
@@ -586,7 +599,13 @@ private function getPRTNodesFromXML($data, $prt_name)
$new_node->setFalseScore(strip_tags($prt_node['falsescore']));
$new_node->setFalsePenalty(strip_tags($prt_node['falsepenalty']));
$new_node->setFalseAnswerNote($prt_node['falseanswernote']);
- $new_node->setFalseFeedbackFormat(1);
+ if (isset($prt_node['falsefeedbackformat']))
+ {
+ $new_node->setFalseFeedbackFormat($prt_node['falsefeedbackformat']);
+ } else
+ {
+ $new_node->setFalseFeedbackFormat(1);
+ }
$mapping = $this->getMediaObjectsFromXML($prt_node['falsefeedback'][0]['file']);
$falsefeedback = assStackQuestionUtils::_casTextConverter($this->replaceMediaObjectReferences($prt_node['falsefeedback'][0]['text'], $mapping), $this->getQuestion()->getTitle(), TRUE);
@@ -709,7 +728,7 @@ private function getExtraInfoFromXML($data)
/**
* Create media objects from array converted file elements
- * @param array $data [['_attributes' => ['name' => string, 'path' => string], '_content' => string], ...]
+ * @param array $data [['_attributes' => ['name' => string, 'path' => string], '_content' => string], ...]
* @return array filename => object_id
*/
private function getMediaObjectsFromXML($data = array())
@@ -735,8 +754,8 @@ private function getMediaObjectsFromXML($data = array())
/**
* Replace references to media objects in a text
- * @param string text from moodleXML with local references
- * @param array mapping of filenames to media object IDs
+ * @param string text from moodleXML with local references
+ * @param array mapping of filenames to media object IDs
* @return string text with paths to media objects
*/
private function replaceMediaObjectReferences($text = "", $mapping = array())
@@ -874,7 +893,7 @@ public function checkQuestion(assStackQuestion $question)
}
//Step 5: Check tests
- if (sizeof($question->getTests()))
+ if (!empty($question->getTests()))
{
foreach ($question->getTests() as $test)
{
@@ -992,4 +1011,631 @@ public function getRTETags()
{
return $this->rte_tags;
}
+
+ public function php72Format($raw_data)
+ {
+ $full_data = array();
+
+ foreach ($raw_data as $question_data)
+ {
+ $data = array();
+ //Check for not category
+ if (is_array($question_data['category']))
+ {
+ continue;
+ }
+
+ //Question Name
+ $data['name'][0]['text'] = $question_data['name'][0]['text'][0]["_content"];
+
+ //Question text
+ $data['questiontext'][0]['text'] = $question_data['questiontext'][0]['text'];
+
+ //General feedback
+ $data['generalfeedback'][0]['text'] = $question_data['generalfeedback'][0]['text'];
+
+ //default grade
+ $data['defaultgrade'] = $question_data['defaultgrade'][0]["_content"];
+
+ //penalty
+ $data['penalty'] = $question_data['penalty'][0]["_content"];
+
+ //hidden
+ if (isset($question_data['hidden'][0]["_content"]))
+ {
+ $data['hidden'] = $question_data['hidden'][0]["_content"];
+ } else
+ {
+ $data['hidden'] = "";
+ }
+
+ //stackversion
+ if (isset($question_data['stackversion'][0]["_content"]))
+ {
+ $data['stackversion'][0]['text'] = $question_data['stackversion'][0]['text'];
+ } else
+ {
+ $data['stackversion'][0]['text'] = "";
+ }
+
+ //questionvariables 2 versions to solve problems with question variables tarting with comments
+ if (isset($question_data['questionvariables'][0]['text'][0]['_content']))
+ {
+ $data['questionvariables'][0]['text'] = $question_data['questionvariables'][0]['text'][0]['_content'];
+ } elseif (isset($question_data['questionvariables'][0]['text']) AND is_string($question_data['questionvariables'][0]['text']))
+ {
+ $data['questionvariables'][0]['text'] = $question_data['questionvariables'][0]['text'];
+ } else
+ {
+ $data['questionvariables'][0]['text'] = "";
+ }
+
+ //specificfeedback:
+ if (isset($question_data['specificfeedback'][0]['text'][0]['_content']))
+ {
+ $data['specificfeedback'][0]['text'] = $question_data['specificfeedback'][0]['text'][0]['_content'];
+ } elseif (isset($question_data['specificfeedback'][0]['text']) AND is_string($question_data['specificfeedback'][0]['text']))
+ {
+ $data['specificfeedback'][0]['text'] = $question_data['specificfeedback'][0]['text'];
+ } else
+ {
+ $data['specificfeedback'][0]['text'] = "";
+ }
+
+ //questionnote
+ if (isset($question_data['questionnote'][0]['text'][0]['_content']))
+ {
+ $data['questionnote'][0]['text'] = $question_data['questionnote'][0]['text'][0]['_content'];
+ } elseif (isset($question_data['questionnote'][0]['text']) AND is_string($question_data['questionnote'][0]['text']))
+ {
+ $data['questionnote'][0]['text'] = $question_data['questionnote'][0]['text'];
+ }else
+ {
+ $data['questionnote'][0]['text'] = "";
+ }
+
+ //questionsimplify
+ if (isset($question_data['questionsimplify'][0]["_content"]))
+ {
+ $data['questionsimplify'] = $question_data['questionsimplify'][0]["_content"];
+ } else
+ {
+ $data['questionsimplify'] = "";
+ }
+
+ //assumepositive
+ if (isset($question_data['assumepositive'][0]["_content"]))
+ {
+ $data['assumepositive'] = $question_data['assumepositive'][0]["_content"];
+ } else
+ {
+ $data['assumepositive'] = "";
+ }
+
+ //assumereal
+ if (isset($question_data['assumereal'][0]["_content"]))
+ {
+ $data['assumereal'] = $question_data['assumereal'][0]["_content"];
+ } else
+ {
+ $data['assumereal'] = "";
+ }
+
+ //prtcorrect
+ if (isset($question_data['prtcorrect'][0]["_content"]))
+ {
+ $data['prtcorrect'][0]['text'] = $question_data['prtcorrect'][0]['text'];
+ } else
+ {
+ $data['prtcorrect'][0]['text'] = "";
+ }
+
+ //prtpartiallycorrect
+ if (isset($question_data['prtpartiallycorrect'][0]["_content"]))
+ {
+ $data['prtpartiallycorrect'][0]['text'] = $question_data['prtpartiallycorrect'][0]['text'];
+ } else
+ {
+ $data['prtpartiallycorrect'][0]['text'] = "";
+ }
+
+ //prtincorrect
+ if (isset($question_data['prtincorrect'][0]["_content"]))
+ {
+ $data['prtincorrect'][0]['text'] = $question_data['prtincorrect'][0]['text'];
+ } else
+ {
+ $data['prtincorrect'][0]['text'] = "";
+ }
+
+ //multiplicationsign
+ if (isset($question_data['multiplicationsign'][0]["_content"]))
+ {
+ $data['multiplicationsign'] = $question_data['multiplicationsign'][0]["_content"];
+ } else
+ {
+ $data['multiplicationsign'] = "";
+ }
+
+ //sqrtsign
+ if (isset($question_data['sqrtsign'][0]["_content"]))
+ {
+ $data['sqrtsign'] = $question_data['sqrtsign'][0]["_content"];
+ } else
+ {
+ $data['sqrtsign'] = "";
+ }
+
+ //complexno
+ if (isset($question_data['complexno'][0]["_content"]))
+ {
+ $data['complexno'] = $question_data['complexno'][0]["_content"];
+ } else
+ {
+ $data['complexno'] = "";
+ }
+
+ //inversetrig
+ if (isset($question_data['inversetrig'][0]["_content"]))
+ {
+ $data['inversetrig'] = $question_data['inversetrig'][0]["_content"];
+ } else
+ {
+ $data['inversetrig'] = "";
+ }
+
+ //matrixparens
+ if (isset($question_data['matrixparens'][0]["_content"]))
+ {
+ $data['matrixparens'] = $question_data['matrixparens'][0]["_content"];
+ } else
+ {
+ $data['matrixparens'] = "";
+ }
+
+ //variantsselectionseed
+ if (isset($question_data['variantsselectionseed']))
+ {
+ $data['variantsselectionseed'] = $question_data['variantsselectionseed'];
+ } else
+ {
+ $data['variantsselectionseed'] = "";
+ }
+
+ //Inputs
+ if (is_array($question_data['input']))
+ {
+ foreach ($question_data['input'] as $input_raw)
+ {
+ $input_data = array();
+
+ //name
+ if (isset($input_raw['name'][0]["_content"]))
+ {
+ $input_data['name'] = $input_raw['name'][0]["_content"];
+ } else
+ {
+ $input_data['name'] = "";
+ }
+
+ //type
+ if (isset($input_raw['type'][0]["_content"]))
+ {
+ $input_data['type'] = $input_raw['type'][0]["_content"];
+ } else
+ {
+ $input_data['type'] = "";
+ }
+
+ //tans
+ if (isset($input_raw['tans'][0]["_content"]))
+ {
+ $input_data['tans'] = $input_raw['tans'][0]["_content"];
+ } else
+ {
+ $input_data['tans'] = "";
+ }
+
+ //boxsize
+ if (isset($input_raw['boxsize'][0]["_content"]))
+ {
+ $input_data['boxsize'] = $input_raw['boxsize'][0]["_content"];
+ } else
+ {
+ $input_data['boxsize'] = "";
+ }
+
+ //strictsyntax
+ if (isset($input_raw['strictsyntax'][0]["_content"]))
+ {
+ $input_data['strictsyntax'] = $input_raw['strictsyntax'][0]["_content"];
+ } else
+ {
+ $input_data['strictsyntax'] = "";
+ }
+
+ //insertstars
+ if (isset($input_raw['insertstars'][0]["_content"]))
+ {
+ $input_data['insertstars'] = $input_raw['insertstars'][0]["_content"];
+ } else
+ {
+ $input_data['insertstars'] = "";
+ }
+
+ //syntaxhint
+ if (isset($input_raw['syntaxhint'][0]["_content"]))
+ {
+ $input_data['syntaxhint'] = $input_raw['syntaxhint'][0]["_content"];
+ } else
+ {
+ $input_data['syntaxhint'] = "";
+ }
+
+ //syntaxattribute
+ if (isset($input_raw['syntaxattribute'][0]["_content"]))
+ {
+ $input_data['syntaxattribute'] = $input_raw['syntaxattribute'][0]["_content"];
+ } else
+ {
+ $input_data['syntaxattribute'] = "";
+ }
+
+ //forbidwords
+ if (isset($input_raw['forbidwords'][0]["_content"]))
+ {
+ $input_data['forbidwords'] = $input_raw['forbidwords'][0]["_content"];
+ } else
+ {
+ $input_data['forbidwords'] = "";
+ }
+
+ //allowwords
+ if (isset($input_raw['allowwords'][0]["_content"]))
+ {
+ $input_data['allowwords'] = $input_raw['allowwords'][0]["_content"];
+ } else
+ {
+ $input_data['allowwords'] = "";
+ }
+
+ //forbidfloat
+ if (isset($input_raw['forbidfloat'][0]["_content"]))
+ {
+ $input_data['forbidfloat'] = $input_raw['forbidfloat'][0]["_content"];
+ } else
+ {
+ $input_data['forbidfloat'] = "";
+ }
+
+ //requirelowestterms
+ if (isset($input_raw['requirelowestterms'][0]["_content"]))
+ {
+ $input_data['requirelowestterms'] = $input_raw['requirelowestterms'][0]["_content"];
+ } else
+ {
+ $input_data['requirelowestterms'] = "";
+ }
+
+ //checkanswertype
+ if (isset($input_raw['checkanswertype'][0]["_content"]))
+ {
+ $input_data['checkanswertype'] = $input_raw['checkanswertype'][0]["_content"];
+ } else
+ {
+ $input_data['checkanswertype'] = "";
+ }
+
+ //mustverify
+ if (isset($input_raw['mustverify'][0]["_content"]))
+ {
+ $input_data['mustverify'] = $input_raw['mustverify'][0]["_content"];
+ } else
+ {
+ $input_data['mustverify'] = "";
+ }
+
+ //showvalidation
+ if (isset($input_raw['showvalidation'][0]["_content"]))
+ {
+ $input_data['showvalidation'] = $input_raw['showvalidation'][0]["_content"];
+ } else
+ {
+ $input_data['showvalidation'] = "";
+ }
+
+ //options
+ if (isset($input_raw['options'][0]["_content"]))
+ {
+ $input_data['options'] = $input_raw['options'][0]["_content"];
+ } else
+ {
+ $input_data['options'] = "";
+ }
+
+ //Add to question
+ $data['input'][] = $input_data;
+ }
+ }
+
+ //PRT
+ if (is_array($question_data['prt']))
+ {
+ foreach ($question_data['prt'] as $prt_raw)
+ {
+ $prt_data = array();
+
+ //name
+ if (isset($prt_raw['name'][0]["_content"]))
+ {
+ $prt_data['name'] = $prt_raw['name'][0]["_content"];
+ } else
+ {
+ $prt_data['name'] = "";
+ }
+
+ //value
+ if (isset($prt_raw['value'][0]["_content"]))
+ {
+ $prt_data['value'] = $prt_raw['value'][0]["_content"];
+ } else
+ {
+ $prt_data['value'] = "";
+ }
+
+ //autosimplify
+ if (isset($prt_raw['autosimplify'][0]["_content"]))
+ {
+ $prt_data['autosimplify'] = $prt_raw['autosimplify'][0]["_content"];
+ } else
+ {
+ $prt_data['autosimplify'] = "";
+ }
+
+ //feedbackvariables
+ if (isset($prt_raw['feedbackvariables'][0]["text"]))
+ {
+ $prt_data['feedbackvariables'][0]["text"] = $prt_raw['feedbackvariables'][0]["text"];
+ } else
+ {
+ $prt_data['feedbackvariables'][0]["text"] = "";
+ }
+
+ //Nodes
+ if (is_array($prt_raw['node']))
+ {
+ foreach ($prt_raw['node'] as $node_raw)
+ {
+ $node_data = array();
+
+ //name
+ if (isset($node_raw['name'][0]["_content"]))
+ {
+ $node_data['name'] = $node_raw['name'][0]["_content"];
+ } else
+ {
+ $node_data['name'] = "";
+ }
+
+ //answertest
+ if (isset($node_raw['answertest'][0]["_content"]))
+ {
+ $node_data['answertest'] = $node_raw['answertest'][0]["_content"];
+ } else
+ {
+ $node_data['answertest'] = "";
+ }
+
+ //sans
+ if (isset($node_raw['sans'][0]["_content"]))
+ {
+ $node_data['sans'] = $node_raw['sans'][0]["_content"];
+ } else
+ {
+ $node_data['sans'] = "";
+ }
+
+ //tans
+ if (isset($node_raw['tans'][0]["_content"]))
+ {
+ $node_data['tans'] = $node_raw['tans'][0]["_content"];
+ } else
+ {
+ $node_data['tans'] = "";
+ }
+
+ //testoptions
+ if (isset($node_raw['testoptions'][0]["_content"]))
+ {
+ $node_data['testoptions'] = $node_raw['testoptions'][0]["_content"];
+ } else
+ {
+ $node_data['testoptions'] = "";
+ }
+
+ //quiet
+ if (isset($node_raw['quiet'][0]["_content"]))
+ {
+ $node_data['quiet'] = $node_raw['quiet'][0]["_content"];
+ } else
+ {
+ $node_data['quiet'] = "";
+ }
+
+ //truescoremode
+ if (isset($node_raw['truescoremode'][0]["_content"]))
+ {
+ $node_data['truescoremode'] = $node_raw['truescoremode'][0]["_content"];
+ } else
+ {
+ $node_data['truescoremode'] = "";
+ }
+
+ //truescore
+ if (isset($node_raw['truescore'][0]["_content"]))
+ {
+ $node_data['truescore'] = $node_raw['truescore'][0]["_content"];
+ } else
+ {
+ $node_data['truescore'] = "";
+ }
+
+ //truepenalty
+ if (isset($node_raw['truepenalty'][0]["_content"]))
+ {
+ $node_data['truepenalty'] = $node_raw['truepenalty'][0]["_content"];
+ } else
+ {
+ $node_data['truepenalty'] = "";
+ }
+
+ //truenextnode
+ if (isset($node_raw['truenextnode'][0]["_content"]))
+ {
+ $node_data['truenextnode'] = $node_raw['truenextnode'][0]["_content"];
+ } else
+ {
+ $node_data['truenextnode'] = "";
+ }
+
+ //trueanswernote
+ if (isset($node_raw['trueanswernote'][0]["_content"]))
+ {
+ $node_data['trueanswernote'] = $node_raw['trueanswernote'][0]["_content"];
+ } else
+ {
+ $node_data['trueanswernote'] = "";
+ }
+
+ //truefeedback
+ if (isset($node_raw['truefeedback'][0]["text"][0]["_content"]))
+ {
+ $node_data['truefeedback'][0]["text"] = $node_raw['truefeedback'][0]["text"][0]["_content"];
+ } else
+ {
+ $node_data['truefeedback'][0]["text"] = "";
+ }
+
+ //falsescoremode
+ if (isset($node_raw['falsescoremode'][0]["_content"]))
+ {
+ $node_data['falsescoremode'] = $node_raw['falsescoremode'][0]["_content"];
+ } else
+ {
+ $node_data['falsescoremode'] = "";
+ }
+
+ //falsescore
+ if (isset($node_raw['falsescore'][0]["_content"]))
+ {
+ $node_data['falsescore'] = $node_raw['falsescore'][0]["_content"];
+ } else
+ {
+ $node_data['falsescore'] = "";
+ }
+
+ //falsepenalty
+ if (isset($node_raw['falsepenalty'][0]["_content"]))
+ {
+ $node_data['falsepenalty'] = $node_raw['falsepenalty'][0]["_content"];
+ } else
+ {
+ $node_data['falsepenalty'] = "";
+ }
+
+ //falsenextnode
+ if (isset($node_raw['falsenextnode'][0]["_content"]))
+ {
+ $node_data['falsenextnode'] = $node_raw['falsenextnode'][0]["_content"];
+ } else
+ {
+ $node_data['falsenextnode'] = "";
+ }
+
+ //falseanswernote
+ if (isset($node_raw['falseanswernote'][0]["_content"]))
+ {
+ $node_data['falseanswernote'] = $node_raw['falseanswernote'][0]["_content"];
+ } else
+ {
+ $node_data['falseanswernote'] = "";
+ }
+
+ //falsefeedback
+ if (isset($node_raw['falsefeedback'][0]["text"][0]["_content"]))
+ {
+ $node_data['falsefeedback'][0]["text"] = $node_raw['falsefeedback'][0]["text"][0]["_content"];
+ } else
+ {
+ $node_data['falsefeedback'][0]["text"] = "";
+ }
+
+ //Add to prt
+ $prt_data['node'][] = $node_data;
+ }
+ }
+
+ //Add to question
+ $data['prt'][] = $prt_data;
+
+ //qtest
+ if (is_array($question_data['qtest']))
+ {
+ foreach ($question_data['qtest'] as $qtest_raw)
+ {
+ $qtest_data = array();
+
+ //testcase
+ if (isset($qtest_raw['testcase'][0]["_content"]))
+ {
+ $qtest_data['testcase'] = $qtest_raw['testcase'][0]["_content"];
+ } else
+ {
+ $qtest_data['testcase'] = "";
+ }
+
+ //testinput
+ if (isset($qtest_raw['testinput'][0]['name'][0]["_content"]) AND isset($qtest_raw['testinput'][0]['value'][0]["_content"]))
+ {
+ $qtest_data['testinput'][0]['name'] = $qtest_raw['testinput'][0]['name'][0]["_content"];
+ $qtest_data['testinput'][0]['value'] = $qtest_raw['testinput'][0]['value'][0]["_content"];
+ } else
+ {
+ $qtest_data['testinput'][0]['name'] = "";
+ $qtest_data['testinput'][0]['value'] = "";
+ }
+
+ //expected
+ if (isset($qtest_raw['expected'][0]['name'][0]["_content"]) AND isset($qtest_raw['expected'][0]['expectedscore'][0]["_content"]) AND isset($qtest_raw['expected'][0]['expectedanswernote'][0]["_content"]))
+ {
+ $qtest_data['expected'][0]['name'] = $qtest_raw['expected'][0]['name'][0]["_content"];
+ $qtest_data['expected'][0]['expectedscore'] = $qtest_raw['expected'][0]['expectedscore'][0]["_content"];
+ $qtest_data['expected'][0]['expectedpenalty'] = $qtest_raw['expected'][0]['expectedpenalty'][0]["_content"];
+ $qtest_data['expected'][0]['expectedanswernote'] = $qtest_raw['expected'][0]['expectedanswernote'][0]["_content"];
+
+ } else
+ {
+ $qtest_data['expected'][0]['name'] = "";
+ $qtest_data['expected'][0]['expectedscore'] = "";
+ $qtest_data['expected'][0]['expectedpenalty'] = "";
+ $qtest_data['expected'][0]['expectedanswernote'] = "";
+ }
+
+
+ //Add to question
+ $data['qtest'][] = $qtest_data;
+ }
+ }
+
+ }
+ }
+
+ //Add to full data
+ $full_data['question'][] = $data;
+
+ }
+
+ return $full_data;
+ }
+
}
diff --git a/classes/model/question_display/class.assStackQuestionDisplay.php b/classes/model/question_display/class.assStackQuestionDisplay.php
index 603c1b64..236709fc 100644
--- a/classes/model/question_display/class.assStackQuestionDisplay.php
+++ b/classes/model/question_display/class.assStackQuestionDisplay.php
@@ -167,12 +167,16 @@ private function replacementForInputPlaceholders($input, $input_name, $in_test,
//In assStackQuestionDisplay the User response should be store with the "value" format for assStackQuestionUtils::_getUserResponse.
$student_answer = $this->getUserResponse($input_name, $in_test);
//Bug https://www.ilias.de/mantis/view.php?id=22129 about matrix syntax hint
- if (!sizeof($student_answer) AND ($input->get_parameter('syntaxHint') != '') AND is_a($input, 'stack_matrix_input'))
+ if (is_array($student_answer))
{
- $student_answer = assStackQuestionUtils::_changeUserResponseStyle(array($input_name => $input->get_parameter('syntaxHint')), $this->getQuestion()->getQuestionId(), array($input_name => $input), 'reduced_to_value');
- $student_answer = $student_answer["xqcas_input_" . $input_name . "_value"];
+ if (!sizeof($student_answer) AND ($input->get_parameter('syntaxHint') != '') AND is_a($input, 'stack_matrix_input'))
+ {
+ $student_answer = assStackQuestionUtils::_changeUserResponseStyle(array($input_name => $input->get_parameter('syntaxHint')), $this->getQuestion()->getQuestionId(), array($input_name => $input), 'reduced_to_value');
+ $student_answer = $student_answer["xqcas_input_" . $input_name . "_value"];
+ }
}
+
//Create input state
if ($in_test)
{
@@ -187,9 +191,16 @@ private function replacementForInputPlaceholders($input, $input_name, $in_test,
//Solve problem with string input type
if (is_array($student_answer))
{
- if ($student_answer[$input_name] == NULL)
+ if (get_class($input) == 'stack_matrix_input')
+ {
+ //https://mantis.ilias.de/view.php?id=25256
+ return $state->contentsdisplayed;
+ } else
{
- return "";
+ if ($student_answer[$input_name] == NULL)
+ {
+ return "";
+ }
}
}
@@ -259,19 +270,21 @@ private function replacementForValidationPlaceholders($input, $input_name)
private function replacementForPRTPlaceholders($prt, $prt_name, $in_test)
{
$string = "";
- if (sizeof($this->getInlineFeedback()))
+ if (!empty($this->getInlineFeedback()))
{
//feedback
- $string .= '';
- //Generic feedback
- $string .= $this->inline_feedback['prt'][$prt_name]['status']['message'];
- //$string .= '
';
+ //feedback
+ if (strlen($this->inline_feedback['prt'][$prt_name]['status']['message']))
+ {
+ //Generic feedback
+ $string .= $this->inline_feedback['prt'][$prt_name]['status']['message'];
+ }
//Specific feedback
$string .= $this->inline_feedback['prt'][$prt_name]['feedback'];
$string .= $this->inline_feedback['prt'][$prt_name]['errors'];
- $string .= '
';
}
- return $string;
+
+ return assStackQuestionUtils::_getFeedbackStyledText($string, "feedback_default");
}
/*
@@ -469,12 +482,16 @@ public function replacementForValidationInput($input, $input_name, $in_test, $re
//In assStackQuestionDisplay the User response should be store with the "value" format for assStackQuestionUtils::_getUserResponse.
$student_answer = $this->getUserResponse($input_name, $in_test);
//Bug https://www.ilias.de/mantis/view.php?id=22129 about matrix syntax hint
- if (!sizeof($student_answer) AND ($input->get_parameter('syntaxHint') != '') AND is_a($input, 'stack_matrix_input'))
+ if (is_array($student_answer))
{
- $student_answer = assStackQuestionUtils::_changeUserResponseStyle(array($input_name => $input->get_parameter('syntaxHint')), $this->getQuestion()->getQuestionId(), array($input_name => $input), 'reduced_to_value');
- $student_answer = $student_answer["xqcas_input_" . $input_name . "_value"];
+ if (!sizeof($student_answer) AND ($input->get_parameter('syntaxHint') != '') AND is_a($input, 'stack_matrix_input'))
+ {
+ $student_answer = assStackQuestionUtils::_changeUserResponseStyle(array($input_name => $input->get_parameter('syntaxHint')), $this->getQuestion()->getQuestionId(), array($input_name => $input), 'reduced_to_value');
+ $student_answer = $student_answer["xqcas_input_" . $input_name . "_value"];
+ }
}
+
$input_state = $this->getQuestion()->getInputStates($input_name);
$input_size = (string)$input->get_parameter("boxWidth");
@@ -506,7 +523,14 @@ public function replacementForValidationInput($input, $input_name, $in_test, $re
for ($j = 0; $j < $matrix_input_columns; $j++)
{
$user_matrix .= "";
- $user_filled_input = '' . $student_answer[$input_name][$input_name . "_sub_" . $i . "_" . $j] . '';
+ //https://mantis.ilias.de/view.php?id=25256
+ if ($in_test)
+ {
+ $user_filled_input = '' . $student_answer[$input_name][$input_name . "_sub_" . $i . "_" . $j] . '';
+ } else
+ {
+ $user_filled_input = '' . $student_answer[$input_name . "_sub_" . $i . "_" . $j] . '';
+ }
$user_matrix .= $user_filled_input;
$user_matrix .= " | ";
}
@@ -557,10 +581,7 @@ public function replacementForValidationInput($input, $input_name, $in_test, $re
}
if (is_a($input, "stack_notes_input"))
{
- $string = "";
- $string .= '';
- $string .= $this->getPlugin()->txt("notes_best_solution_message");
- $string .= '
';
+ $string = assStackQuestionUtils::_getFeedbackStyledText($this->getPlugin()->txt("notes_best_solution_message"), "feedback_default");
$result["value"] = $string;
$result["display"] = "";
diff --git a/classes/model/question_evaluation/class.assStackQuestionFeedback.php b/classes/model/question_evaluation/class.assStackQuestionFeedback.php
index 512dbb72..01c69fbf 100644
--- a/classes/model/question_evaluation/class.assStackQuestionFeedback.php
+++ b/classes/model/question_evaluation/class.assStackQuestionFeedback.php
@@ -91,7 +91,6 @@ private function createPRTFeedback($prt_name, $prt_data)
$prt_feedback['status'] = $this->fillStatus($prt_data['state']);
//fill answernote
$prt_feedback['answernote'] = $this->fillAnswerNote($prt_data['state']);
-
return $prt_feedback;
}
@@ -172,8 +171,27 @@ private function fillFeedback($prt_state)
{
foreach ($prt_state->__get('feedback') as $feedback_obj)
{
- $feedback .= $prt_state->substitue_variables_in_feedback($feedback_obj->feedback);
- $feedback .= '';
+ switch ($feedback_obj->format)
+ {
+ case "2":
+ $feedback .= "[[feedback_node_right]]".$prt_state->substitue_variables_in_feedback($feedback_obj->feedback). "[[feedback_node_right_close]]";
+ break;
+ case "3":
+ $feedback .= "[[feedback_node_wrong]]".$prt_state->substitue_variables_in_feedback($feedback_obj->feedback). "[[feedback_node_wrong_close]]";
+ break;
+ case "4":
+ $feedback .= "[[feedback_solution_hint]]".$prt_state->substitue_variables_in_feedback($feedback_obj->feedback). "[[feedback_solution_hint_close]]";
+ break;
+ case "5":
+ $feedback .= "[[feedback_extra_info]]".$prt_state->substitue_variables_in_feedback($feedback_obj->feedback). "[[feedback_extra_info_close]]";
+ break;
+ case "6":
+ $feedback .= "[[feedback_plot_feedback]]".$prt_state->substitue_variables_in_feedback($feedback_obj->feedback). "[[feedback_plot_feedback_close]]";
+ break;
+ default:
+ $feedback .= $prt_state->substitue_variables_in_feedback($feedback_obj->feedback);
+ break;
+ }
}
}
@@ -496,10 +514,7 @@ public function getCorrectResponsePlaceholders($input_name = "")
}
if (is_a($input, "stack_notes_input"))
{
- $string = "";
- $string .= '';
- $string .= $this->getPlugin()->txt("notes_best_solution_message");
- $string .= '
';
+ $string = assStackQuestionUtils::_getFeedbackStyledText($this->getPlugin()->txt("notes_best_solution_message"), "feedback_default");
$result["value"] = $string;
$result["display"] = "";
diff --git a/classes/stack/cas/cassession.class.php b/classes/stack/cas/cassession.class.php
index fb7886d8..12c52948 100644
--- a/classes/stack/cas/cassession.class.php
+++ b/classes/stack/cas/cassession.class.php
@@ -531,7 +531,7 @@ private function construct_maxima_command() {
}
// Special handling for the conditionally evaluated strings.
- if (count($cs->get_conditions()) > 0) {
+ if (!empty($cs->get_conditions())) {
$conditions = array();
foreach ($cs->get_conditions() as $cond) {
// No need to evaluate again if it is already evaluated.
diff --git a/classes/stack/cas/casstring.class.php b/classes/stack/cas/casstring.class.php
index ca560f28..404e4254 100644
--- a/classes/stack/cas/casstring.class.php
+++ b/classes/stack/cas/casstring.class.php
@@ -555,7 +555,7 @@ public function __construct($rawstring, $conditions = null) {
if (!($conditions === null || is_array($conditions))) {
throw new stack_exception('stack_cas_casstring: conditions must be null or an array.');
}
- if (count($conditions) != 0) {
+ if (!empty($conditions)) {
$this->conditions = $conditions;
}
}
diff --git a/classes/stack/cas/castext.class.php b/classes/stack/cas/castext.class.php
index b77401f6..db3bec56 100644
--- a/classes/stack/cas/castext.class.php
+++ b/classes/stack/cas/castext.class.php
@@ -356,10 +356,10 @@ private function instantiate() {
return false;
}
- // Deal with castext without any CAS variables.
- if (null !== $this->session && count($this->session->get_session()) > 0) {
- $this->session->instantiate();
- }
+ // Deal with castext without any CAS variables.
+ if (null !== $this->session && !empty($this->session->get_session())) {
+ $this->session->instantiate();
+ }
// Handle blocks.
$requiresrerun = false;
diff --git a/classes/stack/cas/connector.dbcache.class.php b/classes/stack/cas/connector.dbcache.class.php
index 11b70d1a..c92d310f 100644
--- a/classes/stack/cas/connector.dbcache.class.php
+++ b/classes/stack/cas/connector.dbcache.class.php
@@ -119,7 +119,7 @@ protected function get_cached_result($command)
// If there was more than one record in the cache (due to a race condition)
// drop the duplicates.
////fim: #9 Use ILIAS DB instead of Moodle DB
- if (sizeof($data) > 1)
+ if (!empty($data))
{
unset($data[0]);
foreach ($data as $record)
diff --git a/classes/stack/input/checkbox/checkbox.class.php b/classes/stack/input/checkbox/checkbox.class.php
index fc5dbd49..78cebe4d 100644
--- a/classes/stack/input/checkbox/checkbox.class.php
+++ b/classes/stack/input/checkbox/checkbox.class.php
@@ -154,11 +154,13 @@ public function response_to_contents($response) {
}
$contents = array();
- foreach ($this->ddlvalues as $key => $val) {
- if (array_key_exists($this->name.'_'.$key, $response)) {
- $contents[] = (int) $response[$this->name.'_'.$key];
- }
- }
+ if(is_array($this->ddlvalues)){
+ foreach ($this->ddlvalues as $key => $val) {
+ if (array_key_exists($this->name.'_'.$key, $response)) {
+ $contents[] = (int) $response[$this->name.'_'.$key];
+ }
+ }
+ }
return $contents;
}
diff --git a/classes/utils/class.assStackQuestionUtils.php b/classes/utils/class.assStackQuestionUtils.php
index 1b45b8ed..45600359 100644
--- a/classes/utils/class.assStackQuestionUtils.php
+++ b/classes/utils/class.assStackQuestionUtils.php
@@ -146,10 +146,12 @@ public static function _getUserResponse($question_id, array $inputs, array $prev
$current_response = array();
$user_response_from_db = array();
- if(sizeof($previous_response)){
+ if (!empty($previous_response))
+ {
foreach ($previous_response["prt"] as $prt_name => $prt_info)
{
- if(sizeof($prt_info["response"])){
+ if (!empty($prt_info["response"]))
+ {
foreach ($prt_info["response"] as $input_name => $input_info)
{
$user_response_from_db[$input_name] = $input_info["value"];
@@ -179,7 +181,7 @@ public static function _getUserResponse($question_id, array $inputs, array $prev
return $user_response;
}
- /**
+ /**
* @param $user_response
* @param $question_id
* @param $inputs
@@ -300,7 +302,7 @@ public static function _changeUserResponseStyle($user_response, $question_id, $i
foreach ($inputs as $input_name => $input)
{
//If input is not matrix
- if (is_subclass_of($input,"stack_dropdown_input"))
+ if (is_subclass_of($input, "stack_dropdown_input"))
{
$new_user_response_array['xqcas_input_' . $input_name . '_value'] = $input->maxima_to_response_array($user_response[$input_name]);
} elseif (!is_a($input, 'stack_matrix_input'))
@@ -641,4 +643,124 @@ public static function stack_output_castext($castext)
return stack_maths::process_display_castext($castext);
}
+ /**
+ * Returns the ID of each content styles available in the platform.
+ */
+ public static function _getContentStylesAvailable()
+ {
+ global $DIC;
+ $db = $DIC->database();
+
+ $styles_id = array();
+ $query = "SELECT id FROM style_data WHERE active = '1'";
+ $result = $db->query($query);
+ while ($row = $db->fetchAssoc($result))
+ {
+ $styles_id[] = $row["id"];
+ }
+
+ return $styles_id;
+ }
+
+ /**
+ * Returns a text with a format from the content style
+ * @param $a_text
+ * @param $a_format
+ * @return string
+ */
+ public static function _getFeedbackStyledText($a_text, $a_format)
+ {
+ //Get Styles assigned to Formats
+ $config_options = assStackQuestionConfig::_getStoredSettings("feedback");
+ require_once "./Services/Style/Content/classes/class.ilObjStyleSheet.php";
+
+ //Return text depending Format
+ if (strlen($a_text))
+ {
+ switch ($a_format)
+ {
+ case "feedback_default":
+ if ($config_options["feedback_default"] == "0")
+ {
+ return '' . $a_text . '
';
+ } else
+ {
+ $style_assigned = $config_options[$a_format];
+
+ return '' . $a_text . '
';
+ }
+ default:
+ //Use specific feedback style
+ $style_assigned = $config_options[$a_format];
+
+ return '' . $a_text . '
';
+ }
+ } else
+ {
+ return $a_text;
+ }
+
+ }
+
+ public static function _getActiveContentStyleId()
+ {
+ global $DIC;
+ $db = $DIC->database();
+
+ $styles_id = array();
+ $query = "SELECT value FROM xqcas_configuration WHERE parameter_name = 'feedback_stylesheet_id'";
+ $result = $db->query($query);
+ while ($row = $db->fetchAssoc($result))
+ {
+ return $row["value"];
+ }
+ }
+
+ public static function _replaceFeedbackPlaceHolders($feedback){
+ //Get Styles assigned to Formats
+ $config_options = assStackQuestionConfig::_getStoredSettings("feedback");
+
+ $text = $feedback;
+ //Search for right feedback
+ $style_assigned = $config_options["feedback_node_right"];
+ $text = str_replace("[[feedback_node_right]]", '',$text);
+ $text = str_replace("[[feedback_node_right_close]]", '
',$text);
+
+ //Search for wrong feedback
+ $style_assigned = $config_options["feedback_node_wrong"];
+ $text = str_replace("[[feedback_node_wrong]]", '',$text);
+ $text = str_replace("[[feedback_node_wrong_close]]", '
',$text);
+
+ //Search for wrong feedback
+ $style_assigned = $config_options["feedback_solution_hint"];
+ $text = str_replace("[[feedback_solution_hint]]", '',$text);
+ $text = str_replace("[[feedback_solution_hint_close]]", '
',$text);
+
+ //Replace Extra info
+ $style_assigned = $config_options["feedback_extra_info"];
+ $text = str_replace("[[feedback_extra_info]]", '',$text);
+ $text = str_replace("[[feedback_extra_info_close]]", '
',$text);
+
+ //Replace Extra info
+ $style_assigned = $config_options["feedback_plot_feedback"];
+ $text = str_replace("[[feedback_plot_feedback]]", '',$text);
+ $text = str_replace("[[feedback_plot_feedback_close]]", '
',$text);
+
+ return $text;
+ }
+
+
+ public static function _isPhP72()
+ {
+ $php_version = phpversion();
+
+ $version = substr($php_version, 0, 3);
+ if ($version < 7.2)
+ {
+ return FALSE;
+ } else
+ {
+ return TRUE;
+ }
+ }
}
diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index 02b7c04f..429e726d 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -400,6 +400,25 @@ notes_best_solution_message#:#Notizen haben keine bestmögliche Lösung
show_default_prts_settings#:#Vorgabewerte für Rückmeldebäume-Einstellungen
default_prts_settings#:#Standard-Einstellungen für Rückmeldebäume und Knoten
config_default_prts_message#:#Die Einstellungen für Rückmeldebäume wurden erfolgreich geändert.
+prt_node_pos_feedback_class#:#Feedback-Style, wenn wahr
+prt_node_pos_feedback_class_info#:#Wählen Sie den Feedback-Style, wenn der Answertest dieses Knotens wahr ist.
+prt_node_neg_feedback_class#:#Feedback-Style, wenn falsch
+prt_node_neg_feedback_class_info#:#Wählen Sie den Feedback-Style, wenn der Answertest dieses Knotens falsch ist.
+feedback_styles_settings#:#Feedback-Style Einstellungen
+feedback_styles_settings#:#Feedback-Style Einstellungen
+feedback_node_right#:#Richtig
+feedback_node_right_info#:#Feedback-Typ für richtige Antworten
+feedback_node_wrong#:#Falsch
+feedback_node_wrong_info#:#Feedback-Typ für falsche Antworten
+feedback_solution_hint#:#Hinweis
+feedback_solution_hint_info#:#Feedback-Style für Lösungshinweise
+feedback_extra_info#:#Info
+feedback_extra_info_info#:#Feedback-Style für zusätzliche Informationen
+feedback_plot_feedback#:#Diagramm
+feedback_plot_feedback_info#:#Für Diagramme benutzter Feedback-Style
+config_feedback_styles_changed_message#:#Die Standardeinstellungen für Feedback-Style wurden erfolgreich geändert.
+feedback_extra_1#:#Teilweise korrekt
+feedback_extra_1_info#:#Feedback-Style für teilweise korrekte Antworten
copy_node#:#Knoten kopieren
paste_node#:#Knoten einfügen
copy_prt#:# Rückmeldebaum kopieren
@@ -431,4 +450,12 @@ servers_deactivated#:#Die Server wurden deaktiviert.
no_server_selected#:#Bitte wählen Sie einen Server aus.
confirm_delete_servers#:#Möchten Sie den/die folgenden Server löschen?
server_deleted#:#Der Server wurde gelöscht.
-servers_deleted#:#Die Server wurden gelöscht.
\ No newline at end of file
+servers_deleted#:#Die Server wurden gelöscht.
+deletion_error_connected_node#:#You cannot delete this node as is connected to a PRT, please change the PRT structure to disconnect the node before delete it.
+import_in_test_error#:#Import STACK questions from MoodleXML is not allowed in tests, please import it into a question pool before including it into a test.
+feedback_stylesheet_id#:#Content-Style
+feedback_stylesheet_id_info#:#Wählen Sie den Content-Style, der für das STACK-Feedback verwendet wird. Es können nur aktive Content-Style ausgewählt werden. Wenn kein Inhaltsstil ausgewählt ist, wird der Standard-Feedback-Style verwendet. Bitte beachten Sie, dass bei einer Änderung des Inhaltsstils alle Werte in diesem Formular auf Standard zurückgesetzt werden.
+feedback_default#:#Allgemeiner Feedback-Style
+feedback_default_info#:#Wählen Sie den Feedback-Style für Feedback-Nachrichten in STACK-Fragen. Er wird für den Abschnitt einer Feedback-Nachricht von STACK verwendet. Innerhalb dieses Abschnitts sind die Feedbacks der Knoten eines Rückmeldebaums eingebettet, die zusätzlich mit eigenen Styles versehen werden können.
+nodes_feedback#:#Feedback von Knoten
+config_prts_changed_message#:#Änderungen wurden übernommen
\ No newline at end of file
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index 799cfd91..45eb8eef 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -400,26 +400,22 @@ notes_best_solution_message#:#Notes inputs have no best solution
show_default_prts_settings#:#Default values for Potential response Trees and First nodes
default_prts_settings#:#Default values for Potential response Trees
config_default_prts_message#:#The default settings for PRT have been changed successfully.
-prt_node_pos_feedback_class#:#Feedback Style if True
-prt_node_pos_feedback_class_info#:#Choose the feedback style if this node's answertest is true, feedback style can be managed in plugin configuration.
-prt_node_neg_feedback_class#:#Feedback Style if False
-prt_node_neg_feedback_class_info#:#Choose the feedback style if this node's answertest is false, feedback style can be managed in plugin configuration.
+prt_node_pos_feedback_class#:#Feedback Type if True
+prt_node_pos_feedback_class_info#:#Choose the feedback style if this node's answertest is true
+prt_node_neg_feedback_class#:#Feedback Type if False
+prt_node_neg_feedback_class_info#:#Choose the feedback style if this node's answertest is false
feedback_styles_settings#:#Feedback Styles Settings
-feedback_node_right#:#Right Answer
+feedback_node_right#:#Right
feedback_node_right_info#:#Feedback style for right answers
-feedback_node_wrong#:#Wrong Answer
+feedback_node_wrong#:#Wrong
feedback_node_wrong_info#:#Feedback style for wrong answers
-feedback_solution_hint#:#Solution Hint
+feedback_solution_hint#:#Hint
feedback_solution_hint_info#:#Feedback style for solution hints
-feedback_extra_info#:#Extra Information
+feedback_extra_info#:#Info
feedback_extra_info_info#:#Feedback style used for extra information
feedback_plot_feedback#:#Plot
feedback_plot_feedback_info#:#Feedback style used for plots
config_feedback_styles_changed_message#:#The default settings for Feedback Styles have been changed successfully.
-feedback_extra_1#:#Partially correct
-feedback_extra_1_info#:#Feedback style for partially correct answers
-options_stepwise_feedback#:#Stepwise Feedback
-options_stepwise_feedback_info#:#Allow students to evaluate each PRT separately without reload the page
copy_node#:#Copy Node
paste_node#:#Paste Node
copy_prt#:#Copy Potential Response Tree
@@ -452,3 +448,11 @@ no_server_selected#:#Please select a server.
confirm_delete_servers#:#Delete the following server(s)?
server_deleted#:#The server is deleted.
servers_deleted#:#The servers are deleted.
+deletion_error_connected_node#:#You cannot delete this node as is connected to a PRT, please change the PRT structure to disconnect the node before delete it.
+import_in_test_error#:#Import STACK questions from MoodleXML is not allowed in tests, please import it into a question pool before including it into a test.
+feedback_stylesheet_id#:#Content Style
+feedback_stylesheet_id_info#:#Select the content style used for STACK Feedback. Only active content styles can be selected. If no content style is chosen the default feedback style will be applied. Please notice, in case you change the content style, all values in this form will be set to default.
+feedback_default#:#General Feedback Style
+feedback_default_info#:#Select the feedback style for feedback messages in STACK questions. It is used for the section of a STACK feedback message. Within this section, the feedbacks of the nodes of a potential response tree are embedded, which can also be provided with their own styles.
+nodes_feedback#:#Feedback from Nodes
+config_prts_changed_message#:#Changes have been applied
\ No newline at end of file
diff --git a/plugin.php b/plugin.php
index 26d350d5..2bd8993b 100644
--- a/plugin.php
+++ b/plugin.php
@@ -8,12 +8,13 @@
$id = "xqcas";
// code version; must be changed for all code changes
-$version = "3.0.22";
+
+$version = "3.1.5";
// ilias min and max version; must always reflect the versions that should
// run with the plugin
-$ilias_min_version = "5.3.0";
-$ilias_max_version = "5.3.999";
+$ilias_min_version = "5.4.0";
+$ilias_max_version = "5.4.999";
// optional, but useful: Add one or more responsible persons and a contact email
$responsible = "Fred Neumann, Jesus Copado";
diff --git a/sql/dbupdate.php b/sql/dbupdate.php
index 03c70412..f540d21d 100644
--- a/sql/dbupdate.php
+++ b/sql/dbupdate.php
@@ -737,4 +737,37 @@
$db->insert("xqcas_configuration", array('parameter_name' => array('text', "prt_neg_penalty"), 'value' => array('clob', '0'), 'group_name' => array('text', 'prts')));
$db->insert("xqcas_configuration", array('parameter_name' => array('text', "prt_neg_answernote"), 'value' => array('clob', 'prt1-0-F'), 'group_name' => array('text', 'prts')));
}
-?>
\ No newline at end of file
+?>
+<#36>
+
+<#37>
+database();
+//Create feedback styles
+if ($db->tableExists('xqcas_configuration'))
+{
+ //Feedback style 1 will be used as default, in case feedback_default is chosen, the value in true/false_feedback_format will be 1, and no specific style will be used, but platform style
+ $db->insert("xqcas_configuration", array('parameter_name' => array('text', "feedback_default"), 'value' => array('clob', ''), 'group_name' => array('text', 'feedback')));
+ //Specific feedback formats.
+ $db->insert("xqcas_configuration", array('parameter_name' => array('text', "feedback_node_right"), 'value' => array('clob', ''), 'group_name' => array('text', 'feedback')));
+ $db->insert("xqcas_configuration", array('parameter_name' => array('text', "feedback_node_wrong"), 'value' => array('clob', ''), 'group_name' => array('text', 'feedback')));
+ $db->insert("xqcas_configuration", array('parameter_name' => array('text', "feedback_node_partially"), 'value' => array('clob', ''), 'group_name' => array('text', 'feedback')));
+ $db->insert("xqcas_configuration", array('parameter_name' => array('text', "feedback_solution_hint"), 'value' => array('clob', ''), 'group_name' => array('text', 'feedback')));
+ $db->insert("xqcas_configuration", array('parameter_name' => array('text', "feedback_extra_info"), 'value' => array('clob', ''), 'group_name' => array('text', 'feedback')));
+ $db->insert("xqcas_configuration", array('parameter_name' => array('text', "feedback_plot_feedback"), 'value' => array('clob', ''), 'group_name' => array('text', 'feedback')));
+}
+?>
+<#38>
+database();
+//Create feedback styles
+if ($db->tableExists('xqcas_configuration'))
+{
+ //We have to store the id of the content style we want to use for stack feedback styles
+ $db->insert("xqcas_configuration", array('parameter_name' => array('text', "feedback_stylesheet_id"), 'value' => array('clob', ''), 'group_name' => array('text', 'feedback')));
+}
+?>