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

teacher can choose columns to hide / unhide in course reporting -ref #4165

Browse Source
skala
Hubert Borderiou 13 years ago
parent 02bf7c5e74
commit 14b80c88db
2 changed files with 2181 additions and 2109 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. 7
      main/inc/lib/tracking.lib.php
  2. 113
      main/tracking/courseLog.php

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

@ -3587,7 +3587,8 @@ class TrackingCourseLog {
$sql = "SELECT user.user_id as user_id,
user.official_code as col0,
user.lastname as col1,
user.firstname as col2
user.firstname as col2,
user.username as col3
FROM $tbl_user as user $url_table
$condition_user $url_condition";
@ -3647,6 +3648,7 @@ class TrackingCourseLog {
$user['lastname'] = $user['col1'];
$user['firstname'] = $user['col2'];
}
$user['username'] = $user['col3'];
$user['time'] = api_time_to_hms(Tracking::get_time_spent_on_the_course($user['user_id'], $course_code, $session_id));
$avg_student_score = Tracking::get_avg_student_score($user['user_id'], $course_code, array(), $session_id);
@ -3704,7 +3706,7 @@ class TrackingCourseLog {
$user_row[]= $user['firstname'];
$user_row[]= $user['lastname'];
}
$user_row[]= $user['username']; // hubr
$user_row[]= $user['time']; //3
$user_row[]= $user['average_progress'];
$user_row[]= $user['exercise_progress'];
@ -3726,7 +3728,6 @@ class TrackingCourseLog {
$user_row[]= $user['additional'];
}
$user_row[]= $user['link'];
$users[] = $user_row;

113
main/tracking/courseLog.php
Unescape View File

@ -512,47 +512,117 @@ if ($_GET['studentlist'] == 'false') {
$parameters['from'] = isset($_GET['myspace']) ? Security::remove_XSS($_GET['myspace']) : null;
$table->set_additional_parameters($parameters);
$tab_table_header = array(); // tab of header texts
$table->set_header(0, get_lang('OfficialCode'), true, 'align="center"');
$tab_table_header[] = get_lang('OfficialCode');
if ($is_western_name_order) {
$table->set_header(1, get_lang('FirstName'), true, 'align="center"');
$tab_table_header[] = get_lang('FirstName');
$table->set_header(2, get_lang('LastName'), true, 'align="center"');
$tab_table_header[] = get_lang('LastName');
} else {
$table->set_header(1, get_lang('LastName'), true, 'align="center"');
$tab_table_header[] = get_lang('LastName');
$table->set_header(2, get_lang('FirstName'), true, 'align="center"');
}
$table->set_header(3, get_lang('TrainingTime'), false);
$table->set_header(4, get_lang('CourseProgress').' '.Display::return_icon('info3.gif', get_lang('ScormAndLPProgressTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')), false, array('style' => 'width:110px;'));
$table->set_header(5, get_lang('ExerciseProgress'), false);
$table->set_header(6, get_lang('ExerciseAverage'), false);
$table->set_header(7, get_lang('Score').' '.Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')), false, array('style' => 'width:110px;'));
$table->set_header(8, get_lang('Student_publication'), false);
$table->set_header(9, get_lang('Messages'), false);
$tab_table_header[] = get_lang('FirstName');
}
$table->set_header(3, get_lang('Login'), false, 'align="center"'); // hubr
$tab_table_header[] = get_lang('Login');
$table->set_header(4, get_lang('TrainingTime'), false);
$tab_table_header[] = get_lang('TrainingTime');
$table->set_header(5, get_lang('CourseProgress').' '.Display::return_icon('info3.gif', get_lang('ScormAndLPProgressTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')), false, array('style' => 'width:110px;'));
$tab_table_header[] = get_lang('CourseProgress');
$table->set_header(6, get_lang('ExerciseProgress'), false);
$tab_table_header[] = get_lang('ExerciseProgress');
$table->set_header(7, get_lang('ExerciseAverage'), false);
$tab_table_header[] = get_lang('ExerciseAverage');
$table->set_header(8, get_lang('Score').' '.Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')), false, array('style' => 'width:110px;'));
$tab_table_header[] = get_lang('Score');
$table->set_header(9, get_lang('Student_publication'), false);
$tab_table_header[] = get_lang('Student_publication');
$table->set_header(10, get_lang('Messages'), false);
$tab_table_header[] = get_lang('Messages');
if (empty($session_id)) {
$table->set_header(10, get_lang('Survey'), false);
$table->set_header(11, get_lang('FirstLogin'), false, 'align="center"');
$table->set_header(12, get_lang('LatestLogin'), false, 'align="center"');
$table->set_header(11, get_lang('Survey'), false);
$tab_table_header[] = get_lang('Survey');
$table->set_header(12, get_lang('FirstLogin'), false, 'align="center"');
$tab_table_header[] = get_lang('FirstLogin');
$table->set_header(13, get_lang('LatestLogin'), false, 'align="center"');
$tab_table_header[] = get_lang('LatestLogin');
if (isset($_GET['additional_profile_field']) AND is_numeric($_GET['additional_profile_field'])) {
$table->set_header(13, $extra_info['field_display_text'], false);
$table->set_header(14, get_lang('Details'), false);
$table->set_header(14, $extra_info['field_display_text'], false);
$tab_table_header[] = $extra_info['field_display_text'];
$table->set_header(15, get_lang('Details'), false);
$tab_table_header[] = get_lang('Details');
} else {
$table->set_header(13, get_lang('Details'), false);
$table->set_header(14, get_lang('Details'), false);
$tab_table_header[] = get_lang('Details');
}
} else {
$table->set_header(10, get_lang('FirstLogin'), false, 'align="center"');
$table->set_header(11, get_lang('LatestLogin'), false, 'align="center"');
$table->set_header(11, get_lang('FirstLogin'), false, 'align="center"');
$tab_table_header[] = get_lang('FirstLogin');
$table->set_header(12, get_lang('LatestLogin'), false, 'align="center"');
$tab_table_header[] = get_lang('LatestLogin');
if (isset($_GET['additional_profile_field']) AND is_numeric($_GET['additional_profile_field'])) {
$table->set_header(12, $extra_info['field_display_text'], false);
$table->set_header(13, get_lang('Details'), false);
$table->set_header(13, $extra_info['field_display_text'], false);
$tab_table_header[] = $extra_info['field_display_text'];
$table->set_header(14, get_lang('Details'), false);
$tab_table_header[] = get_lang('Details');
} else {
$table->set_header(12, get_lang('Details'), false);
$table->set_header(13, get_lang('Details'), false);
$tab_table_header[] = get_lang('Details');
}
}
// display buttons to unhide hidden columns
echo "<br/><br/><div id='unhideButtons'>";
for ($i=0; $i < count($tab_table_header); $i++) {
$index = $i + 1;
echo "<span title='".get_lang('DisplayColumn')." ".$tab_table_header[$i]."' class='unhide_button hide' onclick='foldup($index)'>".Display :: return_icon('move.png', get_lang('DisplayColumn'), array('align'=>'absmiddle', 'hspace'=>'3px'), 16)." ".$tab_table_header[$i]."</span>";
}
echo "</div>";
// display the table
echo "<div id='reporting_table'>";
$table->display();
echo "</div>";
// some scripts and style
echo "<script type='text/javascript'>";
echo "function foldup(in_id) {\n";
echo " $('div#reporting_table table tr td:nth-child('+in_id+')').fadeToggle();\n";
echo " $('div#reporting_table table tr th:nth-child('+in_id+')').fadeToggle();\n";
echo " $('div#unhideButtons span:nth-child('+in_id+')').fadeToggle();\n";
echo "}\n";
echo "function init_hide() {\n";
echo " $('div#reporting_table table tr th').each(\n";
echo " function(index) {\n";
echo " num_index = index + 1;\n";
echo " $(this).prepend('<span style=\"cursor:pointer\" onclick=\"foldup('+num_index+')\">".Display :: return_icon('delete.png', get_lang('HideColumn'), array('align' => 'absmiddle', 'hspace' => '3px'), 16)."</span><br/>');\n";
echo " }\n";
echo " );\n";
echo "}\n";
echo "$(document).ready( function() {";
echo " init_hide();\n";
// hide several column at startup
echo " foldup(1);foldup(9);foldup(10);foldup(11);foldup(12);\n";
echo "});\n";
echo "</script>";
echo "<style type='text/css'>";
echo ".unhide_button {";
echo " cursor : pointer;";
echo " border:1px solid black;";
echo " background-color: #FAFAFA;";
echo " padding: 5px;";
echo " border-radius : 3px;";
echo " margin-right:3px;";
echo "}";
echo "div#reporting_table table th {";
echo " vertical-align:top;";
echo "}";
echo "</style>";
} else {
echo Display::display_warning_message(get_lang('NoUsersInCourse'));
}
@ -569,6 +639,7 @@ if ($_GET['studentlist'] == 'false') {
$csv_headers[] = get_lang('LastName', '');
$csv_headers[] = get_lang('FirstName', '');
}
$csv_headers[] = get_lang('Login', ''); // hubr
$csv_headers[] = get_lang('TrainingTime', '');
$csv_headers[] = get_lang('CourseProgress', '');
$csv_headers[] = get_lang('ExerciseProgress','');

Write Preview
Loading…
Cancel
Save