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

some fixes for user report

Browse source
This commit is contained in:
toyomoyo 2007-09-05 04:39:07 +00:00
parent 16a208f9e6
commit 6ef84f6f48
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
grade/report/user/lib.php
View file

@ -95,7 +95,7 @@ class grade_report_user extends grade_report {
function fill_table() { function fill_table() {
global $CFG; global $CFG;
$numusers = $this->get_numusers(); $numusers = $this->get_numusers(false); // total course users
if ($all_grade_items = grade_item::fetch_all(array('courseid'=>$this->courseid))) { if ($all_grade_items = grade_item::fetch_all(array('courseid'=>$this->courseid))) {
$grade_items = array(); $grade_items = array();
@ -140,7 +140,12 @@ class grade_report_user extends grade_report {
} }
if ($grade_grade->is_hidden() && !has_capability('moodle/grade:viewhidden', get_context_instance(CONTEXT_COURSE, $grade_item->courseid))) { if ($grade_grade->is_hidden() && !has_capability('moodle/grade:viewhidden', get_context_instance(CONTEXT_COURSE, $grade_item->courseid))) {
if ((int) $grade_grade->finalgrade < 1) {
$data[] = '-';
} else {
$data[] = get_string('gradedon', 'grades', userdate($grade_grade->timemodified)); $data[] = get_string('gradedon', 'grades', userdate($grade_grade->timemodified));
}
} else { } else {
if ($grade_item->scaleid) { if ($grade_item->scaleid) {
@ -157,13 +162,21 @@ class grade_report_user extends grade_report {
} }
} else { } else {
// normal grade, or text, just display // normal grade, or text, just display
if ((int) $grade_grade->finalgrade < 1) {
$data[] = $excluded.'-';
} else {
$data[] = $excluded.format_float($grade_grade->finalgrade, $decimalpoints); $data[] = $excluded.format_float($grade_grade->finalgrade, $decimalpoints);
} }
} }
}
/// prints percentage /// prints percentage
if ($grade_grade->is_hidden() && !has_capability('moodle/grade:viewhidden', get_context_instance(CONTEXT_COURSE, $grade_item->courseid))) { if ($grade_grade->is_hidden() && !has_capability('moodle/grade:viewhidden', get_context_instance(CONTEXT_COURSE, $grade_item->courseid))) {
if ((int) $grade_grade->finalgrade < 1) {
$data[] = '-';
} else {
$data[] = get_string('gradedon', 'grades', userdate($grade_grade->timemodified)); $data[] = get_string('gradedon', 'grades', userdate($grade_grade->timemodified));
}
} else { } else {
if ($grade_item->gradetype == GRADE_TYPE_VALUE) { if ($grade_item->gradetype == GRADE_TYPE_VALUE) {
// processing numeric grade // processing numeric grade