Merge branch 'MDL-38311_23' of git://github.com/timhunt/moodle into M…

…OODLE_23_STABLE

question/behaviour/adaptive/tests/walkthrough_test.php

@@ -158,7 +158,7 @@ public function test_adaptive_multichoice() {
                 $this->get_contains_correct_expectation());
 
         // Process a manual comment.
-        $this->manual_grade('Not good enough!', 1);
+        $this->manual_grade('Not good enough!', 1, FORMAT_HTML);
 
         // Verify.
         $this->check_current_state(question_state::$mangrpartial);

question/behaviour/adaptivenopenalty/tests/walkthrough_test.php

@@ -124,7 +124,7 @@ public function test_multichoice() {
                 $this->get_contains_correct_expectation());
 
         // Process a manual comment.
-        $this->manual_grade('Not good enough!', 1);
+        $this->manual_grade('Not good enough!', 1, FORMAT_HTML);
 
         // Verify.
         $this->check_current_state(question_state::$mangrpartial);

question/behaviour/deferredcbm/tests/walkthrough_test.php

@@ -95,7 +95,7 @@ public function test_deferred_cbm_truefalse_high_certainty() {
                 $this->get_contains_correct_expectation());
 
         // Process a manual comment.
-        $this->manual_grade('Not good enough!', 1);
+        $this->manual_grade('Not good enough!', 1, FORMAT_HTML);
 
         // Verify.
         $this->check_current_state(question_state::$mangrpartial);

question/behaviour/deferredfeedback/tests/walkthrough_test.php

@@ -92,7 +92,7 @@ public function test_deferredfeedback_feedback_truefalse() {
                 $this->quba->get_response_summary($this->slot));
 
         // Process a manual comment.
-        $this->manual_grade('Not good enough!', 1);
+        $this->manual_grade('Not good enough!', 1, FORMAT_HTML);
 
         $this->check_current_state(question_state::$mangrpartial);
         $this->check_current_mark(1);

question/behaviour/immediatecbm/tests/walkthrough_test.php

@@ -109,7 +109,7 @@ public function test_immediatecbm_feedback_multichoice_right() {
                 $this->get_contains_correct_expectation());
 
         // Process a manual comment.
-        $this->manual_grade('Not good enough!', 0.5);
+        $this->manual_grade('Not good enough!', 0.5, FORMAT_HTML);
 
         // Verify.
         $this->check_current_state(question_state::$mangrpartial);
@@ -176,7 +176,7 @@ public function test_immediatecbm_feedback_multichoice_try_to_submit_blank() {
                 $this->get_contains_mc_radio_expectation(2, false, false));
 
         // Process a manual comment.
-        $this->manual_grade('Not good enough!', 0.5);
+        $this->manual_grade('Not good enough!', 0.5, FORMAT_HTML);
 
         // Verify.
         $this->check_current_state(question_state::$mangrpartial);

question/behaviour/immediatefeedback/tests/walkthrough_test.php

@@ -116,7 +116,7 @@ public function test_immediatefeedback_feedback_multichoice_right() {
                 $this->get_contains_correct_expectation());
 
         // Process a manual comment.
-        $this->manual_grade('Not good enough!', 0.5);
+        $this->manual_grade('Not good enough!', 0.5, FORMAT_HTML);
 
         // Verify.
         $this->check_current_state(question_state::$mangrpartial);
@@ -185,7 +185,7 @@ public function test_immediatefeedback_feedback_multichoice_try_to_submit_blank(
                 $this->get_contains_mc_radio_expectation(2, false, false));
 
         // Process a manual comment.
-        $this->manual_grade('Not good enough!', 0.5);
+        $this->manual_grade('Not good enough!', 0.5, FORMAT_HTML);
 
         // Verify.
         $this->check_current_state(question_state::$mangrpartial);

question/behaviour/informationitem/tests/walkthrough_test.php

@@ -74,7 +74,7 @@ public function test_informationitem_feedback_description() {
                 $this->get_contains_general_feedback_expectation($description));
 
         // Process a manual comment.
-        $this->manual_grade('Not good enough!', null);
+        $this->manual_grade('Not good enough!', null, FORMAT_HTML);
 
         $this->check_current_state(question_state::$manfinished);
         $this->check_current_mark(null);
@@ -83,6 +83,6 @@ public function test_informationitem_feedback_description() {
 
         // Check that trying to process a manual comment with a grade causes an exception.
         $this->setExpectedException('moodle_exception');
-        $this->manual_grade('Not good enough!', 1);
+        $this->manual_grade('Not good enough!', 1, FORMAT_HTML);
     }
 }

question/behaviour/interactive/tests/walkthrough_test.php

@@ -157,7 +157,7 @@ public function test_interactive_feedback_multichoice_right() {
                 $this->get_no_hint_visible_expectation());
 
         // Process a manual comment.
-        $this->manual_grade('Not good enough!', 0.5);
+        $this->manual_grade('Not good enough!', 0.5, FORMAT_HTML);
 
         // Verify.
         $this->check_current_state(question_state::$mangrpartial);

question/behaviour/manualgraded/tests/walkthrough_test.php

@@ -90,7 +90,7 @@ public function test_manual_graded_essay() {
                 $this->quba->get_response_summary($this->slot));
 
         // Process a manual comment.
-        $this->manual_grade('Not good enough!', 10);
+        $this->manual_grade('Not good enough!', 10, FORMAT_HTML);
 
         // Verify.
         $this->check_current_state(question_state::$mangrright);
@@ -140,7 +140,7 @@ public function test_manual_graded_truefalse() {
                 $this->get_does_not_contain_specific_feedback_expectation());
 
         // Process a manual comment.
