Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-45837_master' of git://github.com/markn86/moodle
  • Loading branch information
David Monllao committed Feb 13, 2018
2 parents 5ac4e27 + e960152 commit 4b14068
Show file tree
Hide file tree
Showing 12 changed files with 898 additions and 4 deletions.
26 changes: 25 additions & 1 deletion grade/edit/letter/index.php
View file
Expand Up @@ -184,21 +184,45 @@
// The letter has been assigned to another boundary, we update it.
$record->id = $pool[$boundary]->id;
$DB->update_record('grade_letters', $record);
// Trigger the letter grade updated event.
$event = \core\event\grade_letter_updated::create(array(
'objectid' => $record->id,
'context' => $context,
));
$event->trigger();
}
unset($pool[$boundary]); // Remove the letter from the pool.
} else if ($candidate = array_pop($pool)) {
// The boundary is new, we update a random record from the pool.
$record->id = $candidate->id;
$DB->update_record('grade_letters', $record);
// Trigger the letter grade updated event.
$event = \core\event\grade_letter_updated::create(array(
'objectid' => $record->id,
'context' => $context,
));
$event->trigger();
} else {
// No records were found, this must be a new letter.
$DB->insert_record('grade_letters', $record);
$newid = $DB->insert_record('grade_letters', $record);
// Trigger the letter grade added event.
$event = \core\event\grade_letter_created::create(array(
'objectid' => $newid,
'context' => $context,
));
$event->trigger();
}
}

// Delete the unused records.
foreach($pool as $leftover) {
$DB->delete_records('grade_letters', array('id' => $leftover->id));
// Trigger the letter grade deleted event.
$event = \core\event\grade_letter_deleted::create(array(
'objectid' => $leftover->id,
'context' => $context,
));
$event->trigger();
}

redirect($returnurl);
Expand Down
37 changes: 37 additions & 0 deletions grade/tests/behat/grade_letter_logging.feature
View file
@@ -0,0 +1,37 @@
@core @core_grades
Feature: We can view the logs for any changes to grade letters.
In order to view changes the letter boundary of a course
As an administrator
I need to add make changes and then view the logs.

Scenario: I override the letter boundaries and check the logs.
Given the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And I log in as "admin"
And I am on "Course 1" course homepage
And I navigate to "Setup > Course grade settings" in the course gradebook
And I set the following fields to these values:
| Grade display type | Letter |
And I press "Save changes"
And I navigate to "Letters" in the course gradebook
And I follow "Edit grade letters"
And I set the following fields to these values:
| id_override | 1 |
| id_gradeboundary10 | 57 |
And I press "Save changes"
And I follow "Edit grade letters"
And I set the following fields to these values:
| id_override | 1 |
| id_gradeboundary10 | 50 |
And I press "Save changes"
And I follow "Edit grade letters"
And I set the following fields to these values:
| id_override | 1 |
| id_gradeletter11 | |
| id_gradeboundary11 | |
And I press "Save changes"
When I navigate to "Live logs" node in "Site administration > Reports"
Then I should see "Grade letter created"
And I should see "Grade letter updated"
And I should see "Grade letter deleted"
27 changes: 27 additions & 0 deletions grade/tests/behat/grade_scales_logging.feature
View file
@@ -0,0 +1,27 @@
@core @core_grades
Feature: We can view the logs for any changes to grade scales.
In order to view changes grade scales
As an administrator
I need to add make changes and then view the logs.

Scenario: I edit scales and then view the logs.
Given I log in as "admin"
And I navigate to "Scales" node in "Site administration > Grades"
# Add a scale
And I press "Add a new scale"
And I set the following fields to these values:
| Name | Letterscale |
| Scale | F,D,C,B,A |
And I press "Save changes"
# Delete first scale
And I follow "Delete"
And I press "Continue"
# Edit first scale
And I follow "Edit"
And I set the following fields to these values:
| id_scale | ONE,TWO,THREE |
And I press "Save changes"
When I navigate to "Live logs" node in "Site administration > Reports"
Then I should see "Scale created"
And I should see "Scale updated"
And I should see "Scale deleted"
204 changes: 204 additions & 0 deletions grade/tests/events_test.php
View file
@@ -0,0 +1,204 @@
<?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 events found in /grade/letter and /grade/scale.
*
* @package core_grades
* @category test
* @copyright 2017 Stephen Bourget
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
*/

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

global $CFG;
require_once($CFG->dirroot . '/grade/lib.php');

/**
* Unit tests for grade events.
*
* @package core_grades
* @category test
* @copyright 2017 Stephen Bourget
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_grade_events_test extends advanced_testcase {

/** @var stdClass the course used for testing */
private $course;

/**
* Test set up.
*
* This is executed before running any test in this file.
*/
public function setUp() {
$this->resetAfterTest();

$this->setAdminUser();
$this->course = $this->getDataGenerator()->create_course();
}

/**
* Test the grade letter created event.
*
* There is no external API for triggering this event, so the unit test will simply
* create and trigger the event and ensure the data is returned as expected.
*/
public function test_grade_letter_created() {
// Create a grade letter created event.
$event = \core\event\grade_letter_created::create(array(
'objectid' => 10,
'context' => context_course::instance($this->course->id)
));

// Trigger and capture the event.
$sink = $this->redirectEvents();
$event->trigger();
$events = $sink->get_events();
$event = reset($events);

// Check that the event data is valid.
$this->assertInstanceOf('\core\event\grade_letter_created', $event);
$this->assertEquals(context_course::instance($this->course->id), $event->get_context());
}

