--- loncom/interface/lonquickgrades.pm	2025/01/16 21:11:56	1.49.6.8.2.6
+++ loncom/interface/lonquickgrades.pm	2011/05/24 18:06:10	1.90
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.49.6.8.2.6 2025/01/16 21:11:56 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.90 2011/05/24 18:06:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,13 +29,12 @@
 package Apache::lonquickgrades;
 
 use strict;
-use Apache::Constants qw(:common :http REDIRECT);
+use Apache::Constants qw(:common :http);
 use POSIX;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
 use Apache::grades;
-use Apache::lonuserstate;
 
 sub handler {
     my $r = shift;
@@ -58,110 +57,31 @@ sub real_handler {
         return OK;
     }
 
-    my $cangrade=&Apache::lonnet::allowed('mgr');
-    my $showPoints =
-        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
-
-    my $reinitresult;
+    # Send header, don't cache this page
+    &Apache::loncommon::no_cache($r);
+    $r->send_http_header;
 
-    if ($env{'request.course.id'}) {
-        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        my $clientip = &Apache::lonnet::get_requestor_ip($r);
-        my ($blocked,$blocktext) =
-            &Apache::loncommon::blocking_status('grades',$clientip,$cnum,$cdom);
-        if ($blocked) {
-            my $checkrole = "cm./$cdom/$cnum";
-            if ($env{'request.course.sec'} ne '') {
-                $checkrole .= "/$env{'request.course.sec'}";
-            }
-            unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) &&
-                    ($env{'request.role'} !~ m{^st\./$cdom/$cnum})) {
-                &grades_blocked($r,$blocktext,$showPoints);
-                return OK;
-            }
-        }
-    }
+    my $showPoints =
+        (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard')
+      || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories'));
+    my $notshowSPRSlink =
+        (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
+      || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
+    my $notshowTotals=
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+    my $showCategories=
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
 
-    unless ($cangrade) {
-        # Check for critical messages and redirect if present.
-        my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'grades');
-        if ($redirect) {
-            &Apache::loncommon::content_type($r,'text/html');
-            $r->header_out(Location => $url);
-            return REDIRECT;
-        }
-
-        # Check if course needs to be re-initialized
-        my $loncaparev = $r->dir_config('lonVersion');
-        ($reinitresult,my @reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
-
-        if ($reinitresult eq 'switch') {
-            &Apache::loncommon::content_type($r,'text/html');
-            $r->send_http_header;
-            $r->print(&Apache::loncommon::check_release_result(@reinit));
-            return OK;
-        }
-        my ($cid,$cnum,$cdom);
-        if ($reinitresult) {
-            $cid = $env{'request.course.id'};
-            $cnum = $env{'course.'.$cid.'.num'};
-            $cdom = $env{'course.'.$cid.'.domain'};
-        }
-        if (($reinitresult eq 'main') || ($reinitresult eq 'both')) {        
-            &Apache::loncommon::content_type($r,'text/html');
-            $r->send_http_header;
-            &startpage($r,$showPoints);
-            my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.
-                           '<br />'.
-                           &mt('Your course session is being updated because of recent changes by course personnel.').
-                           ' '.&mt('Please be patient').'.<br /></div>'.
-                           '<div style="padding:0;clear:both;margin:0;border:0"></div>';
-            my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble);
-            &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
-            $r->rflush();
-            my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
-            &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
-            &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-            my $closure = <<ENDCLOSE;
-<script type="text/javascript">
-// <![CDATA[
-\$("#LC_update_$cid").hide('slow');
-// ]]>
-</script>
-ENDCLOSE
-            if ($ferr) {
-                $r->print($closure.&Apache::loncommon::end_page());
-                my $requrl = $r->uri;
-                $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
-                $env{'user.reinit'} = 1;
-                return HTTP_NOT_ACCEPTABLE;
-            } else {
-               $r->print($closure);
-            }
-        }
-        if (($reinitresult eq 'supp') || ($reinitresult eq 'both')) {
-            my $possdel;
-            if ($reinitresult eq 'supp') {
-                $possdel = 1;
-            }
-            my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);
-            unless ($refs_updated) {
-                &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental);
-            }
-        }
-    }
 
