From 5716e100bfa197523533121ff7ece97538e86502 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Thu, 19 Mar 2015 14:56:22 -0500 Subject: [PATCH] Minor - Format code --- main/exercice/multiple_answer.class.php | 221 ++++++++++++------------ main/exercice/unique_answer.class.php | 40 ++--- 2 files changed, 127 insertions(+), 134 deletions(-) diff --git a/main/exercice/multiple_answer.class.php b/main/exercice/multiple_answer.class.php index 39516ed3cd..aea4e9d63d 100755 --- a/main/exercice/multiple_answer.class.php +++ b/main/exercice/multiple_answer.class.php @@ -26,126 +26,133 @@ class MultipleAnswer extends Question } /** - * function which redifines Question::createAnswersForm - * @param the formvalidator instance - * @param the answers number to display - */ - function createAnswersForm ($form) + * function which redifines Question::createAnswersForm + * @param the formvalidator instance + * @param the answers number to display + */ + 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['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0)); - - $obj_ex = $_SESSION['objExercise']; - - $html=' - - - - '; - // show column comment when feedback is enable - $html .=''; - $html .= ' - '; - $form -> addElement ('label', get_lang('Answers').'
', $html); - - $defaults = array(); - $correct = 0; - $answer = false; - if(!empty($this -> id)) { - $answer = new Answer($this -> id); - $answer -> read(); - if(count($answer->nbrAnswers)>0 && !$form->isSubmitted()) { - $nb_answers = $answer->nbrAnswers; - } - } - - $form -> addElement('hidden', 'nb_answers'); - $boxes_names = array(); - - if ($nb_answers < 1) { - $nb_answers = 1; - Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer')); - } - - for ($i = 1 ; $i <= $nb_answers ; ++$i) { - if(is_object($answer)) { - $defaults['answer['.$i.']'] = $answer -> answer[$i]; - $defaults['comment['.$i.']'] = $answer -> comment[$i]; - $defaults['weighting['.$i.']'] = float_format($answer -> weighting[$i], 1); - $defaults['correct['.$i.']'] = $answer -> correct[$i]; - } else { - $defaults['answer[1]'] = get_lang('DefaultMultipleAnswer2'); - $defaults['comment[1]'] = get_lang('DefaultMultipleComment2'); - $defaults['correct[1]'] = true; - $defaults['weighting[1]'] = 10; - - $defaults['answer[2]'] = get_lang('DefaultMultipleAnswer1'); - $defaults['comment[2]'] = get_lang('DefaultMultipleComment1'); - $defaults['correct[2]'] = false; - $defaults['weighting[2]'] = -5; - } - $renderer = & $form->defaultRenderer(); + $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)); - $renderer->setElementTemplate('', 'correct['.$i.']'); - $renderer->setElementTemplate('', 'counter['.$i.']'); - $renderer->setElementTemplate('', 'answer['.$i.']'); - $renderer->setElementTemplate('', 'comment['.$i.']'); - $renderer->setElementTemplate('', 'weighting['.$i.']'); + $obj_ex = $_SESSION['objExercise']; - $answer_number=$form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"'); - $answer_number->freeze(); + $html = '
- '.get_lang('Number').' - - '.get_lang('True').' - - '.get_lang('Answer').' - - '.get_lang('Comment').' - - '.get_lang('Weighting').' -
{error}
{element}		{error}
{element}		{error}
{element}		{error}
{element}		{error}
{element}
+ + + + + + + '; + $form->addElement('label', get_lang('Answers') . '
', $html); - $form->addElement('checkbox', 'correct['.$i.']', null, null, 'class="checkbox" style="margin-left: 0em;"'); - $boxes_names[] = 'correct['.$i.']'; + $defaults = array(); + $correct = 0; + $answer = false; + if (!empty($this->id)) { + $answer = new Answer($this->id); + $answer->read(); + if (count($answer->nbrAnswers) > 0 && !$form->isSubmitted()) { + $nb_answers = $answer->nbrAnswers; + } + } - $form->addElement('html_editor', 'answer['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')); - $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required'); + $form->addElement('hidden', 'nb_answers'); + $boxes_names = array(); - $form->addElement('html_editor', 'comment['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')); + if ($nb_answers < 1) { + $nb_answers = 1; + Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer')); + } - $form->addElement('text', 'weighting['.$i.']',null, array('class' => "span1", 'value' => '0')); - $form -> addElement ('html', ''); - } - $form -> addElement ('html', '
' . get_lang('Number') . '' . get_lang('True') . '' . get_lang('Answer') . '' . get_lang('Comment') . '' . get_lang('Weighting') . '
'); - $form -> addElement ('html', '
'); + for ($i = 1; $i <= $nb_answers; ++$i) { + if (is_object($answer)) { + $defaults['answer[' . $i . ']'] = $answer->answer[$i]; + $defaults['comment[' . $i . ']'] = $answer->comment[$i]; + $defaults['weighting[' . $i . ']'] = float_format($answer->weighting[$i], 1); + $defaults['correct[' . $i . ']'] = $answer->correct[$i]; + } else { + $defaults['answer[1]'] = get_lang('DefaultMultipleAnswer2'); + $defaults['comment[1]'] = get_lang('DefaultMultipleComment2'); + $defaults['correct[1]'] = true; + $defaults['weighting[1]'] = 10; + + $defaults['answer[2]'] = get_lang('DefaultMultipleAnswer1'); + $defaults['comment[2]'] = get_lang('DefaultMultipleComment1'); + $defaults['correct[2]'] = false; + $defaults['weighting[2]'] = -5; + } + $renderer = & $form->defaultRenderer(); + + $renderer->setElementTemplate( + '{error}
{element}', + 'correct[' . $i . ']' + ); + $renderer->setElementTemplate( + '{error}
{element}', + 'counter[' . $i . ']' + ); + $renderer->setElementTemplate( + '{error}
{element}', + 'answer[' . $i . ']' + ); + $renderer->setElementTemplate( + '{error}
{element}', + 'comment[' . $i . ']' + ); + $renderer->setElementTemplate( + '{error}
{element}', + 'weighting[' . $i . ']' + ); + + $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="' . $i . '"'); + $answer_number->freeze(); + + $form->addElement('checkbox', 'correct[' . $i . ']', null, null, + 'class="checkbox" style="margin-left: 0em;"'); + $boxes_names[] = 'correct[' . $i . ']'; + + $form->addElement('html_editor', 'answer[' . $i . ']', null, array(), + array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')); + $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required'); + + $form->addElement('html_editor', 'comment[' . $i . ']', null, array(), + array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')); + + $form->addElement('text', 'weighting[' . $i . ']', null, array('class' => "span1", 'value' => '0')); + $form->addElement('html', ''); + } + $form->addElement('html', ''); + $form->addElement('html', '
'); - $form -> add_multiple_required_rule ($boxes_names , get_lang('ChooseAtLeastOneCheckbox') , 'multiple_required'); + $form->add_multiple_required_rule($boxes_names, get_lang('ChooseAtLeastOneCheckbox'), 'multiple_required'); - global $text, $class; - if ($obj_ex->edit_exercise_in_lp == true) { - // 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', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"'); - $form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"'); - } + global $text, $class; + if ($obj_ex->edit_exercise_in_lp == true) { + // 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', 'moreAnswers', get_lang('PlusAnswer'), 'class="btn plus"'); + $form->addElement('style_submit_button', 'submitQuestion', $text, 'class="' . $class . '"'); + } - $renderer->setElementTemplate('{element} ','lessAnswers'); - $renderer->setElementTemplate('{element} ','submitQuestion'); - $renderer->setElementTemplate('{element} ','moreAnswers'); - $form -> addElement ('html', ''); + $renderer->setElementTemplate('{element} ', 'lessAnswers'); + $renderer->setElementTemplate('{element} ', 'submitQuestion'); + $renderer->setElementTemplate('{element} ', 'moreAnswers'); + $form->addElement('html', ''); - $defaults['correct'] = $correct; + $defaults['correct'] = $correct; - if (!empty($this -> id)) { - $form -> setDefaults($defaults); - } else { - if ($this -> isContent == 1) { - $form -> setDefaults($defaults); - } - } - $form->setConstants(array('nb_answers' => $nb_answers)); - } + if (!empty($this->id)) { + $form->setDefaults($defaults); + } else { + if ($this->isContent == 1) { + $form->setDefaults($defaults); + } + } + $form->setConstants(array('nb_answers' => $nb_answers)); + } /** diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php index 3829ed407a..5a4b36ec52 100755 --- a/main/exercice/unique_answer.class.php +++ b/main/exercice/unique_answer.class.php @@ -45,14 +45,14 @@ class UniqueAnswer extends Question //this line defines how many questions by default appear when creating a choice question // The previous default value was 2. See task #1759. - $nb_answers = isset($_POST['nb_answers']) ? (int)$_POST['nb_answers'] : 4; + $nb_answers = isset($_POST['nb_answers']) ? (int) $_POST['nb_answers'] : 4; $nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0)); /* - Types of Feedback - $feedback_option[0]=get_lang('Feedback'); - $feedback_option[1]=get_lang('DirectFeedback'); - $feedback_option[2]=get_lang('NoFeedback'); + Types of Feedback + $feedback_option[0]=get_lang('Feedback'); + $feedback_option[1]=get_lang('DirectFeedback'); + $feedback_option[2]=get_lang('NoFeedback'); */ $feedback_title = ''; @@ -106,8 +106,7 @@ class UniqueAnswer extends Question } $question = Question::read($questionid); $select_question[$questionid] = 'Q' . $key . ' :' . cut( - $question->selectTitle(), - 20 + $question->selectTitle(), 20 ); } } @@ -201,33 +200,22 @@ class UniqueAnswer extends Question ); $answer_number = $form->addElement( - 'text', - 'counter[' . $i . ']', - null, - ' value = "' . $i . '"' + 'text', 'counter[' . $i . ']', null, ' value = "' . $i . '"' ); $answer_number->freeze(); $form->addElement( - 'radio', - 'correct', - null, - null, - $i, - 'class="checkbox"' + 'radio', 'correct', null, null, $i, 'class="checkbox"' ); - $form->addHtmlEditor('answer[' . $i . ']',null,null,true, $editor_config); + $form->addHtmlEditor('answer[' . $i . ']', null, null, true, $editor_config); $form->addRule( - 'answer[' . $i . ']', - get_lang('ThisFieldIsRequired'), - 'required' + 'answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required' ); if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) { - $form->addHtmlEditor('comment[' . $i . ']',null,null,false,$editor_config); + $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config); // Direct feedback - //Adding extra feedback fields $group = array(); $group['try' . $i] = $form->createElement( @@ -263,11 +251,10 @@ class UniqueAnswer extends Question '{error}
{element}', 'scenario' ); - } else { - $form->addHtmlEditor('comment[' . $i . ']',null,null,false,$editor_config); + $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config); } - $form->addText('weighting[' . $i . ']', null,null, array('class' => "col-md-1", 'value' => '0')); + $form->addText('weighting[' . $i . ']', null, null, array('class' => "col-md-1", 'value' => '0')); $form->addElement('html', ''); } @@ -327,7 +314,6 @@ class UniqueAnswer extends Question } else { $form->setDefaults(array('correct' => 1)); } - } $form->setConstants(array('nb_answers' => $nb_answers)); }