Skip to content

Commit

Permalink
Add setting course_log_hide_columns default columns to hide see BT#9609
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmontoyaa
jmontoyaa committed Mar 23, 2015
1 parent aced0a6 commit c479248
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 39 deletions.
2 changes: 2 additions & 0 deletions main/install/configuration.dist.php
View file
Expand Up @@ -293,3 +293,5 @@
//$_configuration['prevent_session_admins_to_manage_all_users'] = false;
// Show delete option in attendance
//$_configuration['allow_delete_attendance'] = false;
// Course log - Default columns to hide
//$_configuration['course_log_hide_columns'] = array(1, 9);
88 changes: 49 additions & 39 deletions main/tracking/courseLog.php
View file
Expand Up @@ -100,6 +100,9 @@
}
ob_start();
}
$columnsToHideFromSetting = api_get_configuration_value('course_log_hide_columns');
$columnsToHide = empty($columnsToHideFromSetting) ? array(1, 9, 10, 11, 12) : $columnsToHideFromSetting;
$columnsToHide = json_encode($columnsToHide);

$csv_content = array();
// Scripts for reporting array hide/show columns
Expand Down Expand Up @@ -130,14 +133,14 @@ function(index) {
// hide some column at startup
// be sure that these columns always exists
// see tab_table_header = array(); // tab of header texts
// see headers = array();
// tab of header texts
$(document).ready( function() {
init_hide();
foldup(1);
foldup(9);
foldup(10);
foldup(11);
foldup(12);
var columnsToHide = ".$columnsToHide.";
columnsToHide.forEach(function(id) {
foldup(id);
});
})
</script>";

Expand Down Expand Up @@ -184,9 +187,6 @@ function(index) {
$view = isset($_REQUEST['view']) ? $_REQUEST['view'] : '';
$nameTools = get_lang('Tracking');

// Display the header.
Display::display_header($nameTools, 'Tracking');

// getting all the students of the course
if (empty($session_id)) {
// Registered students in a course outside session.
Expand Down Expand Up @@ -224,6 +224,9 @@ function(index) {
);
}

// Display the header.
Display::display_header($nameTools, 'Tracking');

/* MAIN CODE */

echo '<div class="actions">';
Expand Down Expand Up @@ -366,7 +369,8 @@ function(index) {
$el = $form->addElement(
'select',
'since',
'<img width="ICON_SIZE_SMALL" align="middle" src="'.api_get_path(WEB_IMG_PATH).'messagebox_warning.gif" border="0" />'.get_lang('RemindInactivesLearnersSince'),
'<img align="middle" src="'.api_get_path(WEB_IMG_PATH).'messagebox_warning.gif" border="0" />'.
get_lang('RemindInactivesLearnersSince'),
$options
);
$el->setSelected(7);
Expand Down Expand Up @@ -404,78 +408,84 @@ function(index) {
$parameters['from'] = isset($_GET['myspace']) ? Security::remove_XSS($_GET['myspace']) : null;

$table->set_additional_parameters($parameters);
$tab_table_header = array();
$headers = array();
// tab of header texts
$table->set_header(0, get_lang('OfficialCode'), true);
$tab_table_header[] = get_lang('OfficialCode');
$headers['official_code'] = get_lang('OfficialCode');
if ($is_western_name_order) {
$table->set_header(1, get_lang('FirstName'), true);
$tab_table_header[] = get_lang('FirstName');
$headers['firstname'] = get_lang('FirstName');
$table->set_header(2, get_lang('LastName'), true);
$tab_table_header[] = get_lang('LastName');
$headers['lastname'] = get_lang('LastName');
} else {
$table->set_header(1, get_lang('LastName'), true);
$tab_table_header[] = get_lang('LastName');
$headers['lastname'] = get_lang('LastName');
$table->set_header(2, get_lang('FirstName'), true);
$tab_table_header[] = get_lang('FirstName');
$headers['firstname'] = get_lang('FirstName');
}
$table->set_header(3, get_lang('Login'), false);
$tab_table_header[] = get_lang('Login');
$headers['login'] = get_lang('Login');

$table->set_header(4, get_lang('TrainingTime').'&nbsp;'.Display::return_icon('info3.gif', get_lang('TrainingTimeInfo'), array('align' => 'absmiddle', 'hspace' => '3px')), false, array('style' => 'width:110px;'));
$tab_table_header[] = get_lang('TrainingTime');
$headers['training_time'] = get_lang('TrainingTime');
$table->set_header(5, get_lang('CourseProgress').'&nbsp;'.Display::return_icon('info3.gif', get_lang('ScormAndLPProgressTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')), false, array('style' => 'width:110px;'));
$tab_table_header[] = get_lang('CourseProgress');
$headers['course_progress'] = get_lang('CourseProgress');

$table->set_header(6, get_lang('ExerciseProgress').'&nbsp;'.Display::return_icon('info3.gif', get_lang('ExerciseProgressInfo'), array('align' => 'absmiddle', 'hspace' => '3px')), false, array('style' => 'width:110px;'));
$tab_table_header[] = get_lang('ExerciseProgress');
$headers['exercise_progress'] = get_lang('ExerciseProgress');
$table->set_header(7, get_lang('ExerciseAverage').'&nbsp;'.Display::return_icon('info3.gif', get_lang('ExerciseAverageInfo'), array('align' => 'absmiddle', 'hspace' => '3px')), false, array('style' => 'width:110px;'));
$tab_table_header[] = get_lang('ExerciseAverage');
$headers['exercise_average'] = get_lang('ExerciseAverage');
$table->set_header(8, get_lang('Score').'&nbsp;'.Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')), false, array('style' => 'width:110px;'));
$tab_table_header[] = get_lang('Score');
$headers['score'] = get_lang('Score');
$table->set_header(9, get_lang('Student_publication'), false);
$tab_table_header[] = get_lang('Student_publication');
$headers['student_publication'] = get_lang('Student_publication');
$table->set_header(10, get_lang('Messages'), false);
$tab_table_header[] = get_lang('Messages');
$headers['messages'] = get_lang('Messages');

if (empty($session_id)) {
$table->set_header(11, get_lang('Survey'), false);
$tab_table_header[] = get_lang('Survey');
$headers['survey'] = get_lang('Survey');
$table->set_header(12, get_lang('FirstLogin'), false);
$tab_table_header[] = get_lang('FirstLogin');
$headers['first_login'] = get_lang('FirstLogin');
$table->set_header(13, get_lang('LatestLogin'), false);
$tab_table_header[] = get_lang('LatestLogin');
$headers['latest_login'] = get_lang('LatestLogin');
if (isset($_GET['additional_profile_field']) and is_numeric($_GET['additional_profile_field'])) {
$table->set_header(14, $extra_info['field_display_text'], false);
$tab_table_header[] = $extra_info['field_display_text'];
$headers['field_display_text'] = $extra_info['field_display_text'];
$table->set_header(15, get_lang('Details'), false);
$tab_table_header[] = get_lang('Details');
$headers['details'] = get_lang('Details');
} else {
$table->set_header(14, get_lang('Details'), false);
$tab_table_header[] = get_lang('Details');
$headers['details'] = get_lang('Details');
}

} else {
$table->set_header(11, get_lang('FirstLogin'), false);
$tab_table_header[] = get_lang('FirstLogin');
$headers['first_login'] = get_lang('FirstLogin');
$table->set_header(12, get_lang('LatestLogin'), false);
$tab_table_header[] = get_lang('LatestLogin');
$headers['latest_login'] = 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);
$tab_table_header[] = $extra_info['field_display_text'];
$headers['field_display_text'] = $extra_info['field_display_text'];
$table->set_header(14, get_lang('Details'), false);
$tab_table_header[] = get_lang('Details');
$headers['Details'] = get_lang('Details');
} else {
$table->set_header(13, get_lang('Details'), false);
$tab_table_header[] = get_lang('Details');
$headers['Details'] = get_lang('Details');
}
}
// display buttons to un hide 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>";
$index = 0;
foreach ($headers as $header) {
echo "<span title='".get_lang('DisplayColumn')." ".$header."' class='unhide_button hide' onclick='foldup($index)'>".
Display :: return_icon(
'move.png',
get_lang('DisplayColumn'),
array('align'=>'absmiddle', 'hspace'=>'3px'),
16
)." ".$header."</span>";
$index++;
}
echo "</div>";
// Display the table
Expand Down

0 comments on commit c479248

Please sign in to comment.