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

MDL-29920: now complete report properly calls view_feedback in assignment

Browse Source
This commit is contained in:
Marina Glancy
2011-11-02 09:04:01 +08:00
parent bb17ac1e32
commit 156d6f4876
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assignment/lib.php
+20 -18
View File
@@ -257,6 +257,8 @@ class assignment_base {
*
* This default method prints the teacher picture and name, date when marked,
* grade and teacher submissioncomment.
* If advanced grading is used the method render_grade from the
* advanced grading controller is called to display the grade.
*
* @global object
* @global object
@@ -268,27 +270,27 @@ class assignment_base {
require_once($CFG->libdir.'/gradelib.php');
require_once("$CFG->dirroot/grade/grading/lib.php");
if (!is_enrolled($this->context, $USER, 'mod/assignment:view')) {
// can not submit assignments -> no feedback
return;
}
if (!$submission) { /// Get submission for this assignment
$submission = $this->get_submission($USER->id);
$userid = $USER->id;
$submission = $this->get_submission($userid);
} else {
$userid = $submission->userid;
}
// Check the user can submit
$cansubmit = has_capability('mod/assignment:submit', $this->context, $USER->id, false);
$canviewfeedback = ($userid == $USER->id && has_capability('mod/assignment:submit', $this->context, $USER->id, false));
// If not then check if the user still has the view cap and has a previous submission
$cansubmit = $cansubmit || (!empty($submission) && has_capability('mod/assignment:view', $this->context, $USER->id, false));
$canviewfeedback = $canviewfeedback || (!empty($submission) && $submission->userid == $USER->id && has_capability('mod/assignment:view', $this->context));
// Or if user can grade (is a teacher or admin)
$canviewfeedback = $canviewfeedback || has_capability('mod/assignment:grade', $this->context);
if (!$cansubmit) {
// can not submit assignments -> no feedback
if (!$canviewfeedback) {
// can not view or submit assignments -> no feedback
return;
}
$grading_info = grade_get_grades($this->course->id, 'mod', 'assignment', $this->assignment->id, $USER->id);
$grading_info = grade_get_grades($this->course->id, 'mod', 'assignment', $this->assignment->id, $userid);
$item = $grading_info->items[0];
$grade = $item->grades[$USER->id];
$grade = $item->grades[$userid];
if ($grade->hidden or $grade->grade === false) { // hidden or error
return;
@@ -2086,12 +2088,6 @@ class assignment_base {
*/
function user_complete($user, $grade=null) {
global $OUTPUT;
if ($grade) {
echo $OUTPUT->container(get_string('grade').': '.$grade->str_long_grade);
if ($grade->str_feedback) {
echo $OUTPUT->container(get_string('feedback').': '.$grade->str_feedback);
}
}
if ($submission = $this->get_submission($user->id)) {
@@ -2118,6 +2114,12 @@ class assignment_base {
echo $OUTPUT->box_end();
} else {
if ($grade) {
echo $OUTPUT->container(get_string('grade').': '.$grade->str_long_grade);
if ($grade->str_feedback) {
echo $OUTPUT->container(get_string('feedback').': '.$grade->str_feedback);
}
}
print_string("notsubmittedyet", "assignment");
}
}