Feature #2785 Reports

skala
Juan Carlos Raña 15 years ago
parent 8ad973456d
commit 54d8a5cfc8
  1. 32
      main/mySpace/index.php
  2. 15
      main/mySpace/lp_tracking.php
  3. 2
      main/mySpace/myStudents.php
  4. 2
      main/tracking/courseLog.php
  5. 18
      main/tracking/exams.php

@ -204,20 +204,18 @@ if ($is_drh || $_GET['display'] == 'yourstudents') {
$nb_menu_items = count($menu_items);
if ($nb_teacher_courses > 0 ) {
echo '<div class="actions" style ="font-size:10pt;">';
echo '<div style="float:right">';
echo '<div id="actions" class="actions">';
if (isset($_GET['display']) && ($_GET['display'] == 'useroverview' || $_GET['display'] == 'sessionoverview' || $_GET['display'] == 'courseoverview')) {
echo '<a href="'.api_get_self().'?display='.$_GET['display'].'&export=csv&view='.$view.'"><img align="absbottom" src="../img/csv.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>';
}
echo '<a href="'.api_get_path(WEB_CODE_PATH).'auth/my_progress.php"><img align="absbottom" src="../img/statistics.gif">&nbsp;'.get_lang('MyStats').'</a>';
echo '&nbsp;&nbsp; <a href="javascript: void(0);" onclick="javascript: window.print()"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a>';
echo '</div>';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'auth/my_progress.php">'.
Display::return_icon('stats.png', get_lang('MyStats'),'','32').'</a>';
echo '<a href="javascript: void(0);" onclick="javascript: window.print()">'.
Display::return_icon('printer.png', get_lang('Print'),'','32').'</a>';
if (empty($session_id)) {
if ($nb_menu_items > 1) {
foreach ($menu_items as $key => $item) {
@ -228,15 +226,15 @@ if ($nb_teacher_courses > 0 ) {
}
}
} else {
echo '&nbsp;<a href="javascript: window.back();" ">'.Display::return_icon('back.png', get_lang('Back')).get_lang('Back').'</a>';
echo '<a href="javascript: window.back();" ">'.Display::return_icon('back.png', get_lang('Back'),'','32').'</a>';
}
echo '</div>';
} else {
echo '<div class="actions-title" style ="font-size:10pt;">';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'auth/my_progress.php"><img align="absbottom" src="../img/statistics.gif">&nbsp;'.get_lang('MyStats').'</a> ';
echo '<div id="actions" class="actions">';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'auth/my_progress.php">'
.Display::return_icon('stats.png', get_lang('MyStats'),'','32').'</a>';//
echo '</div>';
//Display::display_warning_message(get_lang('HaveNoCourse'));
}

@ -137,12 +137,15 @@ $rs = Database::query($sql);
$lp_title = Database::result($rs, 0, 0);
echo '<div class ="actions"><div align="left" style="float:left;margin-top:2px;" ><a href="javascript:window.back();">'.Display::return_icon('back.png').get_lang('Back').'</a></div>
<div align="right">
<a href="javascript: void(0);" onclick="javascript: window.print();"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a>
<a href="'.api_get_self().'?export=csv&'.Security::remove_XSS($_SERVER['QUERY_STRING']).'"><img align="absbottom" src="../img/csv.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>
</div></div>
<div class="clear"></div>';
echo '<div class ="actions">';
echo '<a href="javascript:window.back();">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';
echo '<a href="javascript: void(0);" onclick="javascript: window.print();">
'.Display::return_icon('printer.png',get_lang('Print'),'','32').'</a>';
echo '<a href="'.api_get_self().'?export=csv&'.Security::remove_XSS($_SERVER['QUERY_STRING']).'">
'.Display::return_icon('export_csv.png',get_lang('ExportAsCSV'),'','32').'</a>';
echo '</div>';
echo '<div class="clear"></div>';
$session_name = api_get_session_name(api_get_session_id());
$table_title = ($session_name? get_lang('Session').' : '.$session_name.' | ':'').get_lang('Course').' : '.$_course['title'].' | '.$name;

@ -711,7 +711,7 @@ if ($timezone !== null) {
echo '<td align="center">';
if($any_result === true) {
echo '<a href="myStudents.php?action=reset_lp&sec_token='.$token.'&course='.Security::remove_XSS($_GET['course']).'&details='.Security::remove_XSS($_GET['details']).'&origin='.Security::remove_XSS($_GET['origin']).'&lp_id='.$learnpath['id'].'&student='.$info_user['user_id'].'&details=true&id_session='.Security::remove_XSS($_GET['id_session']).'">';
echo '<img src="../img/delete_data.gif" border="0" />';
echo Display::return_icon('clean.png',get_lang('Clean'),'','22').'</a>';
echo '</a>';
}
echo '</td>';

@ -155,7 +155,7 @@ if ($_GET['studentlist'] == 'false') {
} elseif($_GET['studentlist'] == '' || $_GET['studentlist'] == 'true') {
if (!empty($_GET['from'])) {
echo '&nbsp;<a href="javascript: window.back();" ">'.Display::return_icon('back.png', get_lang('Back')).get_lang('Back').'</a>';
echo '<a href="javascript: window.back();" ">'.Display::return_icon('back.png', get_lang('Back'),'','32').'</a>';
}
/*

@ -73,10 +73,13 @@ $form->setDefaults(array('score'=>$filter_score));
if (!$export_to_xls) {
Display :: display_header(get_lang('Reporting'));
echo '<div class="actions" style ="font-size:10pt;">';
echo '<div class="actions">';
if ($global) {
echo '<div style="float:right"> <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>' .
'<a href="javascript: void(0);" onclick="javascript: window.print()"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a></div>';
echo '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
'.Display::return_icon('export_excel.png',get_lang('ExportAsXLS'),'','32').'</a>';
echo '<a href="javascript: void(0);" onclick="javascript: window.print()">
'.Display::return_icon('printer.png',get_lang('Print'),'','32').'</a>';
$menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher">'.get_lang('TeacherInterface').'</a>';
if (api_is_platform_admin()) {
$menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=admin">'.get_lang('AdminInterface').'</a>';
@ -84,8 +87,6 @@ if (!$export_to_xls) {
$menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=coach">'.get_lang('AdminInterface').'</a>';
}
$menu_items[] = get_lang('ExamTracking');
$nb_menu_items = count($menu_items);
if($nb_menu_items>1) {
@ -95,18 +96,17 @@ if (!$export_to_xls) {
echo ' | ';
}
}
echo '<br />';
}
} else {
echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
<a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>&nbsp;|&nbsp';
echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=resources">'.get_lang('ResourcesTracking').'</a>';
echo ' | '.get_lang('ExamTracking').'';
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><br /><br />';
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 '<br /><br />';
echo '</div>';
$form->display();
echo '<h3>'.sprintf(get_lang('FilteringWithScoreX'), $filter_score).'%</h3>';
}

Loading…
Cancel
Save