--- loncom/interface/lonquickgrades.pm	2011/03/09 01:46:08	1.73
+++ loncom/interface/lonquickgrades.pm	2011/03/25 01:34:49	1.78
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.73 2011/03/09 01:46:08 www Exp $
+# $Id: lonquickgrades.pm,v 1.78 2011/03/25 01:34:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,13 +80,38 @@ sub real_handler {
 
     &startGradeScreen($r,'quick');
 
-    $r->rflush();
-
-#    my $uname='korte';
-#    my $udom='gerd';
-
+    my $cangrade=&Apache::lonnet::allowed('mgr');
+#
+# Pick student
+#
     my $uname;
     my $udom;
+    my $stdid;
+    if ($cangrade) {
+        if ($env{'form.uname'}) { $uname=$env{'form.uname'}; }
+        if ($env{'form.udom'}) { $udom=$env{'form.udom'}; }
+        if ($env{'form.id'}) { $stdid=$env{'form.id'}; }
+        if (($stdid) && ($udom)) {
+            $uname=(&Apache::lonnet::idget($udom,$stdid))[1];
+        }
+        if (($stdid) && (!$uname)) {
+            $r->print('<p><span class="LC_warning">'.&mt("Unknown Student/Employee ID: [_1]",$stdid).'</span></p>');
+            $stdid='';
+        }
+        $r->print('<form method="post" name="quickform" action="/adm/quickgrades">');
+        my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
+           &Apache::loncommon::selectstudent_link('quickform','uname','udom');
+        $r->print("<p>\n".&Apache::loncommon::studentbrowser_javascript()."\n");
+        $r->print(&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
+                 ,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
+                 ,'<input type="text" value="'.$stdid.'" size="12" name="id" /> '
+                 ,$chooseopt).'<br />'.
+                 '<input type="submit" name="display" value="'.&mt('Update Display').'" /></p>');
+        if (($uname) && ($udom)) {
+            $r->print('<p>'.&mt('Full Name: [_1]',&Apache::loncommon::plainname($uname,$udom)).'</p>');
+        }
+    }
+    $r->rflush();
 
     my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
        &getData($showPoints,$uname,$udom);
@@ -98,6 +123,7 @@ sub real_handler {
        &outputTable($r,$showPoints,$notshowTotals,
                  $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
     }
+    if ($cangrade) { $r->print("\n</form>\n"); }
     &endGradeScreen($r);
     return OK;
 
@@ -430,19 +456,13 @@ sub outputCategories {
         &Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum);
     }
 # new categories loaded now
-# Form only generated if user can change the grading categories
-    if ($cangrade) {
-        $r->print('<form method="post" name="quickform" action="/adm/quickgrades">');
-    }
-#
     &output_category_table($r,$cangrade,$navmap,%categories);
 #
     if ($cangrade) {
         $r->print('<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>'.
-                  '</form>');
+                  '<script>function storecmd (cmd) { document.quickform.cmd.value=cmd; document.quickform.submit(); }</script>');
     }
 }
 
@@ -471,6 +491,12 @@ sub process_category_edits {
         %categories=&move_down_category($1,$cangrade,%categories);
     } elsif ($cmd=~/^delcat\_(.+)$/) {
         %categories=&del_category($1,$cangrade,%categories);
+    } elsif ($cmd=~/^addcont\_(.+)$/) {
+        %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);
     }
 # Move to a new position
     my $moveid=$env{'form.storemove'};
@@ -567,19 +593,39 @@ ENDMOVE
         $r->print('<td>'.$categories{$id.'_name'}.'</td>');
     }
 # Content
-# FIXME: just placeholders
+    $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>');
+        }
+        $r->print('</li>');
+    }
+    $r->print('</ul>');
     if ($cangrade) {
-       $r->print("<td>Content Edit</td>");
-    } else {
-       $r->print("<td>Content</td>");
+        $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
-# FIXME: just placeholders
+    $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(\'delcalc_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>');
+        }
+        $r->print('</li>');
+    }
+    $r->print('</ul>');
     if ($cangrade) {
-       $r->print("<td>Calculation Edit</td>");
-    } else {
-       $r->print("<td>Calculation</td>");
+        $r->print('<br />'.&new_calc_rule_form($id));
     }
+    $r->print('</td>');
+
+
 # Total
     if ($cangrade) {
        $r->print('<td>'.
@@ -641,20 +687,117 @@ sub make_new_category {
     return %categories;
 }
 
+
+# === Calculation Rule Editing
+
+sub pretty_prt_rule {
+    my ($cangrade,$id,$code,$value)=@_;
+    my $cid=$id.'_'.$code;
+    my %lt=&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');
+    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.'" /></span>';
+    } else {
+        $ret.=$lt{$code}.'; N='.$value;
+    }
+    $ret.='</span>';
+    return $ret;
+}
+
+sub new_calc_rule_form {
+    my ($id)=@_;
+    return '<a href="javascript:storecmd(\'newrule_'.$id.'\');">'.&mt('New Calculation Rule').'</a>';
+}
+
+#
+# Add a calculation rule
+#
+
+sub add_calculation_rule {
+    my ($id,$cangrade,$newcontent,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    my %newcontent=($newcontent => 1);
+    foreach my $current (split(/\,/,$categories{$id.'_calculations'})) {
+        $newcontent{$current}=1;
+    }
+    $categories{$id.'_calculations'}=join(',',sort(keys(%newcontent)));
+    return %categories;
+}
+
+#
+# Delete a calculation rule
+#
+
+sub del_calculation_rule {
+    my ($id,$cangrade,$delcontent,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    my @newcontent=();
+    foreach my $current (split(/\,/,$categories{$id.'_calculations'})) {
+        unless ($current=~/^\Q$delcontent\E\:/) {
+            push(@newcontent,$current);
+        }
+    }
+    $categories{$id.'_calculations'}=join(',',@newcontent);
+    return %categories;
+}
+
+# === Category Editing
+
+#
+# Add to category content
+#
+
+sub add_category_content {
+    my ($id,$cangrade,$newcontent,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    my %newcontent=($newcontent => 1);
+    foreach my $current (split(/\,/,$categories{$id.'_content'})) {
+        $newcontent{$current}=1;
+    }
+    $categories{$id.'_content'}=join(',',sort(keys(%newcontent)));
+    return %categories;
+}
+
+#
+# Delete from category content
+#
+
+sub del_category_content {
+    my ($id,$cangrade,$delcontent,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    my @newcontent=();
+    foreach my $current (split(/\,/,$categories{$id.'_content'})) {
+        unless ($current eq $delcontent) {
+            push(@newcontent,$current);
+        }
+    }
+    $categories{$id.'_content'}=join(',',@newcontent);
+    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;
+    my ($id,$cangrade,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    my @neworder=();
+    foreach my $currentid (split(/\,/,$categories{'order'})) {
+        unless ($currentid eq $id) {
+            push(@neworder,$currentid);
+        }
+    }
+    $categories{'order'}=join(',',@neworder);
+    return %categories;
 }
 
 #