diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index 4b49ea4cce..b8fd3b580e 100755 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -3502,7 +3502,6 @@ class Tracking //protect data $last_days = intval($last_days); - $course_code = Database::escape_string($course_code); $session_id = intval($session_id); $tbl_stats_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); $now = api_get_utc_datetime(); @@ -3863,7 +3862,7 @@ class Tracking */ public static function get_tools_most_used_by_course($courseId, $session_id = null) { - $course_code = intval($courseId); + $courseId = intval($courseId); $data = array(); $TABLETRACK_ACCESS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LASTACCESS); $condition_session = ''; @@ -3871,7 +3870,10 @@ class Tracking $session_id = intval($session_id); $condition_session = ' AND access_session_id = '. $session_id; } - $sql = "SELECT access_tool, COUNT(DISTINCT access_user_id),count( access_tool ) as count_access_tool + $sql = "SELECT + access_tool, + COUNT(DISTINCT access_user_id), + count(access_tool) as count_access_tool FROM $TABLETRACK_ACCESS WHERE access_tool IS NOT NULL AND @@ -4070,8 +4072,8 @@ class Tracking $data = array(); - $TABLETRACK_LINKS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LINKS); - $TABLECOURSE_LINKS = Database::get_course_table(TABLE_LINK); + $TABLETRACK_LINKS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LINKS); + $TABLECOURSE_LINKS = Database::get_course_table(TABLE_LINK); $condition_session = ''; if (isset($session_id)) { diff --git a/main/tracking/course_log_tools.php b/main/tracking/course_log_tools.php index 232ae40026..9663564acf 100755 --- a/main/tracking/course_log_tools.php +++ b/main/tracking/course_log_tools.php @@ -30,6 +30,22 @@ if (!$is_allowedToTrack) { exit; } +$showChatReporting = true; +$showTrackingReporting = true; +$documentReporting = true; +$linkReporting = true; +$exerciseReporting = true; +$lpReporting = true; + +if (!empty($groupId)) { + $showChatReporting = false; + $showTrackingReporting = false; + $documentReporting = false; + $linkReporting = false; + $exerciseReporting = false; + $lpReporting = false; +} + // Including additional libraries. require_once api_get_path(SYS_CODE_PATH).'resourcelinker/resourcelinker.inc.php'; @@ -129,110 +145,133 @@ echo ''; $course_code = api_get_course_id(); $course_id = api_get_course_int_id(); -$list = new LearnpathList(null, $course_code, $session_id); -$flat_list = $list->get_flat_list(); +if ($lpReporting) { + $list = new LearnpathList(null, $course_code, $session_id); + $flat_list = $list->get_flat_list(); -if (count($flat_list) > 0) { - - // learning path tracking - echo '
- '.Display::page_subheader( - Display::return_icon('scorms.gif',get_lang('AverageProgressInLearnpath')).get_lang('AverageProgressInLearnpath') - ).' - '; + if (count($flat_list) > 0) { - if ($export_csv) { - $temp = array(get_lang('AverageProgressInLearnpath', ''), ''); - $csv_content[] = array('', ''); - $csv_content[] = $temp; - } + // learning path tracking + echo '
+ '.Display::page_subheader( + Display::return_icon( + 'scorms.gif', + get_lang('AverageProgressInLearnpath') + ).get_lang('AverageProgressInLearnpath') + ).' +
'; - foreach ($flat_list as $lp_id => $lp) { - $lp_avg_progress = 0; - foreach ($a_students as $student_id => $student) { - // get the progress in learning pathes - $lp_avg_progress += Tracking::get_avg_student_progress( - $student_id, - $course_code, - array($lp_id), - $session_id - ); - } - if ($studentCount > 0) { - $lp_avg_progress = $lp_avg_progress / $studentCount; - } else { - $lp_avg_progress = null; + if ($export_csv) { + $temp = array(get_lang('AverageProgressInLearnpath', ''), ''); + $csv_content[] = array('', ''); + $csv_content[] = $temp; } - // Separated presentation logic. - if (is_null($lp_avg_progress)) { - $lp_avg_progress = '0%'; - } else { - $lp_avg_progress = round($lp_avg_progress, 1).'%'; + + foreach ($flat_list as $lp_id => $lp) { + $lp_avg_progress = 0; + foreach ($a_students as $student_id => $student) { + // get the progress in learning pathes + $lp_avg_progress += Tracking::get_avg_student_progress( + $student_id, + $course_code, + array($lp_id), + $session_id + ); + } + if ($studentCount > 0) { + $lp_avg_progress = $lp_avg_progress / $studentCount; + } else { + $lp_avg_progress = null; + } + // Separated presentation logic. + if (is_null($lp_avg_progress)) { + $lp_avg_progress = '0%'; + } else { + $lp_avg_progress = round($lp_avg_progress, 1).'%'; + } + echo ''; + if ($export_csv) { + $temp = array($lp['lp_name'], $lp_avg_progress); + $csv_content[] = $temp; + } } - echo ''; + echo '
'.$lp['lp_name'].''.$lp_avg_progress.'
'.$lp['lp_name'].''.$lp_avg_progress.'
'; + } else { if ($export_csv) { - $temp = array($lp['lp_name'], $lp_avg_progress); + $temp = array(get_lang('NoLearningPath', ''), ''); $csv_content[] = $temp; } } - echo ''; -} else { - if ($export_csv) { - $temp = array(get_lang('NoLearningPath', ''), ''); - $csv_content[] = $temp; - } } -// Exercices tracking. -echo '
- '.Display::page_subheader( - Display::return_icon('quiz.gif',get_lang('AverageResultsToTheExercices')).get_lang('AverageResultsToTheExercices') - ).' - '; +if ($exerciseReporting) { -$course_id = api_get_course_int_id(); + // Exercices tracking. + echo '
+ '.Display::page_subheader( + Display::return_icon( + 'quiz.gif', + get_lang('AverageResultsToTheExercices') + ).get_lang('AverageResultsToTheExercices') + ).' +
'; -$sql = "SELECT id, title FROM $TABLEQUIZ - WHERE c_id = $course_id AND active <> -1 AND session_id = $session_id"; -$rs = Database::query($sql); + $course_id = api_get_course_int_id(); -if ($export_csv) { - $temp = array(get_lang('AverageProgressInLearnpath'), ''); - $csv_content[] = array('', ''); - $csv_content[] = $temp; -} + $sql = "SELECT id, title FROM $TABLEQUIZ + WHERE c_id = $course_id AND active <> -1 AND session_id = $session_id"; + $rs = Database::query($sql); -$course_path_params = '&cidReq='.$course_code.'&id_session='.$session_id; + if ($export_csv) { + $temp = array(get_lang('AverageProgressInLearnpath'), ''); + $csv_content[] = array('', ''); + $csv_content[] = $temp; + } -if (Database::num_rows($rs) > 0) { - while ($quiz = Database::fetch_array($rs)) { - $quiz_avg_score = 0; - if ($studentCount > 0) { - foreach ($student_ids as $student_id) { - $avg_student_score = Tracking::get_avg_student_exercise_score($student_id, $course_code, $quiz['id'], $session_id); - $quiz_avg_score += $avg_student_score; + $course_path_params = '&cidReq='.$course_code.'&id_session='.$session_id; + + if (Database::num_rows($rs) > 0) { + while ($quiz = Database::fetch_array($rs)) { + $quiz_avg_score = 0; + if ($studentCount > 0) { + foreach ($student_ids as $student_id) { + $avg_student_score = Tracking::get_avg_student_exercise_score( + $student_id, + $course_code, + $quiz['id'], + $session_id + ); + $quiz_avg_score += $avg_student_score; + } + } + $studentCount = ($studentCount == 0 || is_null( + $studentCount + ) || $studentCount == '') ? 1 : $studentCount; + $quiz_avg_score = round(($quiz_avg_score / $studentCount), 2).'%'; + $url = api_get_path( + WEB_CODE_PATH + ).'exercice/overview.php?exerciseId='.$quiz['id'].$course_path_params; + + echo ''; + if ($export_csv) { + $temp = array($quiz['title'], $quiz_avg_score); + $csv_content[] = $temp; } } - $studentCount = ($studentCount == 0 || is_null($studentCount) || $studentCount == '') ? 1 : $studentCount; - $quiz_avg_score = round(($quiz_avg_score / $studentCount), 2).'%'; - $url = api_get_path(WEB_CODE_PATH).'exercice/overview.php?exerciseId='.$quiz['id'].$course_path_params; - - echo ''; + } else { + echo ''; if ($export_csv) { - $temp = array($quiz['title'], $quiz_avg_score); + $temp = array(get_lang('NoExercises', ''), ''); $csv_content[] = $temp; } } -} else { - echo ''; - if ($export_csv) { - $temp = array(get_lang('NoExercises', ''), ''); - $csv_content[] = $temp; - } -} -echo '
'.Display::url( + $quiz['title'], + $url + ).''.$quiz_avg_score.'
'.Display::url($quiz['title'], $url).''.$quiz_avg_score.'
'.get_lang('NoExercises').'
'.get_lang('NoExercises').'
'; -echo '
'; + echo ''; + echo '
'; +} $filterByUsers = array(); @@ -259,10 +298,10 @@ $count_number_of_posts_by_course = Tracking:: count_number_of_posts_by_course( ); if ($export_csv) { - $csv_content[] = array(get_lang('Forum'), ''); - $csv_content[] = array(get_lang('ForumForumsNumber', ''), $count_number_of_forums_by_course); - $csv_content[] = array(get_lang('ForumThreadsNumber', ''), $count_number_of_threads_by_course); - $csv_content[] = array(get_lang('ForumPostsNumber', ''), $count_number_of_posts_by_course); + $csv_content[] = array(get_lang('Forum')); + $csv_content[] = array(get_lang('ForumForumsNumber'), $count_number_of_forums_by_course); + $csv_content[] = array(get_lang('ForumThreadsNumber'), $count_number_of_threads_by_course); + $csv_content[] = array(get_lang('ForumPostsNumber'), $count_number_of_posts_by_course); } // Forums tracking. @@ -282,124 +321,197 @@ echo ''; echo '
'; // Chat tracking. +if ($showChatReporting) { + echo '
+ '.Display::page_subheader( + Display::return_icon('chat.gif', get_lang('Chat')).get_lang('Chat') + ).' + '; + $chat_connections_during_last_x_days_by_course = Tracking::chat_connections_during_last_x_days_by_course( + $course_code, + 7, + $session_id + ); + if ($export_csv) { + $csv_content[] = array(get_lang('Chat', ''), ''); + $csv_content[] = array( + sprintf( + get_lang('ChatConnectionsDuringLastXDays', ''), + '7' + ), + $chat_connections_during_last_x_days_by_course + ); + } + echo ''; -echo '
- '.Display::page_subheader(Display::return_icon('chat.gif',get_lang('Chat')).get_lang('Chat')).' -
'.sprintf( + get_lang('ChatConnectionsDuringLastXDays'), + '7' + ).''.$chat_connections_during_last_x_days_by_course.'
'; -$chat_connections_during_last_x_days_by_course = Tracking::chat_connections_during_last_x_days_by_course($course_code, 7, $session_id); -if ($export_csv) { - $csv_content[] = array(get_lang('Chat', ''), ''); - $csv_content[] = array(sprintf(get_lang('ChatConnectionsDuringLastXDays', ''), '7'), $chat_connections_during_last_x_days_by_course); + echo '
'; + echo '
'; } -echo ''.sprintf(get_lang('ChatConnectionsDuringLastXDays'), '7').''.$chat_connections_during_last_x_days_by_course.''; - -echo ''; -echo '
'; // Tools tracking. -echo '
- '.Display::page_subheader(Display::return_icon('acces_tool.gif', get_lang('ToolsMostUsed')).get_lang('ToolsMostUsed')).' +if ($showTrackingReporting) { + echo '
+ '.Display::page_subheader( + Display::return_icon( + 'acces_tool.gif', + get_lang('ToolsMostUsed') + ).get_lang('ToolsMostUsed') + ).' '; -$tools_most_used = Tracking::get_tools_most_used_by_course($course_id, $session_id); + $tools_most_used = Tracking::get_tools_most_used_by_course( + $course_id, + $session_id + ); -if ($export_csv) { - $temp = array(get_lang('ToolsMostUsed'), ''); - $csv_content[] = $temp; -} + if ($export_csv) { + $temp = array(get_lang('ToolsMostUsed'), ''); + $csv_content[] = $temp; + } -if (!empty($tools_most_used)) { - foreach ($tools_most_used as $row) { - echo ' + if (!empty($tools_most_used)) { + foreach ($tools_most_used as $row) { + echo ' - + '; - if ($export_csv) { - $temp = array(get_lang(ucfirst($row['access_tool']), ''), $row['count_access_tool'].' '.get_lang('Clicks', '')); - $csv_content[] = $temp; + if ($export_csv) { + $temp = array( + get_lang(ucfirst($row['access_tool']), ''), + $row['count_access_tool'].' '.get_lang('Clicks', '') + ); + $csv_content[] = $temp; + } } } -} - -echo '
'.get_lang(ucfirst($row['access_tool'])).''.$row['count_access_tool'].' '.get_lang('Clicks').''.$row['count_access_tool'].' '.get_lang( + 'Clicks' + ).'
'; -echo '
'; -// Documents tracking. -if (!isset($_GET['num']) || empty($_GET['num'])) { - $num = 3; - $link = ' - '.get_lang('SeeDetail').''; -} else { - $num = 1000; - $link = ' - '.get_lang('ViewMinus').''; + echo '
'; + echo '
'; } - echo '
- '.Display::page_subheader(Display::return_icon('documents.gif',get_lang('DocumentsMostDownloaded')).' '.get_lang('DocumentsMostDownloaded').$link).' - '; +if ($documentReporting) { + // Documents tracking. + if (!isset($_GET['num']) || empty($_GET['num'])) { + $num = 3; + $link = ' - '.get_lang('SeeDetail').''; + } else { + $num = 1000; + $link = ' - '.get_lang('ViewMinus').''; + } -$documents_most_downloaded = Tracking::get_documents_most_downloaded_by_course($course_code, $session_id, $num); + echo '
+ '.Display::page_subheader( + Display::return_icon( + 'documents.gif', + get_lang('DocumentsMostDownloaded') + ).' '.get_lang('DocumentsMostDownloaded').$link + ).' +
'; -if ($export_csv) { - $temp = array(get_lang('DocumentsMostDownloaded', ''), ''); - $csv_content[] = array('', ''); - $csv_content[] = $temp; -} + $documents_most_downloaded = Tracking::get_documents_most_downloaded_by_course( + $course_code, + $session_id, + $num + ); + + if ($export_csv) { + $temp = array(get_lang('DocumentsMostDownloaded', ''), ''); + $csv_content[] = array('', ''); + $csv_content[] = $temp; + } -if (!empty($documents_most_downloaded)) { - foreach ($documents_most_downloaded as $row) { - echo ' - - - '; + if (!empty($documents_most_downloaded)) { + foreach ($documents_most_downloaded as $row) { + echo ' + + + '; + if ($export_csv) { + $temp = array( + $row['down_doc_path'], + $row['count_down'].' '.get_lang('Clicks', '') + ); + $csv_content[] = $temp; + } + } + } else { + echo ''; if ($export_csv) { - $temp = array($row['down_doc_path'], $row['count_down'].' '.get_lang('Clicks', '')); + $temp = array(get_lang('NoDocumentDownloaded', ''), ''); $csv_content[] = $temp; } } -} else { - echo ''; - if ($export_csv) { - $temp = array(get_lang('NoDocumentDownloaded', ''), ''); - $csv_content[] = $temp; - } + echo '
'.Display::url($row['down_doc_path'], api_get_path(WEB_CODE_PATH).'document/show_content.php?file='.$row['down_doc_path'].$course_path_params).''.$row['count_down'].' '.get_lang('Clicks').'
'.Display::url( + $row['down_doc_path'], + api_get_path( + WEB_CODE_PATH + ).'document/show_content.php?file='.$row['down_doc_path'].$course_path_params + ).''.$row['count_down'].' '.get_lang( + 'Clicks' + ).'
'.get_lang('NoDocumentDownloaded').'
'.get_lang('NoDocumentDownloaded').'
'; + + echo '
'; } -echo ''; -echo '
'; +if ($linkReporting) { -// links tracking - echo '
- '.Display::page_subheader(Display::return_icon('link.gif',get_lang('LinksMostClicked')).' '.get_lang('LinksMostClicked')).' - '; + // links tracking + echo '
+ '.Display::page_subheader( + Display::return_icon( + 'link.gif', + get_lang('LinksMostClicked') + ).' '.get_lang('LinksMostClicked') + ).' +
'; -$links_most_visited = Tracking::get_links_most_visited_by_course($course_code, $session_id); + $links_most_visited = Tracking::get_links_most_visited_by_course( + $course_code, + $session_id + ); -if ($export_csv) { - $temp = array(get_lang('LinksMostClicked'), ''); - $csv_content[] = array('', ''); - $csv_content[] = $temp; -} + if ($export_csv) { + $temp = array(get_lang('LinksMostClicked'), ''); + $csv_content[] = array('', ''); + $csv_content[] = $temp; + } -if (!empty($links_most_visited)) { - foreach ($links_most_visited as $row) { - echo ' - - - '; - if ($export_csv){ - $temp = array($row['title'], $row['count_visits'].' '.get_lang('Clicks', '')); + if (!empty($links_most_visited)) { + foreach ($links_most_visited as $row) { + echo ' + + + '; + if ($export_csv) { + $temp = array( + $row['title'], + $row['count_visits'].' '.get_lang('Clicks', '') + ); + $csv_content[] = $temp; + } + } + } else { + echo ''; + if ($export_csv) { + $temp = array(get_lang('NoLinkVisited'), ''); $csv_content[] = $temp; } } -} else { - echo ''; - if ($export_csv) { - $temp = array(get_lang('NoLinkVisited'), ''); - $csv_content[] = $temp; - } + echo '
'.Display::url($row['title'].' ('.$row['url'].')', $row['url']).''.$row['count_visits'].' '.get_lang('Clicks').'
'.Display::url( + $row['title'].' ('.$row['url'].')', + $row['url'] + ).''.$row['count_visits'].' '.get_lang( + 'Clicks' + ).'
'.get_lang('NoLinkVisited').'
'.get_lang('NoLinkVisited').'
'; + echo '
'; } -echo ''; -echo '
'; // send the csv file if asked if ($export_csv) {