/**
* Test the grade letter deleted event.
*
* There is no external API for triggering this event, so the unit test will simply
* create and trigger the event and ensure the data is returned as expected.
*/
public function test_grade_letter_deleted() {
// Create a grade letter deleted event.
$event = \core\event\grade_letter_deleted::create(array(
'objectid' => 10,
'context' => context_course::instance($this->course->id)
));

// Trigger and capture the event.
$sink = $this->redirectEvents();
$event->trigger();
$events = $sink->get_events();
$event = reset($events);

// Check that the event data is valid.
$this->assertInstanceOf('\core\event\grade_letter_deleted', $event);
$this->assertEquals(context_course::instance($this->course->id), $event->get_context());
}

/**
* Test the grade letter updated event.
*
* There is no external API for triggering this event, so the unit test will simply
* create and trigger the event and ensure the data is returned as expected.
*/
public function test_grade_letter_updated() {
// Create a grade letter updated event.
$event = \core\event\grade_letter_updated::create(array(
'objectid' => 10,
'context' => context_course::instance($this->course->id)
));

// Trigger and capture the event.
$sink = $this->redirectEvents();
$event->trigger();
$events = $sink->get_events();
$event = reset($events);

// Check that the event data is valid.
$this->assertInstanceOf('\core\event\grade_letter_updated', $event);
$this->assertEquals(context_course::instance($this->course->id), $event->get_context());
}

/**
* Test the scale created event.
*/
public function test_scale_created() {
$gradescale = new grade_scale();
$gradescale->name = 'unittestscale3';
$gradescale->courseid = $this->course->id;
$gradescale->userid = 317;
$gradescale->scale = 'Distinction, Very Good, Good, Pass, Fail';
$gradescale->description = 'This scale is used to mark standard assignments.';

$url = new \moodle_url('/grade/edit/scale/index.php', array('id' => $this->course->id));

// Trigger and capture the event.
$sink = $this->redirectEvents();
$id = $gradescale->insert();
$events = $sink->get_events();
$event = reset($events);

// Check that the event data is valid.
$this->assertInstanceOf('\core\event\scale_created', $event);
$this->assertEquals($id, $event->objectid);
$this->assertEquals($url, $event->get_url());
$this->assertEquals(context_course::instance($this->course->id), $event->get_context());
}

/**
* Test the scale deleted event.
*/
public function test_scale_deleted() {
$gradescale = new grade_scale();
$gradescale->name = 'unittestscale3';
$gradescale->courseid = $this->course->id;
$gradescale->userid = 317;
$gradescale->scale = 'Distinction, Very Good, Good, Pass, Fail';
$gradescale->description = 'This scale is used to mark standard assignments.';
$gradescale->insert();

// Trigger and capture the event.
$sink = $this->redirectEvents();
$gradescale->delete();
$events = $sink->get_events();
$event = reset($events);

// Check that the event data is valid.
$this->assertInstanceOf('\core\event\scale_deleted', $event);
$this->assertEquals(context_course::instance($this->course->id), $event->get_context());
}

/**
* Test the scale updated event.
*/
public function test_scale_updated() {
$gradescale = new grade_scale();
$gradescale->name = 'unittestscale3';
$gradescale->courseid = $this->course->id;
$gradescale->userid = 317;
$gradescale->scale = 'Distinction, Very Good, Good, Pass, Fail';
$gradescale->description = 'This scale is used to mark standard assignments.';
$id = $gradescale->insert();

$gradescale->name = 'Updated info for this unittest grade_scale';
$url = new \moodle_url('/grade/edit/scale/index.php', array('id' => $this->course->id));

// Trigger and capture the event.
$sink = $this->redirectEvents();
$gradescale->update();
$events = $sink->get_events();
$event = reset($events);

// Check that the event data is valid.
$this->assertInstanceOf('\core\event\scale_updated', $event);
$this->assertEquals($id, $event->objectid);
$this->assertEquals($url, $event->get_url());
$this->assertEquals(context_course::instance($this->course->id), $event->get_context());
}
}
6 changes: 6 additions & 0 deletions lang/en/grades.php
View file
Expand Up @@ -194,7 +194,13 @@
$string['errorupdatinggradecategoryaggregation'] = 'Error updating the aggregation type of grade category ID {$a->id}';
$string['errorupdatinggradeitemaggregationcoef'] = 'Error updating the aggregation coefficient (weight or extra credit) of grade item ID {$a->id}';
$string['eventgradedeleted'] = 'Grade deleted';
$string['eventgradelettercreated'] = 'Grade letter created';
$string['eventgradeletterdeleted'] = 'Grade letter deleted';
$string['eventgradeletterupdated'] = 'Grade letter updated';
$string['eventgradeviewed'] = 'Grades were viewed in the gradebook';
$string['eventscalecreated'] = 'Scale created';
$string['eventscaledeleted'] = 'Scale deleted';
$string['eventscaleupdated'] = 'Scale updated';
$string['eventusergraded'] = 'User graded';
$string['excluded'] = 'Excluded';
$string['excluded_help'] = 'If ticked, the grade will not be included in any aggregation.';
Expand Down

0 comments on commit 4b14068

Please sign in to comment.