--- loncom/interface/lonquickgrades.pm	2011/03/26 16:09:33	1.80
+++ loncom/interface/lonquickgrades.pm	2011/05/26 18:02:22	1.93
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.80 2011/03/26 16:09:33 www Exp $
+# $Id: lonquickgrades.pm,v 1.93 2011/05/26 18:02:22 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,7 +62,8 @@ sub real_handler {
     $r->send_http_header;
 
     my $showPoints =
-        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
+        (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard')
+      || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories'));
     my $notshowSPRSlink =
         (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
       || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
@@ -266,8 +267,12 @@ sub getData {
 		    $totalRight += $score;
 		    $partsCount += $curRes->weight($part);
 
+                    $curRes->{DATA}->{PROB_SCORE}  += $score;
+                    $curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part);
+
 		    if ($curRes->opendate($part) < $now) {
 			$totalPossible += $curRes->weight($part);
+                        $curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part);
 		    }
 		    $totalParts += $curRes->weight($part);
 		} else {
@@ -459,11 +464,77 @@ sub outputCategories {
     &output_category_table($r,$cangrade,$navmap,%categories);
 #
     if ($cangrade) {
-        $r->print('<input type="hidden" name="storemove" value="" />'.
+        $r->print(&Apache::loncommon::resourcebrowser_javascript().
+                  '<input type="hidden" name="storemove" value="" />'.
                   '<input type="hidden" name="cmd" value="" />'.
+                  '<input type="hidden" name="resourcesymb" value="" />'.
                   '<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" />'.
                   '<script>function storecmd (cmd) { document.quickform.cmd.value=cmd; document.quickform.submit(); }</script>');
     }
+#
+# Debug
+#
+#    my %data=&dumpdata($navmap);
+#    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 />');
+
+}
+
+#
+# Get data for all symbs
+#
+
+sub dumpdata {
+    my ($navmap)=@_;
+    my %returndata=();
+
+# Run through the map and get all data
+
+    my $iterator = $navmap->getIterator(undef, undef, undef, 1);
+    my $depth = 1;
+    $iterator->next(); # ignore first BEGIN_MAP
+    my $curRes = $iterator->next();
+
+    while ($depth > 0) {
+        if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
+        if ($curRes == $iterator->END_MAP()) { $depth--; }
+        if (ref($curRes)) {
+            if ($curRes->is_map()) {
+                $returndata{$curRes->symb()}='folder:'.$curRes->{DATA}->{CHILD_PARTS}.':'.$curRes->{DATA}->{CHILD_ATTEMPTED}.':'.$curRes->{DATA}->{CHILD_CORRECT};
+            } else {
+                $returndata{$curRes->symb()}='res:'.$curRes->{DATA}->{PROB_WEIGHT}.':'.$curRes->{DATA}->{PROB_POSSIBLE}.':'.$curRes->{DATA}->{PROB_SCORE};
+            } 
+        }
+        $curRes = $iterator->next();
+    }
+    return %returndata;
 }
 
 #
@@ -479,6 +550,7 @@ sub process_category_edits {
         %categories=&set_category_name($cangrade,$id,$env{'form.name_'.$id},%categories);
         %categories=&set_category_total($cangrade,$id,$env{'form.totaltype_'.$id},$env{'form.total_'.$id},%categories);
         %categories=&set_category_weight($cangrade,$id,$env{'form.weight_'.$id},%categories);
+        %categories=&set_category_displayachieved($cangrade,$id,$env{'form.displayachieved_'.$id},%categories);
 # Set values for category rules (before names may change)
         %categories=&set_category_rules($cangrade,$id,%categories);
     }
@@ -494,7 +566,7 @@ sub process_category_edits {
     } elsif ($cmd=~/^delcat\_(.+)$/) {
         %categories=&del_category($1,$cangrade,%categories);
     } elsif ($cmd=~/^addcont\_(.+)$/) {
-        %categories=&add_category_content($1,$cangrade,$env{'form.addcont_'.$1.'_symb'},%categories);
+        %categories=&add_category_content($1,$cangrade,$env{'form.resourcesymb'},%categories);
     } elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) {
         %categories=&del_category_content($1,$cangrade,$2,%categories);
     } elsif ($cmd=~/^newrule\_(.+)$/) {
@@ -524,9 +596,10 @@ sub output_category_table {
 #
     my @order=split(/\,/,$categories{'order'});
 #
+    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,%categories);
+        my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories);
         $sum+=$value*$weight;
         $total+=$weight;
     }
