[Aimmath-commit] moodle/mod/math_assignment view.php,1.8,1.9
Brought to you by:
gustav_delius,
npstrick
Menu
▾
▴
[Aimmath-commit] moodle/mod/math_assignment view.php,1.8,1.9
|
From: <gus...@us...> - 2003-09-20 15:56:07
|
Update of /cvsroot/aimmath/moodle/mod/math_assignment
In directory sc8-pr-cvs1:/tmp/cvs-serv30557/mod/math_assignment
Modified Files:
view.php
Log Message:
now prints paper grades only if the maximum pagergrade is >0 and similarly for computer grades.
Index: view.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/view.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** view.php 19 Sep 2003 13:52:53 -0000 1.8
--- view.php 20 Sep 2003 15:56:02 -0000 1.9
***************
*** 45,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");
--- 45,51 ----
add_to_log($course->id, "math_assignment", "view", "view.php?id=$cm->id", "$math_assignment->id");
! $hasaim = ($math_assignment->aimgrade > 0);
! $haspaper = ($math_assignment->papergrade > 0);
! $hasboth = ($hasaim and $haspaper);
$strfirstname = get_string("firstname");
***************
*** 120,125 ****
$myxls->InsertText($strfirstname);
$myxls->InsertText($strlastname);
! $myxls->InsertText("$strpaper $strgrade");
! if ($hasaim) $myxls->InsertText("$strcomputer $strgrade");
$myxls->InsertText("$strtotal $strgrade");
--- 122,129 ----
$myxls->InsertText($strfirstname);
$myxls->InsertText($strlastname);
! if ($hasboth) {
! $myxls->InsertText("$strpaper $strgrade");
! $myxls->InsertText("$strcomputer $strgrade");
! }
$myxls->InsertText("$strtotal $strgrade");
***************
*** 134,146 ****
$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));
--- 138,150 ----
$myxls->InsertText($student->firstname);
$myxls->InsertText($student->lastname);
! if ($hasboth) {
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));
***************
*** 161,165 ****
echo "$strfirstname\t$strlastname\t";
! if ($hasaim)
echo "$strpaper $strgrade\t$strcomputer $strgrade\t$strtotal $strgrade\n";
else
--- 165,169 ----
echo "$strfirstname\t$strlastname\t";
! if ($hasboth)
echo "$strpaper $strgrade\t$strcomputer $strgrade\t$strtotal $strgrade\n";
else
***************
*** 171,180 ****
$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";
}
--- 175,184 ----
$student = $students[$studentid];
echo "$student->firstname\t$student->lastname\t";
! if ($hasboth) {
if ($studentgrade->papergrade >= 0)
! echo "$studentgrade->papergrade";
echo "\t";
if ($studentgrade->aimgrade >= 0)
! echo "$studentgrade->aimgrade";
echo "\t";
}
***************
*** 202,206 ****
echo "<tr><th>$strfirstname</th><th>$strlastname</th>";
! if ($hasaim)
echo "<th>AiM<br>$strgrade</th><th>$strpaper<br>$strgrade</th>";
else
--- 206,210 ----
echo "<tr><th>$strfirstname</th><th>$strlastname</th>";
! if ($hasboth)
echo "<th>AiM<br>$strgrade</th><th>$strpaper<br>$strgrade</th>";
else
***************
*** 213,224 ****
$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>";
--- 217,228 ----
$student = $students[$studentid];
echo "<tr><td height=\"40\">$student->firstname</td><td>$student->lastname</td>";
! if ($hasboth) {
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>";
***************
*** 226,231 ****
else {
echo "<td>";
! if ($studentgrade->aimgrade >= 0)
! echo "$studentgrade->aimgrade";
else echo " ";
echo "</td>";
--- 230,235 ----
else {
echo "<td>";
! if (math_assignment_total_grade($math_assignment, $studentgrade) >= 0)
! echo math_assignment_total_grade($math_assignment, $studentgrade);
else echo " ";
echo "</td>";
***************
*** 265,296 ****
$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");
}
}
--- 269,303 ----
$inbox = true;
}
! if ($haspaper) {
echo "<b>$strpaper $strgrade :</b> ";
if ($grade->papergrade >= 0)
! echo "$grade->papergrade / $math_assignment->papergrade";
else
! print_string("notmarked", "math_assignment");
! echo "<br />";
! }
! if ($hasaim) {
! echo "<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 />";
}
! if ($hasboth) {
! $totalgrade = math_assignment_total_grade($math_assignment, $grade);
! echo "<b>$strtotal $strgrade :</b> ";
! if ($totalgrade >= 0)
! echo " $totalgrade / $totalmax";
else
! print_string("notmarked", "math_assignment");
}
}
***************
*** 301,305 ****
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");
--- 308,312 ----
echo math_assignment_get_admin_links($cm, $math_assignment, "right");
print_heading($strgrades);
! if ($hasboth) {
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");
***************
*** 323,350 ****
$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++;
}
--- 330,364 ----
$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 ($hasboth)
! $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 if ($haspaper)
! $table->data[] = array($picture, $student->firstname, $student->lastname, $papergrade);
! else if ($hasaim)
! $table->data[] = array($picture, $student->firstname, $student->lastname,
! "$aimgrade $edited<a href=\"editgrade.php?id=$math_assignment->id&userid=$student->id\">$stredit</a>$editedclose");
!
$i++;
}
***************
*** 367,374 ****
$options["download"] = "txt";
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>";
--- 381,392 ----
$options["download"] = "txt";
print_single_button("view.php", $options, get_string("downloadtext"));
! echo "</td>";
! if ($haspaper) {
! echo "<td>";
! $options["download"] = "marksheet";
! print_single_button("view.php", $options, get_string("marksheet","math_assignment"));
! echo "</td>";
! }
! echo "<td>";
helpbutton ("downloadgrades", "$strgrades", "math_assignment");
echo "</td></tr></table>";
***************
*** 383,389 ****
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>";
--- 401,407 ----
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>";
|
