--- loncom/interface/lonquickgrades.pm	2011/05/28 16:55:49	1.95
+++ loncom/interface/lonquickgrades.pm	2011/06/02 01:34:34	1.98
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.95 2011/05/28 16:55:49 www Exp $
+# $Id: lonquickgrades.pm,v 1.98 2011/06/02 01:34:34 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,17 @@ use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
 use Apache::grades;
+use Time::HiRes;
+my $time=0;
+
+sub tim {
+    my ($label)=@_;
+    my $tt=&Time::HiRes::time();
+    my $dt=$tt-$time;
+    &Apache::lonnet::logthis("qg $label ".$dt);
+    $time=$tt;
+}
+
 
 sub handler {
     my $r = shift;
@@ -242,39 +253,40 @@ sub getData {
             my $stack = $iterator->getStack();
             
             for my $part (@{$parts}) {
-		my $completionStatus = $curRes->getCompletionStatus($part);
 		my $dateStatus = $curRes->getDateStatus($part);
-		
-                if ($completionStatus == $curRes->EXCUSED()) {
+                my $weight = $curRes->weight($part);
+                my $problemstatus = $curRes->problemstatus($part);
+
+                if ($curRes->solved($part) eq 'excused') {
                     next;
                 }
 		if ($showPoints) {
 		    my $score = 0;
 		    # If we're not telling status and the answer date isn't passed yet, 
 		    # it's an "attempted" point
-		    if ((($curRes->problemstatus($part) eq 'no') ||
-                        ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&
+		    if ((($problemstatus eq 'no') ||
+                         ($problemstatus eq 'no_feedback_ever')) &&
 			($dateStatus != $curRes->ANSWER_OPEN)) {
 			my $status = $curRes->simpleStatus($part);
 			if ($status == $curRes->ATTEMPTED) {
-			    $partsAttempted += $curRes->weight($part);
+			    $partsAttempted += $weight;
 			    $totalAttempted += $partsAttempted;
 			}
 		    } else {
-			$score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
+			$score = &Apache::grades::compute_points($weight, $curRes->awarded($part));
 		    }
 		    $partsRight += $score;
 		    $totalRight += $score;
-		    $partsCount += $curRes->weight($part);
+		    $partsCount += $weight;
 
                     $curRes->{DATA}->{PROB_SCORE}  += $score;
-                    $curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part);
+                    $curRes->{DATA}->{PROB_WEIGHT} += $weight;
 
 		    if ($curRes->opendate($part) < $now) {
-			$totalPossible += $curRes->weight($part);
-                        $curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part);
+			$totalPossible += $weight;
+                        $curRes->{DATA}->{PROB_POSSIBLE} += $weight;
 		    }
-		    $totalParts += $curRes->weight($part);
+		    $totalParts += $weight;
 		} else {
 		    my $status = $curRes->simpleStatus($part);
 		    my $thisright = 0;
@@ -291,7 +303,6 @@ sub getData {
 			$totalAttempted++;
 		    }
 		    
-		    my $dateStatus = $curRes->getDateStatus($part);
 		    $totalParts++;
 		    if ($curRes->opendate($part) < $now) {
 			$totalPossible++;
@@ -588,8 +599,10 @@ sub process_category_edits {
 
 sub output_category_table {
     my ($r,$cangrade,$navmaps,%categories)=@_;
-    my $sum=0;
-    my $total=0;
+    
+    my $totalweight=0;
+    my $totalpoints=0;
+
     $r->print(&Apache::loncommon::start_data_table());
 #
     &output_category_table_header($r,$cangrade);
@@ -600,14 +613,18 @@ sub output_category_table {
     my $maxpos=$#order;
     for (my $i=0;$i<=$maxpos;$i++) {
         my ($correct,$possible,$type,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories);
-        $sum+=$correct*$weight;
-        $total+=$weight;
+        unless ($possible) { next; }
+        $totalpoints+=$weight*$correct/$possible;
+        $totalweight+=$weight;
     }
 #
-    &bottom_line_category($r,$cangrade,$sum,$total);
+    my $perc=0;
+    if ($totalweight) { $perc=100.*$totalpoints/$totalweight; }
+
+    &bottom_line_category($r,$cangrade,$perc);
 #
     $r->print(&Apache::loncommon::end_data_table());
-    return $sum;
+    return $perc;
 }
 
 sub output_category_table_header {
@@ -681,7 +698,7 @@ ENDMOVE
         if ($possible>0) { push(@individual,"$possible:$correct"); }
         if ($output) {
            $r->print('<li>');
-           $r->print(&Apache::lonnet::gettitle($contentid).' ('.$correct.'/'.$possible.')');
+           $r->print(&Apache::lonnet::gettitle($contentid).' ('.&numberout($correct).'/'.&numberout($possible).')');
            if ($cangrade) {
               $r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');
            }
@@ -693,7 +710,7 @@ ENDMOVE
        if ($cangrade) {
            $r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />');
        }
-       $r->print('<p>'.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');
+       $r->print('<p><b>'.&mt('Total raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
        $r->print('</td>'); 
     }
 # Total
@@ -718,7 +735,7 @@ ENDMOVE
        $totalpossible=1.*$categories{$id.'_total'};
     }
     if ($output) {
-       $r->print('<p>'.&mt('Adjusted raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');
+       $r->print('<p><b>'.&mt('Adjusted raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
     }
 
 
@@ -762,7 +779,7 @@ ENDMOVE
     if ($output) { 
         $r->print('</ul>'); 
         if ($cangrade) { $r->print('<br />'.&new_calc_rule_form($id)); }
-        $r->print('<p>'.&mt('Calculated points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');
+        $r->print('<p><b>'.&mt('Calculated points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
         $r->print('</td>'); 
     }
 #
@@ -795,17 +812,17 @@ ENDMOVE
         }
     }
     if ($output) {
-        $r->print('<p>');
+        $r->print('<p><b>');
         if ($type eq 'percent') {
             my $perc='---';
             if ($totalpossible) {
                 $perc=100.*$totalcorrect/$totalpossible;
             }
-            $r->print(&mt('[_1] percent',$perc));
+            $r->print(&mt('[_1] percent',&numberout($perc)));
         } else {
-            $r->print(&mt('[_1]/[_2] points',$totalcorrect,$totalpossible));
+            $r->print(&mt('[_1]/[_2] points',&numberout($totalcorrect),&numberout($totalpossible)));
         }
-        $r->print('</p>');
+        $r->print('</b></p>');
     }
     if ($output) { $r->print('</td>'); }
 
@@ -857,14 +874,21 @@ sub drop {
 #
 
 sub bottom_line_category {
-    my ($r,$cangrade,$sum,$total)=@_;
+    my ($r,$cangrade,$perc)=@_;
     $r->print(&Apache::loncommon::start_data_table_row());
     if ($cangrade) {
         $r->print('<td colspan="3"><a href="javascript:storecmd(\'createnewcat\');">'.&mt('Create New Category').'</a></td>');
     }
-    $r->print('<td colspan="6">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>');
+    $r->print('<td colspan="6"><b>'.&mt('Total: [_1] percent',&numberout($perc)).'</b></td>');
 }
 
+sub numberout {
+    my ($number)=@_;
+    my $printout=sprintf("%.3f", $number);
+    $printout=~s/0+$//;
+    $printout=~s/\.$//;
+    return $printout;
+}
 #
 # Make one new category
 #