--- loncom/interface/lonquickgrades.pm	2011/05/24 18:06:10	1.90
+++ loncom/interface/lonquickgrades.pm	2011/05/27 19:32:10	1.94
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.90 2011/05/24 18:06:10 www Exp $
+# $Id: lonquickgrades.pm,v 1.94 2011/05/27 19:32:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -478,6 +478,33 @@ sub outputCategories {
 #    foreach (keys(%data)) {
 #        $r->print("\n<br />".$_.'='.$data{$_});
 #    }
+#   my @debugarray=('5:1','4:3','1:1','5:5','6:7');
+#   $r->print("Array: ".join(',',@debugarray).'<br />');
+#   $r->print("0,0,0: ".join(',',&drop(0,0,0,@debugarray)).'<br />');
+#   $r->print("1,0,0: ".join(',',&drop(1,0,0,@debugarray)).'<br />');
+#   $r->print("0,1,0: ".join(',',&drop(0,1,0,@debugarray)).'<br />');
+#   $r->print("1,1,0: ".join(',',&drop(1,1,0,@debugarray)).'<br />');
+#
+#   $r->print("0,0,2: ".join(',',&drop(0,0,2,@debugarray)).'<br />');
+#   $r->print("1,0,2: ".join(',',&drop(1,0,2,@debugarray)).'<br />');
+#   $r->print("0,1,2: ".join(',',&drop(0,1,2,@debugarray)).'<br />');
+#   $r->print("1,1,2: ".join(',',&drop(1,1,2,@debugarray)).'<br />');
+#
+#   $r->print("0,0,4: ".join(',',&drop(0,0,4,@debugarray)).'<br />');
+#   $r->print("1,0,4: ".join(',',&drop(1,0,4,@debugarray)).'<br />');
+#   $r->print("0,1,4: ".join(',',&drop(0,1,4,@debugarray)).'<br />');
+#   $r->print("1,1,4: ".join(',',&drop(1,1,4,@debugarray)).'<br />');
+#
+#   $r->print("0,0,5: ".join(',',&drop(0,0,5,@debugarray)).'<br />');
+#   $r->print("1,0,5: ".join(',',&drop(1,0,5,@debugarray)).'<br />');
+#   $r->print("0,1,5: ".join(',',&drop(0,1,5,@debugarray)).'<br />');
+#   $r->print("1,1,5: ".join(',',&drop(1,1,5,@debugarray)).'<br />');
+#
+#   $r->print("0,0,7: ".join(',',&drop(0,0,7,@debugarray)).'<br />');
+#   $r->print("1,0,7: ".join(',',&drop(1,0,7,@debugarray)).'<br />');
+#   $r->print("0,1,7: ".join(',',&drop(0,1,7,@debugarray)).'<br />');
+#   $r->print("1,1,7: ".join(',',&drop(1,1,7,@debugarray)).'<br />');
+
 }
 
 #
@@ -646,11 +673,13 @@ ENDMOVE
 # Content display and summing up of points
     my $totalpossible=0;
     my $totalcorrect=0;
+    my @individual=();
     if ($output) { $r->print('<td><ul>'); }
     foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {
         my ($type,$possible,$attempted,$correct)=split(/\:/,$$performance{$contentid});
         $totalpossible+=$possible;
         $totalcorrect+=$correct;
+        if ($possible>0) { push(@individual,"$possible:$correct"); }
         if ($output) {
            $r->print('<li>');
            $r->print(&Apache::lonnet::gettitle($contentid).' ('.$correct.'/'.$possible.')');
@@ -662,10 +691,10 @@ ENDMOVE
     }
     if ($output) {
        $r->print('</ul>');
-       $r->print('<p>'.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>'); 
        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('</td>'); 
     }
 # Total
@@ -703,13 +732,40 @@ ENDMOVE
         if ($cangrade) {
            if ($output) { $r->print(' <a href="javascript:storecmd(\'delrule_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>'); }
         }
+        if ($code eq 'capabove') {
+            if ($totalpossible>0) {
+                if ($totalcorrect/$totalpossible>$value/100.) {
+                    $totalcorrect=$totalpossible*$value/100.;
+                }
+            }
+        } elsif ($code eq 'capbelow') {
+            if ($totalpossible>0) {
+                if ($totalcorrect/$totalpossible<$value/100.) {
+                    $totalcorrect=$totalpossible*$value/100.;
+                }
+            }
+        } elsif ($code eq 'droplow') {
+            ($totalpossible,$totalcorrect,@individual)=&drop(0,0,$value,@individual);
+        } elsif ($code eq 'drophigh') {
+            ($totalpossible,$totalcorrect,@individual)=&drop(1,0,$value,@individual);
+        } elsif ($code eq 'droplowperc') {
+            ($totalpossible,$totalcorrect,@individual)=&drop(0,1,$value,@individual);
+        } elsif ($code eq 'drophighperc') {
+            ($totalpossible,$totalcorrect,@individual)=&drop(1,1,$value,@individual);
+        }
         if ($output) { $r->print('</li>'); }
     }
-    if ($output) { $r->print('</ul>'); }
-    if ($cangrade) {
-        if ($output) { $r->print('<br />'.&new_calc_rule_form($id)); }
+# 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>'); 
     }
-    if ($output) { $r->print('</td>'); }
 
 # Weight
     if ($cangrade) {
@@ -747,6 +803,46 @@ ENDMOVE
 }
 
 #
+# Drop folders and problems
+#
+
+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);
+        if ($percent) {
+            my $perca=0;
+            if ($pa>0) { $perca=$ca/$pa; }
+            my $percb=0;
+            if ($pb>0) { $percb=$cb/$pb; }
+            $perca<=>$percb;
+        } else {
+            $ca<=>$cb;
+        }
+    } @individual;
+# Drop the ones we don't want
+    if ($#newindividual>=$n) {
+        if ($high) {
+           splice(@newindividual,$#newindividual+1-$n,$n);
+        } else {
+           splice(@newindividual,0,$n);
+        }
+    } else {
+        @newindividual=();
+    }
+# Re-calculate how many points possible and achieved
+    my $newpossible=0;
+    my $newcorrect=0;
+    for my $score (@newindividual) {
+        my ($thispossible,$thiscorrect)=(split(/\:/,$score));
+        $newpossible+=$thispossible;
+        $newcorrect+=$thiscorrect;
+    }
+    return ($newpossible,$newcorrect,@newindividual);
+} 
+#
 # Bottom line with grades
 #
 
@@ -789,8 +885,10 @@ sub make_new_category {
 
 sub category_rule_codes {
     return &Apache::lonlocal::texthash(
-                'droplow'  => 'Drop N lowest grade assignments',
-                'drophigh' => 'Drop N highest grade assignments',
+                'droplowperc'  => 'Drop N lowest grade percentage problems/folders',
+                'drophighperc' => 'Drop N highest grade percentage problems/folderss',
+                'droplow'  => 'Drop N lowest point problems/folders',
+                'drophigh' => 'Drop N highest point problems/folders',
                 'capabove' => 'Cap percentage above N percent',
                 'capbelow' => 'Cap percentage below N percent');
 }