L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-31919 Fix assignment overview output to respect gradebook grading.

Browse Source 
Currenly, if assigment has been graded in gradebook only, in the assigment
overview it is listed as not graded.
This commit is contained in:
Ruslan Kabalin
2012-03-13 14:01:00 +13:00
committed by Sam Hemelryk
parent 63f4993e4a
commit 08fb6ca3f1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assignment/lib.php
+6 -2
View File
@@ -3446,6 +3446,7 @@ function assignment_types() {
function assignment_print_overview($courses, &$htmlarray) {
global $USER, $CFG, $DB;
require_once($CFG->libdir.'/gradelib.php');
if (empty($courses) || !is_array($courses) || count($courses) == 0) {
return array();
@@ -3514,6 +3515,9 @@ function assignment_print_overview($courses, &$htmlarray) {
assignment $sqlassignmentids", array_merge(array($USER->id), $assignmentidparams));
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. ': '.
'<a '.($assignment->visible ? '':' class="dimmed"').
'title="'.$strassignment.'" href="'.$CFG->wwwroot.
@@ -3547,9 +3551,9 @@ function assignment_print_overview($courses, &$htmlarray) {
$submission = $mysubmissions[$assignment->id];
if ($submission->teacher == 0 && $submission->timemarked == 0) {
if ($submission->teacher == 0 && $submission->timemarked == 0 && !$final_grade->grade) {
$str .= $strsubmitted . ', ' . $strnotgradedyet;
} else if ($submission->grade <= 0) {
} else if ($submission->grade <= 0 && !$final_grade->grade) {
$str .= $strsubmitted . ', ' . $strreviewed;
} else {
$str .= $strsubmitted . ', ' . $strgraded;