mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 07:56:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip_MDL-48055_master_quiz_activity_report_grade_visibility' of https://github.com/POETGroup/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-11-14 13:39:56 +00:00
commit 20f576629b
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mod/quiz/lib.php
View File

@ -458,7 +458,13 @@ function quiz_user_outline($course, $user, $mod, $quiz) {
}
$result = new stdClass();
$result->info = get_string('grade') . ': ' . $grade->str_long_grade;
// If the user can't see hidden grades, don't return that information.
$gitem = grade_item::fetch(array('id' => $grades->items[0]->id));
if (!$gitem->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
$result->info = get_string('grade') . ': ' . $grade->str_long_grade;
} else {
$result->info = get_string('grade') . ': ' . get_string('hidden', 'grades');
}
// Datesubmitted == time created. dategraded == time modified or time overridden
// if grade was last modified by the user themselves use date graded. Otherwise use
@ -491,9 +497,18 @@ function quiz_user_complete($course, $user, $mod, $quiz) {
$grades = grade_get_grades($course->id, 'mod', 'quiz', $quiz->id, $user->id);
if (!empty($grades->items[0]->grades)) {
$grade = reset($grades->items[0]->grades);
echo $OUTPUT->container(get_string('grade').': '.$grade->str_long_grade);
if ($grade->str_feedback) {
echo $OUTPUT->container(get_string('feedback').': '.$grade->str_feedback);
// If the user can't see hidden grades, don't return that information.
$gitem = grade_item::fetch(array('id' => $grades->items[0]->id));
if (!$gitem->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
echo $OUTPUT->container(get_string('grade').': '.$grade->str_long_grade);
if ($grade->str_feedback) {
echo $OUTPUT->container(get_string('feedback').': '.$grade->str_feedback);
}
} else {
echo $OUTPUT->container(get_string('grade') . ': ' . get_string('hidden', 'grades'));
if ($grade->str_feedback) {
echo $OUTPUT->container(get_string('feedback').': '.get_string('hidden', 'grades'));
}
}
}