From 6e166320e1bb3defdc9599557bb6da7bb85a3407 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 22 Dec 2020 08:24:28 +0100
Subject: [PATCH] Exercise report: Fix query, hide deleted exercises.

---
 main/exercise/exercise_global_report.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/main/exercise/exercise_global_report.php b/main/exercise/exercise_global_report.php
index a281547f65..1121c3aac9 100644
--- a/main/exercise/exercise_global_report.php
+++ b/main/exercise/exercise_global_report.php
@@ -16,8 +16,10 @@ $data = [];
 
 $students = CourseManager::get_student_list_from_course_code($courseCode);
 $categories = TestCategory::getCategoryListInfo('', $courseId);
-
-$sql = "SELECT iid, title FROM c_quiz WHERE c_id = $courseId AND active <> 2 order by iid";
+$table = Database::get_course_table(TABLE_QUIZ_TEST);
+$sql = "SELECT iid, title FROM $table
+        WHERE c_id = $courseId AND active <> -1
+        ORDER by iid";
 $result = Database::query($sql);
 $exercises = Database::store_result($result);
 $list = [];
@@ -46,16 +48,12 @@ $objExercise = new Exercise();
 
 foreach ($students as $studentInfo) {
     $studentId = $studentInfo['user_id'];
-    //$userExtra = UserManager::get_extra_user_data($studentId);
-
     $data = [];
     $data[] = $studentInfo['username'];
     $data[] = $studentInfo['lastname'];
     $data[] = $studentInfo['firstname'];
     $data[] = $studentInfo['email'];
     $data[] = $studentInfo['official_code'];
-    //$data[] = isset($userExtra['extra_nif']) ? $userExtra['extra_nif'] : '';
-
     $userExerciseData = [];
     $categoryData = [];
     foreach ($exercises as $exerciseInfo) {