--- loncom/interface/lonquickgrades.pm	2020/09/08 04:24:18	1.49.6.6.2.1
+++ loncom/interface/lonquickgrades.pm	2010/12/03 15:19:09	1.53
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.49.6.6.2.1 2020/09/08 04:24:18 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.53 2010/12/03 15:19:09 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,199 +57,76 @@ sub real_handler {
         return OK;
     }
 
-    my $cangrade=&Apache::lonnet::allowed('mgr');
-    my $showPoints =
+    # Send header, don't cache this page
+    &Apache::loncommon::no_cache($r);
+    $r->send_http_header;
+
+    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'));
+    my $notshowTotals=
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+    my $showCategories=
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
 
-    my $reinitresult;
 
-    if ($env{'request.course.id'}) {
-        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        my ($blocked,$blocktext) =
-            &Apache::loncommon::blocking_status('grades',$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;
-            }
-        }
-    }
+    # 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})
+             );
 
-    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;
-        }
+    $r->print(&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading'));
 
-        # 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;
-        } elsif ($reinitresult eq 'update') {
-            my $cid = $env{'request.course.id'};
-            my $cnum = $env{'course.'.$cid.'.num'};
-            my $cdom = $env{'course.'.$cid.'.domain'};
-            &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 (!$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>');
     }
 
-    unless ($reinitresult eq 'update') {
-        # Send header, don't cache this page
-        &Apache::loncommon::no_cache($r);
-        $r->send_http_header;
-        &startpage($r,$showPoints);
-    }
-    $r->rflush();
+    $r->print('<p class="LC_info">'.&mt('This may take a few moments to display.').'</p>');
 
-    &startGradeScreen($r);
-
-#
-# 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],'ids'))[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');
-        $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).
-                 '&nbsp;&nbsp;<input type="submit" name="display" value="'.&mt('Display Individual Student').'" /></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 $notshowTotals=
-        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+    my $uname='korte';
+    my $udom='gerd';
 
-    my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,
-        $topLevelRight,$topLevelAttempted) = &getData($showPoints,$uname,$udom);
+    my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
+       &getData($showPoints,$uname,$udom);
 
-    if (ref($navmap)) {
-        &outputTable($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible,
-                     $totalRight,$totalAttempted,$topLevelParts,$topLevelRight,
-                     $topLevelAttempted);
+    if ($showCategories) {
+       &outputCategories($r,$showPoints,$notshowTotals,
+                 $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;
+       &outputTable($r,$showPoints,$notshowTotals,
+                 $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
     }
-    if ($cangrade) { $r->print("\n</form>\n"); }
-    &endGradeScreen($r);
     return OK;
-}
 
-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;
 }
 
-#
-# Go through the complete course and collect data
-#
-
 sub getData {
 
     my ($showPoints,$uname,$udom)=@_;
 
+    &Apache::lonnet::logthis("About to call with $uname $udom");
+
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
 
-    if (!defined($navmap)) {
-        return ();
-    }
-
     my $res = $navmap->firstResource(); # temp resource to access constants
 
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);
     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
@@ -283,36 +159,35 @@ 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);
 
 		    if ($curRes->opendate($part) < $now) {
-			$totalPossible += $weight;
+			$totalPossible += $curRes->weight($part);
 		    }
-		    $totalParts += $weight;
+		    $totalParts += $curRes->weight($part);
 		} else {
 		    my $status = $curRes->simpleStatus($part);
 		    my $thisright = 0;
@@ -329,6 +204,7 @@ sub getData {
 			$totalAttempted++;
 		    }
 		    
+		    my $dateStatus = $curRes->getDateStatus($part);
 		    $totalParts++;
 		    if ($curRes->opendate($part) < $now) {
 			$totalPossible++;
@@ -359,8 +235,7 @@ sub getData {
         }
         $curRes = $iterator->next();
     }
-    return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,
-            $topLevelParts,$topLevelRight,$topLevelAttempted);
+    return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
 }
 
 #
@@ -369,8 +244,8 @@ sub getData {
 
 sub outputTable {
 
-    my ($r,$showPoints,$notshowTotals,$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);
@@ -443,7 +318,7 @@ sub outputTable {
     # If there were any problems at the top level, print an extra "catchall"
     if ($topLevelParts > 0) {
         my $ratio = $topLevelRight / $topLevelParts;
-        my $color = &mixColors(\@start, \@end, $ratio);
+        my $color = mixColors(\@start, \@end, $ratio);
         $r->print(&Apache::loncommon::start_data_table_row()
                  .'<td style="background-color:'.$color.';">');
         $r->print(&mt("Problems Not Contained In A Folder")."</td><td>");
@@ -455,85 +330,37 @@ sub outputTable {
 # show totals (if applicable), close table
 #
     if ($showPoints) {
-	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()
+        $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>'
+        $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());
-    return;
-}
+    $r->print(&Apache::loncommon::end_data_table()
+             .&Apache::loncommon::end_page());
 
-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 startGradeScreen {
-    my ($r)=@_;
-
-    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'));
-    my $notshowTotals =
-        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
-    my $showSPRSlink =
-        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet';
-
-    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'}");
-    }
-
-    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'}");
-    }
+#
+# Outputting category-based grades.
+#
 
-    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 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>')));
-        }
-    }
-    return;
-}
+sub outputCategories {
 
-sub endGradeScreen {
-    my ($r)=@_;
-    $r->print(&Apache::loncommon::end_page());
-    return;
+    my ($r,$showPoints,$notshowTotals,
+           $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
 }
 
 # 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;