[Aimmath-commit] moodle/mod/math_assignment view.php,1.6,1.7
Brought to you by:
gustav_delius,
npstrick
Menu
▾
▴
[Aimmath-commit] moodle/mod/math_assignment view.php,1.6,1.7
|
From: <gus...@us...> - 2003-09-19 19:58:42
|
Update of /cvsroot/aimmath/moodle/mod/math_assignment
In directory sc8-pr-cvs1:/tmp/cvs-serv28285/mod/math_assignment
Modified Files:
view.php
Log Message:
can now produce a printer-friendly marksheet from view.php. Not very polished yet but will do until we get feedback about it.
Index: view.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/view.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** view.php 18 Sep 2003 11:30:04 -0000 1.6
--- view.php 19 Sep 2003 09:36:44 -0000 1.7
***************
*** 136,146 ****
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));
--- 136,146 ----
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));
***************
*** 173,180 ****
if ($hasaim) {
if ($studentgrade->papergrade >= 0)
! echo "$studentgrade->papergrade";
echo "\t";
if ($studentgrade->aimgrade >= 0)
! echo "$studentgrade->aimgrade";
echo "\t";
}
--- 173,180 ----
if ($hasaim) {
if ($studentgrade->papergrade >= 0)
! echo "$studentgrade->papergrade";
echo "\t";
if ($studentgrade->aimgrade >= 0)
! echo "$studentgrade->aimgrade";
echo "\t";
}
***************
*** 184,187 ****
--- 184,229 ----
exit;
+
+ } else if ($download == "marksheet") { // display marksheet table, ready for printing
+
+ /// Print names of all the fields
+
+ echo "<html><head><title>Marksheet for $course->shortname, $math_assignment->name</title></head>
+ <body><b>Marksheet for $course->shortname<br>$math_assignment->name<b><p>
+ <table border=\"1\"><tr><th>$strfirstname</th><th>$strlastname</th>";
+ if ($hasaim)
+ echo "<th>AiM<br>$strgrade</th><th>$strpaper<br>$strgrade</th>";
+ else
+ echo "<th>$strgrade</th>";
+ echo "<th width=\"300\">Comments</th></tr>";
+
+ /// Print all the lines of data.
+
+ foreach ($grades as $studentid => $studentgrade) {
+ $student = $students[$studentid];
+ echo "<tr><td height=\"40\">$student->firstname</td><td>$student->lastname</td>";
+ if ($hasaim) {
+ echo "<td>";
+ if ($studentgrade->aimgrade >= 0)
+ echo "$studentgrade->aimgrade";
+ else echo " ";
+ echo "</td><td>";
+ if ($studentgrade->papergrade >= 0)
+ echo "$studentgrade->papergrade";
+ else echo " ";
+ echo "</td>";
+ }
+ else {
+ echo "<td>";
+ if ($studentgrade->aimgrade >= 0)
+ echo "$studentgrade->aimgrade";
+ else echo " ";
+ echo "</td>";
+ }
+ echo "<td> </td></tr>";
+ }
+ echo "</table></body></html>";
+
+ exit;
} else { // Just print the web page
***************
*** 216,235 ****
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";
--- 258,277 ----
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";
***************
*** 238,244 ****
echo "<b>$strgrade :</b> ";
if ($grade->papergrade >= 0)
! echo "$grade->papergrade / $math_assignment->papergrade";
else
! print_string("notmarked", "math_assignment");
}
}
--- 280,286 ----
echo "<b>$strgrade :</b> ";
if ($grade->papergrade >= 0)
! echo "$grade->papergrade / $math_assignment->papergrade";
else
! print_string("notmarked", "math_assignment");
}
}
***************
*** 271,298 ****
$picture = print_user_picture($student->id, $course->id, $student->picture, false, true);
if ($studentgrade->papergrade >= 0)
! $papergrade = $studentgrade->papergrade;
else
! $papergrade = "";
$papergrade = "<input type=\"text\" name=\"$student->id\" size=\"10\" maxlength=\"10\" value=\"$papergrade\" tabindex=\"$i\" />";
if ($studentgrade->aimgrade >= 0)
! $aimgrade = $studentgrade->aimgrade;
else
! $aimgrade = "";
if ($studentgrade->aimoverride) {
! $edited = "$stredited (";
! $editedclose = ")";
}
else if ($studentgrade->aimcomment) {
! $edited = "$strcommented (";
! $editedclose = ")";
}
else {
! $edited = "";
! $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++;
}
--- 313,340 ----
$picture = print_user_picture($student->id, $course->id, $student->picture, false, true);
if ($studentgrade->papergrade >= 0)
! $papergrade = $studentgrade->papergrade;
else
! $papergrade = "";
$papergrade = "<input type=\"text\" name=\"$student->id\" size=\"10\" maxlength=\"10\" value=\"$papergrade\" tabindex=\"$i\" />";
if ($studentgrade->aimgrade >= 0)
! $aimgrade = $studentgrade->aimgrade;
else
! $aimgrade = "";
if ($studentgrade->aimoverride) {
! $edited = "$stredited (";
! $editedclose = ")";
}
else if ($studentgrade->aimcomment) {
! $edited = "$strcommented (";
! $editedclose = ")";
}
else {
! $edited = "";
! $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++;
}
***************
*** 316,319 ****
--- 358,364 ----
print_single_button("view.php", $options, get_string("downloadtext"));
echo "</td><td>";
+ $options["download"] = "marksheet";
+ print_single_button("view.php", $options, get_string("marksheet","math_assignment"));
+ echo "</td><td>";
helpbutton ("downloadgrades", "$strgrades", "math_assignment");
echo "</td></tr></table>";
***************
*** 328,334 ****
if (!empty($math_assignment->aimquiz)) {
if ($grade->aimoverride) {
! echo "<p align=\"center\">";
! print_string("gradeoverridemsg", "math_assignment");
! echo "</p>";
}
echo "<p align=\"center\"><a href=\"aimpage.php?id=$cm->id\">" . get_string("viewquiz", "math_assignment") . "</a></p>";
--- 373,379 ----
if (!empty($math_assignment->aimquiz)) {
if ($grade->aimoverride) {
! echo "<p align=\"center\">";
! print_string("gradeoverridemsg", "math_assignment");
! echo "</p>";
}
echo "<p align=\"center\"><a href=\"aimpage.php?id=$cm->id\">" . get_string("viewquiz", "math_assignment") . "</a></p>";
|
