From b563b145c21061edf46f1a0e184bc3235cbad655 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Fri, 28 Aug 2020 18:33:44 -0500
Subject: [PATCH] Fix exercises reports in model.ajax.php - refs BT#17654 #3479

---
 main/inc/ajax/model.ajax.php  | 5 +++++
 main/inc/lib/exercise.lib.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php
index abf0cbdd3c..d6edaa167a 100755
--- a/main/inc/ajax/model.ajax.php
+++ b/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,
diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
index d69e67bbfd..0d91da650d 100644
--- a/main/inc/lib/exercise.lib.php
+++ b/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
                 ";