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

MDL-13046 Fixed notices. Merging from MOODLE_19_STABLE

Browse Source
This commit is contained in:
nicolasconnault
2008-03-06 09:42:33 +00:00
parent 542300b41e
commit 6dfea40119
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/exercise/locallib.php
+2 -2
View File
@@ -1569,7 +1569,7 @@ function exercise_print_assessment_form($exercise, $assessment = false, $allowch
?>
<form id="assessmentform" method="post" action="assessments.php">
<input type="hidden" name="id" value="<?php echo $cm->id ?>" />
<input type="hidden" name="aid" value="<?php echo $assessment->id ?>" />
<input type="hidden" name="aid" value="<?php echo @$assessment->id ?>" />
<input type="hidden" name="action" value="updateassessment" />
<input type="hidden" name="resubmit" value="0" />
<input type="hidden" name="returnto" value="<?php echo $returnto ?>" />
@@ -2004,7 +2004,7 @@ function exercise_print_assessment_form($exercise, $assessment = false, $allowch
$timenow = time();
// always show the teacher the grading grade if it's not their assessment!
if (isteacher($course->id) and ($assessment->userid != $USER->id) and $exercise->gradinggrade) {
if ($assessment and isteacher($course->id) and ($assessment->userid != $USER->id) and $exercise->gradinggrade) {
echo "<tr><td align=\"right\"><b>".get_string("gradeforstudentsassessment", "exercise", $course->student).
"</td><td>\n";
echo number_format($exercise->gradinggrade * $assessment->gradinggrade / 100.0, 0);
mod/workshop/locallib.php
+4 -4
View File
@@ -2053,7 +2053,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
<form id="assessmentform" method="post" action="assessments.php">
<div>
<input type="hidden" name="id" value="<?php echo $cm->id ?>" />
<input type="hidden" name="aid" value="<?php echo $assessment->id ?>" />
<input type="hidden" name="aid" value="<?php echo @$assessment->id ?>" />
<input type="hidden" name="action" value="updateassessment" />
<input type="hidden" name="returnto" value="<?php echo $returnto ?>" />
<input type="hidden" name="elementno" value="" />
@@ -2069,11 +2069,11 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
} else {
print_string('assessment', 'workshop');
}
echo '</b><br />'.userdate($assessment->timecreated)."</div></td>\n";
echo '</b><br />'.userdate(@$assessment->timecreated)."</div></td>\n";
echo "</tr>\n";
// only show the grade if grading strategy > 0 and the grade is positive
if ($showgrades and $workshop->gradingstrategy and $assessment->grade >= 0) {
if ($assessment and $showgrades and $workshop->gradingstrategy and $assessment->grade >= 0) {
echo "<tr valign=\"top\">\n
<td colspan=\"2\" align=\"center\">
<b>".get_string("thegradeis", "workshop").": ".
@@ -2594,7 +2594,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
$timenow = time();
// now show the grading grade if available...
if ($assessment->timegraded) {
if ($assessment and $assessment->timegraded) {
echo "<tr valign=\"top\">\n";
echo "<td colspan=\"2\" class=\"workshopassessmentheading\" align=\"center\"><b>".
get_string('gradeforstudentsassessment', 'workshop')."</b></td>\n";