Skip to content
Permalink
Browse files
Merge branch 'MDL-64590_35' of https://github.com/timhunt/moodle into…
… MOODLE_35_STABLE
  • Loading branch information
David Monllaó committed Feb 12, 2019
2 parents 799e4e2 + 6131932 commit 82b65196474329e4a5715b49dff6124a0a9b974f
Showing with 35 additions and 3 deletions.
  1. +3 −3 question/behaviour/behaviourbase.php
  2. +32 −0 question/behaviour/manualgraded/tests/walkthrough_test.php
@@ -550,13 +550,13 @@ public function format_comment($comment = null, $commentformat = null, $context

/**
* @return string a summary of a manual comment action.
* @param unknown_type $step
* @param question_attempt_step $step
*/
protected function summarise_manual_comment($step) {
$a = new stdClass();
if ($step->has_behaviour_var('comment')) {
list($comment, $commentformat, $commentstep) = $this->qa->get_manual_comment();
$comment = question_utils::to_plain_text($comment, $commentformat);
$comment = question_utils::to_plain_text($step->get_behaviour_var('comment'),
$step->get_behaviour_var('commentformat'));
$a->comment = shorten_text($comment, 200);
} else {
$a->comment = '';
@@ -686,4 +686,36 @@ public function test_manual_grading_reshows_exactly_the_mark_input() {
$this->render();
$this->check_output_contains_text_input('-mark', '0.3333333');
}

public function test_manual_grading_history_display() {
global $PAGE;

// The current text editor depends on the users profile setting - so it needs a valid user.
$this->setAdminUser();
// Required to init a text editor.
$PAGE->set_url('/');

// Create an essay question graded out of 15 and attempt it.
$essay = test_question_maker::make_an_essay_question();
$this->start_attempt_at_question($essay, 'deferredfeedback', 10);
$this->process_submission(array('answer' => 'This is my wonderful essay!', 'answerformat' => FORMAT_HTML));
$this->quba->finish_all_questions();

// Verify.
$this->check_current_state(question_state::$needsgrading);

// Process an initial grade and comment.
$this->manual_grade('First comment', '5.0', FORMAT_HTML);

// Process a second grade and comment.
$this->manual_grade('Second comment', '7.0', FORMAT_HTML);

// Verify.
$this->check_current_state(question_state::$mangrpartial);
$this->check_current_mark(7);
$this->displayoptions->history = question_display_options::VISIBLE;
$this->render();
$this->check_output_contains('Manually graded 5 with comment: First comment');
$this->check_output_contains('Manually graded 7 with comment: Second comment');
}
}

0 comments on commit 82b6519

Please sign in to comment.