Browse Source

Remove message to review question with reviewed oral question - refs BT#12619

Angel Fernando Quiroz Campos 7 years ago
parent
commit
4664d73bfa
2 changed files with 21 additions and 10 deletions
  1. 4 2
      main/exercise/exercise.class.php
  2. 17 8
      main/inc/lib/exercise_show_functions.lib.php

+ 4 - 2
main/exercise/exercise.class.php

@@ -4408,7 +4408,8 @@ class Exercise
                                 0,
                                 0,
                                 $objQuestionTmp->getFileUrl(true),
-                                $results_disabled
+                                $results_disabled,
+                                $questionScore
                             );
                         } elseif ($answerType == HOT_SPOT) {
                             /**
@@ -4769,7 +4770,8 @@ class Exercise
                                     $exeId,
                                     $questionId,
                                     $objQuestionTmp->getFileUrl(),
-                                    $results_disabled
+                                    $results_disabled,
+                                    $questionScore
                                 ).'</td>
                                 </tr>
                                 </table>';

+ 17 - 8
main/inc/lib/exercise_show_functions.lib.php

@@ -140,14 +140,23 @@ class ExerciseShowFunctions
     }
 
     /**
-    * @param $feedback_type
-    * @param $answer
-    * @param $id
-    * @param $questionId
-    * @param null $nano
-    * @param int $results_disabled
+     * @param $feedback_type
+     * @param $answer
+     * @param $id
+     * @param $questionId
+     * @param null $fileUrl
+     * @param int $results_disabled
+     * @param int $questionScore
      */
-    public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0)
+    public static function display_oral_expression_answer(
+        $feedback_type,
+        $answer,
+        $id,
+        $questionId,
+        $fileUrl = null,
+        $results_disabled = 0,
+        $questionScore = 0
+    )
     {
         if (isset($fileUrl)) {
             echo '
@@ -161,7 +170,7 @@ class ExerciseShowFunctions
             echo '<tr>';
             echo Display::tag('td', Security::remove_XSS($answer), array('width'=>'55%'));
             echo '</tr>';
-            if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
+            if (!$questionScore && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
                 echo '<tr>';
                 echo Display::tag('td', ExerciseLib::getNotCorrectedYetText(), array('width'=>'45%'));
                 echo '</tr>';