--- loncom/interface/statistics/lonstudentsubmissions.pm	2004/03/01 16:39:19	1.5
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2004/03/16 16:41:26	1.10
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.5 2004/03/01 16:39:19 matthew Exp $
+# $Id: lonstudentsubmissions.pm,v 1.10 2004/03/16 16:41:26 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -153,7 +153,6 @@ sub BuildStudentSubmissionsPage {
     }
 }
 
-
 #########################################################
 #########################################################
 ##
@@ -163,6 +162,7 @@ sub BuildStudentSubmissionsPage {
 #########################################################
 sub prepare_excel_output {
     my ($r,$problem,$ProblemData,$Students) = @_;
+    my $c = $r->connection();
     my ($resource,$respid,$partid) = ($problem->{'resource'},
                                       $problem->{'respid'},
                                       $problem->{'part'});
@@ -170,7 +170,7 @@ sub prepare_excel_output {
               &mt('Preparing Excel spreadsheet of student responses').
               '</h2>');
     #
-    &GetStudentAnswers($r,$problem,$Students);
+    &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students);
     #
     my @Columns = ( 'username','domain','attempt','time',
                     'submission','correct', 'grading','awarded','weight',
@@ -209,6 +209,7 @@ sub prepare_excel_output {
     #
     # Populate the worksheet with the student data
     foreach my $student (@$Students) {
+        last if ($c->aborted());
         my $results = &Apache::loncoursedata::get_response_data_by_student
             ($student,$resource->{'symb'},$respid);
         my %row;
@@ -286,35 +287,6 @@ sub prepare_excel_output {
               '</a></p>'."\n");
 }
 
-sub GetStudentAnswers {
-    my ($r,$problem,$Students) = @_;
-    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->rflush();
-    foreach my $student (@$Students) {
-        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;
-    }
-    $r->print("</table>\n");
-    $r->rflush();
-    # close progress window
-    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-    return;
-}
-
-
 #########################################################
 #########################################################
 ##
@@ -344,6 +316,8 @@ 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) {