--- loncom/interface/lonquickgrades.pm	2011/05/24 17:17:24	1.89
+++ loncom/interface/lonquickgrades.pm	2011/06/01 20:32:30	1.96
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.89 2011/05/24 17:17:24 www Exp $
+# $Id: lonquickgrades.pm,v 1.96 2011/06/01 20:32:30 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 />');
+
 }
 
 #
@@ -561,8 +588,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);
@@ -572,15 +601,19 @@ 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;
-        $total+=$weight;
+        my ($correct,$possible,$type,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories);
+        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 {
@@ -605,8 +638,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',
@@ -646,14 +678,16 @@ 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.')');
+           $r->print(&Apache::lonnet::gettitle($contentid).' ('.&numberout($correct).'/'.&numberout($possible).')');
            if ($cangrade) {
               $r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');
            }
@@ -662,28 +696,36 @@ 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><b>'.&mt('Total raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
        $r->print('</td>'); 
     }
 # Total
+    if ($output) { $r->print('<td>'); }
     if ($cangrade) {
        if ($output) { 
-          $r->print('<td>'.
+          $r->print(
                   '<select name="totaltype_'.$id.'">'.
                   '<option value="default"'.($categories{$id.'_totaltype'} eq 'default'?' selected="selected"':'').'>'.&mt('default').'</option>'.
                   '<option value="typein"'.($categories{$id.'_totaltype'} eq 'typein'?' selected="selected"':'').'>'.&mt('Type-in value').'</option>'.
                   '</select>'.
                   '<input type="text" size="4" name="total_'.$id.
-                  '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_total'}).'" /></td>'); 
+                  '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_total'}).'" />'); 
        }
     } else {
        if ($output) {
-          $r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).'</td>');
+          $r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}));
        }
     }
+# Adjust total points
+    if ($categories{$id.'_totaltype'} eq 'typein') {
+       $totalpossible=1.*$categories{$id.'_total'};
+    }
+    if ($output) {
+       $r->print('<p><b>'.&mt('Adjusted raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
+    }
 
 
 # Calculation
@@ -695,62 +737,147 @@ 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('</td>'); }
 
+    if ($output) { 
+        $r->print('</ul>'); 
+        if ($cangrade) { $r->print('<br />'.&new_calc_rule_form($id)); }
+        $r->print('<p><b>'.&mt('Calculated points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></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><b>');
+        if ($type eq 'percent') {
+            my $perc='---';
+            if ($totalpossible) {
+                $perc=100.*$totalcorrect/$totalpossible;
             }
+            $r->print(&mt('[_1] percent',&numberout($perc)));
+        } else {
+            $r->print(&mt('[_1]/[_2] points',&numberout($totalcorrect),&numberout($totalpossible)));
         }
+        $r->print('</b></p>');
     }
     if ($output) { $r->print('</td>'); }
 
-    return ($value,$weight);
+    return ($totalcorrect,$totalpossible,$type,$weight);
 }
 
 #
+# 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
 #
 
 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
 #
@@ -781,8 +908,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');
 }