More result_disable changes BT#15743

main/exercise/MatchingDraggable.php

@@ -267,7 +267,7 @@ class MatchingDraggable extends Question
         $header .= '<th>'.get_lang('ElementList').'</th>';
         if (!in_array($exercise->results_disabled, [
             RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
-            RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
+            //RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
         ])
         ) {
             $header .= '<th>'.get_lang('YourChoice').'</th>';

main/exercise/matching.class.php

@@ -289,7 +289,6 @@ class Matching extends Question
         $header .= '<th>'.get_lang('ElementList').'</th>';
         if (!in_array($exercise->results_disabled, [
             RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
-            RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
         ])
         ) {
             $header .= '<th>'.get_lang('Choice').'</th>';

main/exercise/multiple_answer.class.php

@@ -237,7 +237,7 @@ class MultipleAnswer extends Question
         $header .= '<th>'.get_lang('Choice').'</th>';
         if (!in_array($exercise->results_disabled, [
             RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
-            RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
+            //RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
         ])
         ) {
             $header .= '<th>'.get_lang('ExpectedChoice').'</th>';

main/exercise/multiple_answer_combination.class.php

@@ -234,7 +234,7 @@ class MultipleAnswerCombination extends Question
 
         if (!in_array($exercise->results_disabled, [
             RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
-            RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
+            //RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
         ])
         ) {
             $header .= '<th>'.get_lang('Choice').'</th>';

main/exercise/multiple_answer_true_false.class.php

@@ -315,7 +315,7 @@ class MultipleAnswerTrueFalse extends Question
 
         if (!in_array($exercise->results_disabled, [
             RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
-            RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
+            //RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
         ])
         ) {
             $header .= '<th>'.get_lang('Choice').'</th>';

main/exercise/question.class.php

@@ -2013,7 +2013,6 @@ abstract class Question
             ) {
                 $scoreLabel = get_lang('CorrectAnswer');
             }
-
             $class = 'success';
         }
 

main/exercise/unique_answer.class.php

@@ -419,7 +419,7 @@ class UniqueAnswer extends Question
         $header .= '<th>'.get_lang('Choice').'</th>';
         if (!in_array($exercise->results_disabled, [
             RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
-            RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
+            //RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
         ])
         ) {
             $header .= '<th>'.get_lang('ExpectedChoice').'</th>';

main/exercise/unique_answer_no_option.class.php

@@ -406,7 +406,7 @@ class UniqueAnswerNoOption extends Question
 
         if (!in_array($exercise->results_disabled, [
             RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
-            RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
+            //RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
         ])
         ) {
             $header .= '<th>'.get_lang('Choice').'</th>';

main/inc/lib/api.lib.php

@@ -480,8 +480,6 @@ define('RESULT_DISABLE_RANKING', 6);
 define('RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER', 7);
 define('RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING', 8);
 
-// 4: Show final score only with  and show expected answers only on the last attempt
-
 define('EXERCISE_MAX_NAME_SIZE', 80);
 
 // Question types (edit next array as well when adding values)