[LON-CAPA-cvs] cvs: loncom /homework grades.pm /interface lonquickgrades.pm /interface/statistics lonstudentassessment.pm

[albertel]

albertel		Mon Feb 27 14:40:47 2006 EDT

  Modified files:              
    /loncom/homework	grades.pm 
    /loncom/interface/statistics	lonstudentassessment.pm 
    /loncom/interface	lonquickgrades.pm 
  Log:
  - style police
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.319 loncom/homework/grades.pm:1.320
--- loncom/homework/grades.pm:1.319	Sun Feb 26 21:06:52 2006
+++ loncom/homework/grades.pm	Mon Feb 27 14:40:21 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.319 2006/02/27 02:06:52 bowersj2 Exp $
+# $Id: grades.pm,v 1.320 2006/02/27 19:40:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1421,7 +1421,7 @@
 		  '<font color="red">problem weight assigned by computer</font>');
     $wgt       = ($wgt > 0 ? $wgt : '1');
     my $score  = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
-		  '' : compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));
+		  '' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));
     my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
     $result.='<br />'.$partid.' - '.$respid.'<br />';
     my $display_part=&get_display_part($partid,undef,$symb);
@@ -2893,7 +2893,7 @@
             $aggregates{$part} = 1;
         }
 	if ($type eq 'awarded') {
-	    my $pts = $score eq '' ? '' : compute_points($score,$$weight{$part});
+	    my $pts = $score eq '' ? '' : &compute_points($score,$$weight{$part});
 	    $result.='<input type="hidden" name="'.
 		'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
 	    $result.='<input type="text" name="'.
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.130 loncom/interface/statistics/lonstudentassessment.pm:1.131
--- loncom/interface/statistics/lonstudentassessment.pm:1.130	Sun Feb 26 21:25:44 2006
+++ loncom/interface/statistics/lonstudentassessment.pm	Mon Feb 27 14:40:30 2006
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.130 2006/02/27 02:25:44 bowersj2 Exp $
+# $Id: lonstudentassessment.pm,v 1.131 2006/02/27 19:40:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1943,7 +1943,7 @@
                 $hasdata = 1;
             }
             #
-            $partscore = Apache::grades::compute_points($weight,$awarded);
+            $partscore = &Apache::grades::compute_points($weight,$awarded);
             if (! defined($awarded)) {
                 $partscore = undef;
             }
Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.38 loncom/interface/lonquickgrades.pm:1.39
--- loncom/interface/lonquickgrades.pm:1.38	Sun Feb 26 21:11:27 2006
+++ loncom/interface/lonquickgrades.pm	Mon Feb 27 14:40:43 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.38 2006/02/27 02:11:27 bowersj2 Exp $
+# $Id: lonquickgrades.pm,v 1.39 2006/02/27 19:40:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -158,7 +158,7 @@
 			    $totalAttempted += $partsAttempted;
 			}
 		    } else {
-			$score = Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
+			$score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
 		    }
 		    $partsRight += $score;
 		    $totalRight += $score;