--- loncom/interface/lonquickgrades.pm	2011/05/26 18:02:22	1.93
+++ loncom/interface/lonquickgrades.pm	2011/05/28 16:55:49	1.95
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.93 2011/05/26 18:02:22 www Exp $
+# $Id: lonquickgrades.pm,v 1.95 2011/05/28 16:55:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -599,8 +599,8 @@ sub output_category_table {
     my %performance=&dumpdata($navmaps);
     my $maxpos=$#order;
     for (my $i=0;$i<=$maxpos;$i++) {
-        my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories);
-        $sum+=$value*$weight;
+        my ($correct,$possible,$type,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories);
+        $sum+=$correct*$weight;
         $total+=$weight;
     }
 #
@@ -632,8 +632,7 @@ sub output_category_table_header {
 
 sub output_and_calc_category {
     my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,$performance,$output,%categories)=@_;
-    my $value=0;
-    my $weight=0;
+
     my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
     my %lt=&Apache::lonlocal::texthash(
            'up' => 'Move Up',
@@ -745,56 +744,72 @@ ENDMOVE
                 }
             }
         } elsif ($code eq 'droplow') {
-            ($totalcorrect,@individual)=&drop(0,0,$value,@individual);
+            ($totalpossible,$totalcorrect,@individual)=&drop(0,0,$value,@individual);
         } elsif ($code eq 'drophigh') {
-            ($totalcorrect,@individual)=&drop(1,0,$value,@individual);
+            ($totalpossible,$totalcorrect,@individual)=&drop(1,0,$value,@individual);
         } elsif ($code eq 'droplowperc') {
-            ($totalcorrect,@individual)=&drop(0,1,$value,@individual);
+            ($totalpossible,$totalcorrect,@individual)=&drop(0,1,$value,@individual);
         } elsif ($code eq 'drophighperc') {
-            ($totalcorrect,@individual)=&drop(1,1,$value,@individual);
+            ($totalpossible,$totalcorrect,@individual)=&drop(1,1,$value,@individual);
         }
         if ($output) { $r->print('</li>'); }
     }
+# Re-adjust total points if force total
+    if ($categories{$id.'_totaltype'} eq 'typein') {
+       $totalpossible=1.*$categories{$id.'_total'};
+    }
+
     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('</td>'); 
     }
-
+#
+# Prepare for export
+#
 # Weight
+    my $weight=$categories{$id.'_weight'};
+    unless (1.*$weight>0) { $weight=0; }
     if ($cangrade) {
        if ($output) { 
           $r->print('<td>'.
                   '<input type="text" size="4" name="weight_'.$id.
-                  '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_weight'}).'" /></td>');
+                  '" value="'.&Apache::lonhtmlcommon::entity_encode($weight).'" /></td>');
        }
     } else {
        if ($output) {
-          $r->print('<td>'.$categories{$id.'_weight'}.'</td>');
+          $r->print('<td>'.$weight.'</td>');
        }
     }
 # Achieved
+    my $type=$categories{$id.'_displayachieved'};
+    unless (($type eq 'percent') || ($type eq 'points')) { $type='points'; }
     if ($output) { $r->print('<td>'); }
     if ($cangrade) {
         if ($output) {
            $r->print('<select name="displayachieved_'.$id.'">'.
-                  '<option value="percent"'.($categories{$id.'_displayachieved'} eq 'percent'?' selected="selected"':'').'>'.&mt('percent').'</option>'.
-                  '<option value="points"'.($categories{$id.'_displayachieved'} eq 'points'?' selected="selected"':'').'>'.&mt('points').'</option>'.
+                  '<option value="percent"'.($type eq 'percent'?' selected="selected"':'').'>'.&mt('percent').'</option>'.
+                  '<option value="points"'.($type eq 'points'?' selected="selected"':'').'>'.&mt('points').'</option>'.
                   '</select>');
         }
-    } else {
-        if ($output) {
-            if ($categories{$id.'_displayachieved'} eq 'percent') {
-                $r->print(&mt('percent'));
-            } else {
-                $r->print(&mt('points'));
+    }
+    if ($output) {
+        $r->print('<p>');
+        if ($type eq 'percent') {
+            my $perc='---';
+            if ($totalpossible) {
+                $perc=100.*$totalcorrect/$totalpossible;
             }
+            $r->print(&mt('[_1] percent',$perc));
+        } else {
+            $r->print(&mt('[_1]/[_2] points',$totalcorrect,$totalpossible));
         }
+        $r->print('</p>');
     }
     if ($output) { $r->print('</td>'); }
 
-    return ($value,$weight);
+    return ($totalcorrect,$totalpossible,$type,$weight);
 }
 
 #
@@ -803,6 +818,7 @@ ENDMOVE
 
 sub drop {
     my ($high,$percent,$n,@individual)=@_;
+# Sort assignments by points or percent
     my @newindividual=sort {
         my ($pa,$ca)=split(/\:/,$a);
         my ($pb,$cb)=split(/\:/,$b);
@@ -816,6 +832,7 @@ sub drop {
             $ca<=>$cb;
         }
     } @individual;
+# Drop the ones we don't want
     if ($#newindividual>=$n) {
         if ($high) {
            splice(@newindividual,$#newindividual+1-$n,$n);
@@ -825,11 +842,15 @@ sub drop {
     } else {
         @newindividual=();
     }
+# Re-calculate how many points possible and achieved
+    my $newpossible=0;
     my $newcorrect=0;
     for my $score (@newindividual) {
-        $newcorrect+=(split(/\:/,$score))[1];
+        my ($thispossible,$thiscorrect)=(split(/\:/,$score));
+        $newpossible+=$thispossible;
+        $newcorrect+=$thiscorrect;
     }
-    return ($newcorrect,@newindividual);
+    return ($newpossible,$newcorrect,@newindividual);
 } 
 #
 # Bottom line with grades