--- loncom/interface/lonquickgrades.pm	2010/12/03 21:33:52	1.55
+++ loncom/interface/lonquickgrades.pm	2011/01/21 16:28:32	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.55 2010/12/03 21:33:52 www Exp $
+# $Id: lonquickgrades.pm,v 1.64 2011/01/21 16:28:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,24 +121,38 @@ sub startGradeScreen {
     my $allowed_to_edit =  &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
 
     if ($allowed_to_view) {
-       $r->print('<table><tr>');
-       if ($notshowTotals)  { $r->print ('<td>'.&mt('Students do not see total points.').'</td>'); }
-       if ($notshowSPRSlink){ $r->print ('<td>'.&mt('Students do not see link to spreadsheet.').'</td>'); }
-       if ($showPoints)     { $r->print ('<td>'.&mt('Students will see points based on problem weights.').'</td>'); }
-       if ($showCategories) { $r->print ('<td>'.&mt('Students will see points based on categories.').'</td>'); }
-       $r->print('<td>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading').'</td></td></table>');
+       my @notes;
+       push(@notes,&mt('Students do not see total points.')) if ($notshowTotals);
+       push(@notes,&mt('Students do not see link to spreadsheet.')) if ($notshowSPRSlink);
+       push(@notes,&mt('Students will see points based on problem weights.')) if ($showPoints);
+       push(@notes,&mt('Students will see points based on categories.')) if ($showCategories);
+       push(@notes, &Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading'));
+       $r->print(&Apache::loncommon::head_subbox(join('&nbsp;&nbsp;',@notes)));
     }
 
 
-    $r->print('<ul class="LC_TabContentBigger" id="main">');
-    $r->print('<li'.($mode eq 'quick'?' class="active"':'').'><a href="/adm/quickgrades"><b>'.
-                                          ($showPoints?&mt('Points'):($showCategories?&mt('Grades'):&mt('Completion'))).'</b></a></li>');
+    $r->print("\n".'<ul class="LC_TabContentBigger" id="main">');
+    $r->print("\n".'<li'.($mode eq 'quick'?' class="active"':'').'><a href="/adm/quickgrades"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.
+                                          ($showPoints?&mt('Individual Points Overview'):($showCategories?&mt('Grades Overview'):&mt('Completion Overview'))).
+                                          '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
 
     if (!($showPoints || $notshowSPRSlink) || ($allowed_to_view)) {
-       $r->print('<li'.($mode eq 'spreadsheet'?' class="active"':'').'><a href="/adm/'.($allowed_to_view?'classcalc':'studentcalc').'"><b>'.
-                                                                 &mt('Spreadsheet').'</b></a></li>');
+       $r->print("\n".'<li'.($mode eq 'spreadsheet'?' class="active"':'').'><a href="/adm/'.($allowed_to_view?'classcalc':'studentcalc').'"><b>'.
+                                                                 &mt('Spreadsheet (Detailed)').'</b></a></li>');
     }
-    $r->print('</ul>');
+    if ($allowed_to_view) {
+       $r->print("\n".'<li'.($mode eq 'statistics'?' class="active"':'').'><a href="/adm/statistics"><b>'.
+                                                                 &mt('Statistics and Reports').'</b></a></li>');
+
+       $r->print("\n".'<li'.($mode eq 'chart'?' class="active"':'').'><a href="/adm/statistics?reportSelected=student_assessment"><b>'.
+                                                                 &mt('Assessment Overview Chart').'</b></a></li>');
+
+    }
+    if ($allowed_to_edit) {
+       $r->print("\n".'<li'.($mode eq 'grading'?' class="active"':'').'><a href="/adm/grades"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.
+                                                                 &mt('Problem Grading').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
+    }
+    $r->print("\n".'</ul>'."\n");
     $r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
 }
 
@@ -392,6 +406,33 @@ sub outputCategories {
 
     my ($r,$showPoints,$notshowTotals,
            $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
+# Take care of storing and retrieving categories
+
+    my $cangrade=&Apache::lonnet::allowed('mgr');
+
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my %categories=();
+# Storing
+    if (($cangrade) && ($env{'form.storechanges'})) {
+
+# Actually store
+        &Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum);
+    } else {
+# Loading
+        %categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);
+    }
+# categories loaded now
+# Form only generated if user can change the grading categories
+   if ($cangrade) {
+      $r->print('<form method="post">');
+   }
+#
+# Business logic here
+#
+   if ($cangrade) {
+      $r->print('<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" /></form>');
+   }
 }
 
 # Pass this two refs to arrays for the start and end color, and a number