-        $this->manual_grade('Not good enough!', 1);
+        $this->manual_grade('Not good enough!', 1, FORMAT_HTML);
 
         $this->check_current_state(question_state::$mangrpartial);
         $this->check_current_mark(1);
@@ -181,14 +181,14 @@ public function test_manual_graded_ignore_repeat_sumbission() {
 
         // Process a blank manual comment. Ensure it does not change the state.
         $numsteps = $this->get_step_count();
-        $this->manual_grade('', '');
+        $this->manual_grade('', '', FORMAT_HTML);
         $this->check_step_count($numsteps);
         $this->check_current_state(question_state::$needsgrading);
         $this->check_current_mark(null);
 
         // Process a comment, but with the mark blank. Should be recorded, but
         // not change the mark.
-        $this->manual_grade('I am not sure what grade to award.', '');
+        $this->manual_grade('I am not sure what grade to award.', '', FORMAT_HTML);
         $this->check_step_count($numsteps + 1);
         $this->check_current_state(question_state::$needsgrading);
         $this->check_current_mark(null);
@@ -197,21 +197,21 @@ public function test_manual_graded_ignore_repeat_sumbission() {
                         preg_quote('I am not sure what grade to award.') . '/'));
 
         // Now grade it.
-        $this->manual_grade('Pretty good!', '9.00000');
+        $this->manual_grade('Pretty good!', '9.00000', FORMAT_HTML);
         $this->check_step_count($numsteps + 2);
         $this->check_current_state(question_state::$mangrpartial);
         $this->check_current_mark(9);
         $this->check_current_output(
                 new question_pattern_expectation('/' . preg_quote('Pretty good!') . '/'));
 
         // Process the same data again, and make sure it does not add a step.
-        $this->manual_grade('Pretty good!', '9.00000');
+        $this->manual_grade('Pretty good!', '9.00000', FORMAT_HTML);
         $this->check_step_count($numsteps + 2);
         $this->check_current_state(question_state::$mangrpartial);
         $this->check_current_mark(9);
 
         // Now set the mark back to blank.
-        $this->manual_grade('Actually, I am not sure any more.', '');
+        $this->manual_grade('Actually, I am not sure any more.', '', FORMAT_HTML);
         $this->check_step_count($numsteps + 3);
         $this->check_current_state(question_state::$needsgrading);
         $this->check_current_mark(null);
@@ -261,7 +261,7 @@ public function test_manual_graded_essay_can_grade_0() {
                 $this->quba->get_response_summary($this->slot));
 
         // Process a blank comment and a grade of 0.
-        $this->manual_grade('', 0);
+        $this->manual_grade('', 0, FORMAT_HTML);
 
         // Verify.
         $this->check_current_state(question_state::$mangrwrong);

question/engine/questionattempt.php

@@ -1114,14 +1114,19 @@ public function regrade(question_attempt $oldqa, $finished) {
 
     /**
      * Perform a manual grading action on this attempt.
-     * @param $comment the comment being added.
-     * @param $mark the new mark. (Optional, if not given, then only a comment is added.)
+     * @param string $comment the comment being added.
+     * @param float $mark the new mark. If null, then only a comment is added.
+     * @param int $commentformat the FORMAT_... for $comment. Must be given.
      * @param int $timestamp the time to record for the action. (If not given, use now.)
      * @param int $userid the user to attribute the aciton to. (If not given, use the current user.)
-     * @return unknown_type
      */
-    public function manual_grade($comment, $mark, $timestamp = null, $userid = null) {
+    public function manual_grade($comment, $mark, $commentformat = null, $timestamp = null, $userid = null) {
         $submitteddata = array('-comment' => $comment);
+        if (is_null($commentformat)) {
+            debugging('You should pass $commentformat to manual_grade.', DEBUG_DEVELOPER);
+            $commentformat = FORMAT_HTML;
+        }
+        $submitteddata['-commentformat'] = $commentformat;
         if (!is_null($mark)) {
             $submitteddata['-mark'] = $mark;
             $submitteddata['-maxmark'] = $this->maxmark;

question/engine/questionusage.php

@@ -647,9 +647,9 @@ public function finish_all_questions($timestamp = null) {
      * @param number $mark the mark that is being assigned. Can be null to just
      * add a comment.
      */
-    public function manual_grade($slot, $comment, $mark) {
+    public function manual_grade($slot, $comment, $mark, $commentformat = null) {
         $qa = $this->get_question_attempt($slot);
-        $qa->manual_grade($comment, $mark);
+        $qa->manual_grade($comment, $mark, $commentformat);
         $this->observer->notify_attempt_modified($qa);
     }
 

question/engine/tests/helpers.php

@@ -653,8 +653,8 @@ protected function process_submission($data) {
         $this->quba->process_action($this->slot, $data);
     }
 
-    protected function manual_grade($comment, $mark) {
-        $this->quba->manual_grade($this->slot, $comment, $mark);
+    protected function manual_grade($comment, $mark, $commentformat = null) {
+        $this->quba->manual_grade($this->slot, $comment, $mark, $commentformat);
     }
 
     protected function check_current_state($state) {

question/engine/tests/unitofwork_test.php

@@ -174,7 +174,7 @@ public function test_add_and_start_question() {
 
     public function test_process_action() {
 
-        $this->quba->manual_grade($this->slot, 'Acutally, that is not quite right', 0.5);
+        $this->quba->manual_grade($this->slot, 'Acutally, that is not quite right', 0.5, FORMAT_HTML);
 
         // Here, however, were we are adding a step to an existing qa, we do need to track that.
         $this->assertEquals(0, count($this->observer->get_attempts_added()));