[Aimmath-commit] moodle/mod/math_assignment lib.php,1.46,1.47

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	lib.php 
Log Message:
grades are now not withheld until the assignment closes but are displayed in grey

Index: lib.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** lib.php	11 Jan 2004 16:36:20 -0000	1.46
--- lib.php	11 Jan 2004 17:20:31 -0000	1.47
***************
*** 1,6 ****
  <?PHP  // $Id$
  
- //@include_once("../../lib/t2mml/edit.php"); // TeX to MathML converter script
- 
  /// Library of functions and constants for module math_assignment
  
--- 1,4 ----
***************
*** 243,263 ****
  /// indexed by user.  It also returns a maximum allowed grade.
  
!     $math_assignment = get_record("math_assignment", "id", $math_assignmentid);
!     
!     // If there is a hand-marked component then don't display grades until they are finalized
!     if ($math_assignment->papergrade > 0 and !$math_assignment->papersheetsreturned) {
!         return false;
!     }
!     // If there is only an aim quiz dont display grades until after due date
!     // This actually turned out to be a nuisance so I am commenting this out
!     //else if ($math_assignment->papergrade <= 0 and $math_assignment->timedue > time()) {
!     //    return false;
!     //} else {
!         $return->maxgrade = $math_assignment->papergrade+ $math_assignment->aimgrade;
!         $return->grades = math_assignment_get_grades($math_assignment, "id", "asc");
!         if ($return->grades)
!             array_walk($return->grades, create_function('&$val','$val = $val->totalgrade;'));
!         return $return;
!     //}
  }
  
--- 241,252 ----
  /// indexed by user.  It also returns a maximum allowed grade.
  
!     $math_assignment = get_record("math_assignment", "id", $math_assignmentid);   
! 
!     $return->maxgrade = $math_assignment->papergrade+ $math_assignment->aimgrade;
!     $return->grades = math_assignment_get_grades($math_assignment, "id", "asc");
!     if ($return->grades)
!         array_walk($return->grades, create_function('&$val','$val = $val->totalgrade;'));
!     return $return;
! 
  }
  
***************
*** 710,714 ****
                    $photo = print_user_picture($userid, 1, $haspicture, true, true);
                    return "<th align=\"left\">Student photo</th><td>$photo</td></tr><tr>
! 	  <th align=\"left\">Student ID</th>\n<td>$matches[1]</td>";'
                ), $out
             );
--- 699,703 ----
                    $photo = print_user_picture($userid, 1, $haspicture, true, true);
                    return "<th align=\"left\">Student photo</th><td>$photo</td></tr><tr>
!                           <th align=\"left\">Student ID</th>\n<td>$matches[1]</td>";'
                ), $out
             );
***************
*** 833,867 ****
              if ($students) {
                  foreach ($students as $key => $student) {
! 	if ($students[$key] = get_record_sql("SELECT firstname, lastname, email, username, mailformat, picture FROM {$CFG->prefix}user WHERE id = '$key' AND deleted = '0'")) {
! 	    $grade = get_record_sql("SELECT papergrade, aimgrade, aimoverride, aimcomment FROM {$CFG->prefix}math_assignment_grades WHERE assignment = '$math_assignment->id' and userid = '$key'");
! 	    if ($grade) {
! 	        $students[$key]->papergrade = $grade->papergrade;
! 	        $students[$key]->aimgrade = $grade->aimgrade;
! 	        $students[$key]->aimoverride = $grade->aimoverride ;
! 	        $students[$key]->aimcomment = $grade->aimcomment;
! 	        $students[$key]->totalgrade = math_assignment_total_grade($math_assignment, $grade);
! 	    }
! 	    else {
! 	        $students[$key]->papergrade = -1;
! 	        $students[$key]->aimgrade = -1;
! 	        $students[$key]->aimoverride = AIMOVR_OFF ;
! 	        $students[$key]->aimcomment = "";
! 	        $students[$key]->totalgrade = 0;
! 	    }
! 	}
! 	else {
! 	    // assume it failed because deleted was not zero
! 	    unset($students[$key]);
! 	}
                  }
                  // sort
                  if (strcasecmp($sortdir, "desc") == 0)
! 	$mult = -1;
                  else
! 	$mult = 1;
                  if (strcasecmp($sort, "id") == 0)
! 	uksort($students, create_function('$a, $b', 'return (($a > $b) ? 1 : -1) * ' . $mult . ';'));
                  else
! 	uasort($students, create_function('$a, $b', 'return (($a->' . $sort . ' > $b->' . $sort . ') ? 1 : -1) * ' . $mult . ';'));
              }
              break;
