moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-27969-randomallocator' of git://github.com/mudrd8mz/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2011-06-22 14:15:52 +02:00
commit fc57ca6a54
1 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

29
mod/workshop/allocation/random/lib.php
View file

@ -118,11 +118,34 @@ class workshop_random_allocator implements workshop_allocator {
$newnonexistingallocations = $newallocations; $newnonexistingallocations = $newallocations;
$this->filter_current_assessments($newnonexistingallocations, $assessments); $this->filter_current_assessments($newnonexistingallocations, $assessments);
$this->add_new_allocations($newnonexistingallocations, $authors, $reviewers); $this->add_new_allocations($newnonexistingallocations, $authors, $reviewers);
$allreviewers = $reviewers[0];
$allreviewersreloaded = false;
foreach ($newallocations as $newallocation) { foreach ($newallocations as $newallocation) {
list($reviewerid, $authorid) = each($newallocation); list($reviewerid, $authorid) = each($newallocation);
$a = new stdclass(); $a = new stdClass();
$a->reviewername = fullname($reviewers[0][$reviewerid]); if (isset($allreviewers[$reviewerid])) {
$a->authorname = fullname($authors[0][$authorid]); $a->reviewername = fullname($allreviewers[$reviewerid]);
} else {
// this may happen if $musthavesubmission is true but the reviewer
// of the re-used assessment has not submitted anything. let us reload
// the list of reviewers name including those without their submission
if (!$allreviewersreloaded) {
$allreviewers = $this->workshop->get_potential_reviewers(false);
$allreviewersreloaded = true;
}
if (isset($allreviewers[$reviewerid])) {
$a->reviewername = fullname($allreviewers[$reviewerid]);
} else {
// this should not happen usually unless the list of participants was changed
// in between two cycles of allocations
$a->reviewername = '#'.$reviewerid;
}
}
if (isset($authors[0][$authorid])) {
$a->authorname = fullname($authors[0][$authorid]);
} else {
$a->authorname = '#'.$authorid;
}
if (in_array($newallocation, $newnonexistingallocations)) { if (in_array($newallocation, $newnonexistingallocations)) {
$o[] = 'ok::indent::' . get_string('allocationaddeddetail', 'workshopallocation_random', $a); $o[] = 'ok::indent::' . get_string('allocationaddeddetail', 'workshopallocation_random', $a);
} else { } else {