From 0b62cc2ea52a18ec6909b96312b0ed51f503e2cb Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Sun, 7 Sep 2014 12:48:10 +0100 Subject: [PATCH] MDL-46810 question CBM behaviours: improve the display of marks. Thanks to Tony Gardner-Medwin for the suggestion. --- .../deferredcbm/lang/en/qbehaviour_deferredcbm.php | 1 + question/behaviour/deferredcbm/renderer.php | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/question/behaviour/deferredcbm/lang/en/qbehaviour_deferredcbm.php b/question/behaviour/deferredcbm/lang/en/qbehaviour_deferredcbm.php index 120defd9cb4..47a4a9760d6 100644 --- a/question/behaviour/deferredcbm/lang/en/qbehaviour_deferredcbm.php +++ b/question/behaviour/deferredcbm/lang/en/qbehaviour_deferredcbm.php @@ -69,3 +69,4 @@ $string['pluginname'] = 'Deferred feedback with CBM'; $string['slightlyoverconfident'] = 'a bit over-confident'; $string['slightlyunderconfident'] = 'a bit under-confident'; $string['underconfident'] = 'under-confident'; +$string['weightx'] = 'Weight {$a}'; diff --git a/question/behaviour/deferredcbm/renderer.php b/question/behaviour/deferredcbm/renderer.php index f5abbf58e14..b094a60aded 100644 --- a/question/behaviour/deferredcbm/renderer.php +++ b/question/behaviour/deferredcbm/renderer.php @@ -95,13 +95,14 @@ class qbehaviour_deferredcbm_renderer extends qbehaviour_renderer { public function marked_out_of_max(question_attempt $qa, core_question_renderer $qoutput, question_display_options $options) { - return get_string('basemark', 'qbehaviour_deferredcbm', $qa->format_fraction_as_mark( + return get_string('weightx', 'qbehaviour_deferredcbm', $qa->format_fraction_as_mark( question_cbm::adjust_fraction(1, question_cbm::default_certainty()), $options->markdp)); } public function mark_out_of_max(question_attempt $qa, core_question_renderer $qoutput, question_display_options $options) { - return get_string('cbmmark', 'qbehaviour_deferredcbm', $qa->format_mark($options->markdp)); + return get_string('cbmmark', 'qbehaviour_deferredcbm', $qa->format_mark($options->markdp)) . + '
' . $this->marked_out_of_max($qa, $qoutput, $options); } -} \ No newline at end of file +}