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

Showing all exercise attempts link in the coach report

Browse Source
skala
Julio Montoya 15 years ago
parent 6bc71baeca
commit 61e837227d
4 changed files with 41 additions and 86 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. 56
      main/exercice/exercice.php
  2. 4
      main/exercice/exercise.lib.php
  3. 49
      main/inc/lib/main_api.lib.php
  4. 18
      main/mySpace/index.php

56
main/exercice/exercice.php
Unescape View File

@ -131,7 +131,7 @@ if ($_GET['delete'] == 'delete' && ($is_allowedToEdit || api_is_coach()) && !emp
$sql = 'DELETE FROM ' . Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES) . ' WHERE exe_id = ' . $_GET['did']; //_GET[did] filtered by entry condition
Database::query($sql);
$filter=Security::remove_XSS($_GET['filter']);
header('Location: exercice.php?cidReq=' . Security::remove_XSS($_GET['cidReq']) . '&show=result&filter=' . $filter . '&exerciseId='.$exerciseId);
header('Location: exercice.php?cidReq=' . Security::remove_XSS($_GET['cidReq']) . '&show=result&filter=' . $filter . '&exerciseId='.$exerciseId.'&filter_by_user='.$_GET['filter_by_user']);
exit;
}
@ -572,9 +572,7 @@ if ($is_allowedToEdit && $origin != 'learnpath') {
});
</script>';
echo '<div id="dialog-confirm" title="'.get_lang("ConfirmYourChoice").'">';
//echo Display::tag('p', get_lang("CSVOrExcel"));
//Display::return_icon('export_excel.png', get_lang('ExportAsXLS'),'','32')
echo '<div id="dialog-confirm" title="'.get_lang("ConfirmYourChoice").'">';
echo Display::tag('p', Display::input('radio', 'export_format', 'csv', array('checked'=>'1', 'id'=>'export_format_csv_label')). Display::tag('label', get_lang('ExportAsCSV'), array('for'=>'export_format_csv_label')));
echo Display::tag('p', Display::input('radio', 'export_format', 'xls', array('id'=>'export_format_xls_label')). Display::tag('label', get_lang('ExportAsXLS'), array('for'=>'export_format_xls_label')));
echo Display::tag('p', Display::input('checkbox', 'load_extra_data', '0',array('id'=>'load_extra_data_id')). Display::tag('label', get_lang('LoadExtraData'), array('for'=>'load_extra_data_id')));
@ -616,7 +614,7 @@ if ($show == 'result') {
default :
null;
}
if (!empty($_GET['exerciseId'])) {
if (!empty($_GET['exerciseId']) && empty($_GET['filter_by_user'])) {
if ($_GET['filter'] == '1' or !isset ($_GET['filter']) or $_GET['filter'] == 0 ) {
$view_result = '<a href="' . api_get_self() . '?cidReq=' . api_get_course_id() . '&show=result&filter=2&id_session='.intval($_GET['id_session']).'&exerciseId='.intval($_GET['exerciseId']).'&gradebook='.$gradebook.'" >'.Display :: return_icon('exercice_check.png', get_lang('ShowCorrectedOnly'),'','32').'</a>';
} else {
@ -653,31 +651,7 @@ if ($show == 'test') {
}
}
if ($show == 'test') {
?>
<script type="text/javascript">
$(function() {
/*
$( "a", ".operations" ).button();
$(".tabs-left").tabs().addClass('ui-tabs-vertical ui-helper-clearfix');
$(".tabs-left li").removeClass('ui-corner-top').addClass('ui-corner-left');
*/
});
</script>
<style type="text/css">
/*
New interface not yet ready for 1.8.8
Vertical Tabs
.ui-tabs-vertical { width: 99%; }
.ui-tabs-vertical .ui-tabs-nav { padding: .2em .1em .2em .2em; float: left; width: 20%; }
.ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 1px !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; white-space:normal;}
.ui-tabs-vertical .ui-tabs-nav li a { display:block; width:100%; }
.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; }
.ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: left; width: 40em;}
*/
</style>
<?php
if ($show == 'test') {
$i =1;
$lis = '';
$exercise_list = array();
@ -690,9 +664,6 @@ if ($show == 'test') {
echo '<table class="data_table">';
if (!empty($exercise_list)) {
//echo '<div id="exercise_tabs" class="tabs-left">';
//echo '<div style="float:left;width:100%">';
//echo Display::tag('ul', $lis);
/* Listing exercises */
if ($origin != 'learnpath') {
@ -841,7 +812,6 @@ if ($show == 'test') {
if ($session_id == $row['session_id']) {
$actions .= Display::url(Display::return_icon('delete.png', get_lang('Delete'),'',22), '', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToDelete'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=delete&sec_token='.$token.'&exerciseId='.$row['id']));
}
//$actions .= '<br />';
$random_label = '';
if ($row['random'] > 0) {
@ -951,16 +921,6 @@ if ($show == 'test') {
$attempt_text = get_lang('CantShowResults');
}
}
//User Attempts
/*
if (empty($row['max_attempt'])) {
//$item .= Display::tag('td',$num);
} else {
if (empty($num)) {
$num = '';
}
//$item .= Display::tag('td',$num.' / '.$row['max_attempt']);
}*/
if (empty($num)) {
$num = '';
@ -1058,14 +1018,8 @@ if ($show == 'test') {
}
$count ++;
}
//echo '</div>';
}
echo '</table>';
/*} else {
echo '<div style="float:left;width:100%">';
echo Display::display_warning_message(get_lang('NoExercises'));
echo '</div>';
}*/
echo '</table>';
Display :: display_footer();
exit;
}

4
main/exercice/exercise.lib.php
Unescape View File

@ -1089,7 +1089,9 @@ function get_exam_results_data($from, $number_of_items, $column, $direction) {
}
}
if (api_is_platform_admin() || $is_tutor) {
$html_link.=' <a href="exercice.php?'.api_get_cidreq().'&show=result&filter=' . $filter . '&exerciseId='.$exercise_id.'&delete=delete&did=' . $id . '" onclick="javascript:if(!confirm(\'' . sprintf(get_lang('DeleteAttempt'), $user, $dt) . '\')) return false;">'.Display :: return_icon('delete.png', get_lang('Delete')).'</a>';
$html_link.=' <a href="exercice.php?'.api_get_cidreq().'&show=result&filter_by_user='.intval($_GET['filter_by_user']).'&filter=' . $filter . '&exerciseId='.$exercise_id.'&delete=delete&did=' . $id . '" onclick="javascript:if(!confirm(\'' . sprintf(get_lang('DeleteAttempt'), $user, $dt) . '\')) return false;">'.Display :: return_icon('delete.png', get_lang('Delete')).'</a>';
$html_link.='&nbsp;';
}
} else {

49
main/inc/lib/main_api.lib.php
Unescape View File

@ -1834,39 +1834,42 @@ function api_is_course_tutor() {
* @return boolean True if current user is a course or session coach
*/
function api_is_coach($session_id = 0, $course_code = '') {
global $_user;
global $sessionIsCoach;
if (!empty($session_id)) {
$session_id = intval($session_id);
} else {
$session_id = api_get_session_id();
}
}
if (!empty($course_code)) {
$course_code = Database::escape_string($course_code);
} else {
$course_code = api_get_course_id();
}
$sql = "SELECT DISTINCT id, name, date_start, date_end
FROM session
INNER JOIN session_rel_course_rel_user session_rc_ru
ON session_rc_ru.id_user = '".Database::escape_string($_user['user_id'])."'
WHERE session_rc_ru.course_code = '$course_code' AND session_rc_ru.status = 2 AND session_rc_ru.id_session = '$session_id'
ORDER BY date_start, date_end, name";
$result = Database::query($sql);
$sessionIsCoach = Database::store_result($result);
$sql = "SELECT DISTINCT id, name, date_start, date_end
FROM session
WHERE session.id_coach = '".Database::escape_string($_user['user_id'])."'
AND id = '$session_id'
ORDER BY date_start, date_end, name";
$result = Database::query($sql);
$sessionIsCoach = array_merge($sessionIsCoach , Database::store_result($result));
if (!empty($course_code)) {
$sql = "SELECT DISTINCT id, name, date_start, date_end
FROM session INNER JOIN session_rel_course_rel_user session_rc_ru
ON session_rc_ru.id_user = '".api_get_user_id()."'
WHERE session_rc_ru.course_code = '$course_code' AND session_rc_ru.status = 2 AND session_rc_ru.id_session = '$session_id'
ORDER BY date_start, date_end, name";
$result = Database::query($sql);
$sessionIsCoach = Database::store_result($result);
}
if (!empty($session_id)) {
$sql = "SELECT DISTINCT id, name, date_start, date_end
FROM session
WHERE session.id_coach = '".api_get_user_id()."' AND id = '$session_id'
ORDER BY date_start, date_end, name";
$result = Database::query($sql);
if (!empty($sessionIsCoach)) {
$sessionIsCoach = array_merge($sessionIsCoach , Database::store_result($result));
} else {
$sessionIsCoach = Database::store_result($result);
}
}
return (count($sessionIsCoach) > 0);
}

18
main/mySpace/index.php
Unescape View File

@ -104,7 +104,7 @@ function rsort_sessions($a, $b) {
/* * MAIN CODE */
$is_coach = api_is_coach();
$is_coach = api_is_coach($_GET['session_id']);
$is_platform_admin = api_is_platform_admin();
$is_drh = api_is_drh();
$is_session_admin = api_is_session_admin();
@ -146,12 +146,12 @@ if (api_is_allowed_to_create_course()) {
if (!$is_coach && !$is_platform_admin) {
$view = 'teacher';
}
if ($view == 'teacher' && empty($session_id)) {
$menu_items[] = get_lang('TeacherInterface');
if ($nb_teacher_courses) {
$title = get_lang('YourCourseList');
$title = get_lang('Courses');
}
} else {
@ -213,11 +213,10 @@ if ($nb_teacher_courses > 0 ) {
if (!empty($session_id)) {
echo '<a href="index.php">'.Display::return_icon('back.png', get_lang('Back'),'','32').'</a>';
}
echo Display::url(Display::return_icon('stats.png', get_lang('MyStats'),'',32),api_get_path(WEB_CODE_PATH)."auth/my_progress.php" );
//echo Display::url(Display::return_icon('printer.png', get_lang('Print'),'',32),"javascript: void(0);", array('onclick'=>'window.print();'));
} else {
echo Display::url(Display::return_icon('stats.png', get_lang('MyStats'),'',32),api_get_path(WEB_CODE_PATH)."auth/my_progress.php" );
}
echo '<a href="javascript: void(0);" onclick="javascript: window.print()">'. Display::return_icon('printer.png', get_lang('Print'),'','32').'</a>';
if (empty($session_id)) {
@ -229,8 +228,6 @@ if ($nb_teacher_courses > 0 ) {
}
}
}
} else {
//
}
echo '</div>';
@ -238,7 +235,6 @@ if ($nb_teacher_courses > 0 ) {
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'));
}
echo Display::tag('h2', $title);

Write Preview
Loading…
Cancel
Save