--- loncom/interface/statistics/lonstudentsubmissions.pm	2004/03/12 21:13:11	1.8
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2004/06/04 21:42:18	1.11
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.8 2004/03/12 21:13:11 matthew Exp $
+# $Id: lonstudentsubmissions.pm,v 1.11 2004/06/04 21:42:18 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,10 +43,6 @@ my @SubmitButtons = ({ name => 'PrevProb
                      { name => 'NextProblem',
                        text => 'Next Problem' },
                      { name => 'break'},
-                     { name => 'ClearCache',
-                       text => 'Clear Caches' },
-                     { name => 'updatecaches',
-                       text => 'Update Student Data' },
                      { name => 'SelectAnother',
                        text => 'Choose a different Problem' },
                      { name => 'Generate',
@@ -75,18 +71,8 @@ sub BuildStudentSubmissionsPage {
         $r->print('<h2>There are no students in the sections selected</h2>');
     }
     #
-    &Apache::loncoursedata::clear_internal_caches();
-    if (exists($ENV{'form.ClearCache'}) || 
-        exists($ENV{'form.updatecaches'}) ||
-        (exists($ENV{'form.firstanalysis'}) &&
-         $ENV{'form.firstanalysis'} ne 'no')) {
-        &Apache::lonstatistics::Gather_Full_Student_Data($r);
-    }
-    if (! exists($ENV{'form.firstanalysis'})) {
-        $r->print('<input type="hidden" name="firstanalysis" value="yes" />');
-    } else {
-        $r->print('<input type="hidden" name="firstanalysis" value="no" />');
-    }
+    my @CacheButtonHTML = 
+        &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
     $r->rflush();
     #
     if (exists($ENV{'form.problemchoice'}) && 
@@ -100,6 +86,9 @@ sub BuildStudentSubmissionsPage {
                 $r->print('&nbsp;'x5);
             }
         }
+        foreach my $html (@CacheButtonHTML) {
+            $r->print($html.('&nbsp;'x5));
+        }
         #
         $r->print('<hr />');
         $r->rflush();
@@ -153,7 +142,6 @@ sub BuildStudentSubmissionsPage {
     }
 }
 
-
 #########################################################
 #########################################################
 ##
@@ -171,8 +159,14 @@ sub prepare_excel_output {
               &mt('Preparing Excel spreadsheet of student responses').
               '</h2>');
     #
-    &GetStudentAnswers($r,$problem,$Students);
+    &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
+                                               'Statistics','stats_status');
     #
+    $r->print('<script>'.
+              'window.document.Statistics.stats_status.value="'.
+              'Done computing student answers.  Compiling spreadsheet.'.
+              '";</script>');
+    $r->rflush();
     my @Columns = ( 'username','domain','attempt','time',
                     'submission','correct', 'grading','awarded','weight',
                     'score');
@@ -286,39 +280,13 @@ sub prepare_excel_output {
     $r->print('<p><a href="'.$filename.'">'.
               &mt('Your Excel spreadsheet.').
               '</a></p>'."\n");
-}
-
-sub GetStudentAnswers {
-    my ($r,$problem,$Students) = @_;
-    my $c = $r->connection();
-    my %Answers;
-    my ($resource,$partid,$respid) = ($problem->{'resource'},
-                                      $problem->{'part'},
-                                      $problem->{'respid'});
-    # Open progress window
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Student Answer Compilation Status',
-         'Student Answer Compilation Progress', scalar(@$Students));
-    $r->print("<table>\n");
+    $r->print('<script>'.
+              'window.document.Statistics.stats_status.value="'.
+              'Done compiling spreadsheet.  See link below to download.'.
+              '";</script>');
     $r->rflush();
-    foreach my $student (@$Students) {
-        last if ($c->aborted());
-        my $sname = $student->{'username'};
-        my $sdom = $student->{'domain'};
-        my $answer = &Apache::lonstathelpers::analyze_problem_as_student
-            ($resource,$sname,$sdom,$partid,$respid);
-        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 &mt('last student'));
-        $student->{'answer'} = $answer;
-    }
-    return if ($c->aborted());
-    $r->print("</table>\n");
-    $r->rflush();
-    # close progress window
-    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-    return;
-}
 
+}
 
 #########################################################
 #########################################################
@@ -333,14 +301,13 @@ sub CreateInterface {
     my $Str = '';
     $Str .= &Apache::lonhtmlcommon::breadcrumbs
         (undef,'Student Submission Reports');
+    $Str .= '<p>';
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
     $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
-    $Str .= '<td align="center">&nbsp;</td>';
     $Str .= '</tr>'."\n";
-    ##
-    ## 
+    #
     $Str .= '<tr><td align="center">'."\n";
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $Str .= '</td>';
@@ -349,26 +316,14 @@ sub CreateInterface {
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
     $Str .= '</td>';
     #
-    $Str .= '<td></td>';
-    #
-    my $only_seq_with_assessments = sub { 
-        my $s=shift;
-        if ($s->{'num_assess'} < 1) { 
-            return 0;
-        } else { 
-            return 1;
-        }
-    };
-    ##
-    ##
     $Str .= '</tr>'."\n";
     $Str .= '</table>'."\n";
     #
-    # We do this to make sure the sequence information is initialized
-    &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
-                                              $only_seq_with_assessments);
-    
-    #
+    $Str .= '<nobr>'.&mt('Status: [_1]',
+                         '<input type="text" '.
+                         'name="stats_status" size="60" value="" />').
+            '</nobr>'.'</p>';    
+    ##
     return $Str;
 }