Fixed missing exams report in course tracking - refs BT#5672

skala
Yannick Warnier 13 years ago
parent 4d70256c6b
commit 0482d46814
  1. 1
      main/tracking/courseLog.php
  2. 14
      main/tracking/exams.php

@ -175,6 +175,7 @@ echo '<div class="actions">';
echo Display::return_icon('user_na.png', get_lang('StudentsTracking'), array(), 32); echo Display::return_icon('user_na.png', get_lang('StudentsTracking'), array(), 32);
echo Display::url(Display::return_icon('course.png', get_lang('CourseTracking'), array(), 32), 'course_log_tools.php?'.api_get_cidreq()); echo Display::url(Display::return_icon('course.png', get_lang('CourseTracking'), array(), 32), 'course_log_tools.php?'.api_get_cidreq());
echo Display::url(Display::return_icon('tools.png', get_lang('ResourcesTracking'), array(), 32), 'course_log_resources.php?'.api_get_cidreq()); echo Display::url(Display::return_icon('tools.png', get_lang('ResourcesTracking'), array(), 32), 'course_log_resources.php?'.api_get_cidreq());
echo Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), 32), api_get_path(WEB_CODE_PATH).'tracking/exams.php?'.api_get_cidreq());
echo '<span style="float:right; padding-top:0px;">'; echo '<span style="float:right; padding-top:0px;">';
echo '<a href="javascript: void(0);" onclick="javascript: window.print();">'.Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>'; echo '<a href="javascript: void(0);" onclick="javascript: window.print();">'.Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';

@ -27,7 +27,7 @@ if (isset($_GET['export'])) {
$tbl_stats_exercices = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES); $tbl_stats_exercices = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
if (api_is_platform_admin() ) { if (api_is_platform_admin() && empty($_GET['cidReq'])) {
$global = true; $global = true;
} else { } else {
$global = false; $global = false;
@ -105,11 +105,10 @@ if (!$export_to_xls) {
} }
} }
} else { } else {
echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;| echo Display::url(Display::return_icon('user.png', get_lang('StudentsTracking'), array(), 32), 'courseLog.php?'.api_get_cidreq().'&amp;studentlist=true');
<a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>&nbsp;|&nbsp'; echo Display::url(Display::return_icon('course.png', get_lang('CourseTracking'), array(), 32), 'courseLog.php?'.api_get_cidreq().'&amp;studentlist=false');
echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=resources">'.get_lang('ResourcesTracking').'</a>'; echo Display::url(Display::return_icon('tools.png', get_lang('ResourcesTracking'), array(), 32), 'courseLog.php?'.api_get_cidreq().'&amp;studentlist=resouces');
echo ' | '.get_lang('ExamTracking').''; echo Display::url(Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), array(), 32), api_get_self().'?'.api_get_cidreq().'&amp;export=1&amp;score='.$filter_score.'&amp;exercise_id='.$exercise_id);
echo '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsXLS').'</a>';
} }
echo '</div>'; echo '</div>';
@ -142,7 +141,7 @@ $table = Database::get_course_table(TABLE_TOOL_LIST);
$t_quiz = Database::get_course_table(TABLE_QUIZ_TEST); $t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
$export_array_global = $export_array = array(); $export_array_global = $export_array = array();
if(!empty($course_list) && is_array($course_list)) if(!empty($course_list) && is_array($course_list)) {
foreach ($course_list as $current_course) { foreach ($course_list as $current_course) {
$global_row = $row_not_global = array(); $global_row = $row_not_global = array();
$course_id = $current_course['real_id']; $course_id = $current_course['real_id'];
@ -415,6 +414,7 @@ foreach ($course_list as $current_course) {
"; ";
} }
} }
}
$html_result .= '</table>'; $html_result .= '</table>';

Loading…
Cancel
Save