--- loncom/interface/lonstatistics.pm	2003/03/25 22:20:25	1.65
+++ loncom/interface/lonstatistics.pm	2003/05/13 14:30:26	1.70
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstatistics.pm,v 1.65 2003/03/25 22:20:25 matthew Exp $
+# $Id: lonstatistics.pm,v 1.70 2003/05/13 14:30:26 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,7 +51,7 @@ Main handler for statistics and chart.
     use Apache::lonproblemstatistics;
     use Apache::lonstudentassessment;
     use Apache::lonpercentage;
-
+    use Apache::lonmysql;
 =over 4
 
 =cut
@@ -82,6 +82,7 @@ use Apache::lonproblemanalysis();
 use Apache::lonproblemstatistics();
 use Apache::lonstudentassessment();
 use Apache::lonpercentage;
+use Apache::lonmysql;
 use Time::HiRes;
 
 #######################################################
@@ -229,6 +230,11 @@ sub PrepareClasslist {
         }
     }
     #
+    # Deal with instructors with restricted section access
+    if ($ENV{'request.course.sec'} !~ /^\s*$/) {
+        @SelectedSections = ($ENV{'request.course.sec'});
+    }
+    #
     # Set up %StudentData
     @StudentDataOrder = qw/fullname username domain id section status/;
     foreach my $field (@StudentDataOrder) {
@@ -237,7 +243,10 @@ sub PrepareClasslist {
         $StudentData{$field}->{'width'} = 
                                $StudentData{$field}->{'base_width'};
     }
-
+    #
+    # get the status requested
+    my $requested_status = 'Active';
+    $requested_status = $ENV{'form.Status'} if (exists($ENV{'form.Status'}));
     #
     # Process the classlist
     while (my ($student,$student_data) = each (%$classlist)) {
@@ -265,7 +274,11 @@ sub PrepareClasslist {
         #
         # Only put in the list those students we are interested in
         foreach my $sect (@SelectedSections) {
-            if (($sect eq 'all') || ($section eq $sect)) {
+            if ( (($sect eq 'all') || 
+                  ($section eq $sect)) &&
+                 (($studenthash->{'status'} eq $requested_status) || 
+                  ($requested_status eq 'Any')) 
+                 ){
                 push (@Students,$studenthash);
                 last;
             }
@@ -273,8 +286,12 @@ sub PrepareClasslist {
     }
     #
     # Put the consolidated section data in the right place
-    @Sections = sort {$a cmp $b} keys(%Sections);
-    unshift(@Sections,'all'); # Put 'all' at the front of the list
+    if ($ENV{'request.course.sec'} !~ /^\s*$/) {
+        @Sections = ($ENV{'request.course.sec'});
+    } else {
+        @Sections = sort {$a cmp $b} keys(%Sections);
+        unshift(@Sections,'all'); # Put 'all' at the front of the list
+    }
     #
     # Sort the Students
     my $sortby = 'fullname';
@@ -831,12 +848,16 @@ sub CreateMainMenu {
     #
     $Str .= '<table border="0"><tbody><tr>'."\n";
     $Str .= '<td></td>'."\n";
+    $Str .= '<td></td>'."\n";
     $Str .= '<td align="center"><b>Select a Report</b></td>'."\n";
-    $Str .= '<td align="center"><b>Student Status</b></td></tr>'."\n";
     $Str .= '<tr>'."\n";
     #
-    $Str .= '<td align="center"><input type="submit" name="Refresh" ';
-    $Str .= 'value="Update Display" /></td>'."\n";
+    $Str .= '<td align="center">'.
+        '<input type="submit" name="Refresh" value="Update Display" />'.
+            "</td>\n";
+    $Str .= '<td align="center">'.
+        '<input type="submit" name="ClearCache" value="Clear Caches" />'.
+            "</td>\n";
     #
     $Str .= '<td align="center">';
     $Str .= '<select name="reportSelected" >'."\n";
@@ -849,10 +870,6 @@ sub CreateMainMenu {
     }
     $Str .= '</select></td>'."\n";
     #
-    $Str .= '<td align="center">';
-    $Str .= &Apache::lonhtmlcommon::StatusOptions($status, 'Statistics');
-    $Str .= '</td>'."\n";
-    #
     $Str .= '</tr></tbody></table>'."\n";
     $Str .= '<hr>'."\n";
     #
@@ -874,10 +891,15 @@ sub handler {
     if ($loaderror) { return $loaderror; }
     #
     # Check for access
-    unless(&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
+    if (! &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
         $ENV{'user.error.msg'}=
-        $r->uri.":vgr:0:0:Cannot view grades for complete course";
-        return HTTP_NOT_ACCEPTABLE;
+            $r->uri.":vgr:0:0:Cannot view grades for complete course";
+        if (! &Apache::lonnet::allowed('vgr',
+                      $ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
+            $ENV{'user.error.msg'}=
+                $r->uri.":vgr:0:0:Cannot view grades with given role";
+            return HTTP_NOT_ACCEPTABLE;
+        }
     }
     #
     # Set document type for header only
@@ -908,6 +930,27 @@ sub handler {
     $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));
     $r->rflush();
     #
+    if (! &Apache::lonmysql::verify_sql_connection()) {
+        my $serveradmin = $r->dir_config('lonAdmEMail');
+        $r->print(<<END);
+<h2><font color="Red">Unable to connect to database!</font></h2>
+<p>
+Please notify the server administrator <b>$serveradmin</b>.
+</p><p>
+Course Statistics and Charts cannot be retrieved until the database is
+restarted.  Your data is intact but cannot be displayed at this time.
+</p>
+</body>
+</html>
+END
+        return;
+    }
+    #
+    # Clean out the caches
+    if (exists($ENV{'form.ClearCache'})) {
+        &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'});
+    }
+    #
     # Set up the statistics and chart environment
     &PrepareClasslist($r);
     &PrepareCourseData($r);
@@ -919,7 +962,7 @@ sub handler {
     # Print main menu
     my %reports = ('classlist'          => 'Class list',
                    'problem_statistics' => 'Problem Statistics',
-                   'student_assessment' => 'Student Assessment',
+                   'student_assessment' => 'Problem Status Chart',
                    'percentage'         => 'Correct-problems Plot',
                    'option_response'    => 'Option Response Analysis',
 #                   'activitylog'        => 'Activity Log',