mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +02:00
The table on view.php now also shows the marks achieved in each attempt in addition to the rescaled grade.
This commit is contained in:
parent
3c1348758d
commit
8930d42124
1 changed files with 23 additions and 8 deletions
|
@ -130,15 +130,22 @@
|
||||||
$strtimetaken = get_string("timetaken", "quiz");
|
$strtimetaken = get_string("timetaken", "quiz");
|
||||||
$strtimecompleted = get_string("timecompleted", "quiz");
|
$strtimecompleted = get_string("timecompleted", "quiz");
|
||||||
$strgrade = get_string("grade");
|
$strgrade = get_string("grade");
|
||||||
|
$strmarks = get_string('marks', 'quiz');
|
||||||
$strbestgrade = $QUIZ_GRADE_METHOD[$quiz->grademethod];
|
$strbestgrade = $QUIZ_GRADE_METHOD[$quiz->grademethod];
|
||||||
|
|
||||||
$mygrade = quiz_get_best_grade($quiz->id, $USER->id);
|
$mygrade = quiz_get_best_grade($quiz->id, $USER->id);
|
||||||
|
|
||||||
if ($numattempts) {
|
if ($numattempts) {
|
||||||
if ($quiz->grade) {
|
if ($quiz->grade and $quiz->sumgrades) {
|
||||||
|
if ($quiz->grade <> $quiz->sumgrades) {
|
||||||
|
$table->head = array($strattempt, $strtimetaken, $strtimecompleted, "$strmarks / $quiz->sumgrades", "$strgrade / $quiz->grade");
|
||||||
|
$table->align = array("center", "center", "left", "right", "right");
|
||||||
|
$table->size = array("", "", "", "", "");
|
||||||
|
} else {
|
||||||
$table->head = array($strattempt, $strtimetaken, $strtimecompleted, "$strgrade / $quiz->grade");
|
$table->head = array($strattempt, $strtimetaken, $strtimecompleted, "$strgrade / $quiz->grade");
|
||||||
$table->align = array("center", "center", "left", "right");
|
$table->align = array("center", "center", "left", "right");
|
||||||
$table->size = array("", "", "", "");
|
$table->size = array("", "", "", "");
|
||||||
|
}
|
||||||
} else { // No grades are being used
|
} else { // No grades are being used
|
||||||
$table->head = array($strattempt, $strtimetaken, $strtimecompleted);
|
$table->head = array($strattempt, $strtimetaken, $strtimecompleted);
|
||||||
$table->align = array("center", "center", "left");
|
$table->align = array("center", "center", "left");
|
||||||
|
@ -156,13 +163,21 @@
|
||||||
$attemptgrade = "<span class=\"highlight\">$attemptgrade</span>";
|
$attemptgrade = "<span class=\"highlight\">$attemptgrade</span>";
|
||||||
}
|
}
|
||||||
if (quiz_review_allowed($quiz)) {
|
if (quiz_review_allowed($quiz)) {
|
||||||
|
$attemptmark = "<a href=\"review.php?q=$quiz->id&attempt=$attempt->id\">$attempt->sumgrades</a>";
|
||||||
$attemptgrade = "<a href=\"review.php?q=$quiz->id&attempt=$attempt->id\">$attemptgrade</a>";
|
$attemptgrade = "<a href=\"review.php?q=$quiz->id&attempt=$attempt->id\">$attemptgrade</a>";
|
||||||
$attempt->attempt = "<a href=\"review.php?q=$quiz->id&attempt=$attempt->id\">#$attempt->attempt</a>";
|
$attempt->attempt = "<a href=\"review.php?q=$quiz->id&attempt=$attempt->id\">#$attempt->attempt</a>";
|
||||||
}
|
}
|
||||||
|
if ($quiz->grade <> $quiz->sumgrades) {
|
||||||
|
$table->data[] = array( $attempt->attempt,
|
||||||
|
format_time($attempt->timefinish - $attempt->timestart),
|
||||||
|
userdate($attempt->timefinish),
|
||||||
|
$attemptmark, $attemptgrade);
|
||||||
|
} else {
|
||||||
$table->data[] = array( $attempt->attempt,
|
$table->data[] = array( $attempt->attempt,
|
||||||
format_time($attempt->timefinish - $attempt->timestart),
|
format_time($attempt->timefinish - $attempt->timestart),
|
||||||
userdate($attempt->timefinish),
|
userdate($attempt->timefinish),
|
||||||
$attemptgrade);
|
$attemptgrade);
|
||||||
|
}
|
||||||
} else { // No grades are being used
|
} else { // No grades are being used
|
||||||
if (quiz_review_allowed($quiz)) {
|
if (quiz_review_allowed($quiz)) {
|
||||||
$attempt->attempt = "<a href=\"review.php?q=$quiz->id&attempt=$attempt->id\">#$attempt->attempt</a>";
|
$attempt->attempt = "<a href=\"review.php?q=$quiz->id&attempt=$attempt->id\">#$attempt->attempt</a>";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue