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-39692 grade: Little code clean up of letter boundary deletion

Browse Source
This commit is contained in:
Frederic Massart 2014-11-10 12:59:59 +08:00
parent 1d693611e5
commit b53a658b26
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
grade/edit/letter/index.php
View File

@ -146,10 +146,10 @@ if (!$edit) {
if ($letter == '') { if ($letter == '') {
continue; continue;
} }
$boundary = floatval($data->$gradeboundaryname);
$boundary = floatval($data->$gradeboundaryname);
if ($boundary < 0 || $boundary > 100) { if ($boundary < 0 || $boundary > 100) {
continue; // skip if out of range continue; // Skip if out of range.
} }
// The keys need to be strings so floats are not truncated. // The keys need to be strings so floats are not truncated.
@ -160,7 +160,7 @@ if (!$edit) {
$pool = array(); $pool = array();
if ($records = $DB->get_records('grade_letters', array('contextid' => $context->id), 'lowerboundary ASC')) { if ($records = $DB->get_records('grade_letters', array('contextid' => $context->id), 'lowerboundary ASC')) {
foreach ($records as $r) { foreach ($records as $r) {
// will re-use the lowerboundary to avoid duplicate during the update process // Will re-use the lowerboundary to avoid duplicate during the update process.
$pool[number_format($r->lowerboundary, 5)] = $r; $pool[number_format($r->lowerboundary, 5)] = $r;
} }
} }
@ -171,27 +171,25 @@ if (!$edit) {
$record->lowerboundary = $boundary; $record->lowerboundary = $boundary;
$record->contextid = $context->id; $record->contextid = $context->id;
// re-use the existing boundary to avoid key constraint
if (isset($pool[$boundary])) { if (isset($pool[$boundary])) {
// skip if the letter has been assigned to the boundary already // Re-use the existing boundary to avoid key constraint.
if ($letter == $pool[$boundary]->letter) { if ($letter != $pool[$boundary]->letter) {
unset($pool[$boundary]); // take it out of the pool // The letter has been assigned to another boundary, we update it.
}
else {
$record->id = $pool[$boundary]->id; $record->id = $pool[$boundary]->id;
$DB->update_record('grade_letters', $record); $DB->update_record('grade_letters', $record);
unset($pool[$boundary]); // remove the ID from the pool
} }
} unset($pool[$boundary]); // Remove the letter from the pool.
else if ($candidate = array_pop($pool)) { } else if ($candidate = array_pop($pool)) {
// The boundary is new, we update a random record from the pool.
$record->id = $candidate->id; $record->id = $candidate->id;
$DB->update_record('grade_letters', $record); $DB->update_record('grade_letters', $record);
} else { } else {
// No records were found, this must be a new letter.
$DB->insert_record('grade_letters', $record); $DB->insert_record('grade_letters', $record);
} }
} }
// delete the unused records // Delete the unused records.
foreach($pool as $leftover) { foreach($pool as $leftover) {
$DB->delete_records('grade_letters', array('id' => $leftover->id)); $DB->delete_records('grade_letters', array('id' => $leftover->id));
} }