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

Merge branch 'MDL-33498' of git://github.com/netspotau/moodle-mod_assign

Browse source
This commit is contained in:
Dan Poltawski 2012-06-08 13:39:17 +08:00
commit c9d7e6fa16
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mod/assign/gradeform.php
View file

@ -73,11 +73,11 @@ class mod_assign_grade_form extends moodleform {
} }
if ($this->assignment->get_instance()->grade > 0) { if ($this->assignment->get_instance()->grade > 0) {
if (!is_numeric($data['grade']) and (!empty($data['grade']))) { if (unformat_float($data['grade']) === null && (!empty($data['grade']))) {
$errors['grade'] = get_string('invalidfloatforgrade', 'assign', $data['grade']); $errors['grade'] = get_string('invalidfloatforgrade', 'assign', $data['grade']);
} else if ($data['grade'] > $this->assignment->get_instance()->grade) { } else if (unformat_float($data['grade']) > $this->assignment->get_instance()->grade) {
$errors['grade'] = get_string('gradeabovemaximum', 'assign', $this->assignment->get_instance()->grade); $errors['grade'] = get_string('gradeabovemaximum', 'assign', $this->assignment->get_instance()->grade);
} else if ($data['grade'] < 0) { } else if (unformat_float($data['grade']) < 0) {
$errors['grade'] = get_string('gradebelowzero', 'assign'); $errors['grade'] = get_string('gradebelowzero', 'assign');
} }
} else { } else {

10
mod/assign/locallib.php
View file

@ -895,7 +895,7 @@ class assign {
if ($this->get_instance()->grade >= 0) { if ($this->get_instance()->grade >= 0) {
// Normal number // Normal number
if ($editing) { if ($editing) {
$o = '<input type="text" name="quickgrade_' . $userid . '" value="' . $grade . '" size="6" maxlength="10" class="quickgrade"/>'; $o = '<input type="text" name="quickgrade_' . $userid . '" value="' . format_float($grade) . '" size="6" maxlength="10" class="quickgrade"/>';
$o .= '&nbsp;/&nbsp;' . format_float($this->get_instance()->grade,2); $o .= '&nbsp;/&nbsp;' . format_float($this->get_instance()->grade,2);
$o .= '<input type="hidden" name="grademodified_' . $userid . '" value="' . $modified . '"/>'; $o .= '<input type="hidden" name="grademodified_' . $userid . '" value="' . $modified . '"/>';
return $o; return $o;
@ -2531,7 +2531,7 @@ class assign {
// gather the userid, updated grade and last modified value // gather the userid, updated grade and last modified value
$record = new stdClass(); $record = new stdClass();
$record->userid = $userid; $record->userid = $userid;
$record->grade = required_param('quickgrade_' . $userid, PARAM_INT); $record->grade = unformat_float(required_param('quickgrade_' . $record->userid, PARAM_TEXT));
$record->lastmodified = $modified; $record->lastmodified = $modified;
$record->gradinginfo = grade_get_grades($this->get_course()->id, 'mod', 'assign', $this->get_instance()->id, array($userid)); $record->gradinginfo = grade_get_grades($this->get_course()->id, 'mod', 'assign', $this->get_instance()->id, array($userid));
$users[$userid] = $record; $users[$userid] = $record;
@ -2560,7 +2560,7 @@ class assign {
if ($CFG->enableoutcomes) { if ($CFG->enableoutcomes) {
foreach ($modified->gradinginfo->outcomes as $outcomeid => $outcome) { foreach ($modified->gradinginfo->outcomes as $outcomeid => $outcome) {
$oldoutcome = $outcome->grades[$modified->userid]->grade; $oldoutcome = $outcome->grades[$modified->userid]->grade;
$newoutcome = optional_param('outcome_' . $outcomeid . '_' . $modified->userid, -1, PARAM_INT); $newoutcome = optional_param('outcome_' . $outcomeid . '_' . $modified->userid, -1, PARAM_FLOAT);
if ($oldoutcome != $newoutcome) { if ($oldoutcome != $newoutcome) {
// can't check modified time for outcomes because it is not reported // can't check modified time for outcomes because it is not reported
$modifiedusers[$modified->userid] = $modified; $modifiedusers[$modified->userid] = $modified;
@ -2605,7 +2605,7 @@ class assign {
// ok - ready to process the updates // ok - ready to process the updates
foreach ($modifiedusers as $userid => $modified) { foreach ($modifiedusers as $userid => $modified) {
$grade = $this->get_user_grade($userid, true); $grade = $this->get_user_grade($userid, true);
$grade->grade= grade_floatval($modified->grade); $grade->grade= grade_floatval(unformat_float($modified->grade));
$grade->grader= $USER->id; $grade->grader= $USER->id;
$this->update_grade($grade); $this->update_grade($grade);
@ -3180,7 +3180,7 @@ class assign {
} else { } else {
// handle the case when grade is set to No Grade // handle the case when grade is set to No Grade
if (isset($formdata->grade)) { if (isset($formdata->grade)) {
$grade->grade= grade_floatval($formdata->grade); $grade->grade= grade_floatval(unformat_float($formdata->grade));
} }
} }
$grade->grader= $USER->id; $grade->grader= $USER->id;