--- loncom/interface/lonquickgrades.pm	2011/03/19 02:22:18	1.76
+++ loncom/interface/lonquickgrades.pm	2011/05/03 23:51:19	1.84
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.76 2011/03/19 02:22:18 www Exp $
+# $Id: lonquickgrades.pm,v 1.84 2011/05/03 23:51:19 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,49 @@ 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="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{$_});
+#    }
+}
+
+#
+# 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;
 }
 
 #
@@ -475,10 +518,13 @@ sub process_category_edits {
     unless ($cangrade) { return %categories; }
 # First store everything
     foreach my $id (split(/\,/,$categories{'order'})) {
+# Set names, types, and weight (there is only one of each per category)
         %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);
-# More changes here
+        %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);
     }
 
 # Now deal with commands
@@ -495,6 +541,10 @@ sub process_category_edits {
         %categories=&add_category_content($1,$cangrade,$env{'form.addcont_'.$1.'_symb'},%categories);
     } elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) {
         %categories=&del_category_content($1,$cangrade,$2,%categories);
+    } elsif ($cmd=~/^newrule\_(.+)$/) {
+        %categories=&add_calculation_rule($1,$cangrade,':',%categories);
+    } elsif ($cmd=~/^delrule\_(.+)\_\_\_\_\_\_(.*)$/) {
+        %categories=&del_calculation_rule($1,$cangrade,$2,%categories);
     }
 # Move to a new position
     my $moveid=$env{'form.storemove'};
@@ -539,9 +589,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());
 }
 
@@ -602,27 +653,10 @@ ENDMOVE
     }
     $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('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id.'_res',&mt('Add Problem or Folder')).'<br />'.
+                  '<input type="hidden" name="addcont_'.$id.'_res" onChange='."'".'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>');
-        $r->print(&pretty_prt_rule($calcrule));
-        if ($cangrade) {
-           $r->print(' <a href="javascript:storecmd(\'delcalc_'.$id.'______'.$calcrule.'\');">'.&mt('Delete').'</a>');
-        }
-        $r->print('</li>');
-    }
-    $r->print('</ul>');
-    if ($cangrade) {
-        $r->print('<br />'.&mt('Add Calculation Rule').'<br />'.
-                  &new_calc_rule_form('addcalc_'.$id.'_','this.form.cmd.value="addcalc_'.$id.'";this.form.submit();'));
-    }
-    $r->print('</td>');
-
 
 # Total
     if ($cangrade) {
@@ -636,6 +670,25 @@ ENDMOVE
     } else {
         $r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).'</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));
+    }
+    $r->print('</td>');
+
 # Weight
     if ($cangrade) {
        $r->print('<td>'.
@@ -644,6 +697,21 @@ ENDMOVE
     } else {
         $r->print('<td>'.$categories{$id.'_weight'}.'</td>');
     }
+# Achieved
+    $r->print('<td>');
+    if ($cangrade) {
+        $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 ($categories{$id.'_displayachieved'} eq 'percent') {
+            $r->print(&mt('percent'));
+        } else {
+            $r->print(&mt('points'));
+        }
+    }
+    $r->print('</td>');
 
     return ($value,$weight);
 }
@@ -658,7 +726,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>');
 }
 
 #
@@ -682,19 +750,42 @@ sub make_new_category {
     }
     $categories{$id.'_weight'}=0;
     $categories{$id.'_totaltype'}='default';
+    $categories{$id.'_displayachieved'}='percent';
     return %categories;
 }
 
 
 # === Calculation Rule Editing
 
+sub category_rule_codes {
+    return &Apache::lonlocal::texthash(
+                'droplow'  => 'Drop N lowest grade assignments',
+                'drophigh' => 'Drop N highest grade assignments',
+                'capabove' => 'Cap percentage above N percent',
+                'capbelow' => 'Cap percentage below N percent');
+}
+
 sub pretty_prt_rule {
-    my ($rule)=@_;
-    return $rule;
+    my ($cangrade,$id,$code,$value)=@_;
+    my $cid=$id.'_'.$code;
+    my %lt=&category_rule_codes();
+    my $ret='<span class="LC_nobreak">';
+    if ($cangrade) {
+        $ret.='<select name="sel_'.$cid.'">';
+        foreach my $calc (''=>'',sort(keys(%lt))) {
+            $ret.='<option value="'.$calc.'"'.($calc eq $code?' selected="selected"':'').' />'.$lt{$calc}.'</input>';
+        }
+        $ret.='</select> N=<input type="text" size="5" name="val_'.$cid.'" value="'.$value.'" /></span>';
+    } else {
+        $ret.=$lt{$code}.'; N='.$value;
+    }
+    $ret.='</span>';
+    return $ret;
 }
 
 sub new_calc_rule_form {
-    return "New Rule";
+    my ($id)=@_;
+    return '<a href="javascript:storecmd(\'newrule_'.$id.'\');">'.&mt('New Calculation Rule').'</a>';
 }
 
 #
@@ -721,7 +812,7 @@ sub del_calculation_rule {
     unless ($cangrade) { return %categories; }
     my @newcontent=();
     foreach my $current (split(/\,/,$categories{$id.'_calculations'})) {
-        unless ($current eq $delcontent) {
+        unless ($current=~/^\Q$delcontent\E\:/) {
             push(@newcontent,$current);
         }
     }
@@ -729,6 +820,21 @@ sub del_calculation_rule {
     return %categories;
 }
 
+sub set_category_rules {
+    my ($cangrade,$id,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    my %lt=&category_rule_codes();
+    my @newrules=();
+    foreach my $code ('',(keys(%lt))) {
+        if ($env{'form.sel_'.$id.'_'.$code}) {
+            push(@newrules,$env{'form.sel_'.$id.'_'.$code}.':'.$env{'form.val_'.$id.'_'.$code});
+        }
+    }
+    $categories{$id.'_calculations'}=join(',',sort(@newrules));
+    return %categories;
+}
+
+
 # === Category Editing
 
 #
@@ -890,6 +996,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
 #