One more result disable change BT#15743

main/exercise/MatchingDraggable.php

@@ -267,6 +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,
         ])
         ) {
             $header .= '<th>'.get_lang('YourChoice').'</th>';

main/exercise/fill_blanks.class.php

@@ -1265,6 +1265,7 @@ class FillBlanks extends Question
         $hideExpectedAnswer = false;
         $hideUserSelection = false;
         switch ($resultsDisabled) {
+            case RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING:
             case RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER:
                 $hideUserSelection = true;
                 break;

main/exercise/global_multiple_answer.class.php

@@ -271,6 +271,7 @@ class GlobalMultipleAnswer extends Question
 
         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/matching.class.php

@@ -289,6 +289,7 @@ 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,6 +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,
         ])
         ) {
             $header .= '<th>'.get_lang('ExpectedChoice').'</th>';

main/exercise/multiple_answer_combination.class.php

@@ -234,6 +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,
         ])
         ) {
             $header .= '<th>'.get_lang('Choice').'</th>';

main/exercise/multiple_answer_true_false.class.php

@@ -315,6 +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,
         ])
         ) {
             $header .= '<th>'.get_lang('Choice').'</th>';
@@ -331,6 +332,7 @@ class MultipleAnswerTrueFalse extends Question
                 $exercise->results_disabled,
                 [
                     RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
+                    RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
                 ]
             )
         ) {

main/exercise/question.class.php

@@ -1996,6 +1996,7 @@ abstract class Question
 
         if (in_array($exercise->results_disabled, [
             RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
+            RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
         ])
         ) {
             $scoreLabel = get_lang('QuizWrongAnswerHereIsTheCorrectOne');
@@ -2007,6 +2008,7 @@ abstract class Question
 
             if (in_array($exercise->results_disabled, [
                 RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
+                RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
             ])
             ) {
                 $scoreLabel = get_lang('CorrectAnswer');
@@ -2044,6 +2046,7 @@ abstract class Question
             case UNIQUE_ANSWER:
                 if (in_array($exercise->results_disabled, [
                     RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
+                    RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
                 ])
                 ) {
                     if (isset($score['user_answered'])) {
@@ -2077,6 +2080,7 @@ abstract class Question
             if (isset($score['result'])) {
                 if (in_array($exercise->results_disabled, [
                     RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
+                    RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
                 ])
                 ) {
                     $score['result'] = null;

main/exercise/unique_answer.class.php

@@ -419,6 +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,
         ])
         ) {
             $header .= '<th>'.get_lang('ExpectedChoice').'</th>';

main/exercise/unique_answer_no_option.class.php

@@ -406,6 +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,
         ])
         ) {
             $header .= '<th>'.get_lang('Choice').'</th>';