Skip to content
Browse files

Better grade reports

  • Loading branch information...
1 parent e34d323 commit 98092498383c673aa89343e28d030ea094f93851 moodler committed Oct 17, 2002
Showing with 14 additions and 117 deletions.
  1. +0 −109 course/grades.php
  2. +2 −0 lang/en/moodle.php
  3. +3 −8 mod/assignment/lib.php
  4. +9 −0 mod/quiz/lib.php
  5. BIN pix/i/grades.gif
View
109 course/grades.php
@@ -1,109 +0,0 @@
-<?PHP // $Id$
- // Displays all grades for a course
-
- require("../config.php");
- require("lib.php");
-
- require_variable($id); // course id
-
- if (! $course = get_record("course", "id", $id)) {
- error("Course ID was incorrect");
- }
-
- require_login($course->id);
-
- if (!isteacher($course->id)) {
- error("Only teachers can use this page!");
- }
-
- $strgrades = get_string("grades");
- $strgrade = get_string("grade");
- $strmax = get_string("maximumshort");
-
-
-/// Otherwise fill and print the form.
-
- print_header("$course->shortname: $strgrades", "$course->fullname",
- "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A>
- -> $strgrades");
-
- print_heading($strgrades);
-
- if (!$students = get_course_students($course->id)) {
- print_heading(get_string("nostudentsyet"));
- print_footer($course);
- exit;
- }
-
- foreach ($students as $student) {
- $grades[$student->id] = array(); // Collect all grades in this array
- }
- $columns = array(); // Accumulate column names in this array.
-
- // Collect module data
- get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused, $modsectioncounts);
-
- $sections = get_all_sections($course->id); // Sort everything the same as the course
- for ($i=0; $i<=$course->numsections; $i++) {
- if (isset($sections[$i])) { // should always be true
- $section = $sections[$i];
- if ($section->sequence) {
- $sectionmods = explode(",", $section->sequence);
- foreach ($sectionmods as $sectionmod) {
- $mod = $mods[$sectionmod];
- $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";
- if (function_exists($gradefunction)) { // Skip modules without grade function
- $modgrades = $gradefunction($mod->instance);
-
- if ($modgrades->maxgrade) {
- $maxgrade = "<BR>$strmax: $modgrades->maxgrade";
- } else {
- $maxgrade = "";
- }
-
- $image = "<A HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\"".
- " TITLE=\"$mod->modfullname\">".
- "<IMG BORDER=0 VALIGN=absmiddle SRC=\"../mod/$mod->modname/icon.gif\" ".
- "HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\"></A>";
- $columns[] = "$image ".
- "<A HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">".
- "$instance->name".
- "</A>$maxgrade";
-
- foreach ($students as $student) {
- $grades[$student->id][] = $modgrades->grades[$student->id]; // may be empty, that's ok
- }
- }
- }
- }
- }
- }
- } // a new Moodle nesting record? ;-)
-
- $table->head = array ("", get_string("name"));
- $table->head = array_merge($table->head, $columns);
- $table->width = array(35, "");
- $table->align = array("LEFT", "LEFT");
- foreach ($columns as $column) {
- $table->width[] = "";
- $table->align[] = "CENTER";
- }
-
- foreach ($grades as $studentid => $gradelist) {
- $student = $students[$studentid];
- $picture = print_user_picture($student->id, $course->id, $student->picture, false, true);
- $name = array ("$picture", "$student->firstname&nbsp;$student->lastname");
-
-
- $table->data[] = array_merge($name, $gradelist);
- }
-
- print_table($table);
-
- print_footer($course);
-
-?>
View
2 lang/en/moodle.php
@@ -29,6 +29,7 @@
$string['alphanumerical'] = "Can only contain alphabetical letters or numbers";
$string['alreadyconfirmed'] = "Registration has already been confirmed";
$string['answer'] = "Answer";
+$string['assessment'] = "Assessment";
$string['assignteachers'] = "Assign teachers";
$string['availablecourses'] = "Available Courses";
$string['cancel'] = "Cancel";
@@ -442,6 +443,7 @@
$string['topicoutline'] = "Topic outline";
$string['turneditingoff'] = "Turn editing off";
$string['turneditingon'] = "Turn editing on";
+$string['total'] = "Total";
$string['undecided'] = "Undecided";
$string['unenrol'] = "Unenrol";
$string['unenrolme'] = "Unenrol me from \$a";
View
11 mod/assignment/lib.php
@@ -57,15 +57,10 @@ function assignment_delete_instance($id) {
function assignment_user_outline($course, $user, $mod, $assignment) {
if ($submission = assignment_get_submission($assignment, $user)) {
- if ($basedir = assignment_file_area($assignment, $user)) {
- if ($files = get_directory_list($basedir)) {
- $countfiles = count($files)." ".get_string("uploadedfiles", "assignment");
- foreach ($files as $file) {
- $countfiles .= "; $file";
- }
- }
+
+ if ($submission->grade) {
+ $result->info = get_string("grade").": $submission->grade";
}
- $result->info = $countfiles;
$result->time = $submission->timemodified;
return $result;
}
View
9 mod/quiz/lib.php
@@ -153,6 +153,15 @@ function quiz_user_outline($course, $user, $mod, $quiz) {
/// Used for user activity reports.
/// $return->time = the time they did it
/// $return->info = a short text description
+ if ($grade = get_record_sql("SELECT * FROM quiz_grades WHERE user = '$user->id' AND quiz = '$quiz->id'")) {
+
+ if ($grade->grade) {
+ $result->info = get_string("grade").": $grade->grade";
+ }
+ $result->time = $grade->timemodified;
+ return $result;
+ }
+ return NULL;
return $return;
}
View
BIN pix/i/grades.gif
Deleted file not rendered

0 comments on commit 9809249

Please sign in to comment.
Something went wrong with that request. Please try again.