Skip to content

Commit

Permalink
MDL-41101 mod_assign: replaced 'view submission grading table' add_to…
Browse files Browse the repository at this point in the history
…_log call with an event
  • Loading branch information
mdjnelson authored and Petr Skoda committed Apr 17, 2014
1 parent 1045b6e commit 7eda466
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 2 deletions.
76 changes: 76 additions & 0 deletions mod/assign/classes/event/grading_table_viewed.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?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/>.

/**
* The mod_assign grading table viewed event.
*
* @property-read array $other {
* Extra information about event.
*
* - int assignid: the id of the assignment.
* }
*
* @package mod_assign
* @since Moodle 2.7
* @copyright 2014 Mark Nelson <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

namespace mod_assign\event;

defined('MOODLE_INTERNAL') || die();

class grading_table_viewed extends base {

/**
* Init method.
*/
protected function init() {
$this->data['crud'] = 'r';
$this->data['edulevel'] = self::LEVEL_TEACHING;
}

/**
* Returns localised general event name.
*
* @return string
*/
public static function get_name() {
return get_string('eventgradingtableviewed', 'mod_assign');
}

/**
* Returns description of what happened.
*
* @return string
*/
public function get_description() {
return "The user with the id {$this->userid} viewed the grading table for the assignment with the id {$this->other['assignid']}.";
}

/**
* Custom validation.
*
* @throws \coding_exception
*/
protected function validate_data() {
parent::validate_data();

if (!isset($this->other['assignid'])) {
throw new \coding_exception('The \'assignid\' must be set in other.');
}
}
}
1 change: 1 addition & 0 deletions mod/assign/lang/en/assign.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
$string['eventextensiongranted'] = 'An extension has been granted.';
$string['eventfeedbackviewed'] = 'Feedback viewed';
$string['eventgradingformviewed'] = 'Grading form viewed';
$string['eventgradingtableviewed'] = 'Grading table viewed';
$string['eventidentitiesrevealed'] = 'The identities have been revealed.';
$string['eventmarkerupdated'] = 'The allocated marker has been updated.';
$string['eventstatementaccepted'] = 'The user has accepted the statement of the submission.';
Expand Down
12 changes: 10 additions & 2 deletions mod/assign/locallib.php
Original file line number Diff line number Diff line change
Expand Up @@ -3214,8 +3214,16 @@ protected function view_grading_page() {

$o .= $this->view_footer();

$logmessage = get_string('viewsubmissiongradingtable', 'assign');
$this->add_to_log('view submission grading table', $logmessage);
$logmessage = new lang_string('viewsubmissiongradingtable', 'assign');
$event = \mod_assign\event\grading_table_viewed::create(array(
'context' => $this->get_context(),
'other' => array(
'assignid' => $this->get_instance()->id
)
));
$event->set_legacy_logdata('view submission grading table', $logmessage);
$event->trigger();

return $o;
}

Expand Down
39 changes: 39 additions & 0 deletions mod/assign/tests/events_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -602,4 +602,43 @@ public function test_grading_form_viewed() {
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}

/**
* Test the grading_table_viewed event.
*/
public function test_grading_table_viewed() {
global $PAGE;

$this->setUser($this->editingteachers[0]);

$assign = $this->create_instance();

// We need to set the URL in order to view the feedback.
$PAGE->set_url('/a_url');
// A hack - this variable is used by the view_single_grade_page function.
global $_POST;
$_POST['rownum'] = 1;
$_POST['userid'] = $this->students[0]->id;

// Trigger and capture the event.
$sink = $this->redirectEvents();
$assign->view('grading');
$events = $sink->get_events();
$this->assertCount(1, $events);
$event = reset($events);

// Check that the event contains the expected values.
$this->assertInstanceOf('\mod_assign\event\grading_table_viewed', $event);
$this->assertEquals($assign->get_context(), $event->get_context());
$expected = array(
$assign->get_course()->id,
'assign',
'view submission grading table',
'view.php?id=' . $assign->get_course_module()->id,
get_string('viewsubmissiongradingtable', 'assign'),
$assign->get_course_module()->id
);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

0 comments on commit 7eda466

Please sign in to comment.