Quiz: #fix user choice presentation in result page for Dragging question - refs BT#23132

Author: NicoDucou

main/exercise/Draggable.php

@@ -215,15 +215,9 @@ public function return_header(Exercise $exercise, $counter = null, $score = [])
     {
         $header = parent::return_header($exercise, $counter, $score);
         $header .= '<table class="'.$this->question_table_class.'"><tr>';
-
-        if ($exercise->showExpectedChoice()) {
-            $header .= '<th>'.get_lang('YourChoice').'</th>';
-            if ($exercise->showExpectedChoiceColumn()) {
-                $header .= '<th>'.get_lang('ExpectedChoice').'</th>';
-            }
-        } else {
-            $header .= '<th>'.get_lang('ElementList').'</th>';
-            $header .= '<th>'.get_lang('YourChoice').'</th>';
+        $header .= '<th>'.get_lang('ElementList').'</th>';
+        $header .= '<th>'.get_lang('YourChoice').'</th>';
+        if ($exercise->showExpectedChoice() || $exercise->showExpectedChoiceColumn()) {
             $header .= '<th>'.get_lang('ExpectedChoice').'</th>';
         }
         $header .= '<th>'.get_lang('Status').'</th>';

main/exercise/exercise.class.php

@@ -5057,45 +5057,22 @@ function ($answerId) use ($objAnswerTmp) {
                                         echo '</tr>';
                                         break;
                                     case DRAGGABLE:
-                                        if (false == $showTotalScoreAndUserChoicesInLastAttempt) {
-                                            $s_answer_label = '';
-                                        }
                                         if (RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK == $this->results_disabled) {
                                             if (false === $showTotalScoreAndUserChoicesInLastAttempt && empty($s_user_answer)) {
                                                 break;
                                             }
                                         }
 
                                         echo '<tr>';
-                                        if ($this->showExpectedChoice()) {
-                                            if (!in_array($this->results_disabled, [
-                                                RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
-                                                //RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
-                                            ])
-                                            ) {
-                                                echo '<td>'.$user_answer.'</td>';
-                                            } else {
-                                                $status = Display::label(get_lang('Correct'), 'success');
-                                            }
+                                        if ($this->showExpectedChoice() || $this->showExpectedChoiceColumn()) {
                                             echo '<td>'.$s_answer_label.'</td>';
+                                            echo '<td>'.$user_answer.'</td>';
+                                            echo '<td>'.$real_list[$i_answer_correct_answer].'</td>';
                                             echo '<td>'.$status.'</td>';
                                         } else {
                                             echo '<td>'.$s_answer_label.'</td>';
                                             echo '<td>'.$user_answer.'</td>';
-                                            echo '<td>'.$counterAnswer.'</td>';
                                             echo '<td>'.$status.'</td>';
-                                            echo '<td>';
-                                            if (in_array($answerType, [MATCHING, MATCHING_COMBINATION, MATCHING_DRAGGABLE, MATCHING_DRAGGABLE_COMBINATION])) {
-                                                if (isset($real_list[$i_answer_correct_answer]) &&
-                                                    $showTotalScoreAndUserChoicesInLastAttempt === true
-                                                ) {
-                                                    echo Display::span(
-                                                        $real_list[$i_answer_correct_answer],
-                                                        ['style' => 'color: #008000; font-weight: bold;']
-                                                    );
-                                                }
-                                            }
-                                            echo '</td>';
                                         }
                                         echo '</tr>';
                                         break;