mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-65925 assign: Grade page broken if submission was deleted.

Browse Source
This commit is contained in:
Ilya Tregubov 2019-06-17 15:37:32 +10:00
parent 8e9e9a5f7e
commit 64ce596f8c
2 changed files with 167 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mod/assign/feedback/editpdf/ajax.php
View File

@ -83,8 +83,11 @@ if ($action === 'pollconversions') {
if (in_array($response->status, $readystatuslist)) {
$combineddocument = document_services::get_combined_pdf_for_attempt($assignment, $userid, $attemptnumber);
$response->pagecount = $combineddocument->get_page_count();
} else if (in_array($response->status, $completestatuslist)) {
$response->status = $combineddocument->get_status();
$response->filecount = $combineddocument->get_document_count();
}
if (in_array($response->status, $completestatuslist)) {
$pages = document_services::get_page_images_for_attempt($assignment,
$userid,
$attemptnumber,

162
mod/assign/tests/feedback_test.php Normal file
View File

@ -0,0 +1,162 @@
<?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/>.
/**
* Assign feedback unit tests.
*
* @package mod_assign
* @category test
* @copyright 2019 Ilya Tregubov ilyatregubov@catalyst-au.net
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/mod/assign/locallib.php');
require_once($CFG->dirroot . '/mod/assign/tests/generator.php');
use \assignfeedback_editpdf\document_services;
use \assignfeedback_editpdf\combined_document;
/**
* Provides the unit tests for feedback.
*
* @package mod_assign
* @category test
* @copyright 2019 Ilya Tregubov ilyatregubov@catalyst-au.net
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_assign_feedback_testcase extends advanced_testcase {
// Use the generator helper.
use mod_assign_test_generator;
/**
* Helper to create a stored file object with the given supplied content.
*
* @param int $contextid context id for assigment
* @param int $itemid item id from assigment grade
* @param string $filearea File area
* @param int $timemodified Time modified
* @param string $filecontent The content of the mocked file
* @param string $filename The file name to use in the stored_file
* @param string $filerecord Any overrides to the filerecord
* @return stored_file
*/
protected function create_stored_file($contextid, $itemid, $filearea, $timemodified,
$filecontent = 'content', $filename = 'combined.pdf', $filerecord = []) {
$filerecord = array_merge([
'contextid' => $contextid,
'component' => 'assignfeedback_editpdf',
'filearea' => $filearea,
'itemid' => $itemid,
'filepath' => '/',
'filename' => $filename,
'timemodified' => $timemodified,
], $filerecord);
$fs = get_file_storage();
$file = $fs->create_file_from_string($filerecord, $filecontent);
return $file;
}
/**
* Convenience function to create an instance of an assignment.
*
* @param array $params Array of parameters to pass to the generator
* @return assign The assign class.
*/
protected function create_instance($params = array()) {
$generator = $this->getDataGenerator()->get_plugin_generator('mod_assign');
$instance = $generator->create_instance($params);
$cm = get_coursemodule_from_instance('assign', $instance->id);
$context = \context_module::instance($cm->id);
return new \assign($context, $cm, $params['course']);
}
/**
* Test fetching combined.pdf for state checking.
*/
public function test_get_combined_document_for_attempt() {
$this->resetAfterTest(true);
$course = $this->getDataGenerator()->create_course();
$user = $this->getDataGenerator()->create_user();
$this->getDataGenerator()->enrol_user($user->id, $course->id, 'student');
$teacher = $this->getDataGenerator()->create_user();
$this->getDataGenerator()->enrol_user($teacher->id, $course->id, 'editingteacher');
$assign = $this->create_instance([
'course' => $course,
'name' => 'Assign 1',
'attemptreopenmethod' => ASSIGN_ATTEMPT_REOPEN_METHOD_MANUAL,
'maxattempts' => 3,
'assignsubmission_onlinetext_enabled' => true,
'assignfeedback_comments_enabled' => true
]);
$submission = new \stdClass();
$submission->assignment = $assign->get_instance()->id;
$submission->userid = $user->id;
$submission->timecreated = time();
$submission->timemodified = time();
$submission->onlinetext_editor = ['text' => 'Submission text',
'format' => FORMAT_MOODLE];
$this->setUser($user);
$notices = [];
$assign->save_submission($submission, $notices);
$this->setUser($teacher);
$grade = '3.14';
$teachercommenttext = 'This is better. Thanks.';
$data = new \stdClass();
$data->attemptnumber = 1;
$data->grade = $grade;
$data->assignfeedbackcomments_editor = ['text' => $teachercommenttext, 'format' => FORMAT_MOODLE];
// Give the submission a grade.
$assign->save_grade($user->id, $data);
$grade = $assign->get_user_grade($user->id, true, -1);
$contextid = $assign->get_context()->id;
$itemid = $grade->id;
// Create combined document in combined area.
$this->create_stored_file($contextid, $itemid, 'combined', time());
$document = document_services::get_combined_document_for_attempt($assign, $user->id, -1);
$status = $document->get_status();
$this->assertEquals($status, combined_document::STATUS_COMPLETE);
// Create orphaned combined document in partial area.
$this->create_stored_file($contextid, $itemid, 'partial', time() - 3600);
$document = document_services::get_combined_document_for_attempt($assign, $user->id, -1);
$status = $document->get_status();
$this->assertEquals($status, combined_document::STATUS_FAILED);
}
}