RemedialCourse: blocking_percentage added #18165 - refs BT#18165

chamilo · Mar 16, 2021 · 1a69d9b · 1a69d9b
1 parent 62c0af0
commit 1a69d9b
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php
@@ -10945,12 +10945,18 @@ public function remedialCourseList($userId = 0, $review = false, $sessionId = 0)
         if (false === $remedialField) {
             return null;
         }
+        // Check blocking exercise.
+        $extraFieldValue = new ExtraFieldValue('exercise');
+        $blockExercise = $extraFieldValue->get_values_by_handler_and_field_variable(
+            $this->iId,
+            'blocking_percentage'
+        );
         $questionExcluded = [
             FREE_ANSWER,
             ORAL_EXPRESSION,
             ANNOTATION,
         ];
-        $userId = empty($userId) ? api_get_user_id() : (int) $userId;
+        $userId = empty($userId) ? api_get_user_id() : (int)$userId;
         $extraMessage = null;
         $bestAttempt = [];
         $exercise_stat_info = Event::getExerciseResultsByUser(
@@ -10984,6 +10990,14 @@ public function remedialCourseList($userId = 0, $review = false, $sessionId = 0)
                     }
                 }
             }
+            // Check blocking exercise.
+            if ($blockExercise && isset($blockExercise['value']) && !empty($blockExercise['value'])) {
+                $blockPercentage = (int)$blockExercise['value'];
+                if ($attemp['total_percentage'] <= $blockPercentage) {
+                    return null;
+
+                }
+            }
         }
         $percentSuccess = $this->selectPassPercentage();
         $pass = ExerciseLib::isPassPercentageAttemptPassed(