From cd4e5c3683b0305d8525857266bcfe7a54c436d5 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 19 Sep 2019 13:59:34 +0200 Subject: [PATCH] Sync get attendance list with get attendance data --- main/attendance/attendance_list.php | 1 - main/inc/lib/attendance.lib.php | 20 +++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/main/attendance/attendance_list.php b/main/attendance/attendance_list.php index 16cf03bd99..5516a6f27e 100755 --- a/main/attendance/attendance_list.php +++ b/main/attendance/attendance_list.php @@ -51,7 +51,6 @@ if (api_is_allowed_to_edit(null, true)) { } $table->set_form_actions($actions); } - if ($table->get_total_number_of_items() > 0) { $table->display(); } diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php index ff515a3827..3721ca6b87 100755 --- a/main/inc/lib/attendance.lib.php +++ b/main/inc/lib/attendance.lib.php @@ -43,20 +43,30 @@ class Attendance * * @see SortableTable#get_total_number_of_items() */ - public static function getNumberOfAttendances($active = -1) + public static function getNumberOfAttendances() { $tbl_attendance = Database::get_course_table(TABLE_ATTENDANCE); $session_id = api_get_session_id(); $condition_session = api_get_session_condition($session_id); $course_id = api_get_course_int_id(); + + $active_plus = ''; + + if ((isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'true') || + !api_is_allowed_to_edit(null, true) + ) { + $active_plus = ' AND att.active = 1'; + } + $sql = "SELECT COUNT(att.id) AS total_number_of_items FROM $tbl_attendance att - WHERE c_id = $course_id $condition_session "; - - $active = (int) $active; + WHERE + c_id = $course_id AND + active <> 2 $active_plus $condition_session "; + /*$active = (int) $active; if ($active === 1 || $active === 0) { $sql .= "AND att.active = $active"; - } + }*/ $res = Database::query($sql); $obj = Database::fetch_object($res);