mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-11576 Added the groupsql clause to has_hidden_grades

Browse Source
This commit is contained in:
nicolasconnault 2007-10-04 08:16:13 +00:00
parent 6df5b04ec7
commit 5961dbfb10
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grade/report/grader/lib.php
View File

@ -863,7 +863,7 @@ class grade_report_grader extends grade_report {
foreach ($this->items as $item) {
// If the user shouldn't see this grade_item, hide the average as well
// MDL-11576 If any of the grades are hidden and the user doesn't have permission to view them, hide average as well
if (($item->is_hidden() || $item->has_hidden_grades()) && !$canviewhidden) {
if (($item->is_hidden() || $item->has_hidden_grades($groupsql, $groupwheresql)) && !$canviewhidden) {
$avghtml .= '<td class="cell c' . $columncount++.'"> - </td>';
continue;
}

6
lib/grade/grade_item.php
View File

@ -569,8 +569,10 @@ class grade_item extends grade_object {
* Returns the number of grades that are hidden.
* @param return int Number of hidden grades
*/
function has_hidden_grades() {
return count_records('grade_grades', 'itemid', $this->id, 'hidden', 1);
function has_hidden_grades($groupsql = null, $groupwheresql = null) {
global $CFG;
return get_field_sql("SELECT COUNT(*) FROM {$CFG->prefix}grade_grades g LEFT JOIN "
."{$CFG->prefix}user u ON g.userid = u.id$groupsql WHERE itemid = $this->id AND hidden = 1 $groupwheresql");
}
/**