L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-54873 assign: Fetch mapping id for blind marking grading

Browse Source 
This change modifies the grading table to pre-seed record ids where they
already exist.

Where they do not exist, they are still fetched.
This commit is contained in:
Andrew Nicols
2016-08-30 11:46:20 +08:00
parent 35d5053ba2
commit 4ed4be4988
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/gradingtable.php
+21 -5
View File
@@ -176,7 +176,15 @@ class assign_grading_table extends table_sql implements renderable {
$from .= 'LEFT JOIN {assign_user_flags} uf
ON u.id = uf.userid
AND uf.assignment = :assignmentid3';
AND uf.assignment = :assignmentid3 ';
if (!empty($this->assignment->get_instance()->blindmarking)) {
$from .= 'LEFT JOIN {assign_user_mapping} um
ON u.id = um.userid
AND um.assignment = :assignmentid4 ';
$params['assignmentid4'] = (int)$this->assignment->get_instance()->id;
$fields .= ', um.id as recordid ';
}
$userparams = array();
$userindex = 0;
@@ -463,8 +471,10 @@ class assign_grading_table extends table_sql implements renderable {
* @return string
*/
public function col_recordid(stdClass $row) {
return get_string('hiddenuser', 'assign') .
$this->assignment->get_uniqueid_for_user($row->userid);
if (empty($row->recordid)) {
$row->recordid = $this->assignment->get_uniqueid_for_user($row->userid);
}
return get_string('hiddenuser', 'assign') . $row->recordid;
}
@@ -838,7 +848,10 @@ class assign_grading_table extends table_sql implements renderable {
'action' => 'grader');
if ($this->assignment->is_blind_marking()) {
$urlparams['blindid'] = $this->assignment->get_uniqueid_for_user($row->userid);
if (empty($row->recordid)) {
$row->recordid = $this->assignment->get_uniqueid_for_user($row->userid);
}
$urlparams['blindid'] = $row->recordid;
} else {
$urlparams['userid'] = $row->userid;
}
@@ -1015,7 +1028,10 @@ class assign_grading_table extends table_sql implements renderable {
'action' => 'grader');
if ($this->assignment->is_blind_marking()) {
$urlparams['blindid'] = $this->assignment->get_uniqueid_for_user($row->userid);
if (empty($row->recordid)) {
$row->recordid = $this->assignment->get_uniqueid_for_user($row->userid);
}
$urlparams['blindid'] = $row->recordid;
} else {
$urlparams['userid'] = $row->userid;
}
mod/assign/locallib.php
+5 -1
View File
@@ -3921,7 +3921,11 @@ class assign {
public function fullname($user) {
if ($this->is_blind_marking()) {
$hasviewblind = has_capability('mod/assign:viewblinddetails', $this->get_context());
$uniqueid = $this->get_uniqueid_for_user($user->id);
if (empty($user->recordid)) {
$uniqueid = $this->get_uniqueid_for_user($user->id);
} else {
$uniqueid = $user->recordid;
}
if ($hasviewblind) {
return get_string('participant', 'assign') . ' ' . $uniqueid . ' (' . fullname($user) . ')';
} else {