chamilo / chamilo-lms

main/exercice/global_multiple_answer.class.php

Spacing +24 added lines, -24 removed lines

@@ -34,20 +34,20 @@ 
         $html = '<table class="data_table">

                 <tr>

                     <th width="10px">

-                        ' . get_lang('Number') . '

+                        ' . get_lang('Number').'

                     </th>

                     <th width="10px">

-                        ' . get_lang('True') . '

+                        ' . get_lang('True').'

                     </th>

                     <th width="50%">

-                        ' . get_lang('Answer') . '

+                        ' . get_lang('Answer').'

                     </th>';

 

-        $html .='<th>' . get_lang('Comment') . '</th>';

-        $html .='</tr>';

+        $html .= '<th>'.get_lang('Comment').'</th>';

+        $html .= '</tr>';

         $form->addElement(

             'label',

-            get_lang('Answers') .

+            get_lang('Answers').

             '<br /> '.Display::return_icon('fill_field.png'),

             $html

         );

@@ -82,9 +82,9 @@ 
         for ($i = 1; $i <= $nb_answers; ++$i) {

             /* si la reponse est de type objet */

             if (is_object($answer)) {

-                $defaults['answer[' . $i . ']'] = $answer->answer[$i];

-                $defaults['comment[' . $i . ']'] = $answer->comment[$i];

-                $defaults['correct[' . $i . ']'] = $answer->correct[$i];

+                $defaults['answer['.$i.']'] = $answer->answer[$i];

+                $defaults['comment['.$i.']'] = $answer->comment[$i];

+                $defaults['correct['.$i.']'] = $answer->correct[$i];

 

                 // start

                 $scoreA = $answer->weighting[$i];

@@ -106,16 +106,16 @@ 
             $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>', 'weighting['.$i.']');

 

-            $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="' . $i . '"');

+            $answer_number = $form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"');

             $answer_number->freeze();

 

-            $form->addElement('checkbox', 'correct[' . $i . ']', null, null, 'class="checkbox"');

-            $boxes_names[] = 'correct[' . $i . ']';

+            $form->addElement('checkbox', 'correct['.$i.']', null, null, 'class="checkbox"');

+            $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', '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('html_editor', 'comment['.$i.']', null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));

 

             $form->addElement('html', '</tr>');

         }

@@ -181,7 +181,7 @@ 
         // Reponses correctes

         $nbr_corrects = 0;

         for ($i = 1; $i <= $nb_answers; $i++) {

-            $goodAnswer = trim($form->getSubmitValue('correct[' . $i . ']'));

+            $goodAnswer = trim($form->getSubmitValue('correct['.$i.']'));

             if ($goodAnswer) {

                 $nbr_corrects++;

             }

@@ -200,9 +200,9 @@ 
         $test = $form->getSubmitValue('pts');

 

         for ($i = 1; $i <= $nb_answers; $i++) {

-            $answer = trim($form->getSubmitValue('answer[' . $i . ']'));

-            $comment = trim($form->getSubmitValue('comment[' . $i . ']'));

-            $goodAnswer = trim($form->getSubmitValue('correct[' . $i . ']'));

+            $answer = trim($form->getSubmitValue('answer['.$i.']'));

+            $comment = trim($form->getSubmitValue('comment['.$i.']'));

+            $goodAnswer = trim($form->getSubmitValue('correct['.$i.']'));

 

             if ($goodAnswer) {

                 $weighting = abs($answer_score);

@@ -230,12 +230,12 @@ 
         $score = null

     ) {

         $header = parent::return_header($feedback_type, $counter, $score);

-        $header .= '<table class="'.$this->question_table_class .'">

+        $header .= '<table class="'.$this->question_table_class.'">

         <tr>

-            <th>' . get_lang("Choice") . '</th>

-            <th>' . get_lang("ExpectedChoice") . '</th>

-            <th>' . get_lang("Answer") . '</th>';

-        $header .= '<th>' . get_lang("Comment") . '</th>';

+            <th>' . get_lang("Choice").'</th>

+            <th>' . get_lang("ExpectedChoice").'</th>

+            <th>' . get_lang("Answer").'</th>';

+        $header .= '<th>'.get_lang("Comment").'</th>';

         $header .= '</tr>';

 

         return $header;