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

chamilo · Aug 28, 2020 · b563b14 · b563b14 · pmchacin · May 14, 2021
1 parent 609c9a9
commit b563b14
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php
@@ -670,6 +670,11 @@ function getWhereClause($col, $oper, $val)
         }
 
         $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,

diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
@@ -2211,7 +2211,7 @@ public static function get_exam_results_data(
                     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
                 ";