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

Merge branch 'mdl46322-master' of https://github.com/AndresMelo/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2017-06-12 10:23:52 +01:00
commit dd4208e6ec
3 changed files with 160 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/assign/gradingtable.php
View File

@ -647,7 +647,8 @@ class assign_grading_table extends table_sql implements renderable {
static $markerlist = array();
if ($markers === null) {
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->assignment->get_context(), 'mod/assign:grade', '', $sort);
// Only enrolled users could be assigned as potential markers.
$markers = get_enrolled_users($this->assignment->get_context(), 'mod/assign:grade', 0, 'u.*', $sort);
$markerlist[0] = get_string('choosemarker', 'assign');
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->assignment->get_context());
foreach ($markers as $marker) {

15
mod/assign/locallib.php
View File

@ -4018,7 +4018,8 @@ class assign {
$markingallocationoptions = array();
if ($markingallocation) {
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->context, 'mod/assign:grade', '', $sort);
// Only enrolled users could be assigned as potential markers.
$markers = get_enrolled_users($this->context, 'mod/assign:grade', 0, 'u.*', $sort);
$markingallocationoptions[''] = get_string('filternone', 'assign');
$markingallocationoptions[ASSIGN_MARKER_FILTER_NO_MARKER] = get_string('markerfilternomarker', 'assign');
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->context);
@ -4645,7 +4646,8 @@ class assign {
);
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->get_context(), 'mod/assign:grade', '', $sort);
// Only enrolled users could be assigned as potential markers.
$markers = get_enrolled_users($this->get_context(), 'mod/assign:grade', 0, 'u.*', $sort);
$markerlist = array();
foreach ($markers as $marker) {
$markerlist[$marker->id] = fullname($marker);
@ -6533,7 +6535,8 @@ class assign {
$markingallocationoptions[''] = get_string('filternone', 'assign');
$markingallocationoptions[ASSIGN_MARKER_FILTER_NO_MARKER] = get_string('markerfilternomarker', 'assign');
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->context, 'mod/assign:grade', '', $sort);
// Only enrolled users could be assigned as potential markers.
$markers = get_enrolled_users($this->context, 'mod/assign:grade', 0, 'u.*', $sort);
foreach ($markers as $marker) {
$markingallocationoptions[$marker->id] = fullname($marker);
}
@ -7168,7 +7171,8 @@ class assign {
has_capability('mod/assign:manageallocations', $this->context)) {
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->context, 'mod/assign:grade', '', $sort);
// Only enrolled users could be assigned as potential markers.
$markers = get_enrolled_users($this->context, 'mod/assign:grade', 0, 'u.*', $sort);
$markerlist = array('' => get_string('choosemarker', 'assign'));
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->context);
foreach ($markers as $marker) {
@ -7588,7 +7592,8 @@ class assign {
);
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->get_context(), 'mod/assign:grade', '', $sort);
// Only enrolled users could be assigned as potential markers.
$markers = get_enrolled_users($this->get_context(), 'mod/assign:grade', 0, 'u.*', $sort);
$markerlist = array();
foreach ($markers as $marker) {
$markerlist[$marker->id] = fullname($marker);

148
mod/assign/tests/markerallocation_test.php Normal file
View File

@ -0,0 +1,148 @@
<?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 (some of) mod/assign/markerallocaion_test.php.
*
* @package mod_assign
* @category test
* @copyright 2017 Andrés Melo <andres.torres@blackboard.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/lib/accesslib.php');
require_once($CFG->dirroot . '/course/lib.php');
/**
* This class tests some of marker allocation functionality.
*
* @package mod_assign
* @copyright 2017 Andrés Melo <andres.torres@blackboard.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_assign_markerallocation_testcase extends advanced_testcase {
/**
* Create all the needed elements to test the difference between both functions.
*/
public function test_markerusers() {
$this->resetAfterTest();
global $DB;
// Create a course, by default it is created with 5 sections.
$this->course = $this->getDataGenerator()->create_course();
// Setting assing module, markingworkflow and markingallocation set to 1 to enable marker allocation.
$record = new stdClass();
$record->course = $this->course;
$modulesettings = array(
'alwaysshowdescription' => 1,
'submissiondrafts' => 1,
'requiresubmissionstatement' => 0,
'sendnotifications' => 0,
'sendstudentnotifications' => 1,
'sendlatenotifications' => 0,
'duedate' => 0,
'allowsubmissionsfromdate' => 0,
'grade' => 100,
'cutoffdate' => 0,
'teamsubmission' => 0,
'requireallteammemberssubmit' => 0,
'teamsubmissiongroupingid' => 0,
'blindmarking' => 0,
'attemptreopenmethod' => 'none',
'maxattempts' => -1,
'markingworkflow' => 1,
'markingallocation' => 1,
);
$assignelement = $this->getDataGenerator()->create_module('assign', $record, $modulesettings);
$coursesectionid = course_add_cm_to_section($this->course->id, $assignelement->id, 1);
// Adding users to the course.
$userdata = array();
$userdata['firstname'] = 'teacher1';
$userdata['lasttname'] = 'lastname_teacher1';
$user1 = $this->getDataGenerator()->create_user($userdata);
$this->getDataGenerator()->enrol_user($user1->id, $this->course->id, 'teacher');
$userdata = array();
$userdata['firstname'] = 'teacher2';
$userdata['lasttname'] = 'lastname_teacher2';
$user2 = $this->getDataGenerator()->create_user($userdata);
$this->getDataGenerator()->enrol_user($user2->id, $this->course->id, 'teacher');
$userdata = array();
$userdata['firstname'] = 'student';
$userdata['lasttname'] = 'lastname_student';
$user3 = $this->getDataGenerator()->create_user($userdata);
$this->getDataGenerator()->enrol_user($user3->id, $this->course->id, 'student');
// Adding manager to the system.
$userdata = array();
$userdata['firstname'] = 'Manager';
$userdata['lasttname'] = 'lastname_Manager';
$user4 = $this->getDataGenerator()->create_user($userdata);
// Getting id of manager role.
$managerrole = $DB->get_record('role', array('shortname' => 'manager'));
if (!empty($managerrole)) {
// By default the context of the system is assigned.
$idassignment = $this->getDataGenerator()->role_assign($managerrole->id, $user4->id);
}
$oldusers = array($user1, $user2, $user4);
$newusers = array($user1, $user2);
list($sort, $params) = users_order_by_sql();
// Old code, it must return 3 users: teacher1, teacher2 and Manger.
$oldmarkers = get_users_by_capability(context_course::instance($this->course->id), 'mod/assign:grade', '', $sort);
// New code, it must return 2 users: teacher1 and teacher2.
$newmarkers = get_enrolled_users(context_course::instance($this->course->id), 'mod/assign:grade', 0, 'u.*', $sort);
// Test result quantity.
$this->assertEquals(count($oldusers), count($oldmarkers));
$this->assertEquals(count($newusers), count($newmarkers));
$this->assertEquals(count($oldmarkers) > count($newmarkers), true);
// Elements expected with new code.
foreach ($newmarkers as $key => $nm) {
$this->assertEquals($nm, $newusers[array_search($nm, $newusers)]);
}
// Elements expected with old code.
foreach ($oldusers as $key => $os) {
$this->assertEquals($os->id, $oldmarkers[$os->id]->id);
unset($oldmarkers[$os->id]);
}
$this->assertEquals(count($oldmarkers), 0);
}
}