mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 20:50:21 +01:00
Code Issues Projects Releases Wiki Activity

MDL-25524 workshop: fixed random allocator removing current allocations

Browse Source 
The bug was in filter_current_assessments() being applied before get_unkept_assessments()
so actually no current assessment records could be detected.
This commit is contained in:
David Mudrak 2010-12-07 11:39:50 +00:00
parent 6eee65e4b5
commit 95d28f044e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/workshop/allocation/random/lang/en/workshopallocation_random.php
View File

@ -27,6 +27,7 @@
$string['addselfassessment'] = 'Add self-assessments'; $string['addselfassessment'] = 'Add self-assessments';
$string['allocationaddeddetail'] = 'New assessment to be done: <strong>{$a->reviewername}</strong> is reviewer of <strong>{$a->authorname}</strong>'; $string['allocationaddeddetail'] = 'New assessment to be done: <strong>{$a->reviewername}</strong> is reviewer of <strong>{$a->authorname}</strong>';
$string['allocationdeallocategraded'] = 'Unable to deallocate already graded assessment: reviewer <strong>{$a->reviewername}</strong>, submission author: <strong>{$a->authorname}</strong>'; $string['allocationdeallocategraded'] = 'Unable to deallocate already graded assessment: reviewer <strong>{$a->reviewername}</strong>, submission author: <strong>{$a->authorname}</strong>';
$string['allocationreuseddetail'] = 'Reused assessment: <strong>{$a->reviewername}</strong> kept as reviewer of <strong>{$a->authorname}</strong>';
$string['allocationsettings'] = 'Allocation settings'; $string['allocationsettings'] = 'Allocation settings';
$string['assessmentdeleteddetail'] = 'Assessment deallocated: <strong>{$a->reviewername}</strong> is no longer reviewer of <strong>{$a->authorname}</strong>'; $string['assessmentdeleteddetail'] = 'Assessment deallocated: <strong>{$a->reviewername}</strong> is no longer reviewer of <strong>{$a->authorname}</strong>';
$string['assesswosubmission'] = 'Participants can assess without having submitted anything'; $string['assesswosubmission'] = 'Participants can assess without having submitted anything';

14
mod/workshop/allocation/random/lib.php
View File

@ -90,9 +90,6 @@ class workshop_random_allocator implements workshop_allocator {
$newallocations = array(); // array of array(reviewer => reviewee) $newallocations = array(); // array of array(reviewer => reviewee)
if ($numofreviews) { if ($numofreviews) {
// TODO MDL-19870 rewrite this part to make it easier to maintain and extend.
// $removecurrent -> remove it at the beginning and stop doing the magic with unkept allocation
// (leading to possible bugs)
if ($removecurrent) { if ($removecurrent) {
// behave as if there were no current assessments // behave as if there were no current assessments
$curassessments = array(); $curassessments = array();
@ -100,7 +97,6 @@ class workshop_random_allocator implements workshop_allocator {
$curassessments = $assessments; $curassessments = $assessments;
} }
$randomallocations = $this->random_allocation($authors, $reviewers, $curassessments, $numofreviews, $numper, $o); $randomallocations = $this->random_allocation($authors, $reviewers, $curassessments, $numofreviews, $numper, $o);
$this->filter_current_assessments($randomallocations, $assessments);
$newallocations = array_merge($newallocations, $randomallocations); $newallocations = array_merge($newallocations, $randomallocations);
$o[] = 'ok::' . get_string('numofrandomlyallocatedsubmissions', 'workshopallocation_random', count($randomallocations)); $o[] = 'ok::' . get_string('numofrandomlyallocatedsubmissions', 'workshopallocation_random', count($randomallocations));
unset($randomallocations); unset($randomallocations);
@ -114,13 +110,19 @@ class workshop_random_allocator implements workshop_allocator {
if (empty($newallocations)) { if (empty($newallocations)) {
$o[] = 'info::' . get_string('noallocationtoadd', 'workshopallocation_random'); $o[] = 'info::' . get_string('noallocationtoadd', 'workshopallocation_random');
} else { } else {
$this->add_new_allocations($newallocations, $authors, $reviewers); $newnonexistingallocations = $newallocations;
$this->filter_current_assessments($newnonexistingallocations, $assessments);
$this->add_new_allocations($newnonexistingallocations, $authors, $reviewers);
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]); $a->reviewername = fullname($reviewers[0][$reviewerid]);
$a->authorname = fullname($authors[0][$authorid]); $a->authorname = fullname($authors[0][$authorid]);
$o[] = 'ok::indent::' . get_string('allocationaddeddetail', 'workshopallocation_random', $a); if (in_array($newallocation, $newnonexistingallocations)) {
$o[] = 'ok::indent::' . get_string('allocationaddeddetail', 'workshopallocation_random', $a);
} else {
$o[] = 'ok::indent::' . get_string('allocationreuseddetail', 'workshopallocation_random', $a);
}
} }
} }
if ($removecurrent) { if ($removecurrent) {