--- loncom/interface/lonquickgrades.pm	2020/09/01 14:38:07	1.49.6.6
+++ loncom/interface/lonquickgrades.pm	2025/01/16 21:11:56	1.49.6.8.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.49.6.6 2020/09/01 14:38:07 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.49.6.8.2.6 2025/01/16 21:11:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,9 +64,28 @@ sub real_handler {
 
     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 $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;
+            }
+        }
+    }
+
     unless ($cangrade) {
         # Check for critical messages and redirect if present.
-        my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
+        my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'grades');
         if ($redirect) {
             &Apache::loncommon::content_type($r,'text/html');
             $r->header_out(Location => $url);
@@ -82,23 +101,27 @@ sub real_handler {
             $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'};
+        }
+        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>'.
+                           ' '.&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::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
             my $closure = <<ENDCLOSE;
 <script type="text/javascript">
@@ -117,9 +140,19 @@ ENDCLOSE
                $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 'update') {
+    unless (($reinitresult eq 'main') || ($reinitresult eq 'both')) {
         # Send header, don't cache this page
         &Apache::loncommon::no_cache($r);
         $r->send_http_header;
@@ -170,13 +203,41 @@ ENDCLOSE
     my $notshowTotals=
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
 
+    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 ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,
-        $topLevelRight,$topLevelAttempted) = &getData($showPoints,$uname,$udom);
+        $topLevelRight,$topLevelAttempted) = &getData($showPoints,$uname,$udom,$usec);
 
     if (ref($navmap)) {
-        &outputTable($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible,
-                     $totalRight,$totalAttempted,$topLevelParts,$topLevelRight,
-                     $topLevelAttempted);
+        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;
@@ -188,16 +249,39 @@ ENDCLOSE
     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)=@_;
+    my ($showPoints,$uname,$udom,$usec)=@_;
 
     # Create the nav map
-    my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
+    my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom,$usec);
 
     if (!defined($navmap)) {
         return ();
@@ -232,7 +316,7 @@ sub getData {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }
 
-        if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout)
+        if (ref($curRes) && $curRes->is_gradable() && !$curRes->randomout)
         {
             # Get number of correct, incorrect parts
             my $parts = $curRes->parts();
@@ -328,8 +412,8 @@ sub getData {
 
 sub outputTable {
 
-    my ($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible,$totalRight,
-        $totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
+    my ($r,$showPoints,$notshowTotals,$nostdtotals,$navmap,$totalParts,$totalPossible,
+        $totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
 
     my @start = (255, 255, 192);
     my @end   = (0, 192, 0);
@@ -414,16 +498,18 @@ sub outputTable {
 # show totals (if applicable), close table
 #
     if ($showPoints) {
-	my $maxHelpLink = &Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
+        unless ($nostdtotals) {
+	    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());
+	    $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());
@@ -444,6 +530,8 @@ sub startGradeScreen {
 
     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'));
@@ -469,6 +557,20 @@ sub startGradeScreen {
         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.'));
+            } 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)));
+                }
+            }
+        }
         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)));