MDL-20636 updates to code

This commit is contained in:
Dean Lennard
2011-05-09 12:30:59 +01:00
committed by Tim Hunt
parent cbe8754358
commit 8d47043fee
3 changed files with 17 additions and 8 deletions
+1 -1
View File
@@ -100,7 +100,7 @@ $headtags = $attemptobj->get_html_head_contributions($page);
$PAGE->requires->js_init_call('M.mod_quiz.init_attempt_form', null, false, quiz_get_js_module());
// Arrange for the navigation to be displayed.
$navbc = $attemptobj->get_navigation_panel('quiz_attempt_nav_panel', $page);
$navbc = $attemptobj->get_navigation_panel($output, 'quiz_attempt_nav_panel', $page);
$firstregion = reset($PAGE->blocks->get_regions());
$PAGE->blocks->add_fake_block($navbc, $firstregion);
+3 -1
View File
@@ -411,7 +411,9 @@ class mod_quiz_renderer extends plugin_renderer_base {
}
private function summary_get_timer($attemptobj) {
return $attemptobj->get_timer_html();
return html_writer::tag('div', get_string('timeleft', 'quiz') .
html_writer::tag('span', '', array('id' => 'quiz-time-left')),
array('id' => 'quiz-timer'));
}
/*
+13 -6
View File
@@ -141,19 +141,26 @@ $viewobj->accessmanager = $accessmanager;
$viewobj->canattempt = $canattempt;
$viewobj->canpreview = $canpreview;
$viewobj->canreviewmine = $canreviewmine;
$viewobj->attemptcolumn = $attemptcolumn;
$viewobj->markcolumn = $markcolumn;
$viewobj->gradecolumn = $gradecolumn;
$viewobj->feedbackcolumn = $feedbackcolumn;
if ($attempts) {
$viewobj->attemptcolumn = $attemptcolumn;
$viewobj->gradecolumn = $gradecolumn;
$viewobj->markcolumn = $markcolumn;
$viewobj->feedbackcolumn = $feedbackcolumn;
$viewobj->overallstats = $overallstats;
} else {
$viewobj->attemptcolumn = 1;
//$viewobj->gradecolumn = 1;
//$viewobj->markcolumn = 1;
//$viewobj->feedbackcolumn = 1;
//$viewobj->overallstats = 1;
}
$viewobj->timenow = $timenow;
$viewobj->overallstats = $overallstats;
$viewobj->numattempts = $numattempts;
$viewobj->mygrade = $mygrade;
$viewobj->moreattempts = $moreattempts;
$viewobj->numattempts = $numattempts;
$viewobj->mygradeoverridden = $mygradeoverridden;
$viewobj->gradebookfeedback = $gradebookfeedback;
$viewobj->feedbackcolumn = $feedbackcolumn;
$viewobj->unfinished = $unfinished;
$viewobj->lastfinishedattempt = $lastfinishedattempt;