--- loncom/interface/lonquickgrades.pm	2017/04/02 13:42:06	1.49.6.3
+++ loncom/interface/lonquickgrades.pm	2018/09/11 02:44:58	1.49.6.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.49.6.3 2017/04/02 13:42:06 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.49.6.4 2018/09/11 02:44:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,6 +58,11 @@ sub real_handler {
         return OK;
     }
 
+    my $showPoints =
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
+
+    my $reinitresult;
+
     unless (&Apache::lonnet::allowed('mgr')) {
         # Check for critical messages and redirect if present.
         my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
@@ -69,32 +74,58 @@ sub real_handler {
 
         # Check if course needs to be re-initialized
         my $loncaparev = $r->dir_config('lonVersion');
-        my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
+        ($reinitresult,my @reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
 
-        if ($result eq 'switch') {
+        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 ($result eq 'update') {
-            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        } 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>';
+            %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);
             }
         }
     }
 
-    # Send header, don't cache this page
-    &Apache::loncommon::no_cache($r);
-    $r->send_http_header;
+    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();
 
-    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'));
@@ -114,13 +145,6 @@ sub real_handler {
     # should match color/icon
     my $res = $navmap->firstResource(); # temp resource to access constants
  
-    # 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'
@@ -284,7 +308,7 @@ sub real_handler {
             if ($total > 0) {
                 my $ratio;
                 $ratio = $correct / $total;
-                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.';">');
                 
@@ -317,7 +341,7 @@ sub real_handler {
     # 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>");
@@ -326,7 +350,7 @@ sub real_handler {
     }
 
     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");
@@ -344,6 +368,15 @@ sub real_handler {
     return OK;
 }
 
+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})
+             );
+}
+
 # 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");