moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-31919-master-2' of git://git.luns.net.uk/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-03-13 14:00:41 +13:00
commit 595dc849dd
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mod/assignment/lib.php
View file

@ -3622,6 +3622,7 @@ function assignment_types() {
function assignment_print_overview($courses, &$htmlarray) { function assignment_print_overview($courses, &$htmlarray) {
global $USER, $CFG, $DB; global $USER, $CFG, $DB;
require_once($CFG->libdir.'/gradelib.php');
if (empty($courses) || !is_array($courses) || count($courses) == 0) { if (empty($courses) || !is_array($courses) || count($courses) == 0) {
return array(); return array();
@ -3690,6 +3691,9 @@ function assignment_print_overview($courses, &$htmlarray) {
assignment $sqlassignmentids", array_merge(array($USER->id), $assignmentidparams)); assignment $sqlassignmentids", array_merge(array($USER->id), $assignmentidparams));
foreach ($assignments as $assignment) { foreach ($assignments as $assignment) {
$grading_info = grade_get_grades($assignment->course, 'mod', 'assignment', $assignment->id, $USER->id);
$final_grade = $grading_info->items[0]->grades[$USER->id];
$str = '<div class="assignment overview"><div class="name">'.$strassignment. ': '. $str = '<div class="assignment overview"><div class="name">'.$strassignment. ': '.
'<a '.($assignment->visible ? '':' class="dimmed"'). '<a '.($assignment->visible ? '':' class="dimmed"').
'title="'.$strassignment.'" href="'.$CFG->wwwroot. 'title="'.$strassignment.'" href="'.$CFG->wwwroot.
@ -3723,9 +3727,9 @@ function assignment_print_overview($courses, &$htmlarray) {
$submission = $mysubmissions[$assignment->id]; $submission = $mysubmissions[$assignment->id];
if ($submission->teacher == 0 && $submission->timemarked == 0) { if ($submission->teacher == 0 && $submission->timemarked == 0 && !$final_grade->grade) {
$str .= $strsubmitted . ', ' . $strnotgradedyet; $str .= $strsubmitted . ', ' . $strnotgradedyet;
} else if ($submission->grade <= 0) { } else if ($submission->grade <= 0 && !$final_grade->grade) {
$str .= $strsubmitted . ', ' . $strreviewed; $str .= $strsubmitted . ', ' . $strreviewed;
} else { } else {
$str .= $strsubmitted . ', ' . $strgraded; $str .= $strsubmitted . ', ' . $strgraded;