chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - format code

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent c0cb791867
commit d2a8845682
2 changed files with 59 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/inc/lib/tracking.lib.php
  2. 87
      main/tracking/courseLog.php

2
main/inc/lib/tracking.lib.php
Unescape View File

@ -7093,7 +7093,7 @@ class TrackingCourseLog
$direction,
$includeInvitedUsers = false
) {
global $user_ids, $course_code, $export_csv, $is_western_name_order, $csv_content, $session_id;
global $user_ids, $course_code, $export_csv, $csv_content, $session_id;
$course_code = Database::escape_string($course_code);
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);

87
main/tracking/courseLog.php
Unescape View File

@ -145,10 +145,7 @@ $htmlHeadXtra[] .= $js;
// Database table definitions.
//@todo remove this calls
$TABLETRACK_ACCESS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LASTACCESS);
$TABLETRACK_LINKS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LINKS);
$TABLETRACK_DOWNLOADS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
$TABLETRACK_ACCESS_2 = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
$TABLETRACK_EXERCISES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$TABLECOURSE = Database::get_main_table(TABLE_MAIN_COURSE);
@ -159,9 +156,18 @@ $sessionId = api_get_session_id();
// Breadcrumbs.
if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
$interbreadcrumb[] = array('url' => '../admin/index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => '../session/session_list.php', 'name' => get_lang('SessionList'));
$interbreadcrumb[] = array('url' => '../session/resume_session.php?id_session='.$sessionId, 'name' => get_lang('SessionOverview'));
$interbreadcrumb[] = array(
'url' => '../admin/index.php',
'name' => get_lang('PlatformAdmin')
);
$interbreadcrumb[] = array(
'url' => '../session/session_list.php',
'name' => get_lang('SessionList')
);
$interbreadcrumb[] = array(
'url' => '../session/resume_session.php?id_session='.$sessionId,
'name' => get_lang('SessionOverview')
);
}
$view = isset($_REQUEST['view']) ? $_REQUEST['view'] : '';
@ -213,7 +219,12 @@ Display::display_header($nameTools, 'Tracking');
/* MAIN CODE */
$actionsLeft = Display::return_icon('user_na.png', get_lang('StudentsTracking'), array(), ICON_SIZE_MEDIUM);
$actionsLeft = Display::return_icon(
'user_na.png',
get_lang('StudentsTracking'),
array(),
ICON_SIZE_MEDIUM
);
$actionsLeft .= Display::url(
Display::return_icon('group.png', get_lang('GroupReporting'), array(), ICON_SIZE_MEDIUM),
'course_log_groups.php?'.api_get_cidreq()
@ -278,10 +289,25 @@ echo Display::toolbarAction(
$course_name = get_lang('Course').' '.$courseInfo['name'];
if ($session_id) {
$titleSession = Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.api_get_session_name($session_id);
$titleCourse = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name;
$titleSession = Display::return_icon(
'session.png',
get_lang('Session'),
array(),
ICON_SIZE_SMALL
).' '.api_get_session_name($session_id);
$titleCourse = Display::return_icon(
'course.png',
get_lang('Course'),
array(),
ICON_SIZE_SMALL
).' '.$course_name;
} else {
$titleSession = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$courseInfo['name'];
$titleSession = Display::return_icon(
'course.png',
get_lang('Course'),
array(),
ICON_SIZE_SMALL
).' '.$courseInfo['name'];
}
$teacherList = CourseManager::get_teacher_list_from_course_code_to_string(
$courseInfo['code'],
@ -312,7 +338,9 @@ if (!empty($coaches)) {
$html .= $coaches;
}
if (api_is_platform_admin(true) || api_is_session_general_coach()) {
if (api_is_platform_admin(true) ||
api_is_session_general_coach()
) {
$sessionList = SessionManager::get_session_by_course($courseInfo['real_id']);
if (!empty($sessionList)) {
@ -397,7 +425,8 @@ if (count($a_students) > 0) {
'users_tracking',
array('TrackingCourseLog', 'get_number_of_users'),
array('TrackingCourseLog', 'get_user_data'),
(api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2);
(api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2
);
$parameters['cidReq'] = Security::remove_XSS($_GET['cidReq']);
$parameters['id_session'] = $session_id;
@ -515,30 +544,29 @@ echo Display::panel($html, $titleSession);
// Send the csv file if asked.
if ($export_csv) {
$csv_headers = array();
$csv_headers[] = get_lang('OfficialCode', '');
$csv_headers[] = get_lang('OfficialCode');
if ($is_western_name_order) {
$csv_headers[] = get_lang('FirstName', '');
$csv_headers[] = get_lang('LastName', '');
$csv_headers[] = get_lang('FirstName');
$csv_headers[] = get_lang('LastName');
} else {
$csv_headers[] = get_lang('LastName', '');
$csv_headers[] = get_lang('FirstName', '');
$csv_headers[] = get_lang('LastName');
$csv_headers[] = get_lang('FirstName');
}
$csv_headers[] = get_lang('Login', ''); //
$csv_headers[] = get_lang('TrainingTime', '');
$csv_headers[] = get_lang('CourseProgress', '');
$csv_headers[] = get_lang('ExerciseProgress', '');
$csv_headers[] = get_lang('ExerciseAverage', '');
$csv_headers[] = get_lang('Score', '');
$csv_headers[] = get_lang('Student_publication', '');
$csv_headers[] = get_lang('Messages', '');
$csv_headers[] = get_lang('Login');
$csv_headers[] = get_lang('TrainingTime');
$csv_headers[] = get_lang('CourseProgress');
$csv_headers[] = get_lang('ExerciseProgress');
$csv_headers[] = get_lang('ExerciseAverage');
$csv_headers[] = get_lang('Score');
$csv_headers[] = get_lang('Student_publication');
$csv_headers[] = get_lang('Messages');
if (empty($session_id)) {
$csv_headers[] = get_lang('Survey');
}
$csv_headers[] = get_lang('FirstLoginInCourse', '');
$csv_headers[] = get_lang('LatestLoginInCourse', '');
$csv_headers[] = get_lang('FirstLoginInCourse');
$csv_headers[] = get_lang('LatestLoginInCourse');
if (isset($_GET['additional_profile_field'])) {
foreach ($_GET['additional_profile_field'] as $fieldId) {
@ -546,7 +574,8 @@ if ($export_csv) {
}
}
ob_end_clean();
array_unshift($csv_content, $csv_headers); // Adding headers before the content.
// Adding headers before the content.
array_unshift($csv_content, $csv_headers);
Export::arrayToCsv($csv_content, 'reporting_student_list');
exit;

Write Preview
Loading…
Cancel
Save