moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-64590' of https://github.com/timhunt/moodle

Browse source
This commit is contained in:
David Monllaó 2019-02-12 12:45:48 +01:00
commit 6f5d32ea4d
2 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
question/behaviour/behaviourbase.php
View file

@ -550,13 +550,13 @@ abstract class question_behaviour {
/** /**
* @return string a summary of a manual comment action. * @return string a summary of a manual comment action.
* @param unknown_type $step * @param question_attempt_step $step
*/ */
protected function summarise_manual_comment($step) { protected function summarise_manual_comment($step) {
$a = new stdClass(); $a = new stdClass();
if ($step->has_behaviour_var('comment')) { if ($step->has_behaviour_var('comment')) {
list($comment, $commentformat, $commentstep) = $this->qa->get_manual_comment(); $comment = question_utils::to_plain_text($step->get_behaviour_var('comment'),
$comment = question_utils::to_plain_text($comment, $commentformat); $step->get_behaviour_var('commentformat'));
$a->comment = shorten_text($comment, 200); $a->comment = shorten_text($comment, 200);
} else { } else {
$a->comment = ''; $a->comment = '';

32
question/behaviour/manualgraded/tests/walkthrough_test.php
View file

@ -686,4 +686,36 @@ class qbehaviour_manualgraded_walkthrough_testcase extends qbehaviour_walkthroug
$this->render(); $this->render();
$this->check_output_contains_text_input('-mark', '0.3333333'); $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');
}
} }