@@ -545,9 +618,10 @@ sub output_category_table_header {
     }
     $r->print('<th>'.&mt('Category').'</th>'.
               '<th>'.&mt('Contents').'</th>'.
-              '<th>'.&mt('Calculation').'</th>'.
               '<th>'.&mt('Total Points').'</th>'.
-              '<th>'.&mt('Relative Weight').'</th>');
+              '<th>'.&mt('Calculation').'</th>'.
+              '<th>'.&mt('Relative Weight').'</th>'.
+              '<th>'.&mt('Achieved').'</th>');
     $r->print(&Apache::loncommon::end_data_table_header_row());
 }
 
@@ -557,16 +631,16 @@ sub output_category_table_header {
 #
 
 sub output_and_calc_category {
-    my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,%categories)=@_;
+    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',
            'dw' => 'Move Down');
-    $r->print("\n".&Apache::loncommon::start_data_table_row());
+    if ($output) { $r->print("\n".&Apache::loncommon::start_data_table_row()); }
 
-    if ($cangrade) {
+    if ($output && $cangrade) {
         $r->print(<<ENDMOVE);
 <td>
 <div class="LC_docs_entry_move">
@@ -593,68 +667,171 @@ ENDMOVE
         $r->print('<td><a href="javascript:storecmd(\'delcat_'.$id.'\');">'.&mt('Delete').'</a></td>');
         $r->print('<td><input type="text" name="name_'.$id.
                   '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_name'}).'" /></td>');
-    } else {
+    } elsif ($output) {
         $r->print('<td>'.$categories{$id.'_name'}.'</td>');
     }
-# Content
-    $r->print('<td><ul>');
+# 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'})) {
-        $r->print('<li>');
-        $r->print(&Apache::lonnet::gettitle($contentid));
-        if ($cangrade) {
-           $r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');
+        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.')');
+           if ($cangrade) {
+              $r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');
+           }
+           $r->print('</li>');
         }
-        $r->print('</li>');
-    }
-    $r->print('</ul>');
-    if ($cangrade) {
-        $r->print('<br />'.&mt('Add Problem or Sequence').'<br />'.
-                  &Apache::lonstathelpers::problem_selector('.',undef,1,1,'addcont_'.$id.'_',1,'this.form.cmd.value="addcont_'.$id.'";this.form.submit();'));
     }
-    $r->print('</td>'); 
-# Calculation
-    $r->print('<td><ul>');
-    foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {
-        $r->print('<li>');
-        my ($code,$value)=split(/\:/,$calcrule);
-        $r->print(&pretty_prt_rule($cangrade,$id,$code,$value));
-        if ($cangrade) {
-           $r->print(' <a href="javascript:storecmd(\'delrule_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>');
-        }
-        $r->print('</li>');
-    }
-    $r->print('</ul>');
-    if ($cangrade) {
-        $r->print('<br />'.&new_calc_rule_form($id));
+    if ($output) {
+       $r->print('</ul>');
+       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>'); 
     }
-    $r->print('</td>');
-
-
 # Total
+    if ($output) { $r->print('<td>'); }
     if ($cangrade) {
-       $r->print('<td>'.
+       if ($output) { 
+          $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 {
-        $r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).'</td>');
+       if ($output) {
+          $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>'.&mt('Adjusted raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');
+    }
+
+
+# Calculation
+    if ($output) { $r->print('<td><ul>'); }
+    foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {
+        if ($output) { $r->print('<li>'); }
+        my ($code,$value)=split(/\:/,$calcrule);
+        if ($output) { $r->print(&pretty_prt_rule($cangrade,$id,$code,$value)); }
+        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') {
+            ($totalcorrect,@individual)=&drop(0,0,$value,@individual);
+        } elsif ($code eq 'drophigh') {
+            ($totalcorrect,@individual)=&drop(1,0,$value,@individual);
+        } elsif ($code eq 'droplowperc') {
+            ($totalcorrect,@individual)=&drop(0,1,$value,@individual);
+        } elsif ($code eq 'drophighperc') {
+            ($totalcorrect,@individual)=&drop(1,1,$value,@individual);
+        }
+        if ($output) { $r->print('</li>'); }
+    }
+    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>'); 
     }
+
 # Weight
     if ($cangrade) {
-       $r->print('<td>'.
+       if ($output) { 
+          $r->print('<td>'.
                   '<input type="text" size="4" name="weight_'.$id.
                   '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_weight'}).'" /></td>');
+       }
     } else {
-        $r->print('<td>'.$categories{$id.'_weight'}.'</td>');
+       if ($output) {
+          $r->print('<td>'.$categories{$id.'_weight'}.'</td>');
+       }
     }
+# Achieved
+    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>'.
+                  '</select>');
+        }
+    } else {
+        if ($output) {
+            if ($categories{$id.'_displayachieved'} eq 'percent') {
+                $r->print(&mt('percent'));
+            } else {
+                $r->print(&mt('points'));
+            }
+        }
+    }
+    if ($output) { $r->print('</td>'); }
 
     return ($value,$weight);
 }
 
 #
+# Drop folders and problems
+#
+
+sub drop {
+    my ($high,$percent,$n,@individual)=@_;
+    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;
+    if ($#newindividual>=$n) {
+        if ($high) {
+           splice(@newindividual,$#newindividual+1-$n,$n);
+        } else {
+           splice(@newindividual,0,$n);
+        }
+    } else {
+        @newindividual=();
+    }
+    my $newcorrect=0;
+    for my $score (@newindividual) {
+        $newcorrect+=(split(/\:/,$score))[1];
+    }
+    return ($newcorrect,@newindividual);
+} 
+#
 # Bottom line with grades
 #
 
@@ -664,7 +841,7 @@ sub bottom_line_category {
     if ($cangrade) {
         $r->print('<td colspan="3"><a href="javascript:storecmd(\'createnewcat\');">'.&mt('Create New Category').'</a></td>');
     }
-    $r->print('<td colspan="5">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>');
+    $r->print('<td colspan="6">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>');
 }
 
 #
@@ -688,6 +865,7 @@ sub make_new_category {
     }
     $categories{$id.'_weight'}=0;
     $categories{$id.'_totaltype'}='default';
+    $categories{$id.'_displayachieved'}='percent';
     return %categories;
 }
 
@@ -696,8 +874,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');
 }
@@ -781,6 +961,7 @@ sub set_category_rules {
 sub add_category_content {
     my ($id,$cangrade,$newcontent,%categories)=@_;
     unless ($cangrade) { return %categories; }
+    &Apache::lonnet::logthis("In here $newcontent");
     my %newcontent=($newcontent => 1);
     foreach my $current (split(/\,/,$categories{$id.'_content'})) {
         $newcontent{$current}=1;
@@ -933,6 +1114,15 @@ sub set_category_weight {
     return %categories;
 }
 
+sub set_category_displayachieved {
+    my ($cangrade,$id,$value,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    unless (($value eq 'percent') || ($value eq 'points')) { $value='percent'; }
+    $categories{$id.'_displayachieved'}=$value;
+    return %categories;
+}
+
+
 #
 # === end category-related
 #