--- loncom/interface/lonquickgrades.pm	2010/11/29 22:37:26	1.51
+++ loncom/interface/lonquickgrades.pm	2011/01/17 00:19:38	1.63
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.51 2010/11/29 22:37:26 www Exp $
+# $Id: lonquickgrades.pm,v 1.63 2011/01/17 00:19:38 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,9 +61,9 @@ sub real_handler {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
 
-    my $showPoints = 
+    my $showPoints =
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
-    my $notshowSPRSlink = 
+    my $notshowSPRSlink =
         (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
       || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
     my $notshowTotals=
@@ -72,38 +72,104 @@ sub real_handler {
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
 
 
-    # Header
     my $title = "Grading and Statistics";#$showPoints ? "Points Display" : "Completed Problems Display";
     my $brcrum = [{href=>"/adm/quickgrades",text => "Points Display"}];
     $r->print(&Apache::loncommon::start_page($title,undef,
                                             {'bread_crumbs' => $brcrum})
              );
 
-    if (!$showPoints && !$notshowSPRSlink ) {
-        $r->print('<p>'
-                 .&mt('This screen shows how many problems (or problem parts) you have completed'
-                     .', and how many you have not yet done.'
-                     .' You can also look at [_1]a detailed score sheet[_2].'
-                     ,'<a href="/adm/studentcalc">','</a>')
-                 .'</p>');
-    }
-
-    $r->print('<p class="LC_info">'.&mt('This may take a few moments to display.').'</p>');
+    &startGradeScreen($r,'quick');
 
     $r->rflush();
-    my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=&getData($showPoints);
-    &outputTable($r,$showPoints,$notshowTotals,
+
+#    my $uname='korte';
+#    my $udom='gerd';
+
+    my $uname;
+    my $udom;
+
+    my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
+       &getData($showPoints,$uname,$udom);
+
+    if ($showCategories) {
+       &outputCategories($r,$showPoints,$notshowTotals,
                  $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+    } else {
+       &outputTable($r,$showPoints,$notshowTotals,
+                 $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+    }
+    &endGradeScreen($r);
     return OK;
 
 }
 
+sub startGradeScreen {
+    my ($r,$mode)=@_;
+
+    my $showPoints =
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
+    my $notshowSPRSlink =
+        (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
+      || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals')
+      || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories'));
+    my $notshowTotals=
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+    my $showCategories=
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
+
+    my $allowed_to_view =  &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+    my $allowed_to_edit =  &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+
+    if ($allowed_to_view) {
+       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("\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("\n".'<li'.($mode eq 'spreadsheet'?' class="active"':'').'><a href="/adm/'.($allowed_to_view?'classcalc':'studentcalc').'"><b>'.
+                                                                 &mt('Spreadsheet (Detailed)').'</b></a></li>');
+    }
+    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;">');
+}
+
+sub endGradeScreen {
+   my ($r)=@_;
+   $r->print('</div></div></div>');
+}
+
+
 sub getData {
 
-    my ($showPoints)=@_;
+    my ($showPoints,$uname,$udom)=@_;
+
+    &Apache::lonnet::logthis("About to call with $uname $udom");
 
     # Create the nav map
-    my $navmap = Apache::lonnavmaps::navmap->new();
+    my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
 
     my $res = $navmap->firstResource(); # temp resource to access constants
 
@@ -332,6 +398,24 @@ sub outputTable {
 
 }
 
+#
+# Outputting category-based grades.
+#
+
+sub outputCategories {
+
+    my ($r,$showPoints,$notshowTotals,
+           $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
+# Take care of storing and retrieving categories
+
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+    my %categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);
+# categories loaded now
+
+}
+
 # Pass this two refs to arrays for the start and end color, and a number
 # from 0 to 1 for how much of the latter you want to mix in. It will
 # return a string ready to show ("#FFC309");