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

Merging changes from 1.8 -

Browse source 
Fix for MDL-8862 - order of options in choice not logical - shift option for limiting options to aboe where limits are set.
This commit is contained in:
danmarsden 2007-03-15 00:17:22 +00:00
parent b0c90e6ede
commit c12b1f67c0
1 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

66
mod/choice/mod_form.php
View file

@ -3,21 +3,21 @@ require_once ('moodleform_mod.php');
class mod_choice_mod_form extends moodleform_mod { class mod_choice_mod_form extends moodleform_mod {
function definition() { function definition() {
global $CHOICE_SHOWRESULTS, $CHOICE_PUBLISH, $CHOICE_DISPLAY; global $CHOICE_SHOWRESULTS, $CHOICE_PUBLISH, $CHOICE_DISPLAY;
$mform =& $this->_form; $mform =& $this->_form;
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
$mform->addElement('header', 'general', get_string('general', 'form')); $mform->addElement('header', 'general', get_string('general', 'form'));
$mform->addElement('text', 'name', get_string('choicename', 'choice'), array('size'=>'64')); $mform->addElement('text', 'name', get_string('choicename', 'choice'), array('size'=>'64'));
$mform->setType('name', PARAM_TEXT); $mform->setType('name', PARAM_TEXT);
$mform->addRule('name', null, 'required', null, 'client'); $mform->addRule('name', null, 'required', null, 'client');
$mform->addElement('htmleditor', 'text', get_string('choicetext', 'choice')); $mform->addElement('htmleditor', 'text', get_string('choicetext', 'choice'));
$mform->setType('text', PARAM_RAW); $mform->setType('text', PARAM_RAW);
$mform->addRule('text', null, 'required', null, 'client'); $mform->addRule('text', null, 'required', null, 'client');
$mform->setHelpButton('text', array('writing', 'questions', 'richtext'), false, 'editorhelpbutton'); $mform->setHelpButton('text', array('writing', 'questions', 'richtext'), false, 'editorhelpbutton');
$mform->addElement('format', 'format', get_string('format')); $mform->addElement('format', 'format', get_string('format'));
@ -29,6 +29,13 @@ class mod_choice_mod_form extends moodleform_mod {
$repeatarray[] = &MoodleQuickForm::createElement('text', 'limit', get_string('limit','choice')); $repeatarray[] = &MoodleQuickForm::createElement('text', 'limit', get_string('limit','choice'));
$repeatarray[] = &MoodleQuickForm::createElement('hidden', 'optionid', 0); $repeatarray[] = &MoodleQuickForm::createElement('hidden', 'optionid', 0);
$menuoptions=array();
$menuoptions[0] = get_string('disable');
$menuoptions[1] = get_string('enable');
$mform->addElement('header', 'timerestricthdr', get_string('limit', 'choice'));
$mform->addElement('select', 'limitanswers', get_string('limitanswers', 'choice'), $menuoptions);
$mform->setHelpButton('limitanswers', array('limit', get_string('limit', 'choice'), 'choice'));
if ($this->_instance){ if ($this->_instance){
$repeatno=count_records('choice_options', 'choiceid', $this->_instance); $repeatno=count_records('choice_options', 'choiceid', $this->_instance);
$repeatno += 2; $repeatno += 2;
@ -51,19 +58,14 @@ class mod_choice_mod_form extends moodleform_mod {
$menuoptions=array();
$menuoptions[0] = get_string('disable');
$menuoptions[1] = get_string('enable');
$mform->addElement('select', 'limitanswers', get_string('limitanswers', 'choice'), $menuoptions);
$mform->setHelpButton('limitanswers', array('limit', get_string('limit', 'choice'), 'choice'));
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
$mform->addElement('header', 'timerestricthdr', get_string('timerestrict', 'choice')); $mform->addElement('header', 'timerestricthdr', get_string('timerestrict', 'choice'));
$mform->addElement('checkbox', 'timerestrict', get_string('timerestrict', 'choice')); $mform->addElement('checkbox', 'timerestrict', get_string('timerestrict', 'choice'));
$mform->setHelpButton('timerestrict', array("timerestrict", get_string("timerestrict","choice"), "choice")); $mform->setHelpButton('timerestrict', array("timerestrict", get_string("timerestrict","choice"), "choice"));
$mform->addElement('date_time_selector', 'timeopen', get_string("choiceopen", "choice")); $mform->addElement('date_time_selector', 'timeopen', get_string("choiceopen", "choice"));
$mform->disabledIf('timeopen', 'timerestrict'); $mform->disabledIf('timeopen', 'timerestrict');
$mform->addElement('date_time_selector', 'timeclose', get_string("choiceclose", "choice")); $mform->addElement('date_time_selector', 'timeclose', get_string("choiceclose", "choice"));
@ -85,14 +87,14 @@ class mod_choice_mod_form extends moodleform_mod {
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
$this->standard_coursemodule_elements(); $this->standard_coursemodule_elements();
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
$this->add_action_buttons(); $this->add_action_buttons();
} }
function data_preprocessing(&$default_values){ function data_preprocessing(&$default_values){
if (!empty($this->_instance) && ($options = get_records_menu('choice_options','choiceid', $this->_instance, 'id', 'id,text')) if (!empty($this->_instance) && ($options = get_records_menu('choice_options','choiceid', $this->_instance, 'id', 'id,text'))
&& ($options2 = get_records_menu('choice_options','choiceid', $this->_instance, 'id', 'id,maxanswers')) ) { && ($options2 = get_records_menu('choice_options','choiceid', $this->_instance, 'id', 'id,maxanswers')) ) {
$choiceids=array_keys($options); $choiceids=array_keys($options);
$options=array_values($options); $options=array_values($options);
$options2=array_values($options2); $options2=array_values($options2);
@ -110,25 +112,25 @@ class mod_choice_mod_form extends moodleform_mod {
$default_values['timerestrict'] = 1; $default_values['timerestrict'] = 1;
} }
} }
function validation($data){ function validation($data){
$choices=0; $choices=0;
foreach ($data['option'] as $option){ foreach ($data['option'] as $option){
if (trim($option)!=''){ if (trim($option)!=''){
$choices++; $choices++;
} }
} }
if ($choices>1){ if ($choices>1){
return true; return true;
} elseif ($choices==0) { } elseif ($choices==0) {
return array('option[0]'=>get_string('fillinatleastoneoption', 'choice')); return array('option[0]'=>get_string('fillinatleastoneoption', 'choice'));
} else { } else {
return array('option[1]'=>get_string('fillinatleastoneoption', 'choice')); return array('option[1]'=>get_string('fillinatleastoneoption', 'choice'));
} }
} }
} }
?> ?>