--- loncom/interface/lonquickgrades.pm	2011/02/20 21:56:25	1.68
+++ 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.68 2011/02/20 21:56:25 www Exp $
+# $Id: lonquickgrades.pm,v 1.71 2011/02/20 23:57:35 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -455,15 +455,18 @@ sub process_category_edits {
     unless ($cangrade) { return %categories; }
     my $cmd=$env{'form.cmd'};
     if ($cmd eq 'createnewcat') {
-       %categories=&make_new_category($r,$cangrade,undef,%categories);
+        %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
+        }
     }
-    if ($cmd=~/^delcat\_(.+)$/) {
-       my $id=$1;
-       %categories=&del_category($id,$cangrade,%categories);
-    } 
-#
-# Business logic here
-#
     return %categories;
 }
 
@@ -503,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());
 }
 
@@ -548,9 +551,46 @@ 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>");
     }
-    $r->print(&Apache::loncommon::end_data_table_row()."\n");
+# Calculation
+# FIXME: just placeholders
+    if ($cangrade) {
+       $r->print("<td>Calculation Edit</td>");
+    } else {
+       $r->print("<td>Calculation</td>");
+    }
+# 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);
 }
 
@@ -586,6 +626,8 @@ sub make_new_category {
     if (defined($ordernum)) {
         %categories=&move_category($id,$cangrade,$ordernum,%categories);
     }
+    $categories{$id.'_weight'}=0;
+    $categories{$id.'_totaltype'}='default';
     return %categories;
 }
 
@@ -657,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
 #