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

Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2014-10-24 11:48:12 +02:00
committed by Eloy Lafuente (stronk7)
parent 1153177851 a9a02e9170
commit fc533908b0
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/edit/letter/edit_form.php
+13 -17
View File
@@ -46,38 +46,34 @@ class edit_letter_form extends moodleform {
$gradeletter = get_string('gradeletter', 'grades');
$gradeboundary = get_string('gradeboundary', 'grades');
$percentages = array(-1 => get_string('unused', 'grades'));
for ($i=100; $i > -1; $i--) {
$percentages[$i] = "$i %";
}
for($i=1; $i<$num+1; $i++) {
for ($i=1; $i<$num+1; $i++) {
$gradelettername = 'gradeletter'.$i;
$gradeboundaryname = 'gradeboundary'.$i;
$mform->addElement('text', $gradelettername, $gradeletter." $i");
if ($i == 1) {
$mform->addHelpButton($gradelettername, 'gradeletter', 'grades');
}
$entry = array();
$entry[] = $mform->createElement('text', $gradelettername, $gradeletter . " $i");
$mform->setType($gradelettername, PARAM_TEXT);
if (!$admin) {
$mform->disabledIf($gradelettername, 'override', 'notchecked');
$mform->disabledIf($gradelettername, $gradeboundaryname, 'eq', -1);
}
$mform->addElement('select', $gradeboundaryname, $gradeboundary." $i", $percentages);
if ($i == 1) {
$mform->addHelpButton($gradeboundaryname, 'gradeboundary', 'grades');
}
$mform->setDefault($gradeboundaryname, -1);
$mform->setType($gradeboundaryname, PARAM_INT);
$entry[] = $mform->createElement('static', '', '', '&ge;');
$entry[] = $mform->createElement('text', $gradeboundaryname, $gradeboundary." $i");
$entry[] = $mform->createElement('static', '', '', '%');
$mform->addGroup($entry, 'gradeentry'.$i, $gradeletter." $i", array(' '), false);
$mform->setType($gradeboundaryname, PARAM_FLOAT);
if (!$admin) {
$mform->disabledIf($gradeboundaryname, 'override', 'notchecked');
}
}
if ($num > 0) {
$mform->addHelpButton('gradeentry1', 'gradeletter', 'grades');
}
// hidden params
$mform->addElement('hidden', 'id');
$mform->setType('id', PARAM_INT);
grade/edit/letter/index.php
+2 -1
View File
@@ -146,7 +146,8 @@ if (!$edit) {
if ($letter == '') {
continue;
}
$letters[$data->$gradeboundaryname] = $letter;
// The keys need to be strings so floats are not truncated.
$letters[strval($data->$gradeboundaryname)] = $letter;
}
}
krsort($letters, SORT_NUMERIC);