Merge pull request #4009 from christianbeeznest/ofaj19044-tracking3

Tracking: Add validation to export presence pdf - refs BT#19044
pull/4011/head
Yannick Warnier 4 years ago committed by GitHub
commit 848a71560e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      public/main/inc/lib/tracking.lib.php
  2. 14
      public/main/mySpace/course.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'

@ -335,15 +335,21 @@ 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) {
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('Attendance'), [], ICON_SIZE_MEDIUM),
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[] = [
$title,

Loading…
Cancel
Save