Fix columns in results for matching and matching draggable questions

public/main/exercise/MatchingDraggable.php

@@ -260,15 +260,13 @@ class MatchingDraggable extends Question
         ])
         ) {
             $header .= '<th>'.get_lang('Your choice').'</th>';
-        }
-
-        if ($exercise->showExpectedChoice()) {
             if ($exercise->showExpectedChoiceColumn()) {
                 $header .= '<th>'.get_lang('Expected choice').'</th>';
             }
+        }
+
+        if ($exercise->showExpectedChoice()) {
             $header .= '<th>'.get_lang('Status').'</th>';
-        } else {
-            $header .= '<th>'.get_lang('Corresponds to').'</th>';
         }
         $header .= '</tr>';
 

public/main/exercise/matching.class.php

@@ -279,17 +279,13 @@ class Matching extends Question
         ])
         ) {
             $header .= '<th>'.get_lang('Your choice').'</th>';
-            //if ($exercise->showExpectedYour choiceColumn()) {
-                //$header .= '<th>'.get_lang('ExpectedYour choice').'</th>';
-            //}
+            if ($exercise->showExpectedChoiceColumn()) {
+                $header .= '<th>'.get_lang('Expected choice').'</th>';
+            }
         }
 
         if ($exercise->showExpectedChoice()) {
             $header .= '<th>'.get_lang('Status').'</th>';
-        } else {
-            if ($exercise->showExpectedChoiceColumn()) {
-                $header .= '<th>'.get_lang('Corresponds to').'</th>';
-            }
         }
         $header .= '</tr>';