--- loncom/interface/lonstatistics.pm	2002/07/25 19:30:24	1.31
+++ loncom/interface/lonstatistics.pm	2002/07/30 21:31:48	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstatistics.pm,v 1.31 2002/07/25 19:30:24 minaeibi Exp $
+# $Id: lonstatistics.pm,v 1.37 2002/07/30 21:31:48 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +31,7 @@
 # 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei
 # YEAR=2002
 # 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei
-# 5/12,5/14,5/15,5/19,5/26,7/16,25/7  Behrouz Minaei
+# 5/12,5/14,5/15,5/19,5/26,7/16,25/7,29/7  Behrouz Minaei
 #
 ###
 
@@ -70,7 +70,8 @@ sub ProcessFormData{
     $cache->{'reportKey'} = 'false';
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['sort','download','reportSelected',
+                                            ['sort','download',
+                                             'reportSelected',
                                              'StudentAssessmentStudent']);
     &CheckFormElement($cache, 'Status', 'Status', 'Active');
     &CheckFormElement($cache, 'postdata', 'reportSelected', 'Class list');
@@ -94,28 +95,80 @@ sub ProcessFormData{
     } else {
         $cache->{'StudentAssessmentMove'} = 'selected';
     }
-    &CheckFormElement($cache, 'StudentAssessmentMap', 'StudentAssessmentMap', 
-                      'All Maps');
     &CheckFormElement($cache, 'StudentAssessmentStudent', 
                       'StudentAssessmentStudent', 'All Students');
     $cache->{'StudentAssessmentStudent'} = 
         &Apache::lonnet::unescape($cache->{'StudentAssessmentStudent'});
+    &CheckFormElement($cache, 'DefaultColumns', 'DefaultColumns', 'false');
+
+    if(defined($ENV{'form.Section'})) {
+        my @sectionsSelected = (ref($ENV{'form.Section'}) ?
+                               @{$ENV{'form.Section'}} :
+                                ($ENV{'form.Section'}));
+        $cache->{'sectionsSelected'} = join(':', @sectionsSelected);
+    } elsif(!defined($cache->{'sectionsSelected'})) {
+        $cache->{'sectionsSelected'} = $cache->{'sectionList'};
+    }
+
+    my @headingColumns=();
+    my @sequenceColumns=();
+    my $foundColumn = 0;
+    if(defined($ENV{'form.ReselectColumns'})) {
+        my @reselected = (ref($ENV{'form.ReselectColumns'}) ? 
+                          @{$ENV{'form.ReselectColumns'}}
+                          : ($ENV{'form.ReselectColumns'}));
+        foreach (@reselected) {
+            if(/HeadingColumn/) {
+                push(@headingColumns, $_);
+                $foundColumn = 1;
+            } elsif(/SequenceColumn/) {
+                push(@sequenceColumns, $_);
+                $foundColumn = 1;
+            }
+        }
+    }
+
+    $cache->{'reportKey'} = 'false';
+    if($cache->{'reportSelected'} eq 'Analyze') {
+        $cache->{'reportKey'} = 'Analyze';
+    }
 
     foreach (keys(%ENV)) {
-        if(/form\.Analyze:::/) {
-#            $cache->{'reportSelected'} = 'Analyze';
-#            $cache->{'reportKey'} = 'Problem Analysis';
-            my ($uri, $title, $part, $problem);
-            (undef, $uri, $title, $part, $problem)=split(':::', $_);
-            $cache->{'AnalyzeURI'}     = $uri;
-            $cache->{'AnalyzeTitle'}   = $title;
-            $cache->{'AnalyzePart'}    = $part;
-            $cache->{'AnalyzeProblem'} = $problem;
+        if(/form\.Analyze/) {
+            $cache->{'reportSelected'} = 'Analyze';
+            $cache->{'reportKey'} = 'Analyze';
+            my $data;
+            (undef, $data)=split(':::', $_);
+            $cache->{'AnalyzeInfo'}=$data;
             
             &CheckFormElement($cache, 'Interval', 'Interval', '1');
+        } elsif(/form\.HeadingColumn/) {
+            my $value = $_;
+            $value =~ s/form\.//;
+            push(@headingColumns, $value);
+            $foundColumn=1;
+        } elsif(/form\.SequenceColumn/) {
+            my $value = $_;
+            $value =~ s/form\.//;
+            push(@sequenceColumns, $value);
+            $foundColumn=1;
         }
     }
 
+    if($foundColumn) {
+        $cache->{'HeadingsFound'} = join(':', @headingColumns);
+        $cache->{'SequencesFound'} = join(':', @sequenceColumns);;
+    }
+    if(!defined($cache->{'HeadingsFound'}) || 
+       $cache->{'DefaultColumns'} ne 'false') {
+        $cache->{'HeadingsFound'}='HeadingColumnFull Name';
+    }
+    if(!defined($cache->{'SequencesFound'}) ||
+       $cache->{'DefaultColumns'} ne 'false') {
+        $cache->{'SequencesFound'}='All Sequences';
+    }
+    $cache->{'DefaultColumns'} = 'false';
+
     return;
 
     # Select page to display
@@ -195,8 +248,57 @@ sub SortStudents {
     return \@order;
 }
 
+=pod
+
+=item &SpaceColumns()
+
+Determines the width of all the columns in the chart.  It is based on
+the max of the data for that column and its header.
+
+=over 4
+
+Input: $students, $studentInformation, $headings, $ChartDB
+
+$students: An array pointer to a list of students (username:domain)
+
+$studentInformatin: The type of data for the student information.  It is
+used as part of the key in $CacheData.
+
+$headings: The name of the student information columns.
+
+$ChartDB: The name of the cache database which is opened for read/write.
+
+Output: None - All data stored in cache.
+
+=back
+
+=cut
+
+sub SpaceColumns {
+    my ($students,$studentInformation,$headings,$cache)=@_;
+
+    # Initialize Lengths
+    for(my $index=0; $index<(scalar @$headings); $index++) {
+        my @titleLength=split(//,$headings->[$index]);
+        $cache->{$studentInformation->[$index].':columnWidth'}=
+            scalar @titleLength;
+    }
+
+    foreach my $name (@$students) {
+        foreach (@$studentInformation) {
+            my @dataLength=split(//,$cache->{$name.':'.$_});
+            my $length=(scalar @dataLength);
+            if($length > $cache->{$_.':columnWidth'}) {
+                $cache->{$_.':columnWidth'}=$length;
+            }
+        }
+    }
+
+    return;
+}
+
 sub PrepareData {
-    my ($c, $cacheDB)=@_;
+    my ($c, $cacheDB, $studentInformation, $headings)=@_;
 
     # Test for access to the cache data
     my $courseID=$ENV{'request.course.id'};
@@ -255,6 +357,8 @@ sub PrepareData {
 
     &ProcessFormData(\%cache);
     my $students = &SortStudents(\%cache);
+    &SpaceColumns($students, $studentInformation, $headings, \%cache);
+    $cache{'updateTime:columnWidth'}=24;
 
     if($cache{'download'} ne 'false') {
         my $who = $cache{'download'};
@@ -291,11 +395,6 @@ sub PrepareData {
         return 'aborted'; 
     }
 
-    if($c->aborted()) {
-        untie(%cache);
-        return 'aborted'; 
-    }
-
     untie(%cache);
 
     return ('OK', $students);
@@ -337,29 +436,9 @@ sub Close_PrgWin {
     $r->rflush(); 
 }
 
-# For loading the colored table for display or un-colored for print
-sub setbgcolor {
-    my $PrintTable=shift;
-    my %color;
-    if ($PrintTable){
-	$color{"gb"}="#FFFFFF";
-	$color{"red"}="#FFFFFF";
-	$color{"yellow"}="#FFFFFF";
-	$color{"green"}="#FFFFFF";
-	$color{"purple"}="#FFFFFF";
-    } else {
-	$color{"gb"}="#DDFFFF";
-	$color{"red"}="#FFDDDD";
-	$color{"yellow"}="#EEFFCC";
-	$color{"green"}="#DDFFDD";
-	$color{"purple"}="#FFDDFF";
-    }
-
-    return \%color;
-}
 
 sub BuildClasslist {
-    my ($cacheDB,$students,$studentInformation,$headings,$spacePadding)=@_;
+    my ($cacheDB,$students,$studentInformation,$headings)=@_;
 
     my %cache;
     unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
@@ -372,51 +451,42 @@ sub BuildClasslist {
 
     my $displayString = '<td align="left"><a href="/adm/statistics?';
     $displayString .= 'sort=LINKDATA">DISPLAYDATA&nbsp</a></td>'."\n";
-    $Str .= &Apache::lonhtmlcommon::CreateStudentInformationHeadings(\%cache,
-                                                           $studentInformation,
-                                                           $headings,
-                                                           $displayString);
-    $Str .= '<td align="left">';
-    $Str .= '<a href="/adm/statistics?sort=lastDownloadTime">';
-    $Str .= 'Last Updated&nbsp</a></td>'."\n";
+    $Str .= &Apache::lonhtmlcommon::CreateHeadings(\%cache, $studentInformation,
+                                                   $headings, $displayString);
     $Str .= '</tr>'."\n";
     my $alternate=0;
     foreach (@$students) {
         my ($username, $domain) = split(':', $_);
         if($alternate) {
-            $Str .= '<tr bgcolor="#ffffe6"><td>';
+            $Str .= '<tr bgcolor="#ffffe6">';
         } else {
-            $Str .= '<tr bgcolor="#ffffc6"><td>';
+            $Str .= '<tr bgcolor="#ffffc6">';
         }
         $alternate = ($alternate + 1) % 2;
         foreach my $data (@$studentInformation) {
+            $Str .= '<td>';
             if($data eq 'fullname') {
                 $Str .= '<a href="/adm/statistics?reportSelected=';
                 $Str .= &Apache::lonnet::escape('Student Assessment');
                 $Str .= '&StudentAssessmentStudent=';
                 $Str .= &Apache::lonnet::escape($cache{$_.':'.$data}).'">';
-                #$Str .= 'Student Assessment'.'">';
-            }
-
-            $Str .= $cache{$_.':'.$data}.'&nbsp';
-
-            if($data eq 'fullname') {
+                $Str .= $cache{$_.':'.$data}.'&nbsp';
                 $Str .= '</a>';
+            } elsif($data eq 'updateTime') {
+                $Str .= '<a href="/adm/statistics?reportSelected=';
+                $Str .= &Apache::lonnet::escape('Class list');
+                $Str .= '&download='.$_.'">';
+                $Str .= $cache{$_.':'.$data}.'&nbsp';
+                $Str .= '&nbsp</a>';
+            } else {
+                $Str .= $cache{$_.':'.$data}.'&nbsp';
             }
 
-            $Str .= '</td><td>';
-        }
-
-        $Str .= '<a href="/adm/statistics?download='.$_.'">';
-        my $downloadTime = $cache{$_.':lastDownloadTime'};
-        if($downloadTime ne 'Not downloaded') {
-            $downloadTime = localtime($downloadTime);
+            $Str .= '</td>'."\n";
         }
-        $Str .= $downloadTime;
-
-        $Str .= '&nbsp</a></td></tr>'."\n";
     }
 
+    $Str .= '</tr>'."\n";
     $Str .= '</table></td></tr></table>'."\n";
 
     untie(%cache);
@@ -424,13 +494,53 @@ sub BuildClasslist {
     return $Str;
 }
 
+sub CreateMainMenu {
+    my ($status, $reports)=@_;
+
+    my $Str = '';
+
+    $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 .= '<tr>'."\n";
+    $Str .= '<td align="center"><input type="submit" name="Refresh" ';
+    $Str .= 'value="Refresh" /></td>'."\n";
+    $Str .= '<td align="center"><input type="submit" name="DownloadAll" ';
+    $Str .= 'value="Update All Student Data" /></td>'."\n";
+    $Str .= '<td align="center">';
+    $Str .= '<select name="reportSelected" onchange="document.';
+    $Str .= 'Statistics.submit()">'."\n";
+
+    foreach (sort(keys(%$reports))) {
+        next if($_ eq 'reportSelected');
+        $Str .= '<option name="'.$_.'"';
+        if($reports->{'reportSelected'} eq $reports->{$_}) {
+            $Str .= ' selected=""';
+        }
+        $Str .= '>'.$reports->{$_}.'</option>'."\n";
+    }
+    $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";
+
+    return $Str;
+}
+
 sub BuildStatistics {
     my ($r)=@_;
 
     my $c = $r->connection;
-    my @studentInformation=('fullname','section','id','domain','username');
-    my @headings=('Full Name', 'Section', 'PID', 'Domain', 'User Name');
-    my $spacePadding = '   ';
+    my @studentInformation=('fullname','section','id','domain','username',
+                            'updateTime');
+    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',
@@ -441,8 +551,9 @@ sub BuildStatistics {
     my $cacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
                   "_$ENV{'user.domain'}_$courseID\_statistics.db";
 
-    my %color=&setbgcolor(0);
-    my ($returnValue, $students) = &PrepareData($c, $cacheDB);
+    my ($returnValue, $students) = &PrepareData($c, $cacheDB, 
+                                                \@studentInformation, 
+                                                \@headings);
     if($returnValue ne 'OK') {
         $r->print('<html><body>'.$returnValue."\n".'</body></html>');
         return OK;
@@ -452,9 +563,11 @@ sub BuildStatistics {
     if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
         $GoToPage = $cache{'reportSelected'};
         $reports{'reportSelected'} = $cache{'reportSelected'};
-#        if(defined($cache{'reportKey'}) && $cache{'reportKey'} ne 'false') {
-#            $reports{$cache{'reportKey'}} = $cache{'reportSelected'};
-#        }
+        if(defined($cache{'reportKey'}) && 
+           !exists($reports{$cache{'reportKey'}}) && 
+           $cache{'reportKey'} ne 'false') {
+            $reports{$cache{'reportKey'}} = $cache{'reportSelected'};
+        }
 
         if(defined($cache{'OptionResponses'})) {
             $reports{'problem_analysis'} = 'Problem Analysis';
@@ -463,9 +576,7 @@ sub BuildStatistics {
         $r->print(&Apache::lonhtmlcommon::Title('LON-CAPA Statistics'));
         $r->print('<form name="Statistics" ');
         $r->print('method="post" action="/adm/statistics">');
-        $r->print(&Apache::lonhtmlcommon::CreateStatisticsMainMenu(
-                                                             $cache{'Status'}, 
-                                                             \%reports));
+        $r->print(&CreateMainMenu($cache{'Status'}, \%reports));
         untie(%cache);
     } else {
         $r->print('<html><body>Unable to tie database.</body></html>');
@@ -475,32 +586,34 @@ sub BuildStatistics {
     if($GoToPage eq 'Activity Log') {
         &Apache::lonproblemstatistics::Activity();
     } elsif($GoToPage eq 'Problem Statistics') {
-        $r->print(
         &Apache::lonproblemstatistics::BuildProblemStatisticsPage($cacheDB, 
                                                                   $students, 
                                                                   $courseID, 
-                                                                  $c,$r,
-								  \%color));
+                                                                  $c,$r);
     } elsif($GoToPage eq 'Problem Analysis') {
         $r->print(
               &Apache::lonproblemanalysis::BuildProblemAnalysisPage($cacheDB));
     } elsif($GoToPage eq 'Student Assessment') {
         $r->print(
             &Apache::lonstudentassessment::BuildStudentAssessmentPage($cacheDB,
-                                                                     $students,
-                                                                     $courseID,
-                                                                     $c));
+                                                          $students,
+                                                          $courseID,
+                                                          'Statistics',
+                                                          \@headings,
+                                                          $spacing,
+                                                          \@studentInformation,
+                                                          $r, $c));
     } elsif($GoToPage eq 'Analyze') {
         $r->print(&Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB, 
                                                                 $students, 
-                                                                $courseID));
+                                                                $courseID,$r));
     } elsif($GoToPage eq 'DoDiffGraph') {
         &Apache::lonproblemstatistics::BuildDiffGraph($r);
     } elsif($GoToPage eq 'PercentWrongGraph') {
         &Apache::lonproblemstatistics::BuildWrongGraph($r);
     } elsif($GoToPage eq 'Class list') {
         $r->print(&BuildClasslist($cacheDB, $students, \@studentInformation,
-                                  \@headings, $spacePadding));
+                                  \@headings));
     }
 
     $r->print('</form>'."\n");
@@ -515,6 +628,8 @@ sub BuildStatistics {
 sub handler {
     my $r=shift;
 
+#    $jr = $r;
+
     unless(&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
         $ENV{'user.error.msg'}=
         $r->uri.":vgr:0:0:Cannot view grades for complete course";