From 83f6ce9ad0ff8db02d31a6e8ff9d44dde4f2e30a Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 1 Oct 2021 07:41:34 -0500 Subject: [PATCH] Tracking: Add validation to export presence pdf - refs BT#19044 --- public/main/inc/lib/tracking.lib.php | 7 +++++-- public/main/mySpace/course.php | 20 +++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/public/main/inc/lib/tracking.lib.php b/public/main/inc/lib/tracking.lib.php index 6139cff43e..55c26c430e 100644 --- a/public/main/inc/lib/tracking.lib.php +++ b/public/main/inc/lib/tracking.lib.php @@ -9053,9 +9053,12 @@ class TrackingCourseLog $attendanceLink = ''; if (!empty($sessionId)) { + $sessionInfo = api_get_session_info($sessionId); + $startDate = $sessionInfo['access_start_date']; + $endDate = $sessionInfo['access_end_date']; $attendance = new Attendance(); - $result = $attendance->getAttendanceBaseInLogin(false, true); - if (false !== $result) { + $checkExport = $attendance->getAttendanceLogin($startDate, $endDate); + if (false !== $checkExport) { $attendanceLink = Display::url( Display::return_icon('attendance_list.png', get_lang('Logins'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'attendance/index.php?'.api_get_cidreq().'&action=calendar_logins' diff --git a/public/main/mySpace/course.php b/public/main/mySpace/course.php index 4cad227924..463284e104 100644 --- a/public/main/mySpace/course.php +++ b/public/main/mySpace/course.php @@ -335,14 +335,20 @@ function get_courses($from, $limit, $column, $direction) $data['title'], $courseInfo['course_public_url'].'?id_session='.$sessionId ); - $attendance = new Attendance(); - $result = $attendance->getAttendanceBaseInLogin(false, true); + $attendanceLink = ''; - if (false !== $result) { - $attendanceLink = Display::url( - Display::return_icon('attendance_list.png', get_lang('Attendance'), [], ICON_SIZE_MEDIUM), - api_get_path(WEB_CODE_PATH).'attendance/index.php?cid='.$courseId.'&sid='.$sessionId.'&action=calendar_logins' - ); + if (!empty($sessionId)) { + $sessionInfo = api_get_session_info($sessionId); + $startDate = $sessionInfo['access_start_date']; + $endDate = $sessionInfo['access_end_date']; + $attendance = new Attendance(); + $checkExport = $attendance->getAttendanceLogin($startDate, $endDate); + if (false !== $checkExport) { + $attendanceLink = Display::url( + Display::return_icon('attendance_list.png', get_lang('Logins'), '', ICON_SIZE_MEDIUM), + api_get_path(WEB_CODE_PATH).'attendance/index.php?cid='.$courseId.'&sid='.$sessionId.'&action=calendar_logins' + ); + } } $courseList[] = [