[Aimmath-commit] moodle/mod/math_assignment aimpage.php,1.23,1.24 lib.php,1.55,1.56

[Gustav W D. <gus...@us...>]

Update of /cvsroot/aimmath/moodle/mod/math_assignment
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5263

Modified Files:
	aimpage.php lib.php 
Log Message:
shows solutions by default when viewing student's answers
transfers grade to Moodle every time a page with a grade is viewed

Index: lib.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** lib.php	18 Mar 2004 22:29:50 -0000	1.55
--- lib.php	21 Mar 2004 11:42:27 -0000	1.56
***************
*** 675,678 ****
--- 675,679 ----
      
      // extract grades (if present)
+     $grade = NULL;
      if (preg_match("/class=\"marktable\"([\s\S]*)?<\/table>/i", $data, $matches)) {
          $data = $matches[1];

Index: aimpage.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/aimpage.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** aimpage.php	2 Mar 2004 21:11:50 -0000	1.23
--- aimpage.php	21 Mar 2004 11:42:27 -0000	1.24
***************
*** 115,119 ****
          else if ($isteacher and strcasecmp($aimaction, "reviewquiz") == 0) { // review student's quiz attempts
              $postdata = math_assignment_add_arg_to_url_data($postdata, "Command","review/Quiz");
!             $postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "ReviewQuiz");
              $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);
--- 115,120 ----
          else if ($isteacher and strcasecmp($aimaction, "reviewquiz") == 0) { // review student's quiz attempts
              $postdata = math_assignment_add_arg_to_url_data($postdata, "Command","review/Quiz");
!             $postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "ShowSolution");
!             $postdata = math_assignment_add_arg_to_url_data($postdata, "ShowSolution", "true");
              $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);
***************
*** 297,306 ****
      if ($max_grade > 0)
          set_field("math_assignment", "aimgrade", $max_grade, "id", $math_assignment->id);
!     // update student grade when marking only
      if (isstudent($course->id)) {
!         if (array_key_exists("Command", $_POST)) {
!             if (strcmp($_POST['Command'], "MarkQuiz") == 0) {
!                 math_assignment_store_grade($math_assignment, $USER->id, -1, $grade);
!             }
          }
      }
--- 298,305 ----
      if ($max_grade > 0)
          set_field("math_assignment", "aimgrade", $max_grade, "id", $math_assignment->id);
!     // update grade
      if (isstudent($course->id)) {
!         if ($grade or $grade == 0) {
!             math_assignment_store_grade($math_assignment, $USER->id, -1, $grade);
          }
      }