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

MDL-13454 user iterator fixed; merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
skodak 2008-02-17 14:49:40 +00:00
parent e13f9c1008
commit 345674caa0
2 changed files with 63 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
grade/lib.php
View File

@ -95,29 +95,41 @@ class graded_users_iterator {
$groupwheresql = "";
}
$users_sql = "SELECT u.*
if (empty($this->sortfield1)) {
// we must do some sorting even if not specified
$ofields = ", u.id AS usrt";
$order = "usrt ASC";
} else {
$ofields = ", u.$this->sortfield1 AS usrt1";
$order = "usrt1 $this->sortorder1";
if (!empty($this->sortfield2)) {
$ofields .= ", u.$this->sortfield1 AS usrt2";
$order .= ", usrt2 $this->sortorder2";
}
if ($this->sortfield1 != 'id' and $this->sortfield2 != 'id') {
// user order MUST be the same in both queries, must include the only unique user->id if not already present
$ofields .= ", u.id AS usrt";
$order .= ", usrt ASC";
}
}
$users_sql = "SELECT u.* $ofields
FROM {$CFG->prefix}user u
INNER JOIN {$CFG->prefix}role_assignments ra ON u.id = ra.userid
$groupsql
WHERE ra.roleid $gradebookroles
AND ra.contextid $relatedcontexts
$groupwheresql";
$groupwheresql
ORDER BY $order";
// If only sortfield2 is given, it will be ignored
if (!empty($this->sortfield1)) {
$users_sql .= "ORDER BY u.$this->sortfield1 $this->sortorder1";
if (!empty($this->sortfield2)) {
$users_sql .= ", $this->sortfield2 $this->sortorder2";
}
}
$this->users_rs = get_recordset_sql($users_sql);
$this->users_rs = get_recordset_sql($users_sql);
if (!empty($this->grade_items)) {
$itemids = array_keys($this->grade_items);
$itemids = implode(',', $itemids);
$grades_sql = "SELECT g.*
$grades_sql = "SELECT g.* $ofields
FROM {$CFG->prefix}grade_grades g
INNER JOIN {$CFG->prefix}user u ON g.userid = u.id
INNER JOIN {$CFG->prefix}role_assignments ra ON u.id = ra.userid
@ -126,9 +138,12 @@ class graded_users_iterator {
AND ra.contextid $relatedcontexts
AND g.itemid IN ($itemids)
$groupwheresql
ORDER BY g.userid ASC, g.itemid ASC";
ORDER BY $order, g.itemid ASC";
$this->grades_rs = get_recordset_sql($grades_sql);
} else {
$this->grades_rs = false;
}
return true;
}
@ -142,22 +157,22 @@ class graded_users_iterator {
}
if (!$user = rs_fetch_next_record($this->users_rs)) {
if ($current = $this->_pop()) {
// this is not good - user or grades updated between the two reads above :-(
}
return false; // no more users
}
//find the first grade of this user
// find grades of this user
$grade_records = array();
while (true) {
if (!$current = $this->_pop()) {
break; // no more grades
}
if ($current->userid < $user->id) {
// this should not happen, could be caused by concurrent updates - skip this record
continue;
} else if ($current->userid > $user->id) {
// this user does not have any more grades
if ($current->userid != $user->id) {
// grade of the next user, we have all for this user
$this->_push($current);
break;
}
@ -169,20 +184,20 @@ class graded_users_iterator {
$feedbacks = array();
if (!empty($this->grade_items)) {
foreach ($this->grade_items as $grade_item) {
if (array_key_exists($grade_item->id, $grade_records)) {
$feedbacks[$grade_item->id]->feedback = $grade_records[$grade_item->id]->feedback;
$feedbacks[$grade_item->id]->feedbackformat = $grade_records[$grade_item->id]->feedbackformat;
unset($grade_records[$grade_item->id]->feedback);
unset($grade_records[$grade_item->id]->feedbackformat);
$grades[$grade_item->id] = new grade_grade($grade_records[$grade_item->id], false);
} else {
$feedbacks[$grade_item->id]->feedback = '';
$feedbacks[$grade_item->id]->feedbackformat = FORMAT_MOODLE;
$grades[$grade_item->id] = new grade_grade(array('userid'=>$user->id, 'itemid'=>$grade_item->id), false);
foreach ($this->grade_items as $grade_item) {
if (array_key_exists($grade_item->id, $grade_records)) {
$feedbacks[$grade_item->id]->feedback = $grade_records[$grade_item->id]->feedback;
$feedbacks[$grade_item->id]->feedbackformat = $grade_records[$grade_item->id]->feedbackformat;
unset($grade_records[$grade_item->id]->feedback);
unset($grade_records[$grade_item->id]->feedbackformat);
$grades[$grade_item->id] = new grade_grade($grade_records[$grade_item->id], false);
} else {
$feedbacks[$grade_item->id]->feedback = '';
$feedbacks[$grade_item->id]->feedbackformat = FORMAT_MOODLE;
$grades[$grade_item->id] = new grade_grade(array('userid'=>$user->id, 'itemid'=>$grade_item->id), false);
}
}
}
}
$result = new object();
$result->user = $user;

5
grade/report/grader/lib.php
View File

@ -317,10 +317,11 @@ class grade_report_grader extends grade_report {
// If lastname or firstname is given as sortitemid, add the other name (firstname or lastname respectively) as second sort param
$sort2 = '';
if ($this->sortitemid == 'lastname') {
$sort2 = ', u.firstname ' . $this->sortorder;
$sort2 = ', u.firstname '.$this->sortorder;
} elseif ($this->sortitemid == 'firstname') {
$sort2 = ', u.lastname ' . $this->sortorder;
$sort2 = ', u.lastname '.$this->sortorder;
}
$sort2 .= ', u.id ASC'; // make sure the order is the same in case the sort item values are the same
$roles = explode(',', $this->gradebookroles);
$this->users = get_role_users($roles, $this->context, false,
'u.id, u.firstname, u.lastname, u.idnumber, u.imagealt, u.picture', 'u.'.$this->sortitemid .' '. $this->sortorder . $sort2,