merged fix for 5814
This commit is contained in:
+11
-10
@@ -1970,6 +1970,7 @@ function grade_view_all_grades($view_by_student) {
|
||||
global $course;
|
||||
global $preferences;
|
||||
global $USER;
|
||||
global $group; // yu: fix for 5814
|
||||
|
||||
if (!isteacher($course->id)) {
|
||||
$view_by_student = $USER->id;
|
||||
@@ -2000,8 +2001,8 @@ function grade_view_all_grades($view_by_student) {
|
||||
if (isteacher($course->id) ) {
|
||||
$student_heading_link = get_string('student','grades');
|
||||
if ($view_by_student == -1) {
|
||||
$student_heading_link .='<a href="?id='.$course->id.'&action=grades&sort=lastname"><br /><font size="-2">'.get_string('sortbylastname','grades').'</font></a>';
|
||||
$student_heading_link .= '<a href="?id='.$course->id.'&action=grades&sort=firstname"><br /><font size="-2">'.get_string('sortbyfirstname','grades').'</font></a>';
|
||||
$student_heading_link .='<a href="?id='.$course->id.'&action=grades&sort=lastname&group='.$group.'"><br /><font size="-2">'.get_string('sortbylastname','grades').'</font></a>';
|
||||
$student_heading_link .= '<a href="?id='.$course->id.'&action=grades&sort=firstname&group='.$group.'"><br /><font size="-2">'.get_string('sortbyfirstname','grades').'</font></a>';
|
||||
}
|
||||
else {
|
||||
$student_heading_link .= '<br /><a href="?id='.$course->id.'&&action=grades"><font size="-2">'.get_string('showallstudents','grades').'</font></a>';
|
||||
@@ -2103,14 +2104,14 @@ function grade_view_all_grades($view_by_student) {
|
||||
}
|
||||
|
||||
if (isteacher($course->id) && $view_by_student == -1) {
|
||||
$grade_sort_link = '<a href="?id='.$course->id.'&action=grades&sort=highgrade"><img src="'.$CFG->wwwroot.'/pix/t/down.gif" alt="'.get_string('highgradedescending','grades').'" /></a>';
|
||||
$grade_sort_link .= '<a href="?id='.$course->id.'&action=grades&sort=highgrade_asc"><img src="'.$CFG->wwwroot.'/pix/t/up.gif" alt="'.get_string('highgradeascending','grades').'" /></a>';
|
||||
$points_sort_link = '<a href="?id='.$course->id.'&action=grades&sort=points"><img src="'.$CFG->wwwroot.'/pix/t/down.gif" alt="'.get_string('pointsdescending','grades').'" /></a>';
|
||||
$points_sort_link .= '<a href="?id='.$course->id.'&action=grades&sort=points_asc"><img src="'.$CFG->wwwroot.'/pix/t/up.gif" alt="'.get_string('pointsascending','grades').'" /></a>';
|
||||
$weighted_sort_link = '<a href="?id='.$course->id.'&action=grades&sort=weighted"><img src="'.$CFG->wwwroot.'/pix/t/down.gif" alt="'.get_string('weighteddescending','grades').'" /></a>';
|
||||
$weighted_sort_link .= '<a href="?id='.$course->id.'&action=grades&sort=weighted_asc"><img src="'.$CFG->wwwroot.'/pix/t/up.gif" alt="'.get_string('weightedascending','grades').'" /></a>';
|
||||
$percent_sort_link = '<a href="?id='.$course->id.'&action=grades&sort=percent"><img src="'.$CFG->wwwroot.'/pix/t/down.gif" alt="'.get_string('percentdescending','grades').'" /></a>';
|
||||
$percent_sort_link .= '<a href="?id='.$course->id.'&action=grades&sort=percent_asc"><img src="'.$CFG->wwwroot.'/pix/t/up.gif" alt="'.get_string('percentascending','grades').'" /></a>';
|
||||
$grade_sort_link = '<a href="?id='.$course->id.'&action=grades&sort=highgrade&group='.$group.'"><img src="'.$CFG->wwwroot.'/pix/t/down.gif" alt="'.get_string('highgradedescending','grades').'" /></a>';
|
||||
$grade_sort_link .= '<a href="?id='.$course->id.'&action=grades&sort=highgrade_asc&group='.$group.'"><img src="'.$CFG->wwwroot.'/pix/t/up.gif" alt="'.get_string('highgradeascending','grades').'" /></a>';
|
||||
$points_sort_link = '<a href="?id='.$course->id.'&action=grades&sort=points&group='.$group.'"><img src="'.$CFG->wwwroot.'/pix/t/down.gif" alt="'.get_string('pointsdescending','grades').'" /></a>';
|
||||
$points_sort_link .= '<a href="?id='.$course->id.'&action=grades&sort=points_asc&group='.$group.'"><img src="'.$CFG->wwwroot.'/pix/t/up.gif" alt="'.get_string('pointsascending','grades').'" /></a>';
|
||||
$weighted_sort_link = '<a href="?id='.$course->id.'&action=grades&sort=weighted&group='.$group.'"><img src="'.$CFG->wwwroot.'/pix/t/down.gif" alt="'.get_string('weighteddescending','grades').'" /></a>';
|
||||
$weighted_sort_link .= '<a href="?id='.$course->id.'&action=grades&sort=weighted_asc&group='.$group.'"><img src="'.$CFG->wwwroot.'/pix/t/up.gif" alt="'.get_string('weightedascending','grades').'" /></a>';
|
||||
$percent_sort_link = '<a href="?id='.$course->id.'&action=grades&sort=percent&group='.$group.'"><img src="'.$CFG->wwwroot.'/pix/t/down.gif" alt="'.get_string('percentdescending','grades').'" /></a>';
|
||||
$percent_sort_link .= '<a href="?id='.$course->id.'&action=grades&sort=percent_asc&group='.$group.'"><img src="'.$CFG->wwwroot.'/pix/t/up.gif" alt="'.get_string('percentascending','grades').'" /></a>';
|
||||
}
|
||||
$stats_link = '<a href="javascript:void(0)"onclick="window.open(\'?id='.$course->id.'&action=stats&category=all\',\''.get_string('statslink','grades').'\',\'height=200,width=300,scrollbars=no\')"><font size=-2>'.get_string('statslink','grades').'</font></a>';
|
||||
$header .= '<th colspan="'.$total_columns.'">'.get_string('total','grades').' '.$stats_link.'</th>';
|
||||
|
||||
Reference in New Issue
Block a user