--- loncom/interface/lonstatistics.pm	2002/09/03 01:32:10	1.47.2.1
+++ loncom/interface/lonstatistics.pm	2002/09/16 20:09:46	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstatistics.pm,v 1.47.2.1 2002/09/03 01:32:10 albertel Exp $
+# $Id: lonstatistics.pm,v 1.51 2002/09/16 20:09:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,6 +47,7 @@ use Apache::lonhtmlcommon;
 use Apache::lonproblemanalysis;
 use Apache::lonproblemstatistics;
 use Apache::lonstudentassessment;
+use Apache::lonpercentage;
 use HTML::TokeParser;
 use GDBM_File;
 
@@ -84,6 +85,10 @@ sub ProcessFormData{
     &CheckFormElement($cache, 'download', 'download', 'false');
     &CheckFormElement($cache, 'StatisticsMaps', 
                       'StatisticsMaps', 'All Maps');
+    &CheckFormElement($cache, 'StatisticsProblemSelect',
+		      'StatisticsProblemSelect', 'All Problems');
+    &CheckFormElement($cache, 'StatisticsPartSelect',
+		      'StatisticsPartSelect', 'All Parts');
     if(defined($ENV{'form.Section'})) {
         my @sectionsSelected = (ref($ENV{'form.Section'}) ?
                                @{$ENV{'form.Section'}} :
@@ -122,7 +127,8 @@ sub ProcessFormData{
                       'ProblemStatisticsAscend', 'Ascending');
     &CheckFormElement($cache, 'ProblemStatisticsSort',
                       'ProblemStatisticsSort', 'Homework Sets Order');
-    &CheckFormElement($cache, 'DisplayLegend', 'DisplayLegend', 'Hide Legend');
+    &CheckFormElement($cache, 'DisplayLegend', 'DisplayLegend', 
+		      'Hide Legend');
     &CheckFormElement($cache, 'SortProblems', 'SortProblems', 
                       'Sort Within Sequence');
 
@@ -359,41 +365,40 @@ sub PrepareData {
     &SpaceColumns($students, $studentInformation, $headings, \%cache);
     $cache{'updateTime:columnWidth'}=24;
 
-    if($cache{'download'} ne 'false') {
-        my @who = ($cache{'download'});
+    my $download = $cache{'download'};
+    my $downloadAll = $cache{'DownloadAll'};
+    my @allStudents=();
+    if($download ne 'false') {
         $cache{'download'} = 'false';
+    } elsif($downloadAll ne 'false') {
+        $cache{'DownloadAll'} = 'false';
+        if($downloadAll eq 'sorted') {
+            @allStudents = @$students;
+        } else {
+            @allStudents = split(':::', $cache{'NamesOfStudents'});
+        }
+    }
+
+    untie(%cache);
+
+    if($download ne 'false') {
+        my @who = ($download);
         if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'false', 
                                                              $cacheDB, 'true', 
                                                              'false', $courseID,
                                                              $r, $c) ne 'OK') {
-            untie(%cache);
             return 'Stop at download individual';
         }
-    } elsif($cache{'DownloadAll'} ne 'false') {
-        $cache{'DownloadAll'} = 'false';
-        my @allStudents;
-        if($cache{'DownloadAll'} eq 'sorted') {
-            @allStudents = @$students;
-        } else {
-            @allStudents = split(':::', $cache{'NamesOfStudents'});
-        }
+    } elsif($downloadAll ne 'false') {
         if(&Apache::loncoursedata::DownloadStudentCourseData(\@allStudents, 
                                                              'false', 
                                                              $cacheDB, 'true', 
                                                              'true', $courseID,
                                                              $r, $c) ne 'OK') {
-            untie(%cache);
             return 'Stop at download all';
         }
     }
 
-    if($c->aborted()) {
-        untie(%cache);
-        return 'aborted'; 
-    }
-
-    untie(%cache);
-
     return ('OK', $students);
 }
 
@@ -508,6 +513,7 @@ sub BuildStatistics {
     my %reports = ('classlist'          => 'Class list',
                    'problem_statistics' => 'Problem Statistics',
                    'student_assessment' => 'Student Assessment',
+		   'percentage'         => 'Percentage Graphs',
 #                   'activitylog'        => 'Activity Log',
                    'reportSelected'     => 'Class list');
 
@@ -587,6 +593,9 @@ sub BuildStatistics {
     } elsif($GoToPage eq 'Class list') {
         &BuildClasslist($cacheDB, $students, \@studentInformation,
                         \@headings, $r);
+    } elsif($GoToPage eq 'Percentage Graphs') {
+	&Apache::lonpercentage::BuildPercentageGraph($cacheDB, $students,
+						     $courseID, $c, $r);
     }
 
     $r->print('</form>'."\n");
@@ -603,6 +612,13 @@ sub handler {
 
 #    $jr = $r;
 
+    my $loaderror=&Apache::lonnet::overloaderror($r);
+    if ($loaderror) { return $loaderror; }
+    $loaderror=
+       &Apache::lonnet::overloaderror($r,
+         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+    if ($loaderror) { return $loaderror; }
+
     unless(&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
         $ENV{'user.error.msg'}=
         $r->uri.":vgr:0:0:Cannot view grades for complete course";