-    unless (($reinitresult eq 'main') || ($reinitresult eq 'both')) {
-        # Send header, don't cache this page
-        &Apache::loncommon::no_cache($r);
-        $r->send_http_header;
-        &startpage($r,$showPoints);
-    }
-    $r->rflush();
+    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})
+             );
 
-    &startGradeScreen($r);
+    &startGradeScreen($r,'quick');
 
+    my $cangrade=&Apache::lonnet::allowed('mgr');
 #
 # Pick student
 #
@@ -173,16 +93,12 @@ ENDCLOSE
         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],'ids'))[1];
+            $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='';
         }
-        if (($uname eq '') && ($udom eq '')) {
-            $uname = $env{'user.name'};
-            $udom = $env{'user.domain'};
-        }
         $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');
@@ -190,102 +106,102 @@ ENDCLOSE
         $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).
-                 '&nbsp;&nbsp;<input type="submit" name="display" value="'.&mt('Display Individual Student').'" /></p>');
+                 ,$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>');
         }
-    } else {
-        $r->print('<p class="LC_info">'.&mt('This may take a few moments to display.').'</p>');
     }
     $r->rflush();
 
+    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);
+    }
+    if ($cangrade) { $r->print("\n</form>\n"); }
+    &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 $usec;
-    if ($cangrade) {
-        if (($uname eq $env{'user.name'}) && ($udom eq $env{'user.domain'})) {
-            $usec = $env{'request.course.sec'};
-        } else {
-            $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
-        }
-    } else {
-        $usec = $env{'request.course.sec'};
+    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)));
     }
 
-    my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,
-        $topLevelRight,$topLevelAttempted) = &getData($showPoints,$uname,$udom,$usec);
 
