chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - reformat code

Browse Source
skala
Julio Montoya 12 years ago
parent 77dbda6206
commit 7359739be9
1 changed files with 212 additions and 161 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 193
      main/exercice/multiple_answer_true_false.class.php

193
main/exercice/multiple_answer_true_false.class.php
Unescape View File

@ -21,22 +21,25 @@ class MultipleAnswerTrueFalse extends Question
static $typePicture = 'mcmao.gif'; static $typePicture = 'mcmao.gif';
static $explanationLangVar = 'MultipleAnswerTrueFalse'; static $explanationLangVar = 'MultipleAnswerTrueFalse';
var $options; var $options;
/** /**
* Constructor * Constructor
*/ */
function MultipleAnswerTrueFalse(){ public function MultipleAnswerTrueFalse()
{
parent::question(); parent::question();
$this->type = MULTIPLE_ANSWER_TRUE_FALSE; $this->type = MULTIPLE_ANSWER_TRUE_FALSE;
$this->isContent = $this-> getIsContent(); $this->isContent = $this->getIsContent();
$this->options = array(1=>get_lang('True'),2 =>get_lang('False'), 3 =>get_lang('DoubtScore')); $this->options = array(1 => get_lang('True'), 2 => get_lang('False'), 3 => get_lang('DoubtScore'));
} }
/** /**
* function which redifines Question::createAnswersForm * function which redefines Question::createAnswersForm
* @param the formvalidator instance * @param FormValidator instance
* @param the answers number to display * @param the answers number to display
*/ */
function createAnswersForm ($form) { public function createAnswersForm($form)
{
$nb_answers = isset($_POST['nb_answers']) ? $_POST['nb_answers'] : 4; // The previous default value was 2. See task #1759. $nb_answers = isset($_POST['nb_answers']) ? $_POST['nb_answers'] : 4; // The previous default value was 2. See task #1759.
$nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0)); $nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0));
@ -64,22 +67,22 @@ class MultipleAnswerTrueFalse extends Question
'.get_lang('Answer').' '.get_lang('Answer').'
</th>'; </th>';
// show column comment when feedback is enable // show column comment when feedback is enable
if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM ) { if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) {
$html .='<th>'.get_lang('Comment').'</th>'; $html .= '<th>'.get_lang('Comment').'</th>';
} }
$html .= '</tr>'; $html .= '</tr>';
$form -> addElement ('label', get_lang('Answers').'<br />'.Display::return_icon('fill_field.png'), $html); $form->addElement('label', get_lang('Answers').'<br />'.Display::return_icon('fill_field.png'), $html);
$correct = 0; $correct = 0;
if (!empty($this -> id)) { if (!empty($this->id)) {
$answer = new Answer($this -> id); $answer = new Answer($this->id);
$answer->read(); $answer->read();
if (count($answer->nbrAnswers) > 0 && !$form->isSubmitted()) { if (count($answer->nbrAnswers) > 0 && !$form->isSubmitted()) {
$nb_answers = $answer->nbrAnswers; $nb_answers = $answer->nbrAnswers;
} }
} }
$form -> addElement('hidden', 'nb_answers'); $form->addElement('hidden', 'nb_answers');
$boxes_names = array(); $boxes_names = array();
if ($nb_answers < 1) { if ($nb_answers < 1) {
@ -90,14 +93,26 @@ class MultipleAnswerTrueFalse extends Question
// Can be more options // Can be more options
$option_data = Question::readQuestionOption($this->id, $course_id); $option_data = Question::readQuestionOption($this->id, $course_id);
for ($i = 1 ; $i <= $nb_answers ; ++$i) { for ($i = 1; $i <= $nb_answers; ++$i) {
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct['.$i.']'); $renderer->setElementTemplate(
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']'); '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']'); 'correct['.$i.']'
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']'); );
$renderer->setElementTemplate(
$answer_number=$form->addElement('text', 'counter['.$i.']',null,'value="'.$i.'"'); '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
'counter['.$i.']'
);
$renderer->setElementTemplate(
'<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
'answer['.$i.']'
);
$renderer->setElementTemplate(
'<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
'comment['.$i.']'
);
$answer_number = $form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"');
$answer_number->freeze(); $answer_number->freeze();
if (is_object($answer)) { if (is_object($answer)) {
@ -111,7 +126,7 @@ class MultipleAnswerTrueFalse extends Question
$j = 1; $j = 1;
if (!empty($option_data)) { if (!empty($option_data)) {
foreach ($option_data as $id=>$data) { foreach ($option_data as $id => $data) {
$form->addElement('radio', 'correct['.$i.']', null, null, $id); $form->addElement('radio', 'correct['.$i.']', null, null, $id);
$j++; $j++;
if ($j == 3) { if ($j == 3) {
@ -132,44 +147,72 @@ class MultipleAnswerTrueFalse extends Question
$boxes_names[] = 'correct['.$i.']'; $boxes_names[] = 'correct['.$i.']';
$form->addElement('html_editor', 'answer['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')); $form->addElement(
'html_editor',
'answer['.$i.']',
null,
'style="vertical-align:middle"',
array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')
);
$form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
// show comment when feedback is enable // show comment when feedback is enable
if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) {
$form->addElement('html_editor', 'comment['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')); $form->addElement(
'html_editor',
'comment['.$i.']',
null,
'style="vertical-align:middle"',
array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')
);
} }
$form->addElement ('html', '</tr>'); $form->addElement('html', '</tr>');
} }
$form->addElement('html', '</table>'); $form->addElement('html', '</table>');
$form->addElement('html', '<br />'); $form->addElement('html', '<br />');
$form->addElement('html', '<table><tr><td></td><td>'.get_lang('Correct').'</td><td>'.get_lang('Wrong').'</td><td>'.get_lang('DoubtScore').'</td></tr>'); $form->addElement(
'html',
$renderer->setElementTemplate('<tr><td><span class="form_required">*</span>'.get_lang('Score').'&nbsp;&nbsp;&nbsp;&nbsp;</td><td>{element} &nbsp;&nbsp; <br /><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --></td>', 'option[1]'); '<table><tr><td></td><td>'.get_lang('Correct').'</td><td>'.get_lang('Wrong').'</td><td>'.get_lang(
$renderer->setElementTemplate('<td>{element} &nbsp;&nbsp;<br /><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --></td>', 'option[2]'); 'DoubtScore'
$renderer->setElementTemplate('<td>{element} &nbsp;&nbsp;<br /><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --></td>', 'option[3]'); ).'</td></tr>'
);
$renderer->setElementTemplate(
'<tr><td><span class="form_required">*</span>'.get_lang(
'Score'
).'&nbsp;&nbsp;&nbsp;&nbsp;</td><td>{element} &nbsp;&nbsp; <br /><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --></td>',
'option[1]'
);
$renderer->setElementTemplate(
'<td>{element} &nbsp;&nbsp;<br /><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --></td>',
'option[2]'
);
$renderer->setElementTemplate(
'<td>{element} &nbsp;&nbsp;<br /><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --></td>',
'option[3]'
);
// 3 scores // 3 scores
$form->addElement('text', 'option[1]', get_lang('Correct'), array('class'=>'span1','value'=>'1')); $form->addElement('text', 'option[1]', get_lang('Correct'), array('class' => 'span1', 'value' => '1'));
$form->addElement('text', 'option[2]', get_lang('Wrong'), array('class'=>'span1','value'=>'-0.5')); $form->addElement('text', 'option[2]', get_lang('Wrong'), array('class' => 'span1', 'value' => '-0.5'));
$form->addElement('text', 'option[3]', get_lang('DoubtScore'),array('class'=>'span1','value'=>'0')); $form->addElement('text', 'option[3]', get_lang('DoubtScore'), array('class' => 'span1', 'value' => '0'));
$form->addRule('option[1]', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('option[1]', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('option[2]', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('option[2]', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('option[3]', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('option[3]', get_lang('ThisFieldIsRequired'), 'required');
$form -> addElement ('html', '</tr><table>'); $form->addElement('html', '</tr><table>');
$form -> addElement('hidden', 'options_count', 3); $form->addElement('hidden', 'options_count', 3);
$form -> addElement ('html', '</table><br /><br />'); $form->addElement('html', '</table><br /><br />');
//Extra values True, false, Dont known //Extra values True, false, Dont known
if (!empty($this->extra)) { if (!empty($this->extra)) {
$scores = explode(':',$this->extra); $scores = explode(':', $this->extra);
if (!empty($scores)) { if (!empty($scores)) {
for ($i = 1; $i <=3; $i++) { for ($i = 1; $i <= 3; $i++) {
$defaults['option['.$i.']'] = $scores[$i-1]; $defaults['option['.$i.']'] = $scores[$i - 1];
} }
} }
} }
@ -180,30 +223,35 @@ class MultipleAnswerTrueFalse extends Question
if ($obj_ex->edit_exercise_in_lp == true) { if ($obj_ex->edit_exercise_in_lp == true) {
//ie6 fix //ie6 fix
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
$form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"'); $form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'), 'class="btn minus"');
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"'); $form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'), 'class="btn plus"');
$form->addElement('submit', 'submitQuestion',$this->submitText, 'class="'.$this->submitClass.'"'); $form->addElement('submit', 'submitQuestion', $this->submitText, 'class="'.$this->submitClass.'"');
} else { } else {
// setting the save button here and not in the question class.php // setting the save button here and not in the question class.php
$form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"'); $form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'), 'class="btn minus"');
$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"'); $form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'), 'class="btn plus"');
$form->addElement('style_submit_button', 'submitQuestion',$this->submitText, 'class="'.$this->submitClass.'"'); $form->addElement(
'style_submit_button',
'submitQuestion',
$this->submitText,
'class="'.$this->submitClass.'"'
);
} }
} }
$renderer->setElementTemplate('{element}&nbsp;','lessAnswers'); $renderer->setElementTemplate('{element}&nbsp;', 'lessAnswers');
$renderer->setElementTemplate('{element}&nbsp;','submitQuestion'); $renderer->setElementTemplate('{element}&nbsp;', 'submitQuestion');
$renderer->setElementTemplate('{element}&nbsp;','moreAnswers'); $renderer->setElementTemplate('{element}&nbsp;', 'moreAnswers');
$form -> addElement ('html', '</div></div>'); $form->addElement('html', '</div></div>');
$defaults['correct'] = $correct; $defaults['correct'] = $correct;
if (!empty($this -> id)) { if (!empty($this->id)) {
$form -> setDefaults($defaults); $form->setDefaults($defaults);
} else { } else {
//if ($this -> isContent == 1) { //if ($this -> isContent == 1) {
$form -> setDefaults($defaults); $form->setDefaults($defaults);
//} //}
} }
$form->setConstants(array('nb_answers' => $nb_answers)); $form->setConstants(array('nb_answers' => $nb_answers));
@ -215,7 +263,8 @@ class MultipleAnswerTrueFalse extends Question
* @param the formvalidator instance * @param the formvalidator instance
* @param the answers number to display * @param the answers number to display
*/ */
function processAnswersCreation($form) { function processAnswersCreation($form)
{
$questionWeighting = $nbrGoodAnswers = 0; $questionWeighting = $nbrGoodAnswers = 0;
$objAnswer = new Answer($this->id); $objAnswer = new Answer($this->id);
$nb_answers = $form->getSubmitValue('nb_answers'); $nb_answers = $form->getSubmitValue('nb_answers');
@ -233,7 +282,7 @@ class MultipleAnswerTrueFalse extends Question
Question::updateQuestionOption($id, $option_data, $course_id); Question::updateQuestionOption($id, $option_data, $course_id);
} }
} else { } else {
for ($i=1 ; $i <= 3 ; $i++) { for ($i = 1; $i <= 3; $i++) {
$last_id = Question::saveQuestionOption($this->id, $this->options[$i], $course_id, $i); $last_id = Question::saveQuestionOption($this->id, $this->options[$i], $course_id, $i);
$correct[$i] = $last_id; $correct[$i] = $last_id;
} }
@ -243,52 +292,54 @@ class MultipleAnswerTrueFalse extends Question
$new_options = Question::readQuestionOption($this->id, $course_id); $new_options = Question::readQuestionOption($this->id, $course_id);
$sorted_by_position = array(); $sorted_by_position = array();
foreach($new_options as $item) { foreach ($new_options as $item) {
$sorted_by_position[$item['position']] = $item; $sorted_by_position[$item['position']] = $item;
} }
//Saving quiz_question.extra values that has the correct scores of the true, false, doubt options registered in this format XX:YY:ZZZ where XX is a float score value //Saving quiz_question.extra values that has the correct scores of the true, false, doubt options registered in this format XX:YY:ZZZ where XX is a float score value
$extra_values = array(); $extra_values = array();
for ($i=1 ; $i <= 3 ; $i++) { for ($i = 1; $i <= 3; $i++) {
$score = trim($form -> getSubmitValue('option['.$i.']')); $score = trim($form->getSubmitValue('option['.$i.']'));
$extra_values[]= $score; $extra_values[] = $score;
} }
$this->setExtra(implode(':',$extra_values)); $this->setExtra(implode(':', $extra_values));
for ($i=1 ; $i <= $nb_answers ; $i++) { for ($i = 1; $i <= $nb_answers; $i++) {
$answer = trim($form -> getSubmitValue('answer['.$i.']')); $answer = trim($form->getSubmitValue('answer['.$i.']'));
$comment = trim($form -> getSubmitValue('comment['.$i.']')); $comment = trim($form->getSubmitValue('comment['.$i.']'));
$goodAnswer = trim($form -> getSubmitValue('correct['.$i.']')); $goodAnswer = trim($form->getSubmitValue('correct['.$i.']'));
if (empty($options)) { if (empty($options)) {
//If this is the first time that the question is created when change the default values from the form 1 and 2 by the correct "option id" registered //If this is the first time that the question is created when change the default values from the form 1 and 2 by the correct "option id" registered
$goodAnswer = $sorted_by_position[$goodAnswer]['iid']; $goodAnswer = $sorted_by_position[$goodAnswer]['iid'];
} }
$questionWeighting += $extra_values[0]; //By default 0 has the correct answers $questionWeighting += $extra_values[0]; //By default 0 has the correct answers
$objAnswer->createAnswer($answer, $goodAnswer, $comment,'',$i); $objAnswer->createAnswer($answer, $goodAnswer, $comment, '', $i);
} }
// saves the answers into the data base // saves the answers into the data base
$objAnswer -> save(); $objAnswer->save();
// sets the total weighting of the question // sets the total weighting of the question
$this -> updateWeighting($questionWeighting); $this->updateWeighting($questionWeighting);
$this -> save(); $this->save();
} }
function return_header($feedback_type = null, $counter = null, $score = null, $show_media = false) { function return_header($feedback_type = null, $counter = null, $score = null, $show_media = false)
{
$header = parent::return_header($feedback_type, $counter, $score, $show_media); $header = parent::return_header($feedback_type, $counter, $score, $show_media);
$header .= '<table class="'.$this->question_table_class .'"> $header .= '<table class="'.$this->question_table_class.'">
<tr> <tr>
<th>'.get_lang("Choice").'</th> <th>'.get_lang("Choice").'</th>
<th>'. get_lang("ExpectedChoice").'</th> <th>'.get_lang("ExpectedChoice").'</th>
<th>'. get_lang("Answer").'</th>'; <th>'.get_lang("Answer").'</th>';
if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
$header .= '<th>'.get_lang("Comment").'</th>'; $header .= '<th>'.get_lang("Comment").'</th>';
} else { } else {
$header .= '<th>&nbsp;</th>'; $header .= '<th>&nbsp;</th>';
} }
$header .= '</tr>'; $header .= '</tr>';
return $header; return $header;
} }
} }

Write Preview
Loading…
Cancel
Save