[Aimmath-commit] moodle/mod/math_assignment view.php,1.4,1.5
Brought to you by:
gustav_delius,
npstrick
Menu
▾
▴
[Aimmath-commit] moodle/mod/math_assignment view.php,1.4,1.5
|
From: <gus...@us...> - 2003-09-17 10:21:03
|
Update of /cvsroot/aimmath/moodle/mod/math_assignment
In directory sc8-pr-cvs1:/tmp/cvs-serv11482/mod/math_assignment
Modified Files:
view.php
Log Message:
Now only shows computer grade if there actually is an AiM component
Index: view.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/view.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** view.php 10 Sep 2003 18:25:51 -0000 1.4
--- view.php 17 Sep 2003 10:20:59 -0000 1.5
***************
*** 44,47 ****
--- 44,49 ----
add_to_log($course->id, "math_assignment", "view", "view.php?id=$cm->id", "$math_assignment->id");
+
+ $hasaim = (!$math_assignment_aimquiz == "");
$strfirstname = get_string("firstname");
***************
*** 119,123 ****
$myxls->InsertText($strlastname);
$myxls->InsertText("$strpaper $strgrade");
! $myxls->InsertText("$strcomputer $strgrade");
$myxls->InsertText("$strtotal $strgrade");
--- 121,125 ----
$myxls->InsertText($strlastname);
$myxls->InsertText("$strpaper $strgrade");
! if ($hasaim) $myxls->InsertText("$strcomputer $strgrade");
$myxls->InsertText("$strtotal $strgrade");
***************
*** 132,143 ****
$myxls->InsertText($student->firstname);
$myxls->InsertText($student->lastname);
! if ($studentgrade->papergrade >= 0)
! $myxls->InsertNumber($studentgrade->papergrade);
! else
! $myxls->InsertText("");
! if ($studentgrade->aimgrade >= 0)
! $myxls->InsertNumber($studentgrade->aimgrade);
! else
! $myxls->InsertText("");
$myxls->InsertNumber(math_assignment_total_grade($math_assignment, $studentgrade));
}
--- 134,147 ----
$myxls->InsertText($student->firstname);
$myxls->InsertText($student->lastname);
! if ($hasaim) {
! if ($studentgrade->papergrade >= 0)
! $myxls->InsertNumber($studentgrade->papergrade);
! else
! $myxls->InsertText("");
! if ($studentgrade->aimgrade >= 0)
! $myxls->InsertNumber($studentgrade->aimgrade);
! else
! $myxls->InsertText("");
! }
$myxls->InsertNumber(math_assignment_total_grade($math_assignment, $studentgrade));
}
***************
*** 156,160 ****
/// Print names of all the fields
! echo "$strfirstname\t$strlastname\t$strpaper $strgrade\t$strcomputer $strgrade\t$strtotal $strgrade\n";
/// Print all the lines of data.
--- 160,168 ----
/// Print names of all the fields
! echo "$strfirstname\t$strlastname\t";
! if ($hasaim)
! echo "$strpaper $strgrade\t$strcomputer $strgrade\t$strtotal $strgrade\n";
! else
! echo "$strgrade\n";
/// Print all the lines of data.
***************
*** 163,172 ****
$student = $students[$studentid];
echo "$student->firstname\t$student->lastname\t";
! if ($studentgrade->papergrade >= 0)
! echo "$studentgrade->papergrade";
! echo "\t";
! if ($studentgrade->aimgrade >= 0)
! echo "$studentgrade->aimgrade";
! echo "\t";
echo math_assignment_total_grade($math_assignment, $studentgrade);
echo "\n";
--- 171,182 ----
$student = $students[$studentid];
echo "$student->firstname\t$student->lastname\t";
! if ($hasaim) {
! if ($studentgrade->papergrade >= 0)
! echo "$studentgrade->papergrade";
! echo "\t";
! if ($studentgrade->aimgrade >= 0)
! echo "$studentgrade->aimgrade";
! echo "\t";
! }
echo math_assignment_total_grade($math_assignment, $studentgrade);
echo "\n";
***************
*** 203,226 ****
$inbox = true;
}
! echo "<b>$strpaper $strgrade :</b> ";
! if ($grade->papergrade >= 0)
! echo "$grade->papergrade / $math_assignment->papergrade";
! else
! print_string("notmarked", "math_assignment");
! echo "<br /><b>$strcomputer $strgrade :</b> ";
! if ($grade->aimgrade >= 0)
! echo "$grade->aimgrade / $math_assignment->aimgrade";
! else
! print_string("notattempted", "math_assignment");
! if ($grade->aimoverride) {
! echo " (";
! print_string("gradeoverride", "math_assignment");
! echo ")";
}
- echo "<br />";
- if ($grade->aimcomment)
- echo "<b>" . $course->teacher . " " . get_string("comment", "math_assignment") . ":</b> " . nl2br(htmlspecialchars($grade->aimcomment)) . "<br />";
- $totalgrade = math_assignment_total_grade($math_assignment, $grade);
- echo "<b>$strtotal $strgrade :</b> $totalgrade / $totalmax";
}
if ($inbox)
--- 213,245 ----
$inbox = true;
}
! if ($hasaim) {
! echo "<b>$strpaper $strgrade :</b> ";
! if ($grade->papergrade >= 0)
! echo "$grade->papergrade / $math_assignment->papergrade";
! else
! print_string("notmarked", "math_assignment");
! echo "<br /><b>$strcomputer $strgrade :</b> ";
! if ($grade->aimgrade >= 0)
! echo "$grade->aimgrade / $math_assignment->aimgrade";
! else
! print_string("notattempted", "math_assignment");
! if ($grade->aimoverride) {
! echo " (";
! print_string("gradeoverride", "math_assignment");
! echo ")";
! }
! echo "<br />";
! if ($grade->aimcomment)
! echo "<b>" . $course->teacher . " " . get_string("comment", "math_assignment") . ":</b> " . nl2br(htmlspecialchars($grade->aimcomment)) . "<br />";
! $totalgrade = math_assignment_total_grade($math_assignment, $grade);
! echo "<b>$strtotal $strgrade :</b> $totalgrade / $totalmax";
! }
! else {
! echo "<b>$strgrade :</b> ";
! if ($grade->papergrade >= 0)
! echo "$grade->papergrade / $math_assignment->papergrade";
! else
! print_string("notmarked", "math_assignment");
}
}
if ($inbox)
***************
*** 230,237 ****
echo math_assignment_get_admin_links($cm, $math_assignment, "right");
print_heading($strgrades);
! echo "<p align=\"center\"><b>" . get_string("maximumgrade") . "</b>: $math_assignment->papergrade ($strpaper) + $math_assignment->aimgrade ($strcomputer) = $totalmax</p>";
! $table->head = array ("", get_string("firstname"), get_string("lastname"), "$strpaper $strgrade", "$strcomputer $strgrade", "$strtotal $strgrade");
! $table->width = array(35, "", "", "", "", "");
! $table->align = array("LEFT", "RIGHT", "LEFT", "CENTER", "CENTER", "CENTER");
$stredit = get_string("edit", "math_assignment");
--- 249,264 ----
echo math_assignment_get_admin_links($cm, $math_assignment, "right");
print_heading($strgrades);
! if ($hasaim) {
! echo "<p align=\"center\"><b>" . get_string("maximumgrade") . "</b>: $math_assignment->papergrade ($strpaper) + $math_assignment->aimgrade ($strcomputer) = $totalmax</p>";
! $table->head = array ("", get_string("firstname"), get_string("lastname"), "$strpaper $strgrade", "$strcomputer $strgrade", "$strtotal $strgrade");
! $table->width = array(35, "", "", "", "", "");
! $table->align = array("LEFT", "RIGHT", "LEFT", "CENTER", "CENTER", "CENTER");
! }
! else {
! echo "<p align=\"center\"><b>" . get_string("maximumgrade") . "</b>: $totalmax</p>";
! $table->head = array ("", get_string("firstname"), get_string("lastname"), "$strgrade");
! $table->width = array(35, "", "", "");
! $table->align = array("LEFT", "RIGHT", "LEFT", "CENTER");
! }
$stredit = get_string("edit", "math_assignment");
***************
*** 264,268 ****
$editedclose = "";
}
! $table->data[] = array($picture, $student->firstname, $student->lastname, $papergrade, "$aimgrade $edited<a href=\"editgrade.php?id=$math_assignment->id&userid=$student->id\">$stredit</a>$editedclose", math_assignment_total_grade($math_assignment, $studentgrade));
$i++;
}
--- 291,298 ----
$editedclose = "";
}
! if ($hasaim)
! $table->data[] = array($picture, $student->firstname, $student->lastname, $papergrade, "$aimgrade $edited<a href=\"editgrade.php?id=$math_assignment->id&userid=$student->id\">$stredit</a>$editedclose", math_assignment_total_grade($math_assignment, $studentgrade));
! else
! $table->data[] = array($picture, $student->firstname, $student->lastname, $papergrade);
$i++;
}
|
