--- loncom/interface/lonstatistics.pm	2002/09/16 20:09:46	1.51
+++ loncom/interface/lonstatistics.pm	2003/01/12 23:31:22	1.57
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstatistics.pm,v 1.51 2002/09/16 20:09:46 www Exp $
+# $Id: lonstatistics.pm,v 1.57 2003/01/12 23:31:22 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,7 +35,7 @@
 #
 ###
 
-package Apache::lonstatistics; 
+package Apache::lonstatistics;
 
 use strict;
 use Apache::Constants qw(:common :http);
@@ -74,13 +74,25 @@ sub ProcessFormData{
                                              'reportSelected',
                                              'StudentAssessmentStudent',
                                              'ProblemStatisticsSort']);
+    &CheckFormElement($cache, 'DownloadAll', 'DownloadAll', 'false');
+    if ($cache->{'DownloadAll'} ne 'false') {
+        # Clean the hell out of that cache!
+        # We cannot untie the hash at this scope (stupid libgd :( )
+        # So, remove every single key.  What a waste of time....
+        # Of course, if you are doing this you are probably resigned
+        # to waiting a while.
+        &Apache::lonnet::logthis("Cleaning out the cache file");
+        while (my ($key,undef)=each(%$cache)) {
+            next if ($key eq 'DownloadAll');
+            delete($cache->{$key});
+        }
+    }
     &CheckFormElement($cache, 'Status', 'Status', 'Active');
     &CheckFormElement($cache, 'postdata', 'reportSelected', 'Class list');
     &CheckFormElement($cache, 'reportSelected', 'reportSelected', 
                       'Class list');
     $cache->{'reportSelected'} = 
         &Apache::lonnet::unescape($cache->{'reportSelected'});
