moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-27490' of git://github.com/timhunt/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2011-06-17 17:24:51 +02:00
commit faf1f957ac
15 changed files with 549 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

6
question/engine/bank.php
View file

@ -109,11 +109,11 @@ abstract class question_bank {
* Load the question configuration data from config_plugins.
* @return object get_config('question') with caching.
*/
protected static function get_config() {
public static function get_config() {
if (is_null(self::$questionconfig)) {
$questionconfig = get_config('question');
self::$questionconfig = get_config('question');
}
return $questionconfig;
return self::$questionconfig;
}
/**

142
question/engine/lib.php
View file

@ -99,7 +99,6 @@ abstract class question_engine {
* @param int $qubaid the id of the usage to delete.
*/
public static function delete_questions_usage_by_activity($qubaid) {
global $CFG;
self::delete_questions_usage_by_activities(new qubaid_list(array($qubaid)));
}
@ -224,12 +223,9 @@ abstract class question_engine {
*/
public static function get_archetypal_behaviours() {
$archetypes = array();
$behaviours = get_list_of_plugins('question/behaviour');
foreach ($behaviours as $path) {
$behaviour = basename($path);
self::load_behaviour_class($behaviour);
$plugin = 'qbehaviour_' . $behaviour;
if (constant($plugin . '::IS_ARCHETYPAL')) {
$behaviours = get_plugin_list('qbehaviour');
foreach ($behaviours as $behaviour => $notused) {
if (self::is_behaviour_archetypal($behaviour)) {
$archetypes[$behaviour] = self::get_behaviour_name($behaviour);
}
}
@ -238,75 +234,89 @@ abstract class question_engine {
}
/**
* Return an array where the keys are the internal names of the behaviours
* in preferred order and the values are a human-readable name.
*
* @param array $archetypes, array of behaviours
* @param string $questionbehavioursorder, a comma separated list of behaviour names
* @param string $questionbehavioursdisabled, a comma separated list of behaviour names
* @param string $currentbahaviour, current behaviour name
* @return array model name => lang string for this behaviour name.
* @param string $behaviour the name of a behaviour. E.g. 'deferredfeedback'.
* @return bool whether this is an archetypal behaviour.
*/
public static function sort_behaviours($archetypes, $questionbehavioursorder,
$questionbehavioursdisabled, $currentbahaviour) {
$behaviourorder = array();
$behaviourdisabled = array();
// Get disabled behaviours
if ($questionbehavioursdisabled) {
$behaviourdisabledtemp = preg_split('/[\s,;]+/', $questionbehavioursdisabled);
} else {
$behaviourdisabledtemp = array();
}
if ($questionbehavioursorder) {
$behaviourordertemp = preg_split('/[\s,;]+/', $questionbehavioursorder);
} else {
$behaviourordertemp = array();
}
foreach ($behaviourdisabledtemp as $key) {
if (array_key_exists($key, $archetypes)) {
// Do not disable the current behaviour
if ($key != $currentbahaviour) {
$behaviourdisabled[$key] = $archetypes[$key];
}
}
}
// Get behaviours in preferred order
foreach ($behaviourordertemp as $key) {
if (array_key_exists($key, $archetypes)) {
$behaviourorder[$key] = $archetypes[$key];
}
}
// Get the rest of behaviours and sort them alphabetically
$leftover = array_diff_key($archetypes, $behaviourdisabled, $behaviourorder);
asort($leftover, SORT_LOCALE_STRING);
// Set up the final order to be displayed
$finalorder = $behaviourorder + $leftover;
return $finalorder;
public static function is_behaviour_archetypal($behaviour) {
self::load_behaviour_class($behaviour);
$plugin = 'qbehaviour_' . $behaviour;
return constant($plugin . '::IS_ARCHETYPAL');
}
/**
* Return an array where the keys are the internal names of the behaviours
* in preferred order and the values are a human-readable name.
*
* @param string $currentbahaviour
* @param array $archetypes, array of behaviours
* @param string $orderlist, a comma separated list of behaviour names
* @param string $disabledlist, a comma separated list of behaviour names
* @param string $current, current behaviour name
* @return array model name => lang string for this behaviour name.
*/
public static function get_behaviour_options($currentbahaviour) {
global $CFG;
public static function sort_behaviours($archetypes, $orderlist, $disabledlist, $current=null) {
// Get disabled behaviours
if ($disabledlist) {
$disabled = explode(',', $disabledlist);
} else {
$disabled = array();
}
if ($orderlist) {
$order = explode(',', $orderlist);
} else {
$order = array();
}
foreach ($disabled as $behaviour) {
if (array_key_exists($behaviour, $archetypes) && $behaviour != $current) {
unset($archetypes[$behaviour]);
}
}
// Get behaviours in preferred order
$behaviourorder = array();
foreach ($order as $behaviour) {
if (array_key_exists($behaviour, $archetypes)) {
$behaviourorder[$behaviour] = $archetypes[$behaviour];
}
}
// Get the rest of behaviours and sort them alphabetically
$leftover = array_diff_key($archetypes, $behaviourorder);
asort($leftover, SORT_LOCALE_STRING);
// Set up the final order to be displayed
return $behaviourorder + $leftover;
}
/**
* Return an array where the keys are the internal names of the behaviours
* in preferred order and the values are a human-readable name.
*
* @param string $currentbehaviour
* @return array model name => lang string for this behaviour name.
*/
public static function get_behaviour_options($currentbehaviour) {
$config = question_bank::get_config();
$archetypes = self::get_archetypal_behaviours();
// If no admin setting return all behavious
if (empty($CFG->questionbehavioursdisabled) && empty($CFG->questionbehavioursorder)) {
if (empty($config->disabledbehaviours) && empty($config->behavioursortorder)) {
return $archetypes;
}
return self::sort_behaviours($archetypes, $CFG->questionbehavioursorder,
$CFG->questionbehavioursdisabled, $currentbahaviour);
if (empty($config->behavioursortorder)) {
$order = '';
} else {
$order = $config->behavioursortorder;
}
if (empty($config->disabledbehaviours)) {
$disabled = '';
} else {
$disabled = $config->disabledbehaviours;
}
return self::sort_behaviours($archetypes, $order, $disabled, $currentbehaviour);
}
/**
@ -318,6 +328,16 @@ abstract class question_engine {
return get_string('pluginname', 'qbehaviour_' . $behaviour);
}
/**
* Get the translated name of an behaviour, for display in the UI.
* @param string $behaviour the internal name of the model.
* @return string name from the current language pack.
*/
public static function get_behaviour_required_behaviours($behaviour) {
$class = 'qbehaviour_' . $behaviour;
return $class::get_required_behaviours();
}
/**
* @return array all the file area names that may contain response files.
*/

10
question/engine/simpletest/testquestionengine.php
View file

@ -81,16 +81,16 @@ class question_engine_test extends UnitTestCase {
$this->assertIdentical($out, question_engine::sort_behaviours($in, '', 'b1,b2,b3,b4', 'b4'));
$out = array('b6' => 'Behave 6', 'b1' => 'Behave 1', 'b4' => 'Behave 4');
$this->assertIdentical($out, question_engine::sort_behaviours($in, 'b6, b1, b4', 'b1, b2, b3, b4, b5', 'b4'));
$this->assertIdentical($out, question_engine::sort_behaviours($in, 'b6,b1,b4', 'b2,b3,b4,b5', 'b4'));
$out = array('b6' => 'Behave 6', 'b5' => 'Behave 5', 'b4' => 'Behave 4');
$this->assertIdentical($out, question_engine::sort_behaviours($in, 'b6, b5, b4', 'b1, b2, b3', 'b4'));
$this->assertIdentical($out, question_engine::sort_behaviours($in, 'b6,b5,b4', 'b1,b2,b3', 'b4'));
$out = array('b1' => 'Behave 1', 'b6' => 'Behave 6', 'b5' => 'Behave 5', 'b4' => 'Behave 4');
$this->assertIdentical($out, question_engine::sort_behaviours($in, 'b1, b6, b5', 'b1, b2, b3, b4, b5', 'b4'));
$out = array('b6' => 'Behave 6', 'b5' => 'Behave 5', 'b4' => 'Behave 4');
$this->assertIdentical($out, question_engine::sort_behaviours($in, 'b1,b6,b5', 'b1,b2,b3,b4', 'b4'));
$out = array('b2' => 'Behave 2', 'b4' => 'Behave 4', 'b6' => 'Behave 6');
$this->assertIdentical($out, question_engine::sort_behaviours($in, 'b2, b4, b6', 'b1, b3, b5', 'b2'));
$this->assertIdentical($out, question_engine::sort_behaviours($in, 'b2,b4,b6', 'b1,b3,b5', 'b2'));
// Ignore unknown input in the order argument.
$this->assertIdentical($in, question_engine::sort_behaviours($in, 'unknown', '', ''));