|
From: <ma...@us...> - 2003-09-23 22:49:45
|
Update of /cvsroot/aimmath/moodle/mod/math_assignment
In directory sc8-pr-cvs1:/tmp/cvs-serv487/mod/math_assignment
Modified Files:
aimpage.php lib.php view.php
Log Message:
Added zone admin links and added math output selection to view.php.
Index: aimpage.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/aimpage.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** aimpage.php 22 Sep 2003 21:03:54 -0000 1.11
--- aimpage.php 23 Sep 2003 22:49:40 -0000 1.12
***************
*** 70,85 ****
--- 70,97 ----
$postdata = math_assignment_add_arg_to_url_data($postdata, "Command","try/Quiz");
$postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "TryQuiz");
+ $postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
+ $postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->password);
}
else if (strcasecmp($aimaction, "edit") == 0) { // load the edit quiz page
$postdata = math_assignment_add_arg_to_url_data($postdata, "Command","admin/Quiz");
$postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "LoadQuizOptions");
+ $postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
+ $postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->password);
}
else if (strcasecmp($aimaction, "source") == 0) { // load the edit source page
$postdata = math_assignment_add_arg_to_url_data($postdata, "Command","admin/SourceDir");
$postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "BrowseSource");
+ $postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
+ $postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->password);
}
else if (strcasecmp($aimaction, "subject") == 0) { // load the edit subject page
$postdata = math_assignment_add_arg_to_url_data($postdata, "Command","admin/Subject");
$postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "LoadSubjectOptions");
+ $postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
+ $postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->password);
+ }
+ else if (strcasecmp($aimaction, "zoneadmin") == 0) { // load the zone admin page
+ $postdata = math_assignment_add_arg_to_url_data($postdata, "Command","admin/Zone");
+ $postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $server->password);
}
else {
***************
*** 87,94 ****
$postdata = math_assignment_add_arg_to_url_data($postdata, "Command","analyze/Quiz");
$postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "AnalyzeQuiz");
}
$postdata = math_assignment_add_arg_to_url_data($postdata, "SubjectName", $subject->name);
- $postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
- $postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->password);
}
else {
--- 99,106 ----
$postdata = math_assignment_add_arg_to_url_data($postdata, "Command","analyze/Quiz");
$postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "AnalyzeQuiz");
+ $postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
+ $postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->password);
}
$postdata = math_assignment_add_arg_to_url_data($postdata, "SubjectName", $subject->name);
}
else {
***************
*** 191,199 ****
// put output problems box and admin links side by side
! echo "<table width=\"100%\"><tr><td align=\"left\">";
// print output problems box
if (function_exists('editer')) {
! print_simple_box_start();
echo "<form name=\"output_change\" action=\"aimpage.php?id=$cm->id\" method=\"post\">\n";
echo "<input type=\"hidden\" name=\"outputchange\" value=\"" . ($usexml ? "html" : "xml") . "\" />\n";
--- 203,211 ----
// put output problems box and admin links side by side
! echo "<table width=\"100%\"><tr><td align=\"left\" width=\"35%\"></td><td align=\"center\" width=\"30%\">";
// print output problems box
if (function_exists('editer')) {
! print_simple_box_start("center");
echo "<form name=\"output_change\" action=\"aimpage.php?id=$cm->id\" method=\"post\">\n";
echo "<input type=\"hidden\" name=\"outputchange\" value=\"" . ($usexml ? "html" : "xml") . "\" />\n";
***************
*** 210,221 ****
print_string($usexml ? "html" : "mathml", "math_assignment");
echo "</a>\n";
echo "</form>";
print_simple_box_end();
}
! echo "</td><td align=\"right\">";
// write admin links
if (isteacher($course->id))
! echo math_assignment_get_admin_links($cm, $math_assignment, "right");
echo "</td></tr></table>";
--- 222,234 ----
print_string($usexml ? "html" : "mathml", "math_assignment");
echo "</a>\n";
+ math_assignment_help_button("mathdisplay", get_string("mathdisplay", "math_assignment"));
echo "</form>";
print_simple_box_end();
}
! echo "</td><td align=\"right\" width=\"35%\">";
// write admin links
if (isteacher($course->id))
! echo math_assignment_get_admin_links($cm, $math_assignment, $server->password, "right");
echo "</td></tr></table>";
***************
*** 251,255 ****
--- 264,277 ----
// display teacher grade override comment (if any)
+ echo "<br clear=\"all\" /> <br />\n";
math_assignment_print_grade_override($math_assignment, $USER->id);
+ echo "<br clear=\"all\" />\n";
+
+ if (isteacher($course->id)) {
+ if ($adminlinks = math_assignment_get_admin_links($cm, $math_assignment, $server->password, "center")) {
+ print_heading(get_string("administration"));
+ echo $adminlinks;
+ }
+ }
if (isset($debug)) {
Index: lib.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** lib.php 23 Sep 2003 17:53:10 -0000 1.17
--- lib.php 23 Sep 2003 22:49:41 -0000 1.18
***************
*** 280,284 ****
}
! function math_assignment_get_admin_links($cm, $math_assignment, $align="left") {
/// Function which prints the admin links
--- 280,284 ----
}
! function math_assignment_get_admin_links($cm, $math_assignment, $zonelink=false, $align="left") {
/// Function which prints the admin links
***************
*** 305,316 ****
$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)
--- 305,323 ----
$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);
+ if ($zonelink) {
+ $return .= "<br />\n";
+ // Zone Admin
+ $strzoneadmin = get_string("zoneadmin", "math_assignment");
+ $return .= "<a href=\"aimpage.php?id=$cm->id&aimaction=zoneadmin\">$strzoneadmin</a>";
+ $return .= math_assignment_help_button("admin_zoneadmin", $strzoneadmin, false);
+ }
}
else if ($filelinks)
***************
*** 714,729 ****
if ($entry = get_record("math_assignment_grades", "assignment", $math_assignment->id, "userid", $userid)) {
if ($entry->aimoverride) {
! echo "<p><b>";
print_string("grade");
echo ":</b> $entry->aimgrade ";
print_string("gradeoverride", "math_assignment");
! echo "</p>";
}
if ($entry->aimcomment) {
if (!$course = get_record("course", "id", $math_assignment->course))
$course->teacher = get_string("teacher");
! echo "<p><b>$course->teacher ";
print_string("comment", "math_assignment");
! echo ":</b> " . nl2br(htmlspecialchars($entry->aimcomment)) . "</p>";
}
}
--- 721,739 ----
if ($entry = get_record("math_assignment_grades", "assignment", $math_assignment->id, "userid", $userid)) {
if ($entry->aimoverride) {
! print_simple_box_start("left");
! echo "<b>";
print_string("grade");
echo ":</b> $entry->aimgrade ";
print_string("gradeoverride", "math_assignment");
! print_simple_box_end();
}
if ($entry->aimcomment) {
+ print_simple_box_start("left");
if (!$course = get_record("course", "id", $math_assignment->course))
$course->teacher = get_string("teacher");
! echo "<b>$course->teacher ";
print_string("comment", "math_assignment");
! echo ":</b> " . nl2br(htmlspecialchars($entry->aimcomment));
! print_simple_box_end();
}
}
Index: view.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/view.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** view.php 22 Sep 2003 21:09:48 -0000 1.13
--- view.php 23 Sep 2003 22:49:41 -0000 1.14
***************
*** 46,50 ****
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);
--- 46,58 ----
add_to_log($course->id, "math_assignment", "view", "view.php?id=$cm->id", "$math_assignment->id");
!
! if (isset ($outputchange)) {
! if (strcmp($outputchange, "html") == 0 || strcmp($outputchange, "xml") == 0) {
! // set the cookie
! setcookie("output", $outputchange, 0x7FFFFFFF);
! $_COOKIE['output'] = $outputchange;
! }
! }
!
$hasaim = ($math_assignment->aimgrade > 0);
$haspaper = ($math_assignment->papergrade > 0);
***************
*** 350,354 ****
if (isteacher($course->id)) {
! echo math_assignment_get_admin_links($cm, $math_assignment, "right");
print_heading($strgrades);
--- 358,367 ----
if (isteacher($course->id)) {
! $zonelink = false;
! if ($subject = get_record("math_assignment_subject", "course", $course->id)) {
! if ($server = get_record("math_assignment_server", "id", $subject->server))
! $zonelink = $server->password;
! }
! echo math_assignment_get_admin_links($cm, $math_assignment, $zonelink, "right");
print_heading($strgrades);
***************
*** 409,414 ****
}
! if ($haspaper)
! echo "<form action=\"updatepapergrades.php?id=$math_assignment->id\" method=\"post\" name=\"papergradeform\">";
print_table($table);
--- 422,430 ----
}
! if ($haspaper) {
! echo "<form action=\"updatepapergrades.php?id=$math_assignment->id\" method=\"post\" name=\"papergradeform\">\n";
! echo "<input type=\"hidden\" name=\"sort\" value=\"sort\" />\n";
! echo "<input type=\"hidden\" name=\"sortdir\" value=\"sortdir\" />\n";
! }
print_table($table);
***************
*** 440,444 ****
echo "</td></tr></table>";
! if ($adminlinks = math_assignment_get_admin_links($cm, $math_assignment, "center")) {
print_heading(get_string("administration"));
echo $adminlinks;
--- 456,460 ----
echo "</td></tr></table>";
! if ($adminlinks = math_assignment_get_admin_links($cm, $math_assignment, $zonelink, "center")) {
print_heading(get_string("administration"));
echo $adminlinks;
***************
*** 447,451 ****
else {
echo math_assignment_get_file_links($math_assignment, "center");
! if (!empty($math_assignment->aimquiz)) {
if ($grade->aimoverride) {
echo "<p align=\"center\">";
--- 463,467 ----
else {
echo math_assignment_get_file_links($math_assignment, "center");
! if ($hasaim) {
if ($grade->aimoverride) {
echo "<p align=\"center\">";
***************
*** 455,458 ****
--- 471,499 ----
echo "<p align=\"center\"><a href=\"aimpage.php?id=$cm->id\">" . get_string("viewquiz", "math_assignment") . "</a></p>";
}
+ }
+ if ($hasaim && function_exists('editer')) {
+ // get output option from cookie
+ if (array_key_exists("output", $_COOKIE))
+ $usexml = (strcasecmp($_COOKIE['output'], "xml") == 0);
+ else
+ $usexml = $CFG->math_assignment_default_latex_output ? true : false;
+ // print output selection
+ print_simple_box_start("center");
+ echo "<form name=\"output_change\" action=\"view.php?id=$cm->id\" method=\"post\">\n";
+ echo "<input type=\"hidden\" name=\"sort\" value=\"sort\" />\n";
+ echo "<input type=\"hidden\" name=\"sortdir\" value=\"sortdir\" />\n";
+ echo "<input type=\"hidden\" name=\"outputchange\" value=\"" . ($usexml ? "html" : "xml") . "\" />\n";
+ print_string("outputfuture", "math_assignment");
+ echo " ";
+ print_string($usexml ? "mathml" : "html", "math_assignment");
+ echo "<br />\n";
+ echo "<a href=\"javascript:document.output_change.submit();\">";
+ print_string("outputchange", "math_assignment");
+ echo " ";
+ print_string($usexml ? "html" : "mathml", "math_assignment");
+ echo "</a>\n";
+ math_assignment_help_button("mathdisplay", get_string("mathdisplay", "math_assignment"), true);
+ echo "</form>";
+ print_simple_box_end();
}
|
