--- loncom/interface/lonquickgrades.pm	2011/02/07 19:16:34	1.66
+++ loncom/interface/lonquickgrades.pm	2011/02/20 23:57:35	1.71
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.66 2011/02/07 19:16:34 www Exp $
+# $Id: lonquickgrades.pm,v 1.71 2011/02/20 23:57:35 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -173,8 +173,6 @@ sub getData {
 
     my ($showPoints,$uname,$udom)=@_;
 
-    &Apache::lonnet::logthis("About to call with $uname $udom");
-
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
 
@@ -376,7 +374,7 @@ sub outputTable {
     # If there were any problems at the top level, print an extra "catchall"
     if ($topLevelParts > 0) {
         my $ratio = $topLevelRight / $topLevelParts;
-        my $color = mixColors(\@start, \@end, $ratio);
+        my $color = &mixColors(\@start, \@end, $ratio);
         $r->print(&Apache::loncommon::start_data_table_row()
                  .'<td style="background-color:'.$color.';">');
         $r->print(&mt("Problems Not Contained In A Folder")."</td><td>");
@@ -388,7 +386,7 @@ sub outputTable {
 # show totals (if applicable), close table
 #
     if ($showPoints) {
-        my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
+        my $maxHelpLink = &Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
 
         $title = $showPoints ? "Points" : "Parts Done";
         my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
@@ -431,6 +429,7 @@ sub outputCategories {
 # Process the changes
         %categories=&process_category_edits($r,$cangrade,%categories);
 # Actually store
+        &Apache::lonnet::logthis("Storing ".$categories{'order'});
         &Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum);
     }
 # new categories loaded now
@@ -454,9 +453,20 @@ sub outputCategories {
 sub process_category_edits {
     my ($r,$cangrade,%categories)=@_;
     unless ($cangrade) { return %categories; }
-#
-# Business logic here
-#
+    my $cmd=$env{'form.cmd'};
+    if ($cmd eq 'createnewcat') {
+        %categories=&make_new_category($r,$cangrade,undef,%categories);
+    } elsif ($cmd=~/^delcat\_(.+)$/) {
+        %categories=&del_category($1,$cangrade,%categories);
+    } else {
+# Simply store the rest of the stuff
+        foreach my $id (split(/\,/,$categories{'order'})) {
+            %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
+        }
+    }
     return %categories;
 }
 
@@ -467,21 +477,21 @@ sub process_category_edits {
 sub output_category_table {
     my ($r,$cangrade,$navmaps,%categories)=@_;
     my $sum=0;
+    my $total=0;
     $r->print(&Apache::loncommon::start_data_table());
 #
     &output_category_table_header($r,$cangrade);
 #
     my @order=split(/\,/,$categories{'order'});
 #
-# FIXME: Debug only
-    @order=('3131_4123_42124','4124_34231_3412');
-#
     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);
+        $sum+=$value*$weight;
+        $total+=$weight;
     }
 #
-    &bottom_line_category($r,$cangrade);
+    &bottom_line_category($r,$cangrade,$sum,$total);
 #
     $r->print(&Apache::loncommon::end_data_table());
     return $sum;
@@ -496,8 +506,8 @@ sub output_category_table_header {
     $r->print('<th>'.&mt('Category').'</th>'.
               '<th>'.&mt('Contents').'</th>'.
               '<th>'.&mt('Calculation').'</th>'.
-              '<th>'.&mt('Weight').'</th>'.
-              '<th>'.&mt('Percent Overall').'</th>');
+              '<th>'.&mt('Total Points').'</th>'.
+              '<th>'.&mt('Relative Weight').'</th>');
     $r->print(&Apache::loncommon::end_data_table_header_row());
 }
 
@@ -540,9 +550,47 @@ ENDMOVE
             }
         }
         $r->print("\n</select>\n</td>\n");
-
+        $r->print('<td><a href="/adm/quickgrades?cmd=delcat_'.$id.'&storechanges=1">'.&mt('Delete').'</a></td>');
+        $r->print('<td><input type="text" name="name_'.$id.
+                  '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_name'}).'" /></td>');
+    } else {
+        $r->print('<td>'.$categories{$id.'_name'}.'</td>');
+    }
+# Content
+# FIXME: just placeholders
+    if ($cangrade) {
+       $r->print("<td>Content Edit</td>");
+    } else {
+       $r->print("<td>Content</td>");
+    }
+# Calculation
+# FIXME: just placeholders
+    if ($cangrade) {
+       $r->print("<td>Calculation Edit</td>");
+    } else {
+       $r->print("<td>Calculation</td>");
     }
-    $r->print(&Apache::loncommon::end_data_table_row()."\n");
+# Total
+    if ($cangrade) {
+       $r->print('<td>'.
+                  '<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>');
+    } else {
+        $r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).'</td>');
+    }
+# Weight
+    if ($cangrade) {
+       $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>');
+    }
+
     return ($value,$weight);
 }
 
@@ -551,7 +599,12 @@ ENDMOVE
 #
 
 sub bottom_line_category {
-    my ($r,$cangrade)=@_;
+    my ($r,$cangrade,$sum,$total)=@_;
+    $r->print(&Apache::loncommon::start_data_table_row());
+    if ($cangrade) {
+        $r->print('<td colspan="3"><a href="/adm/quickgrades?cmd=createnewcat&storechanges=1">'.&mt('Create New Category').'</a></td>');
+    }
+    $r->print('<td colspan="5">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>');
 }
 
 #
@@ -573,10 +626,28 @@ sub make_new_category {
     if (defined($ordernum)) {
         %categories=&move_category($id,$cangrade,$ordernum,%categories);
     }
+    $categories{$id.'_weight'}=0;
+    $categories{$id.'_totaltype'}='default';
     return %categories;
 }
 
 #
+# Delete category
+#
+
+sub del_category {
+   my ($id,$cangrade,%categories)=@_; 
+   my @neworder=();
+   foreach my $currentid (split(/\,/,$categories{'order'})) {
+      unless ($currentid eq $id) {
+         push(@neworder,$currentid);
+      }
+   }
+   $categories{'order'}=join(',',@neworder);
+   return %categories;
+}
+
+#
 # Move a category to a desired position n the display order
 #
 
@@ -628,12 +699,41 @@ sub current_pos_category {
 # Set name of a category
 #
 sub set_category_name {
-    my ($canedit,$id,$name,%categories)=@_;
-    unless ($canedit) { return %categories; }
+    my ($cangrade,$id,$name,%categories)=@_;
+    unless ($cangrade) { return %categories; }
     $categories{$id.'_name'}=$name;
     return %categories;
 }
 
+#
+# Set total of a category
+#
+sub set_category_total {
+    my ($cangrade,$id,$totaltype,$total,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    if (($categories{$id.'_total'} eq '') && ($total=~/\d/)) {
+        $totaltype='typein';
+    }
+    $categories{$id.'_totaltype'}=$totaltype;
+    if ($totaltype eq 'default') {
+        $categories{$id.'_total'}='';
+    } else {
+        $total=~s/\D//gs;
+        unless ($total) { $total=0; }
+        $categories{$id.'_total'}=$total;
+    }
+    return %categories;
+}
+
+sub set_category_weight {
+    my ($cangrade,$id,$weight,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    $weight=~s/\D//gs;
+    unless ($weight) { $weight=0; }
+    $categories{$id.'_weight'}=$weight;
+    return %categories;
+}
+
 #
 # === end category-related
 #