--- 822,856 ----
              if ($students) {
                  foreach ($students as $key => $student) {
!                     if ($students[$key] = get_record_sql("SELECT firstname, lastname, email, username, mailformat, picture FROM {$CFG->prefix}user WHERE id = '$key' AND deleted = '0'")) {
!                         $grade = get_record_sql("SELECT papergrade, aimgrade, aimoverride, aimcomment FROM {$CFG->prefix}math_assignment_grades WHERE assignment = '$math_assignment->id' and userid = '$key'");
!                         if ($grade) {
!                             $students[$key]->papergrade = $grade->papergrade;
!                             $students[$key]->aimgrade = $grade->aimgrade;
!                             $students[$key]->aimoverride = $grade->aimoverride ;
!                             $students[$key]->aimcomment = $grade->aimcomment;
!                             $students[$key]->totalgrade = math_assignment_total_grade($math_assignment, $grade);
!                         }
!                         else {
!                             $students[$key]->papergrade = -1;
!                             $students[$key]->aimgrade = -1;
!                             $students[$key]->aimoverride = AIMOVR_OFF ;
!                             $students[$key]->aimcomment = "";
!                             $students[$key]->totalgrade = 0;
!                         }
!                     }
!                     else {
!                         // assume it failed because deleted was not zero
!                         unset($students[$key]);
!                     }
                  }
                  // sort
                  if (strcasecmp($sortdir, "desc") == 0)
!                     $mult = -1;
                  else
!                     $mult = 1;
                  if (strcasecmp($sort, "id") == 0)
!                     uksort($students, create_function('$a, $b', 'return (($a > $b) ? 1 : -1) * ' . $mult . ';'));
                  else
!                     uasort($students, create_function('$a, $b', 'return (($a->' . $sort . ' > $b->' . $sort . ') ? 1 : -1) * ' . $mult . ';'));
              }
              break;
***************
*** 1113,1123 ****
              }
              if ($math_assignment->papergrade > 0) {
!                 if (!$math_assignment->papersheetsreturned) {
!                     $papergrade = get_string("notpublished", "math_assignment");
!                 } else if ($grade->papergrade >= 0) {
                      $papergrade = "<b>$grade->papergrade / $math_assignment->papergrade</b>";
                  } else if ($grade->papergrade = -1) {
                      $papergrade = "<b>-- / $math_assignment->papergrade</b>";
                  }
                  if ($math_assignment->timedue > time()) {
                      $papergrade = $stropen;
--- 1102,1114 ----
              }
              if ($math_assignment->papergrade > 0) {
!                 if ($grade->papergrade >= 0) {
                      $papergrade = "<b>$grade->papergrade / $math_assignment->papergrade</b>";
                  } else if ($grade->papergrade = -1) {
                      $papergrade = "<b>-- / $math_assignment->papergrade</b>";
                  }
+                 // display in grey if results have not been finalised
+                 if (!$math_assignment->papersheetsreturned) {
+                     $papergrade = "<span style=\"color: silver \">$papergrade</span>";
+                 // don't give results if assignment still open
                  if ($math_assignment->timedue > time()) {
                      $papergrade = $stropen;
***************
*** 1167,1173 ****
                  $row = array ($link);
              
!             // show links to the solutions only after the due date
              if ($solurl) {
!                 if ($timenow > $math_assignment->timedue)
                      $solutions = "<a href=\"$solurl\" target=\"solutions\">$strviewsolutions</a>";
                  else
--- 1158,1164 ----
                  $row = array ($link);
              
!             // show links to the solutions only after the solutiontime
              if ($solurl) {
!                 if ($timenow > $math_assignment->solutiontime)
                      $solutions = "<a href=\"$solurl\" target=\"solutions\">$strviewsolutions</a>";
                  else