Permalink
Browse files

Merge branch 'MDL-63488-master' of git://github.com/peterRd/moodle

  • Loading branch information...
dmonllao committed Nov 14, 2018
2 parents 54869cd + a1e8c6d commit e15203d011837e3f33b43b96d18959783a47193c
@@ -282,10 +282,24 @@ public function format_column_name($grade_item, $feedback=false, $gradedisplayna
/**
* Returns formatted grade feedback
* @param object $feedback object with properties feedback and feedbackformat
* @param object $grade Grade object with grade properties
* @return string
*/
public function format_feedback($feedback) {
return strip_tags(format_text($feedback->feedback, $feedback->feedbackformat));
public function format_feedback($feedback, $grade = null) {
$string = $feedback->feedback;
if (!empty($grade)) {
// Rewrite links to get the export working for 36, refer MDL-63488.
$string = file_rewrite_pluginfile_urls(
$feedback->feedback,
'pluginfile.php',
$grade->get_context()->id,
GRADE_FILE_COMPONENT,
GRADE_FEEDBACK_FILEAREA,
$grade->id
);
}
return strip_tags(format_text($string, $feedback->feedbackformat));
}
/**
@@ -116,7 +116,7 @@ function print_grades() {
// writing feedback if requested
if ($this->export_feedback) {
$myxls->write_string($i, $j++, $this->format_feedback($userdata->feedbacks[$itemid]));
$myxls->write_string($i, $j++, $this->format_feedback($userdata->feedbacks[$itemid], $grade));
}
}
// Time exported.
@@ -109,7 +109,7 @@ public function print_grades() {
}
if ($this->export_feedback) {
$exportdata[] = $this->format_feedback($userdata->feedbacks[$itemid]);
$exportdata[] = $this->format_feedback($userdata->feedbacks[$itemid], $grade);
}
}
// Time exported.
@@ -110,7 +110,7 @@ public function print_grades() {
}
// writing feedback if requested
if ($this->export_feedback) {
$myxls->write_string($i, $j++, $this->format_feedback($userdata->feedbacks[$itemid]));
$myxls->write_string($i, $j++, $this->format_feedback($userdata->feedbacks[$itemid], $grade));
}
}
// Time exported.
@@ -101,7 +101,7 @@ public function print_grades($feedback = false) {
}
if ($this->export_feedback) {
$feedbackstr = $this->format_feedback($userdata->feedbacks[$itemid]);
$feedbackstr = $this->format_feedback($userdata->feedbacks[$itemid], $grade);
fwrite($handle, "\t\t<feedback>$feedbackstr</feedback>\n");
}
fwrite($handle, "\t</result>\n");
@@ -0,0 +1,173 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Unit tests for grade/report/lib.php.
*
* @package core_grades
* @category phpunit
* @copyright Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot.'/grade/lib.php');
require_once($CFG->dirroot.'/grade/export/lib.php');
/**
* A test class used to test grade_report, the abstract grade report parent class
*/
class core_grade_export_test extends advanced_testcase {
/**
* Ensure that feedback is correct formatted. Test the default implementation of format_feedback
*
* @dataProvider format_feedback_provider
* @param string $input The input string to test
* @param int $inputformat The format of the input string
* @param string $expected The expected result of the format.
*/
public function test_format_feedback($input, $inputformat, $expected) {
$feedback = $this->getMockForAbstractClass(
\grade_export::class,
[],
'',
false
);
$this->assertEquals(
$expected,
$feedback->format_feedback((object) [
'feedback' => $input,
'feedbackformat' => $inputformat,
])
);
}
/**
* Ensure that feedback is correctly formatted. Test augmented functionality to handle file links
*/
public function test_format_feedback_with_grade() {
$this->resetAfterTest();
$dg = $this->getDataGenerator();
$c1 = $dg->create_course();
$u1 = $dg->create_user();
$gi1a = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1a->update_final_grade($u1->id, 1, 'test');
$contextid = $gi1a->get_context()->id;
$gradeid = $gi1a->id;
$tests = [
'Has server based image (HTML)' => [
'<p>See this reference: <img src="@@PLUGINFILE@@/test.img"></p>',
FORMAT_HTML,
"See this reference: "
],
'Has server based image and more (HTML)' => [
'<p>See <img src="@@PLUGINFILE@@/test.img"> for <em>reference</em></p>',
FORMAT_HTML,
"See for reference"
],
'Has server based video and more (HTML)' => [
'<p>See <video src="@@PLUGINFILE@@/test.img">video of a duck</video> for <em>reference</em></p>',
FORMAT_HTML,
'See video of a duck for reference'
],
'Has server based video with text and more (HTML)' => [
'<p>See <video src="@@PLUGINFILE@@/test.img">@@PLUGINFILE@@/test.img</video> for <em>reference</em></p>',
FORMAT_HTML,
"See https://www.example.com/moodle/pluginfile.php/$contextid/grade/feedback/$gradeid/test.img for reference"
],
'Multiple videos (HTML)' => [
'<p>See <video src="@@PLUGINFILE@@/test.img">video of a duck</video> and '.
'<video src="http://example.com/myimage.jpg">video of a cat</video> for <em>reference</em></p>',
FORMAT_HTML,
'See video of a duck and video of a cat for reference'
],
];
$feedback = $this->getMockForAbstractClass(
\grade_export::class,
[],
'',
false
);
foreach ($tests as $key => $testdetails) {
$expected = $testdetails[2];
$input = $testdetails[0];
$inputformat = $testdetails[1];
$this->assertEquals(
$expected,
$feedback->format_feedback((object) [
'feedback' => $input,
'feedbackformat' => $inputformat,
], $gi1a),
$key
);
}
}
/**
* Data provider for the format_feedback tests.
*
* @return array
*/
public function format_feedback_provider() : array {
return [
'Basic string (PLAIN)' => [
'This is an example string',
FORMAT_PLAIN,
'This is an example string',
],
'Basic string (HTML)' => [
'<p>This is an example string</p>',
FORMAT_HTML,
'This is an example string',
],
'Has image (HTML)' => [
'<p>See this reference: <img src="http://example.com/myimage.jpg"></p>',
FORMAT_HTML,
'See this reference: ',
],
'Has image and more (HTML)' => [
'<p>See <img src="http://example.com/myimage.jpg"> for <em>reference</em></p>',
FORMAT_HTML,
'See for reference',
],
'Has video and more (HTML)' => [
'<p>See <video src="http://example.com/myimage.jpg">video of a duck</video> for <em>reference</em></p>',
FORMAT_HTML,
'See video of a duck for reference',
],
'Multiple videos (HTML)' => [
'<p>See <video src="http://example.com/myimage.jpg">video of a duck</video> and '.
'<video src="http://example.com/myimage.jpg">video of a cat</video> for <em>reference</em></p>',
FORMAT_HTML,
'See video of a duck and video of a cat for reference'
],
'HTML Looking tags in PLAIN' => [
'The way you have written the <img thing looks pretty fun >',
FORMAT_PLAIN,
'The way you have written the &lt;img thing looks pretty fun &gt;',
],
];
}
}

0 comments on commit e15203d

Please sign in to comment.