aimmath-commit

[<gus...@us...>]

Update of /cvsroot/aimmath/moodle/mod/math_assignment
In directory sc8-pr-cvs1:/tmp/cvs-serv8539

Modified Files:
	lib.php 
Log Message:
fixed bug in solutiontime.

Index: lib.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** lib.php	11 Jan 2004 14:08:06 -0000	1.45
--- lib.php	11 Jan 2004 16:36:20 -0000	1.46
***************
*** 20,24 ****
  
      // solution time
!     $math_assignment->solutiontime = make_timestamp($math_assignment->dueyear, $math_assignment->duemonth,$math_assignment->dueday, $math_assignment->duehour, $math_assignment->dueminute);
      if ($math_assignment->solutiontime < $math_assignment->timedue) {
          $math_assignment->solutiontime += 86400;
--- 20,24 ----
  
      // solution time
!     $math_assignment->solutiontime = make_timestamp($math_assignment->dueyear, $math_assignment->duemonth,$math_assignment->dueday, $math_assignment->solutionhour, $math_assignment->solutionminute);
      if ($math_assignment->solutiontime < $math_assignment->timedue) {
          $math_assignment->solutiontime += 86400;
***************
*** 87,91 ****
  
      // solution time
!     $math_assignment->solutiontime = make_timestamp($math_assignment->dueyear, $math_assignment->duemonth,$math_assignment->dueday, $math_assignment->duehour, $math_assignment->dueminute);
      if ($math_assignment->solutiontime < $math_assignment->timedue) {
          $math_assignment->solutiontime += 86400;
--- 87,91 ----
  
      // solution time
!     $math_assignment->solutiontime = make_timestamp($math_assignment->dueyear, $math_assignment->duemonth,$math_assignment->dueday, $math_assignment->solutionhour, $math_assignment->solutionminute);
      if ($math_assignment->solutiontime < $math_assignment->timedue) {
          $math_assignment->solutiontime += 86400;
***************
*** 165,171 ****
  /// $return->info = a short text description
  
!     if ($logs = get_records_select("log", "userid='$user->id' AND module='math_assig' 
! 		   AND action='view' AND 
! 		   (info='$math_assignment->id' OR info='$math_assignment->name')", "time ASC")) {
  
          $numviews = count($logs);
--- 165,170 ----
  /// $return->info = a short text description
  
!     if ($logs = get_records_select("log", "userid='$user->id' AND module='math_assignment' 
!             AND action='view' AND info='$math_assignment->id'", "time ASC")) {
  
          $numviews = count($logs);
***************
*** 185,197 ****
      global $CFG, $THEME;
  
!     if ($logs = get_records_select("log", "userid='$user->id' AND module='math_assig' 
! 		   AND action='view' 
! 		   AND (info='$math_assignment->id' OR info='$math_assignment->name')", "time ASC")) {
          $numviews = count($logs);
          $lastlog = array_pop($logs);
          
!         $aimlogs = get_records_select("log", "userid='$user->id' AND module='math_assig' 
! 		   AND action='aimpage' 
! 		   AND (info='$math_assignment->id' OR info='$math_assignment->name')", "time ASC");
          $numaims = count($aimlogs);
          
--- 184,194 ----
      global $CFG, $THEME;
  
!     if ($logs = get_records_select("log", "userid='$user->id' AND module='math_assignment' 
!             AND action='view' AND info='$math_assignment->id'", "time ASC")) {
          $numviews = count($logs);
          $lastlog = array_pop($logs);
          
!         $aimlogs = get_records_select("log", "userid='$user->id' AND module='math_assignment' 
!             AND action='aimpage' AND info='$math_assignment->id'", "time ASC");
          $numaims = count($aimlogs);