Fix exercises reports in model.ajax.php - refs BT#17654 #3479

main/inc/ajax/model.ajax.php

@@ -670,6 +670,11 @@ switch ($action) {
         }
 
         $startDate = Database::escape_string($_REQUEST['start_date']);
+
+        if (!empty($whereCondition)) {
+            $whereCondition = " AND $whereCondition";
+        }
+
         $whereCondition .= " AND exe_date > '$startDate' AND te.status = '' ";
         $count = ExerciseLib::get_count_exam_results(
             $exerciseId,

main/inc/lib/exercise.lib.php

@@ -2211,7 +2211,7 @@ HOTSPOT;
                     te.c_id = $course_id $session_id_and AND
                     ce.active <> -1 AND
                     ce.c_id = $course_id
-                    $exercise_where AND
+                    $exercise_where
                     $extra_where_conditions
                 ";