-    &CheckFormElement($cache, 'DownloadAll', 'DownloadAll', 'false');
     &CheckFormElement($cache, 'sort', 'sort', 'fullname');
     &CheckFormElement($cache, 'download', 'download', 'false');
     &CheckFormElement($cache, 'StatisticsMaps', 
@@ -245,9 +257,11 @@ sub SortStudents {
     my $sortBy = '';
     if(defined($cache->{'sort'})) {
         $sortBy = ':'.$cache->{'sort'};
+    } else {
+        $sortBy = ':fullname';
     }
-    my @order = sort { $cache->{$a.$sortBy} cmp $cache->{$b.$sortBy} ||
-                       $cache->{$a.':fullname'} cmp $cache->{$b.':fullname'} } 
+    my @order = sort { lc($cache->{$a.$sortBy}) cmp lc($cache->{$b.$sortBy}) ||
+                       lc($cache->{$a.':fullname'}) cmp lc($cache->{$b.':fullname'}) } 
                 @sorted1Students;
 
     return \@order;
@@ -312,7 +326,7 @@ sub PrepareData {
         $isRecalculate=1;
     }
 
-    my $isCached = &Apache::loncoursedata::TestCacheData($cacheDB, 
+    my $isCached = &Apache::loncoursedata::TestCacheData($cacheDB,
                                                          $isRecalculate);
     if($isCached < 0) {
         return "Unable to tie hash to db file.";
@@ -383,16 +397,16 @@ sub PrepareData {
 
     if($download ne 'false') {
         my @who = ($download);
-        if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'false', 
-                                                             $cacheDB, 'true', 
+        if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'false',
+                                                             $cacheDB, 'true',
                                                              'false', $courseID,
                                                              $r, $c) ne 'OK') {
             return 'Stop at download individual';
         }
     } elsif($downloadAll ne 'false') {
-        if(&Apache::loncoursedata::DownloadStudentCourseData(\@allStudents, 
-                                                             'false', 
-                                                             $cacheDB, 'true', 
+        if(&Apache::loncoursedata::DownloadStudentCourseData(\@allStudents,
+                                                             'false',
+                                                             $cacheDB, 'true',
                                                              'true', $courseID,
                                                              $r, $c) ne 'OK') {
             return 'Stop at download all';
@@ -410,19 +424,37 @@ sub BuildClasslist {
         return '<html><body>Unable to tie database.</body></html>';
     }
 
+#    my $Ptr = '';
+#    $Ptr .= '<table border="0"><tbody>';
+#    $Ptr .= '<tr><td align="right"><b>Select Sections</b>';
+#    $Ptr .= '</td>'."\n";
+#    $Ptr .= '<td align="left">'."\n";
+#    my @sectionsSelected = split(':',$cache{'sectionsSelected'});
+#    my @sections = split(':',$cache{'sectionList'});
+#    $Ptr .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections,
+#                                                          \@sectionsSelected,
+#                                                          'Statistics');
+#    $Ptr .= '</td></tr></table><br>';
+#    $r->print($Ptr);
+#    $r->rflush();
+#    my %mySections = ();
+#    foreach (@sections) { $mySections{$_} = 'True'; }
+#    $r->print("<br>$cache{'sectionsSelected'}<br>");
+
     my $Str='';
     $Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n";
     $Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n";
 
     my $displayString = '<td align="left"><a href="/adm/statistics?';
     $displayString .= 'sort=LINKDATA">DISPLAYDATA&nbsp</a></td>'."\n";
-    $Str .= &Apache::lonhtmlcommon::CreateHeadings(\%cache, 
+    $Str .= &Apache::lonhtmlcommon::CreateHeadings(\%cache,
                                                    $studentInformation,
                                                    $headings, $displayString);
     $Str .= '</tr>'."\n";
 
     my $alternate=0;
     foreach (@$students) {
+#        if ($mySections{$cache{$_.':'.'section'}} ne 'True') {next;}
         my ($username, $domain) = split(':', $_);
         if($alternate) {
             $Str .= '<tr bgcolor="#ffffe6">';
@@ -470,8 +502,8 @@ sub CreateMainMenu {
 
     $Str .= '<table border="0"><tbody><tr>'."\n";
     $Str .= '<td></td><td></td>'."\n";
-    $Str .= '<td align="center"><b>Analysis Reports:</b></td>'."\n";
-    $Str .= '<td align="center"><b>Student Status:</b></td></tr>'."\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="Refresh" /></td>'."\n";
@@ -510,6 +542,7 @@ sub BuildStatistics {
     my @headings=('Full Name', 'Section', 'PID', 'Domain', 'User Name',
                   'Last Updated');
     my $spacing = '   ';
+
     my %reports = ('classlist'          => 'Class list',
                    'problem_statistics' => 'Problem Statistics',
                    'student_assessment' => 'Student Assessment',
@@ -524,15 +557,15 @@ sub BuildStatistics {
 
     $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));
 
-    my ($returnValue, $students) = &PrepareData($c, $cacheDB, 
-                                                \@studentInformation, 
+    my ($returnValue, $students) = &PrepareData($c, $cacheDB,
+                                                \@studentInformation,
                                                 \@headings,$r);
     if($returnValue ne 'OK') {
         $r->print($returnValue."\n".'</body></html>');
         return OK;
     }
     if(!$c->aborted()) {
-        &Apache::loncoursedata::CheckForResidualDownload($cacheDB, 
+        &Apache::loncoursedata::CheckForResidualDownload($cacheDB,
                                                          'true', 'true',
                                                          $courseID,
                                                          $r, $c);
@@ -542,8 +575,8 @@ sub BuildStatistics {
     if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
         $GoToPage = $cache{'reportSelected'};
         $reports{'reportSelected'} = $cache{'reportSelected'};
-        if(defined($cache{'reportKey'}) && 
-           !exists($reports{$cache{'reportKey'}}) && 
+        if(defined($cache{'reportKey'}) &&
+           !exists($reports{$cache{'reportKey'}}) &&
            $cache{'reportKey'} ne 'false') {
             $reports{$cache{'reportKey'}} = $cache{'reportSelected'};
         }
@@ -565,9 +598,9 @@ sub BuildStatistics {
     if($GoToPage eq 'Activity Log') {
         &Apache::lonproblemstatistics::Activity();
     } elsif($GoToPage eq 'Problem Statistics') {
-        &Apache::lonproblemstatistics::BuildProblemStatisticsPage($cacheDB, 
-                                                                  $students, 
-                                                                  $courseID, 
+        &Apache::lonproblemstatistics::BuildProblemStatisticsPage($cacheDB,
+                                                                  $students,
+                                                                  $courseID,
                                                                   $c,$r);
     } elsif($GoToPage eq 'Option Response Analysis') {
         &Apache::lonproblemanalysis::BuildProblemAnalysisPage($cacheDB, $r);
@@ -581,7 +614,7 @@ sub BuildStatistics {
                                                           \@studentInformation,
                                                           $r, $c);
     } elsif($GoToPage eq 'Analyze') {
-        &Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB, $students, 
+        &Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB, $students,
                                                       $courseID, $r);
     } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {
         my $courseDescription = $ENV{'course.'.$courseID.'.description'};
@@ -622,7 +655,7 @@ sub handler {
     unless(&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; 
+        return HTTP_NOT_ACCEPTABLE;
     }
 
     # Set document type for header only
@@ -640,7 +673,7 @@ sub handler {
     unless($ENV{'request.course.fn'}) {
 	my $requrl=$r->uri;
         $ENV{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
-        return HTTP_NOT_ACCEPTABLE; 
+        return HTTP_NOT_ACCEPTABLE;
     }
 
     $r->content_type('text/html');