Improved display of grades when grades should not be shown MDL-7150

This commit is contained in:
moodler
2006-10-31 15:06:02 +00:00
parent 7675f212ee
commit 67145bac78
3 changed files with 16 additions and 11 deletions
+4 -2
View File
@@ -69,8 +69,10 @@
switch ($mode) {
case "grade":
$course = get_record('course', 'id', required_param('id', PARAM_INT));
require_once($CFG->dirroot.'/grade/lib.php');
print_student_grade($user, $course);
if (!empty($course->showgrades)) {
require_once($CFG->dirroot.'/grade/lib.php');
print_student_grade($user, $course);
}
break;
case "todaylogs" :
+9 -6
View File
@@ -2959,26 +2959,29 @@ function print_student_grade($user, $course) {
$sectionmods = explode(",", $section->sequence);
foreach ($sectionmods as $sectionmod) {
$mod = $mods[$sectionmod];
$instance = get_record("$mod->modname", "id", "$mod->instance");
if (empty($mod->modname)) {
continue; // Just in case, see MDL-7150
}
$instance = get_record($mod->modname, 'id', $mod->instance);
$libfile = "$CFG->dirroot/mod/$mod->modname/lib.php";
if (file_exists($libfile)) {
require_once($libfile);
$gradefunction = $mod->modname."_grades";
$gradefunction = $mod->modname.'_grades';
if (function_exists($gradefunction)) { // Skip modules without grade function
if ($modgrades = $gradefunction($mod->instance)) {
if (!empty($modgrades->maxgrade)) {
if ($mod->visible) {
$maxgrade = "$modgrades->maxgrade";
$maxgrade = $modgrades->maxgrade;
} else {
$maxgrade = "$modgrades->maxgrade";
$maxgrade = $modgrades->maxgrade;
}
} else {
$maxgrade = "";
$maxgrade = '';
}
if ($maxgrade) {
echo "<br/>";
echo '<br />';
if (!empty($modgrades->grades[$user->id])) {
$currentgrade = $modgrades->grades[$user->id];
echo "$mod->modfullname: ".format_string($instance->name,true)." - $currentgrade/$maxgrade"; } else {
+3 -3
View File
@@ -170,10 +170,10 @@
'&amp;user='.$user->id.'&amp;mode=stats',get_string('stats'));
}
// needs permission checking!!!
$secondrow[] = new tabobject('grade', $CFG->wwwroot.'/course/user.php?id='.$course->id.
if ($course->showgrades) {
$secondrow[] = new tabobject('grade', $CFG->wwwroot.'/course/user.php?id='.$course->id.
'&amp;user='.$user->id.'&amp;mode=grade', get_string('grade'));
}
}