diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php index 64f743c878..8202230494 100755 --- a/main/inc/ajax/model.ajax.php +++ b/main/inc/ajax/model.ajax.php @@ -1330,9 +1330,6 @@ switch ($action) { } break; case 'get_exercise_results': - $course = api_get_course_info(); - // Used inside ExerciseLib::get_exam_results_data() - $documentPath = api_get_path(SYS_COURSE_PATH).$course['path']."/document"; $is_allowedToEdit = api_is_allowed_to_edit(null, true) || api_is_drh() || api_is_student_boss() || @@ -1368,10 +1365,6 @@ switch ($action) { ); break; case 'get_exercise_results_report': - // Used inside ExerciseLib::get_exam_results_data() - $documentPath = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document'; - $sessionId = api_get_session_id(); - $columns = [ 'firstname', 'lastname', diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php index 6044465768..e3f6cf7098 100644 --- a/main/inc/lib/exercise.lib.php +++ b/main/inc/lib/exercise.lib.php @@ -1969,8 +1969,7 @@ HOTSPOT; $roundValues = false ) { //@todo replace all this globals - global $documentPath, $filter; - + global $filter; $courseCode = empty($courseCode) ? api_get_course_id() : $courseCode; $courseInfo = api_get_course_info($courseCode); @@ -1978,6 +1977,8 @@ HOTSPOT; return []; } + $documentPath = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document'; + $course_id = $courseInfo['real_id']; $sessionId = api_get_session_id(); $exercise_id = (int) $exercise_id; @@ -2131,7 +2132,7 @@ HOTSPOT; $first_and_last_name = api_is_western_name_order() ? "firstname, lastname" : "lastname, firstname"; if ($get_count) { - $sql_select = "SELECT count(te.exe_id) "; + $sql_select = 'SELECT count(te.exe_id) '; } else { $sql_select = "SELECT DISTINCT user_id, @@ -2197,8 +2198,8 @@ HOTSPOT; AND tth.c_id = $course_id $hotpotatoe_where $sqlWhereOption - AND user.status NOT IN(".api_get_users_status_ignored_in_reports('string').") - ORDER BY tth.c_id ASC, tth.exe_date DESC"; + AND user.status NOT IN (".api_get_users_status_ignored_in_reports('string').") + ORDER BY tth.c_id ASC, tth.exe_date DESC "; } if (empty($sql)) { @@ -2212,9 +2213,7 @@ HOTSPOT; return $rowx[0]; } - $teacher_list = CourseManager::get_teacher_list_from_course_code( - $courseCode - ); + $teacher_list = CourseManager::get_teacher_list_from_course_code($courseCode); $teacher_id_list = []; if (!empty($teacher_list)) { foreach ($teacher_list as $teacher) { @@ -2347,7 +2346,6 @@ HOTSPOT; } $results[$i]['exe_duration'] = !empty($results[$i]['exe_duration']) ? round($results[$i]['exe_duration'] / 60) : 0; - $user_list_id[] = $results[$i]['exe_user_id']; $id = $results[$i]['exe_id']; $dt = api_convert_and_format_date($results[$i]['exe_weighting']);