--- loncom/interface/lonquickgrades.pm	2011/02/20 23:38:00	1.70
+++ loncom/interface/lonquickgrades.pm	2011/03/12 02:58:44	1.75
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.70 2011/02/20 23:38:00 www Exp $
+# $Id: lonquickgrades.pm,v 1.75 2011/03/12 02:58:44 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;
 
@@ -165,7 +191,7 @@ sub startGradeScreen {
 
 sub endGradeScreen {
    my ($r)=@_;
-   $r->print('</div></div></div>');
+   $r->print('</div></div></div>'.&Apache::loncommon::end_page());
 }
 
 
@@ -398,9 +424,7 @@ sub outputTable {
                  .&Apache::loncommon::end_data_table_row());
     }
 
-    $r->print(&Apache::loncommon::end_data_table()
-             .&Apache::loncommon::end_page());
-
+    $r->print(&Apache::loncommon::end_data_table());
 }
 
 #
@@ -425,24 +449,20 @@ sub outputCategories {
 # Loading old categories
     %categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);
 # Storing
-    if (($cangrade) && (($env{'form.storechanges'}) || ($env{'form.storemove'} ne ''))) {
+    if (($cangrade) && (($env{'form.storechanges'}) || ($env{'form.storemove'} ne '') || ($env{'form.cmd'} ne ''))) {
 # 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
-# Form only generated if user can change the grading categories
-    if ($cangrade) {
-        $r->print('<form method="post">');
-    }
-#
     &output_category_table($r,$cangrade,$navmap,%categories);
 #
     if ($cangrade) {
         $r->print('<input type="hidden" name="storemove" value="" />'.
-                  '<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" /></form>');
+                  '<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>');
     }
 }
 
@@ -453,19 +473,34 @@ sub outputCategories {
 sub process_category_edits {
     my ($r,$cangrade,%categories)=@_;
     unless ($cangrade) { return %categories; }
+# First store everything
+    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
+    }
+
+# Now deal with commands
     my $cmd=$env{'form.cmd'};
     if ($cmd eq 'createnewcat') {
         %categories=&make_new_category($r,$cangrade,undef,%categories);
+    } elsif ($cmd=~/^up\_(.+)$/) {
+        %categories=&move_up_category($1,$cangrade,%categories);
+    } elsif ($cmd=~/^down\_(.+)$/) {
+        %categories=&move_down_category($1,$cangrade,%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_weight($cangrade,$id,$env{'form.weighttype_'.$id},$env{'form.weight_'.$id},%categories);
-# More changes here
-        }
-    }
+    } 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);
+    }
+# Move to a new position
+    my $moveid=$env{'form.storemove'};
+    if ($moveid) {
+        %categories=&move_category($moveid,$cangrade,$env{'form.newpos_'.$moveid},%categories);
+    } 
     return %categories;
 }
 
@@ -505,8 +540,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());
 }
 
@@ -529,12 +564,12 @@ sub output_and_calc_category {
         $r->print(<<ENDMOVE);
 <td>
 <div class="LC_docs_entry_move">
-  <a href='/adm/quickgrades?cmd=up_$id&storechanges=1'>
+  <a href='javascript:storecmd("up_$id");'>
     <img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" />
   </a>
 </div>
 <div class="LC_docs_entry_move">
-  <a href='/adm/quickgrades?cmd=down_$id&storechanges=1'>
+  <a href='javascript:storecmd("down_$id");'>
     <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />
   </a>
 </div>
@@ -549,19 +584,28 @@ 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><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 {
         $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
     if ($cangrade) {
@@ -569,17 +613,25 @@ ENDMOVE
     } else {
        $r->print("<td>Calculation</td>");
     }
-# Weight
+# Total
     if ($cangrade) {
        $r->print('<td>'.
-                  '<select name="weighttype_'.$id.'">'.
-                  '<option value="default"'.($categories{$id.'_weighttype'} eq 'default'?' selected="selected"':'').'>'.&mt('default').'</option>'.
-                  '<option value="typein"'.($categories{$id.'_weighttype'} eq 'typein'?' selected="selected"':'').'>'.&mt('Type-in value').'</option>'.
+                  '<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.'_weighttype'} eq 'default'?&mt('default'):$categories{$id.'_weight'}).'</td>');
+        $r->print('<td>'.$categories{$id.'_weight'}.'</td>');
     }
 
     return ($value,$weight);
@@ -593,7 +645,7 @@ sub bottom_line_category {
     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="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>');
 }
@@ -617,7 +669,40 @@ sub make_new_category {
     if (defined($ordernum)) {
         %categories=&move_category($id,$cangrade,$ordernum,%categories);
     }
-    $categories{$id.'_weighttype'}='default';
+    $categories{$id.'_weight'}=0;
+    $categories{$id.'_totaltype'}='default';
+    return %categories;
+}
+
+#
+# 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;
 }
 
@@ -626,15 +711,39 @@ sub make_new_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;
+}
+
+#
+# Move category up
+#
+
+sub move_up_category {
+    my ($id,$cangrade,%categories)=@_;
+    my $currentpos=&current_pos_category($id,%categories);
+    if ($currentpos<1) { return %categories; }
+    return &move_category($id,$cangrade,$currentpos-1,%categories);
+}
+
+#
+# Move category down
+#
+
+sub move_down_category {
+    my ($id,$cangrade,%categories)=@_;
+    my $currentpos=&current_pos_category($id,%categories);
+    my @order=split(/\,/,$categories{'order'});
+    if ($currentpos>=$#order) { return %categories; }
+    return &move_category($id,$cangrade,$currentpos+1,%categories);
 }
 
 #
@@ -696,25 +805,33 @@ sub set_category_name {
 }
 
 #
-# Set weight of a category
+# Set total of a category
 #
-sub set_category_weight {
-    my ($cangrade,$id,$weighttype,$weight,%categories)=@_;
+sub set_category_total {
+    my ($cangrade,$id,$totaltype,$total,%categories)=@_;
     unless ($cangrade) { return %categories; }
-    if (($categories{$id.'_weight'} eq '') && ($weight=~/\d/)) {
-        $weighttype='typein';
+    if (($categories{$id.'_total'} eq '') && ($total=~/\d/)) {
+        $totaltype='typein';
     }
-    $categories{$id.'_weighttype'}=$weighttype;
-    if ($weighttype eq 'default') {
-        $categories{$id.'_weight'}='';
+    $categories{$id.'_totaltype'}=$totaltype;
+    if ($totaltype eq 'default') {
+        $categories{$id.'_total'}='';
     } else {
-        $weight=~s/\D//gs;
-        unless ($weight) { $weight=0; }
-        $categories{$id.'_weight'}=$weight;
+        $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