Fix direct feedback with delineation question see #1737

chamilo · Mar 13, 2017 · 9fb2207 · 9fb2207
1 parent 82a29f5
commit 9fb2207
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
@@ -3589,10 +3589,15 @@ public static function display_question_list_by_attempt(
         $loadChoiceFromSession = false;
         $fromDatabase = true;
         $exerciseResult = null;
+        $exerciseResultCoordinates = null;
+        $delineationResults = null;
         if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
             $loadChoiceFromSession = true;
             $fromDatabase = false;
             $exerciseResult = Session::read('exerciseResult');
+            $exerciseResultCoordinates = Session::read('exerciseResultCoordinates');
+            $delineationResults = Session::read('hotspot_delineation_result');
+            $delineationResults = isset($delineationResults[$objExercise->id]) ? $delineationResults[$objExercise->id] : null;
         }
 
         // Loop over all question to show results for each of them, one by one
@@ -3604,8 +3609,10 @@ public static function display_question_list_by_attempt(
                 // This variable came from exercise_submit_modal.php
                 ob_start();
                 $choice = null;
+                $delineationChoice = null;
                 if ($loadChoiceFromSession) {
                     $choice = isset($exerciseResult[$questionId]) ? $exerciseResult[$questionId] : null;
+                    $delineationChoice = isset($delineationResults[$questionId]) ? $delineationResults[$questionId] : null;
                 }
 
                 // We're inside *one* question. Go through each possible answer for this question
@@ -3614,12 +3621,12 @@ public static function display_question_list_by_attempt(
                     $questionId,
                     $choice,
                     'exercise_result',
-                    [],
+                    $exerciseResultCoordinates,
                     $save_user_result,
                     $fromDatabase,
                     $show_results,
                     $objExercise->selectPropagateNeg(),
-                    [],
+                    $delineationChoice,
                     $showTotalScoreAndUserChoicesInLastAttempt
                 );