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

MDL-33572: Make the display of the "graded" status consistent in mod_assign

Browse Source 
Do not display "graded" when the grade is set to -1.
This commit is contained in:
Damyon Wiese
2012-06-07 10:22:46 +08:00
parent 4913af936f
commit 2d8a9ce96c
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/gradingtable.php
+1 -1
View File
@@ -414,7 +414,7 @@ class assign_grading_table extends table_sql implements renderable {
if ($row->locked) {
$o .= $this->output->container(get_string('submissionslockedshort', 'assign'), 'lockedsubmission');
}
if ($row->grade) {
if ($row->grade >= 0) {
$o .= $this->output->container(get_string('graded', 'assign'), 'submissiongraded');
}
}
mod/assign/locallib.php
+8 -3
View File
@@ -895,7 +895,12 @@ class assign {
if ($this->get_instance()->grade >= 0) {
// Normal number
if ($editing) {
$o = '<input type="text" name="quickgrade_' . $userid . '" value="' . format_float($grade) . '" size="6" maxlength="10" class="quickgrade"/>';
if ($grade < 0) {
$displaygrade = '';
} else {
$displaygrade = format_float($grade);
}
$o = '<input type="text" name="quickgrade_' . $userid . '" value="' . $displaygrade . '" size="6" maxlength
$o .= '&nbsp;/&nbsp;' . format_float($this->get_instance()->grade,2);
$o .= '<input type="hidden" name="grademodified_' . $userid . '" value="' . $modified . '"/>';
return $o;
@@ -1636,7 +1641,7 @@ class assign {
}
if ($grade) {
$data = new stdClass();
if ($grade->grade >= 0) {
if ($grade->grade !== NULL && $grade->grade >= 0) {
$data->grade = format_float($grade->grade,2);
}
} else {
@@ -1897,7 +1902,7 @@ class assign {
private function is_graded($userid) {
$grade = $this->get_user_grade($userid, false);
if ($grade) {
return ($grade->grade != '');
return ($grade->grade !== NULL && $grade->grade >= 0);
}
return false;
}