Minor - Format code

main/exercice/multiple_answer_true_false.class.php

@@ -43,30 +43,25 @@ class MultipleAnswerTrueFalse extends Question
 
         $html = '<table class="data_table">
 					<tr style="text-align: center;">
-						<th>
+						<th>' . get_lang('Number') . '</th>
-							'.get_lang('Number').'
+						<th>' . get_lang('True') . '</th>
-						</th>
+                        <th>' . get_lang('False') . '</th>
-						<th>
+						<th>' . get_lang('Answer') . '</th>';
-							'.get_lang('True').'
-						</th>
-                        <th>
-                            '.get_lang('False').'
-                        </th>
-						<th>
-							'.get_lang('Answer').'
-						</th>';
         // show column comment when feedback is enable
         if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) {
             $html .='<th>' . get_lang('Comment') . '</th>';
         }
         $html .= '</tr>';
+
         $form->addElement('label', get_lang('Answers') . '<br /> <img src="../img/fill_field.png">', $html);
 
         $correct = 0;
         $answer = null;
+
         if (!empty($this->id)) {
             $answer = new Answer($this->id);
             $answer->read();
+
             if (count($answer->nbrAnswers) > 0 && !$form->isSubmitted()) {
                 $nb_answers = $answer->nbrAnswers;
             }
@@ -84,11 +79,22 @@ class MultipleAnswerTrueFalse extends Question
         $option_data = Question::readQuestionOption($this->id, $course_id);
 
         for ($i = 1; $i <= $nb_answers; ++$i) {
-
+            $renderer->setElementTemplate(
-            $renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct['.$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>', 'counter['.$i.']');
+                'correct[' . $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.']');
+            $renderer->setElementTemplate(
+                '<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();
@@ -105,7 +111,9 @@ class MultipleAnswerTrueFalse extends Question
                 if (!empty($option_data)) {
                     foreach ($option_data as $id => $data) {
                         $form->addElement('radio', 'correct[' . $i . ']', null, null, $id);
+
                         $j++;
+
                         if ($j == 3) {
                             break;
                         }
@@ -121,24 +129,49 @@ class MultipleAnswerTrueFalse extends Question
             }
 
             $boxes_names[] = 'correct[' . $i . ']';
-			$form->addElement('html_editor', 'answer['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+            $form->addElement(
+                'html_editor',
+                'answer[' . $i . ']',
+                null,
+                array(),
+                array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')
+            );
             $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
 
             // show comment when feedback is enable
             if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) {
-				$form->addElement('html_editor', 'comment['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+                $form->addElement(
+                    'html_editor',
+                    'comment[' . $i . ']',
+                    null,
+                    array(),
+                    array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')
+                );
             }
+
             $form->addElement('html', '</tr>');
         }
 
         $form->addElement('html', '</table>');
         $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('DoubtScore') . '</td></tr>'
-        $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]');
+
+        $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
         $form->addElement('text', 'option[1]', get_lang('Correct'), array('class' => 'span1', 'value' => '1'));
@@ -156,6 +189,7 @@ class MultipleAnswerTrueFalse extends Question
         //Extra values True, false,  Dont known
         if (!empty($this->extra)) {
             $scores = explode(':', $this->extra);
+
             if (!empty($scores)) {
                 for ($i = 1; $i <= 3; $i++) {
                     $defaults['option[' . $i . ']'] = $scores[$i - 1];
@@ -166,10 +200,10 @@ class MultipleAnswerTrueFalse extends Question
         $navigator_info = api_get_navigator();
 
         global $text, $class;
+
         if ($obj_ex->edit_exercise_in_lp == true) {
             //ie6 fix
             if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
-
                 $form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'), 'class="btn minus"');
                 $form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'), 'class="btn plus"');
                 $form->addElement('submit', 'submitQuestion', $text, 'class="' . $class . '"');
@@ -181,9 +215,11 @@ class MultipleAnswerTrueFalse extends Question
                 $form->addElement('style_submit_button', 'submitQuestion', $text, 'class="' . $class . '"');
             }
         }
+
         $renderer->setElementTemplate('{element}&nbsp;', 'lessAnswers');
         $renderer->setElementTemplate('{element}&nbsp;', 'submitQuestion');
         $renderer->setElementTemplate('{element}&nbsp;', 'moreAnswers');
+
         $form->addElement('html', '</div></div>');
         $defaults['correct'] = $correct;