mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 08:55:15 +02:00
Code Issues Projects Releases Wiki Activity

MDL-54872 assign: Order blindly marked assignments more blindly

Browse Source
This commit is contained in:
Andrew Nicols 2016-06-09 08:53:46 +08:00
parent 0344082208
commit eb4c466162
5 changed files with 198 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mod/assign/gradingtable.php
View File

@ -1420,7 +1420,17 @@ class assign_grading_table extends table_sql implements renderable {
*/
public function get_sort_columns() {
$result = parent::get_sort_columns();
$result = array_merge($result, array('userid' => SORT_ASC));
$assignment = $this->assignment->get_instance();
if (empty($assignment->blindmarking)) {
$result = array_merge($result, array('userid' => SORT_ASC));
} else {
$result = array_merge($result, [
'COALESCE(s.timecreated, ' . time() . ')' => SORT_ASC,
'COALESCE(s.id, ' . PHP_INT_MAX . ')' => SORT_ASC,
'um.id' => SORT_ASC,
]);
}
return $result;
}

40
mod/assign/locallib.php
View File

@ -1564,6 +1564,7 @@ class assign {
* @return array List of user records
*/
public function list_participants($currentgroup, $idsonly) {
global $DB;
if (empty($currentgroup)) {
$currentgroup = 0;
@ -1571,13 +1572,42 @@ class assign {
$key = $this->context->id . '-' . $currentgroup . '-' . $this->show_only_active_users();
if (!isset($this->participants[$key])) {
$order = 'u.lastname, u.firstname, u.id';
if ($this->is_blind_marking()) {
$order = 'u.id';
}
$users = get_enrolled_users($this->context, 'mod/assign:submit', $currentgroup, 'u.*', $order, null, null,
list($esql, $params) = get_enrolled_sql($this->context, 'mod/assign:submit', $currentgroup,
$this->show_only_active_users());
$fields = 'u.*';
$orderby = 'u.lastname, u.firstname, u.id';
$additionaljoins = '';
$instance = $this->get_instance();
if (!empty($instance->blindmarking)) {
$additionaljoins .= " LEFT JOIN {assign_user_mapping} um
ON u.id = um.userid
AND um.assignment = :assignmentid1
LEFT JOIN {assign_submission} s
ON u.id = s.userid
AND s.assignment = :assignmentid2
AND s.latest = 1
";
$params['assignmentid1'] = (int) $instance->id;
$params['assignmentid2'] = (int) $instance->id;
$fields .= ', um.id as recordid ';
// Sort by submission time first, then by um.id to sort reliably by the blind marking id.
// Note, different DBs have different ordering of NULL values.
// Therefore we coalesce the current time into the timecreated field, and the max possible integer into
// the ID field.
$orderby = "COALESCE(s.timecreated, " . time() . ") ASC, COALESCE(s.id, " . PHP_INT_MAX . ") ASC, um.id ASC";
}
$sql = "SELECT $fields
FROM {user} u
JOIN ($esql) je ON je.id = u.id
$additionaljoins
WHERE u.deleted = 0
ORDER BY $orderby";
$users = $DB->get_records_sql($sql, $params);
$cm = $this->get_course_module();
$info = new \core_availability\info_module($cm);
$users = $info->filter_user_list($users);

4
mod/assign/tests/base_test.php
View File

@ -205,7 +205,9 @@ class mod_assign_base_testcase extends advanced_testcase {
*/
protected function create_instance($params=array()) {
$generator = $this->getDataGenerator()->get_plugin_generator('mod_assign');
$params['course'] = $this->course->id;
if (!isset($params['course'])) {
$params['course'] = $this->course->id;
}
$instance = $generator->create_instance($params);
$cm = get_coursemodule_from_instance('assign', $instance->id);
$context = context_module::instance($cm->id);

136
mod/assign/tests/locallib_participants_test.php Normal file
View File

@ -0,0 +1,136 @@
<?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/locallib.php.
*
* @package mod_assign
* @category phpunit
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once(__DIR__ . '/../locallib.php');
class mod_assign_locallib_participants extends advanced_testcase {
public function test_list_participants_blind_marking() {
global $DB;
$this->resetAfterTest(true);
$course = $this->getDataGenerator()->create_course();
$roles = $DB->get_records('role', null, '', 'shortname, id');
$teacher = $this->getDataGenerator()->create_user();
$this->getDataGenerator()->enrol_user($teacher->id,
$course->id,
$roles['teacher']->id);
$this->setUser($teacher);
// Enrol two students.
$students = [];
for ($i = 0; $i < 2; $i++) {
$student = $this->getDataGenerator()->create_user();
$this->getDataGenerator()->enrol_user($student->id,
$course->id,
$roles['student']->id);
$students[$student->id] = $student;
}
$generator = $this->getDataGenerator()->get_plugin_generator('mod_assign');
$instance = $generator->create_instance(['course' => $course->id, 'blindmarking' => 1]);
$cm = get_coursemodule_from_instance('assign', $instance->id);
$context = context_module::instance($cm->id);
$assign = new assign($context, $cm, $course);
$participants = $assign->list_participants(null, false);
// There should be exactly two participants and they should be the students.
$this->assertCount(2, $participants);
foreach ($participants as $participant) {
$this->assertArrayHasKey($participant->id, $students);
}
$keys = array_keys($participants);
// Create a grading table, and query the DB This should have the same order.
$table = new assign_grading_table($assign, 10, '', 0, false);
$table->setup();
$table->query_db(10);
$this->assertEquals($keys, array_keys($table->rawdata));
// Submit a file for the second student.
$data = new stdClass();
$data->onlinetext_editor = array('itemid'=>file_get_unused_draft_itemid(),
'text'=>'Submission text',
'format'=>FORMAT_MOODLE);
static::helper_add_submission($assign, $participants[$keys[1]], $data, 'onlinetext');
// Assign has a private cache. The easiest way to clear this is to create a new instance.
$assign = new assign($context, $cm, $course);
$newparticipants = $assign->list_participants(null, false);
// There should be exactly two participants and they should be the students.
$this->assertCount(2, $newparticipants);
foreach ($newparticipants as $participant) {
$this->assertArrayHasKey($participant->id, $students);
}
$newkeys = array_keys($newparticipants);
// The user who submitted first should now be listed first.
$this->assertEquals($participants[$keys[1]]->id, $newparticipants[$newkeys[0]]->id);
$this->assertEquals($participants[$keys[0]]->id, $newparticipants[$newkeys[1]]->id);
// Submit for the other student.
static::helper_add_submission($assign, $participants[$keys[0]], $data, 'onlinetext');
$assign = new assign($context, $cm, $course);
$newparticipants = $assign->list_participants(null, false);
// The users should still be listed in order of the first submission
$this->assertEquals($participants[$keys[1]]->id, $newparticipants[$newkeys[0]]->id);
$this->assertEquals($participants[$keys[0]]->id, $newparticipants[$newkeys[1]]->id);
// The updated grading table should have the same order as the updated participant list.
$table->query_db(10);
$this->assertEquals($newkeys, array_keys($table->rawdata));
}
public function helper_add_submission($assign, $user, $data, $type) {
global $USER;
$previoususer = $USER;
$this->setUser($user);
$submission = $assign->get_user_submission($user->id, true);
$submission->status = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
$rc = new ReflectionClass('assign');
$rcm = $rc->getMethod('update_submission');
$rcm->setAccessible(true);
$rcm->invokeArgs($assign, [$submission, $user->id, true, false]);
$plugin = $assign->get_submission_plugin_by_type($type);
$plugin->save($submission, $data);
$this->setUser($previoususer);
}
}

21
mod/assign/tests/locallib_test.php
View File

@ -2482,26 +2482,31 @@ Anchor link 2:<a title=\"bananas\" href=\"../logo-240x60.gif\">Link text</a>
* Test if the view blind details capability works
*/
public function test_can_view_blind_details() {
global $PAGE, $DB;
$teacherrole = $DB->get_record('role', array('shortname' => 'teacher'));
$managerrole = $DB->get_record('role', array('shortname' => 'manager'));
global $DB;
// Note: The shared setUp leads to terrible tests. Please don't use it.
$roles = $DB->get_records('role', null, '', 'shortname, id');
$course = $this->getDataGenerator()->create_course([]);
$student = $this->students[0];// Get a student user.
$this->getDataGenerator()->enrol_user($student->id,
$course->id,
$roles['student']->id);
// Create a teacher. Shouldn't be able to view blind marking ID.
$teacher = $this->getDataGenerator()->create_user();
$this->getDataGenerator()->enrol_user($teacher->id,
$this->course->id,
$teacherrole->id);
$course->id,
$roles['teacher']->id);
// Create a manager.. Should be able to view blind marking ID.
$manager = $this->getDataGenerator()->create_user();
$this->getDataGenerator()->enrol_user($manager->id,
$this->course->id,
$managerrole->id);
$course->id,
$roles['manager']->id);
// Generate blind marking assignment.
$assign = $this->create_instance(array('blindmarking' => 1));
$assign = $this->create_instance(array('course' => $course->id, 'blindmarking' => 1));
$this->assertEquals(true, $assign->is_blind_marking());
// Test student names are hidden to teacher.