Improved listing on index page for students

This commit is contained in:
moodler
2005-04-17 18:45:32 +00:00
parent 5a25d82ad8
commit f1893f4428
3 changed files with 22 additions and 13 deletions
+15 -8
View File
@@ -19,6 +19,7 @@
$strname = get_string("name");
$strduedate = get_string("duedate", "assignment");
$strsubmitted = get_string("submitted", "assignment");
$strgrade = get_string("grade");
print_header_simple($strassignments, "", $strassignments, "", "", true, "", navmenu($course));
@@ -31,14 +32,14 @@
$timenow = time();
if ($course->format == "weeks") {
$table->head = array ($strweek, $strname, $strduedate, $strsubmitted);
$table->align = array ("center", "left", "left", "left");
$table->head = array ($strweek, $strname, $strduedate, $strsubmitted, $strgrade);
$table->align = array ("center", "left", "left", "left", "right");
} else if ($course->format == "topics") {
$table->head = array ($strtopic, $strname, $strduedate, $strsubmitted);
$table->align = array ("center", "left", "left", "left");
$table->head = array ($strtopic, $strname, $strduedate, $strsubmitted, $strgrade);
$table->align = array ("center", "left", "left", "left", "right");
} else {
$table->head = array ($strname, $strduedate, $strsubmitted);
$table->align = array ("left", "left", "left");
$table->head = array ($strname, $strduedate, $strsubmitted, $strgrade);
$table->align = array ("left", "left", "left", "right");
}
$currentgroup = get_current_group($course->id);
@@ -59,6 +60,12 @@
$submitted = $assignmentinstance->submittedlink();
if ($submission = $assignmentinstance->get_submission($USER->id)) {
$grade = $assignmentinstance->display_grade($submission->grade);
} else {
$grade = '';
}
$due = userdate($assignment->timedue);
if (!$assignment->visible) {
//Show dimmed if the mod is hidden
@@ -80,9 +87,9 @@
}
if ($course->format == "weeks" or $course->format == "topics") {
$table->data[] = array ($printsection, $link, $due, $submitted);
$table->data[] = array ($printsection, $link, $due, $submitted, $grade);
} else {
$table->data[] = array ($link, $due, $submitted);
$table->data[] = array ($link, $due, $submitted, $grade);
}
}
+1 -1
View File
@@ -908,7 +908,7 @@ class assignment_base {
if ($submission = $this->get_submission($user->id)) {
if ($submission->grade) {
$result->info = get_string("grade").": $submission->grade";
$result->info = get_string('grade').': '.$this->display_grade($submission->grade);
}
$result->time = $submission->timemodified;
return $result;
@@ -29,10 +29,12 @@ class assignment_offline extends assignment_base {
} else {
if (isset($USER->id)) {
if ($submission = $this->get_submission($USER->id)) {
if ($submission->timemodified <= $this->assignment->timedue) {
$submitted = '<span class="early">'.userdate($submission->timemodified).'</span>';
} else {
$submitted = '<span class="late">'.userdate($submission->timemodified).'</span>';
if ($submission->timemodified) {
if ($submission->timemodified <= $this->assignment->timedue) {
$submitted = '<span class="early">'.userdate($submission->timemodified).'</span>';
} else {
$submitted = '<span class="late">'.userdate($submission->timemodified).'</span>';
}
}
}
}