|
From: <ma...@us...> - 2003-09-10 18:25:54
|
Update of /cvsroot/aimmath/moodle/mod/math_assignment
In directory sc8-pr-cvs1:/tmp/cvs-serv27923/mod/math_assignment
Modified Files:
aimpage.php lib.php view.php
Log Message:
Fixed problems when assignments have no AiM part
Index: aimpage.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/aimpage.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aimpage.php 9 Sep 2003 18:31:07 -0000 1.1
--- aimpage.php 10 Sep 2003 18:25:50 -0000 1.2
***************
*** 184,188 ****
// write admin links
if (isteacher($course->id))
! math_assignment_print_admin_links($cm, $math_assignment, "right");
// write pdf link
if ($createpdfaction) {
--- 184,188 ----
// write admin links
if (isteacher($course->id))
! echo math_assignment_get_admin_links($cm, $math_assignment, "right");
// write pdf link
if ($createpdfaction) {
Index: lib.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lib.php 9 Sep 2003 18:31:07 -0000 1.1
--- lib.php 10 Sep 2003 18:25:51 -0000 1.2
***************
*** 173,176 ****
--- 173,188 ----
}
+ function math_assignment_help_button($page, $name, $print=true) {
+ /// Function which outputs / returns the output required for a help button for this module
+
+ if ($print)
+ return helpbutton($page, $name, "math_assignment");
+ ob_start();
+ helpbutton($page, $name, "math_assignment");
+ $return = ob_get_contents();
+ ob_end_clean();
+ return $return;
+ }
+
function math_assignment_get_file_urls($courseid, $math_assignment, &$proburl, &$solurl) {
/// Function which creates the URLs for the problem sheet and solution sheet
***************
*** 187,265 ****
}
! function math_assignment_print_file_links($cm, $math_assignment, $align="left") {
/// Function which prints the problem and solution sheet links
/// Note that if $align is empty we assume we are already in a paragraph, else we put the links in a paragraph
math_assignment_get_file_urls($cm->course, $math_assignment, $proburl, $solurl);
- $count = 0;
if ($math_assignment->problems) {
! if ($count)
! echo "<br />\n";
else if ($align)
! echo "<p align=\"$align\">";
$strviewproblems = get_string("viewproblems", "math_assignment");
! echo "<a href=\"$proburl\" target=\"problems\">$strviewproblems</a>";
! helpbutton("viewproblems", $strviewproblems, "math_assignment");
! $count++;
}
if (($math_assignment->solutions) and ($math_assignment->timedue < time())) {
! if ($count)
! echo "<br />\n";
else if ($align)
! echo "<p align=\"$align\">";
$strviewsolutions = get_string("viewsolutions", "math_assignment");
! echo "<a href=\"$solurl\" target=\"solutions\">$strviewsolutions</a>";
! helpbutton("viewsolutions", $strviewsolutions, "math_assignment");
! $count++;
}
else if(($math_assignment->solutions) && isteacher($cm->course)) {
! if ($count)
! echo "<br />\n";
else if ($align)
! echo "<p align=\"$align\">";
$strviewsolutions = get_string("viewsolutions", "math_assignment");
! echo "<a href=\"$solurl\" target=\"solutions\">$strviewsolutions (" . get_string("notavailabletostudentsyet", "math_assignment") . ")</a>";
! helpbutton("viewsolutionsteacher", $strviewsolutions, "math_assignment");
! $count++;
}
! if ($count && $align)
! echo "</p>\n";
! return $count;
}
! function math_assignment_print_admin_links($cm, $math_assignment, $align="left") {
/// Function which prints the admin links
! echo "<p align=\"$align\">";
! $links = math_assignment_print_file_links($cm, $math_assignment, "");
if ($math_assignment->aimquiz) {
! if ($links)
! echo "<br />\n";
// Analyse Results
$stranalyseresults = get_string("analyseresults", "math_assignment");
! echo "<a href=\"aimpage.php?id=$cm->id\">$stranalyseresults</a>";
! helpbutton("analyze_quiz", $stranalyseresults, "math_assignment");
! echo "<br />\n";
// Try Quiz
$strtryquiz = get_string("tryquiz", "math_assignment");
! echo "<a href=\"aimpage.php?id=$cm->id&aimaction=try\">$strtryquiz</a>";
! helpbutton("try_quiz", $strtryquiz, "math_assignment");
! echo "<br />\n";
// Edit Quiz
$streditquiz = get_string("editquiz", "math_assignment");
! echo "<a href=\"aimpage.php?id=$cm->id&aimaction=edit\">$streditquiz</a>";
! helpbutton("admin_quiz", $streditquiz, "math_assignment");
! echo "<br />\n";
// Browse Source
$strbrowsesource = get_string("browsesource", "math_assignment");
! echo "<a href=\"aimpage.php?id=$cm->id&aimaction=source\">$strbrowsesource</a>";
! helpbutton("admin_sourcedir", $strbrowsesource, "math_assignment");
! echo "<br />\n";
// Edit Subject
$streditsubject = get_string("editsubject", "math_assignment");
! echo "<a href=\"aimpage.php?id=$cm->id&aimaction=subject\">$streditsubject</a>";
! helpbutton("admin_subject", $streditsubject, "math_assignment");
}
! echo "</p>\n";
}
--- 199,280 ----
}
! function math_assignment_get_file_links($cm, $math_assignment, $align="left") {
/// Function which prints the problem and solution sheet links
/// Note that if $align is empty we assume we are already in a paragraph, else we put the links in a paragraph
math_assignment_get_file_urls($cm->course, $math_assignment, $proburl, $solurl);
if ($math_assignment->problems) {
! if (isset($return))
! $return .= "<br />\n";
else if ($align)
! $return .= "<p align=\"$align\">";
$strviewproblems = get_string("viewproblems", "math_assignment");
! $return .= "<a href=\"$proburl\" target=\"problems\">$strviewproblems</a>";
! $return .= math_assignment_help_button("viewproblems", $strviewproblems, false);
}
if (($math_assignment->solutions) and ($math_assignment->timedue < time())) {
! if (isset($return))
! $return .= "<br />\n";
else if ($align)
! $return .= "<p align=\"$align\">";
$strviewsolutions = get_string("viewsolutions", "math_assignment");
! $return .= "<a href=\"$solurl\" target=\"solutions\">$strviewsolutions</a>";
! $return .= math_assignment_help_button("viewsolutions", $strviewsolutions, false);
}
else if(($math_assignment->solutions) && isteacher($cm->course)) {
! if (isset($return))
! $return .= "<br />\n";
else if ($align)
! $return .= "<p align=\"$align\">";
$strviewsolutions = get_string("viewsolutions", "math_assignment");
! $return .= "<a href=\"$solurl\" target=\"solutions\">$strviewsolutions (" . get_string("notavailabletostudentsyet", "math_assignment") . ")</a>";
! $return .= math_assignment_help_button("viewsolutionsteacher", $strviewsolutions, false);
}
! if (isset($return) && $align){
! $return .= "</p>\n";
! return $return;
! }
! return "";
}
! function math_assignment_get_admin_links($cm, $math_assignment, $align="left") {
/// Function which prints the admin links
! $return = "";
! $filelinks = math_assignment_get_file_links($cm, $math_assignment, "");
if ($math_assignment->aimquiz) {
! $return = "<p align=\"$align\">$filelinks";
! if ($filelinks)
! $return .= "<br />\n";
// Analyse Results
$stranalyseresults = get_string("analyseresults", "math_assignment");
! $return .= "<a href=\"aimpage.php?id=$cm->id\">$stranalyseresults</a>";
! $return .= math_assignment_help_button("analyze_quiz", $stranalyseresults, false);
! $return .= "<br />\n";
// Try Quiz
$strtryquiz = get_string("tryquiz", "math_assignment");
! $return .= "<a href=\"aimpage.php?id=$cm->id&aimaction=try\">$strtryquiz</a>";
! $return .= math_assignment_help_button("try_quiz", $strtryquiz, false);
! $return .= "<br />\n";
// Edit Quiz
$streditquiz = get_string("editquiz", "math_assignment");
! $return .= "<a href=\"aimpage.php?id=$cm->id&aimaction=edit\">$streditquiz</a>";
! $return .= math_assignment_help_button("admin_quiz", $streditquiz, false);
! $return .= "<br />\n";
// Browse Source
$strbrowsesource = get_string("browsesource", "math_assignment");
! $return .= "<a href=\"aimpage.php?id=$cm->id&aimaction=source\">$strbrowsesource</a>";
! $return .= math_assignment_help_button("admin_sourcedir", $strbrowsesource, false);
! $return .= "<br />\n";
// Edit Subject
$streditsubject = get_string("editsubject", "math_assignment");
! $return .= "<a href=\"aimpage.php?id=$cm->id&aimaction=subject\">$streditsubject</a>";
! $return .= math_assignment_help_button("admin_subject", $streditsubject, false);
}
! else if ($filelinks)
! $return = "<p align=\"$align\">$filelinks";
! if (!empty($return))
! $return .= "</p>\n";
! return $return;
}
***************
*** 354,357 ****
--- 369,377 ----
/// Function to update the AiM settings when the instance settings change
+ if (empty($math_assignment->aimquiz)) { // no aim questions
+ $math_assignment->aimsubject = 0;
+ $math_assignment->aimgrade = 0;
+ return true;
+ }
if (!$subject = get_record("math_assignment_subject", "id", $math_assignment->aimsubject))
return false;
Index: view.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/view.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** view.php 10 Sep 2003 12:06:18 -0000 1.3
--- view.php 10 Sep 2003 18:25:51 -0000 1.4
***************
*** 228,232 ****
if (isteacher($course->id)) {
! math_assignment_print_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>";
--- 228,232 ----
if (isteacher($course->id)) {
! 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>";
***************
*** 289,297 ****
echo "</td></tr></table>";
! print_heading(get_string("administration"));
! math_assignment_print_admin_links($cm, $math_assignment, "center");
}
else {
! math_assignment_print_file_links($math_assignment, "center");
if (!empty($math_assignment->aimquiz)) {
if ($grade->aimoverride) {
--- 289,299 ----
echo "</td></tr></table>";
! if ($adminlinks = math_assignment_get_admin_links($cm, $math_assignment, "center")) {
! print_heading(get_string("administration"));
! echo $adminlinks;
! }
}
else {
! echo math_assignment_get_file_links($math_assignment, "center");
if (!empty($math_assignment->aimquiz)) {
if ($grade->aimoverride) {
|