-    if (ref($navmap)) {
-        my $nostdtotals;
-        if ($showPoints) {
-            if ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard') {
-                my $hidetotals = $env{'course.'.$env{'request.course.id'}.'.hidetotals'};
-                if ($hidetotals eq 'all') {
-                    $nostdtotals = 1;
-                } elsif ($hidetotals ne '') {
-                    if ($usec ne '') {
-                        my %secnototals;
-                        map { $secnototals{$_} = 1; } split(/,/,$hidetotals);
-                        if ($secnototals{$usec}) {
-                            $nostdtotals = 1;
-                        }
-                    }
-                }
-            }
-        }
-        &outputTable($r,$showPoints,$notshowTotals,$nostdtotals,$navmap,
-                     $totalParts,$totalPossible,$totalRight,$totalAttempted,
-                     $topLevelParts,$topLevelRight,$topLevelAttempted);
-    } else {
-        if ($cangrade) { $r->print("\n</form>\n"); }
-        my $requrl = $r->uri;
-        $env{'user.error.msg'} = "$requrl:bre:0:0:Navmap initialization failed.";
-        return HTTP_NOT_ACCEPTABLE;
+    $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 ($cangrade) { $r->print("\n</form>\n"); }
-    &endGradeScreen($r);
-    return OK;
+    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('Content Grading').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
+       if ($env{'form.symb'}) {
+          $r->print("\n".'<li'.($mode eq 'probgrading'?' class="active"':'').'><a href="/adm/grades?symb='.
+                                              &Apache::lonhtmlcommon::entity_encode($env{'form.symb'}).
+                                              '&command=gradingmenu"><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 grades_blocked {
-    my ($r,$blocktext,$caller) = @_;
-    my $title = 'Points Display';
-    if ($caller eq 'spreadsheet') {
-        $title = 'Spreadsheet';
-    } elsif ($env{'course.'.$env{'request.course.id'}.'.grading'} ne 'standard') {
-        $title = 'Completed Problems Display';
-    }
-    my $brcrum = [{href=>"/adm/quickgrades",text => $title}];
-    &Apache::lonhtmlcommon::clear_breadcrumbs();
-    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/quickgrades',
-                                            text=> $title});
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs($title);
-    &Apache::loncommon::content_type($r,'text/html');
-    &Apache::loncommon::no_cache($r);
-    $r->send_http_header;
-    $r->print(&Apache::loncommon::start_page($title).
-              $breadcrumbs.
-              $blocktext.
-              &Apache::loncommon::end_page());
-    return;
+sub endGradeScreen {
+   my ($r)=@_;
+   $r->print('</div></div></div>'.&Apache::loncommon::end_page());
 }
 
-#
-# Go through the complete course and collect data
-#
 
 sub getData {
 
-    my ($showPoints,$uname,$udom,$usec)=@_;
+    my ($showPoints,$uname,$udom)=@_;
 
     # Create the nav map
-    my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom,$usec);
-
-    if (!defined($navmap)) {
-        return ();
-    }
+    my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
 
     my $res = $navmap->firstResource(); # temp resource to access constants
 
@@ -293,7 +209,7 @@ sub getData {
     my $depth = 1;
     $iterator->next(); # ignore first BEGIN_MAP
     my $curRes = $iterator->next();
-
+    
     # General overview of the following: Walk along the course resources.
     # For every problem in the resource, tell its parent maps how many
     # parts and how many parts correct it has. After that, each map will
@@ -316,7 +232,7 @@ sub getData {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }
 
-        if (ref($curRes) && $curRes->is_gradable() && !$curRes->randomout)
+        if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout)
         {
             # Get number of correct, incorrect parts
             my $parts = $curRes->parts();
@@ -326,36 +242,39 @@ sub getData {
             my $stack = $iterator->getStack();
             
             for my $part (@{$parts}) {
+		my $completionStatus = $curRes->getCompletionStatus($part);
 		my $dateStatus = $curRes->getDateStatus($part);
-                my $weight = $curRes->weight($part);
-                my $problemstatus = $curRes->problemstatus($part);
-
-                if ($curRes->solved($part) eq 'excused') {
+		
+                if ($completionStatus == $curRes->EXCUSED()) {
                     next;
                 }
 		if ($showPoints) {
 		    my $score = 0;
 		    # If we're not telling status and the answer date isn't passed yet, 
 		    # it's an "attempted" point
-		    if ((($problemstatus eq 'no') ||
-                         ($problemstatus eq 'no_feedback_ever')) &&
+		    if ((($curRes->problemstatus($part) eq 'no') ||
+                        ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&
 			($dateStatus != $curRes->ANSWER_OPEN)) {
 			my $status = $curRes->simpleStatus($part);
 			if ($status == $curRes->ATTEMPTED) {
-			    $partsAttempted += $weight;
+			    $partsAttempted += $curRes->weight($part);
 			    $totalAttempted += $partsAttempted;
 			}
 		    } else {
-			$score = &Apache::grades::compute_points($weight, $curRes->awarded($part));
+			$score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
 		    }
 		    $partsRight += $score;
 		    $totalRight += $score;
-		    $partsCount += $weight;
+		    $partsCount += $curRes->weight($part);
+
+                    $curRes->{DATA}->{PROB_SCORE}  += $score;
+                    $curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part);
 
 		    if ($curRes->opendate($part) < $now) {
-			$totalPossible += $weight;
+			$totalPossible += $curRes->weight($part);
+                        $curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part);
 		    }
-		    $totalParts += $weight;
+		    $totalParts += $curRes->weight($part);
 		} else {
 		    my $status = $curRes->simpleStatus($part);
 		    my $thisright = 0;
@@ -372,6 +291,7 @@ sub getData {
 			$totalAttempted++;
 		    }
 		    
+		    my $dateStatus = $curRes->getDateStatus($part);
 		    $totalParts++;
 		    if ($curRes->opendate($part) < $now) {
 			$totalPossible++;
@@ -402,8 +322,7 @@ sub getData {
         }
         $curRes = $iterator->next();
     }
-    return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,
-            $topLevelParts,$topLevelRight,$topLevelAttempted);
+    return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
 }
 
 #
@@ -412,8 +331,8 @@ sub getData {
 
 sub outputTable {
 
-    my ($r,$showPoints,$notshowTotals,$nostdtotals,$navmap,$totalParts,$totalPossible,
-        $totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
+    my ($r,$showPoints,$notshowTotals,
+           $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
 
     my @start = (255, 255, 192);
     my @end   = (0, 192, 0);
@@ -498,103 +417,633 @@ sub outputTable {
 # show totals (if applicable), close table
 #
     if ($showPoints) {
-        unless ($nostdtotals) {
-	    my $maxHelpLink = &Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
+        my $maxHelpLink = &Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
+
+        $title = $showPoints ? "Points" : "Parts Done";
+        my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
+        $r->print(&Apache::loncommon::start_data_table_row()
+                 .'<td colspan="2" align="right">'.$totaltitle.': <b>'.$totalRight.'</b><br />');
+        $r->print(&mt('Max Possible To Date')." $maxHelpLink: <b>$totalPossible</b><br />");
+        $title = $showPoints ? "Points" : "Parts";
+        $r->print(&mt("Total $title In Course").': <b>'.$totalParts.'</b></td>'
+                 .&Apache::loncommon::end_data_table_row());
+    }
+
+    $r->print(&Apache::loncommon::end_data_table());
+}
+
+#
+# === Outputting category-based grades.
+#
+# $category{'order'}: output order of categories by id
+# $category{'all'}: complete list of all categories 
+# $category{$id.'_name'}: display-name of category
+#
+
+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=();
+# Loading old categories
+    %categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);
+# Storing
+    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::put('grading_categories',\%categories,$cdom,$cnum);
+    }
+# new categories loaded now
+    &output_category_table($r,$cangrade,$navmap,%categories);
+#
+    if ($cangrade) {
+        $r->print(&Apache::loncommon::resourcebrowser_javascript().
+                  '<input type="hidden" name="storemove" value="" />'.
+                  '<input type="hidden" name="cmd" value="" />'.
+                  '<input type="hidden" name="resourcesymb" 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>');
+    }
+#
+# Debug
+#
+#    my %data=&dumpdata($navmap);
+#    foreach (keys(%data)) {
+#        $r->print("\n<br />".$_.'='.$data{$_});
+#    }
+}
+
+#
+# Get data for all symbs
+#
+
+sub dumpdata {
+    my ($navmap)=@_;
+    my %returndata=();
+
+# Run through the map and get all data
+
+    my $iterator = $navmap->getIterator(undef, undef, undef, 1);
+    my $depth = 1;
+    $iterator->next(); # ignore first BEGIN_MAP
+    my $curRes = $iterator->next();
 
-	    $title = $showPoints ? "Points" : "Parts Done";
-	    my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
-	    $r->print(&Apache::loncommon::start_data_table_row()
-                     .'<td colspan="2" align="right">'.$totaltitle.': <b>'.$totalRight.'</b><br />');
-	    $r->print(&mt('Max Possible To Date')." $maxHelpLink: <b>$totalPossible</b><br />");
-	    $title = $showPoints ? "Points" : "Parts";
-	    $r->print(&mt("Total $title In Course").': <b>'.$totalParts.'</b></td>'
-                     .&Apache::loncommon::end_data_table_row());
+    while ($depth > 0) {
+        if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
+        if ($curRes == $iterator->END_MAP()) { $depth--; }
+        if (ref($curRes)) {
+            if ($curRes->is_map()) {
+                $returndata{$curRes->symb()}='folder:'.$curRes->{DATA}->{CHILD_PARTS}.':'.$curRes->{DATA}->{CHILD_ATTEMPTED}.':'.$curRes->{DATA}->{CHILD_CORRECT};
+            } else {
+                $returndata{$curRes->symb()}='res:'.$curRes->{DATA}->{PROB_WEIGHT}.':'.$curRes->{DATA}->{PROB_POSSIBLE}.':'.$curRes->{DATA}->{PROB_SCORE};
+            } 
         }
+        $curRes = $iterator->next();
     }
+    return %returndata;
+}
+
+#
+# Process editing commands, update category hash
+#
+
+sub process_category_edits {
+    my ($r,$cangrade,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+# First store everything
+    foreach my $id (split(/\,/,$categories{'order'})) {
+# Set names, types, and weight (there is only one of each per category)
+        %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);
+        %categories=&set_category_displayachieved($cangrade,$id,$env{'form.displayachieved_'.$id},%categories);
+# Set values for category rules (before names may change)
+        %categories=&set_category_rules($cangrade,$id,%categories);
+    }
+
+# 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);
+    } elsif ($cmd=~/^addcont\_(.+)$/) {
+        %categories=&add_category_content($1,$cangrade,$env{'form.resourcesymb'},%categories);
+    } elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) {
+        %categories=&del_category_content($1,$cangrade,$2,%categories);
+    } elsif ($cmd=~/^newrule\_(.+)$/) {
+        %categories=&add_calculation_rule($1,$cangrade,':',%categories);
+    } elsif ($cmd=~/^delrule\_(.+)\_\_\_\_\_\_(.*)$/) {
+        %categories=&del_calculation_rule($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;
+}
 
+#
+# Output the table
+#
+
+sub output_category_table {
+    my ($r,$cangrade,$navmaps,%categories)=@_;
+    my $sum=0;
+    my $total=0;
+    $r->print(&Apache::loncommon::start_data_table());
+#
+    &output_category_table_header($r,$cangrade);
+#
+    my @order=split(/\,/,$categories{'order'});
+#
+    my %performance=&dumpdata($navmaps);
+    my $maxpos=$#order;
+    for (my $i=0;$i<=$maxpos;$i++) {
+        my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories);
+        $sum+=$value*$weight;
+        $total+=$weight;
+    }
+#
+    &bottom_line_category($r,$cangrade,$sum,$total);
+#
     $r->print(&Apache::loncommon::end_data_table());
-    return;
+    return $sum;
 }
 
-sub startpage {
-    my ($r,$showPoints) = @_;
-    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})
-             );
+sub output_category_table_header {
+    my ($r,$cangrade)=@_;
+    $r->print(&Apache::loncommon::start_data_table_header_row());
+    if ($cangrade) {
+        $r->print('<th colspan="2">'.&mt("Move").'</th><th>'.&mt('Action').'</th>');
+    }
+    $r->print('<th>'.&mt('Category').'</th>'.
+              '<th>'.&mt('Contents').'</th>'.
+              '<th>'.&mt('Total Points').'</th>'.
+              '<th>'.&mt('Calculation').'</th>'.
+              '<th>'.&mt('Relative Weight').'</th>'.
+              '<th>'.&mt('Achieved').'</th>');
+    $r->print(&Apache::loncommon::end_data_table_header_row());
 }
 
-sub startGradeScreen {
-    my ($r)=@_;
 
-    my $showPoints =
-        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
-    my $hidetotals =
-        $env{'course.'.$env{'request.course.id'}.'.hidetotals'};
-    my $notshowSPRSlink =
-        (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
-      || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
-    my $notshowTotals =
-        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
-    my $showSPRSlink =
-        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet';
+#
+# Output one category to table
+#
 
-    my $allowed_to_view = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
-    if ((!$allowed_to_view) && ($env{'request.course.sec'} ne '')) {
-        $allowed_to_view = &Apache::lonnet::allowed('vgr',
-                               "$env{'request.course.id'}/$env{'request.course.sec'}");
+sub output_and_calc_category {
+    my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,$performance,$output,%categories)=@_;
+    my $value=0;
+    my $weight=0;
+    my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
+    my %lt=&Apache::lonlocal::texthash(
+           'up' => 'Move Up',
+           'dw' => 'Move Down');
+    if ($output) { $r->print("\n".&Apache::loncommon::start_data_table_row()); }
+
+    if ($output && $cangrade) {
+        $r->print(<<ENDMOVE);
+<td>
+<div class="LC_docs_entry_move">
+  <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='javascript:storecmd("down_$id");'>
+    <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />
+  </a>
+</div>
+</td>
+ENDMOVE
+        $r->print("\n<td>\n<select name='newpos_$id' onchange='this.form.storemove.value=\"$id\";this.form.submit()'>");
+        for (my $i=0;$i<=$maxpos;$i++) {
+            if ($i==$currentpos) {
+                $r->print('<option value="" selected="selected">('.$i.')</option>');
+            } else {
+                $r->print('<option value="'.$i.'">'.$i.'</option>');
+            }
+        }
+        $r->print("\n</select>\n</td>\n");
+        $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>');
+    } elsif ($output) {
+        $r->print('<td>'.$categories{$id.'_name'}.'</td>');
+    }
+# Content display and summing up of points
+    my $totalpossible=0;
+    my $totalcorrect=0;
+    if ($output) { $r->print('<td><ul>'); }
+    foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {
+        my ($type,$possible,$attempted,$correct)=split(/\:/,$$performance{$contentid});
+        $totalpossible+=$possible;
+        $totalcorrect+=$correct;
+        if ($output) {
+           $r->print('<li>');
+           $r->print(&Apache::lonnet::gettitle($contentid).' ('.$correct.'/'.$possible.')');
+           if ($cangrade) {
+              $r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');
+           }
+           $r->print('</li>');
+        }
+    }
+    if ($output) {
+       $r->print('</ul>');
+       $r->print('<p>'.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>'); 
+       if ($cangrade) {
+           $r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />');
+       }
+       $r->print('</td>'); 
+    }
+# Total
+    if ($output) { $r->print('<td>'); }
+    if ($cangrade) {
+       if ($output) { 
+          $r->print(
+                  '<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'}).'" />'); 
+       }
+    } else {
+       if ($output) {
+          $r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}));
+       }
+    }
+# Adjust total points
+    if ($categories{$id.'_totaltype'} eq 'typein') {
+       $totalpossible=1.*$categories{$id.'_total'};
     }
+    if ($output) {
+       $r->print('<p>'.&mt('Adjusted raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');
+    }
+
 
-    my $allowed_to_edit = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
-    if ((!$allowed_to_edit) && ($env{'request.course.sec'} ne '')) {
-        $allowed_to_edit = &Apache::lonnet::allowed('mgr',
-                               "$env{'request.course.id'}/$env{'request.course.sec'}");
+# Calculation
+    if ($output) { $r->print('<td><ul>'); }
+    foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {
+        if ($output) { $r->print('<li>'); }
+        my ($code,$value)=split(/\:/,$calcrule);
+        if ($output) { $r->print(&pretty_prt_rule($cangrade,$id,$code,$value)); }
+        if ($cangrade) {
+           if ($output) { $r->print(' <a href="javascript:storecmd(\'delrule_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>'); }
+        }
+        if ($output) { $r->print('</li>'); }
+    }
+    if ($output) { $r->print('</ul>'); }
+    if ($cangrade) {
+        if ($output) { $r->print('<br />'.&new_calc_rule_form($id)); }
     }
+    if ($output) { $r->print('</td>'); }
 
-    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);
-        if (($showPoints) && ($hidetotals ne '')) {
-            if ($hidetotals eq 'all') {
-                push(@notes,&mt('Students do not see course totals.'));
+# Weight
+    if ($cangrade) {
+       if ($output) { 
+          $r->print('<td>'.
+                  '<input type="text" size="4" name="weight_'.$id.
+                  '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_weight'}).'" /></td>');
+       }
+    } else {
+       if ($output) {
+          $r->print('<td>'.$categories{$id.'_weight'}.'</td>');
+       }
+    }
+# Achieved
+    if ($output) { $r->print('<td>'); }
+    if ($cangrade) {
+        if ($output) {
+           $r->print('<select name="displayachieved_'.$id.'">'.
+                  '<option value="percent"'.($categories{$id.'_displayachieved'} eq 'percent'?' selected="selected"':'').'>'.&mt('percent').'</option>'.
+                  '<option value="points"'.($categories{$id.'_displayachieved'} eq 'points'?' selected="selected"':'').'>'.&mt('points').'</option>'.
+                  '</select>');
+        }
+    } else {
+        if ($output) {
+            if ($categories{$id.'_displayachieved'} eq 'percent') {
+                $r->print(&mt('percent'));
             } else {
-                my @secs = split(/,/,$hidetotals);
-                if (@secs == 1) {
-                    push(@notes,&mt('Students in section [_1] do not see course totals.',
-                                    $hidetotals));
-                } elsif (@secs > 1) {
-                    push(@notes,&mt('Students in sections [_1] do not see course totals.',
-                                    join(', ',@secs)));
-                }
+                $r->print(&mt('points'));
             }
         }
-        push(@notes,&mt('Students will see link to spreadsheet.')) if ($showSPRSlink);
-        push(@notes,&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading'));
-        $r->print(&Apache::loncommon::head_subbox(join('&nbsp;&nbsp;',@notes)));
-    } elsif (!$allowed_to_edit) {
-        if (!$showPoints && !$notshowSPRSlink ) {
-            $r->print(&Apache::loncommon::head_subbox(
-                      &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>')));
+    }
+    if ($output) { $r->print('</td>'); }
+
+    return ($value,$weight);
+}
+
+#
+# Bottom line with grades
+#
+
+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="javascript:storecmd(\'createnewcat\');">'.&mt('Create New Category').'</a></td>');
+    }
+    $r->print('<td colspan="6">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>');
+}
+
+#
+# Make one new category
+#
+
+sub make_new_category {
+    my ($r,$cangrade,$ordernum,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+# Generate new ID
+    my $id=time.'_'.$$.'_'.rand(10000);
+# Add new ID to list of all IDs ever created in this course
+    $categories{'all'}.=','.$id;
+    $categories{'all'}=~s/^\,//;
+# Add new ID to ordered list of displayed and evaluated categories
+    $categories{'order'}.=','.$id;
+    $categories{'order'}=~s/^\,//;
+# Move it into desired space
+    if (defined($ordernum)) {
+        %categories=&move_category($id,$cangrade,$ordernum,%categories);
+    }
+    $categories{$id.'_weight'}=0;
+    $categories{$id.'_totaltype'}='default';
+    $categories{$id.'_displayachieved'}='percent';
+    return %categories;
+}
+
+
+# === Calculation Rule Editing
+
+sub category_rule_codes {
+    return &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');
+}
+
+sub pretty_prt_rule {
+    my ($cangrade,$id,$code,$value)=@_;
+    my $cid=$id.'_'.$code;
+    my %lt=&category_rule_codes();
+    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.'" value="'.$value.'" /></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);
         }
     }
-    return;
+    $categories{$id.'_calculations'}=join(',',@newcontent);
+    return %categories;
 }
 
-sub endGradeScreen {
-    my ($r)=@_;
-    $r->print(&Apache::loncommon::end_page());
-    return;
+sub set_category_rules {
+    my ($cangrade,$id,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    my %lt=&category_rule_codes();
+    my @newrules=();
+    foreach my $code ('',(keys(%lt))) {
+        if ($env{'form.sel_'.$id.'_'.$code}) {
+            push(@newrules,$env{'form.sel_'.$id.'_'.$code}.':'.$env{'form.val_'.$id.'_'.$code});
+        }
+    }
+    $categories{$id.'_calculations'}=join(',',sort(@newrules));
+    return %categories;
+}
+
+
+# === Category Editing
+
+#
+# Add to category content
+#
+
+sub add_category_content {
+    my ($id,$cangrade,$newcontent,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    &Apache::lonnet::logthis("In here $newcontent");
+    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)=@_;
+    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);
+}
+
+#
+# Move a category to a desired position n the display order
+#
+
+sub move_category {
+    my ($id,$cangrade,$ordernum,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    my @order=split(/\,/,$categories{'order'});
+# Where is the index currently?
+    my $currentpos=&current_pos_category($id,%categories);
+    if (defined($currentpos)) {
+        if ($currentpos<$ordernum) {
+# This is moving to a higher index
+# ....X1234....
+# ....1234X....
+            for (my $i=$currentpos;$i<$ordernum;$i++) {
+                $order[$i]=$order[$i+1];
+            }
+            $order[$ordernum]=$id;
+        }
+        if ($currentpos>$ordernum) {
+# This is moving to a lower index
+# ....1234X....
+# ....X1234....
+            for (my $i=$currentpos;$i>$ordernum;$i--) {
+                $order[$i]=$order[$i-1];
+            }
+            $order[$ordernum]=$id;
+        }
+    }
+    $categories{'order'}=join(',',@order);
+    return %categories;
 }
 
+#
+#  Find current postion of a category in the order
+#
+
+sub current_pos_category {
+    my ($id,%categories)=@_;
+    my @order=split(/\,/,$categories{'order'});
+    for (my $i=0;$i<=$#order;$i++) {
+        if ($order[$i] eq $id) { return $i; }
+    }
+# not found
+    return undef;
+}
+
+#
+# Set name of a category
+#
+sub set_category_name {
+    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;
+}
+
+sub set_category_displayachieved {
+    my ($cangrade,$id,$value,%categories)=@_;
+    unless ($cangrade) { return %categories; }
+    unless (($value eq 'percent') || ($value eq 'points')) { $value='percent'; }
+    $categories{$id.'_displayachieved'}=$value;
+    return %categories;
+}
+
+
+#
+# === end category-related
+#
+#
 # 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");
+
 sub mixColors {
     my $start = shift;
     my $end = shift;