--- loncom/interface/statistics/lonstudentsubmissions.pm	2004/09/15 21:08:50	1.18
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2005/02/02 18:53:32	1.30
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.18 2004/09/15 21:08:50 matthew Exp $
+# $Id: lonstudentsubmissions.pm,v 1.30 2005/02/02 18:53:32 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,7 +67,8 @@ sub BuildStudentSubmissionsPage {
     }
     #
     my @CacheButtonHTML = 
-        &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
+        &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status',
+                                   '<h3>'.&mt('Loading student data').'</h3>');
     $r->rflush();
     #
     if (exists($ENV{'form.problemchoice'}) && 
@@ -108,7 +109,7 @@ sub BuildStudentSubmissionsPage {
             my $resource = $navmap->getBySymb($symb);
             push(@Problems,$resource);
         }
-        #
+        # 
         if (! scalar(@Problems) || ! defined($Problems[0])) {
             $r->print('resource is undefined');
         } else {
@@ -123,50 +124,475 @@ sub BuildStudentSubmissionsPage {
                     $r->rflush();
                 }
             }
-            my %Data;
-            if (scalar(@Problems) > 5) {
-                # progress window
-                my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-                    ($r,'Problem Analysis Status',
-                     'Problem Analysis Progress', 
-                     scalar(@Problems),
-                     'inline',undef,'Statistics','stats_status');
-                foreach my $problem (@Problems) {
-                    $Data{$problem->symb} = 
-                    {&Apache::lonstathelpers::get_problem_data
-                         ($problem->src)};
-                    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                             'last problem');
-
-                }
-                &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+            if ($ENV{'form.output'} eq 'excel') {
+                &prepare_excel_output($r,\@Problems,\@Students);
+            } elsif ($ENV{'form.output'} eq 'csv') {
+                &prepare_csv_output($r,\@Problems,\@Students);
             } else {
-                foreach my $problem (@Problems) {
-                    $Data{$problem->symb} = 
-                    {&Apache::lonstathelpers::get_problem_data
-                         ($problem->src)};
-                }
+                &prepare_html_output($r,\@Problems,\@Students);
             }
-            &new_excel_output($r,\@Problems,\@Students,\%Data);
         }
         $r->print('<hr />');
     } else {
         $r->print('<input type="submit" name="Generate" value="'.
                   &mt('Prepare Report').'" />');
         $r->print('&nbsp;'x5);
-        $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
+        $r->print('<p>'.
+                  &mt('Computing correct answers greatly increasese the amount of time required to prepare a report.').
+                  '</p>');
+        $r->print('<p>'.
+                  &mt('please select problems and use the <b>Prepare Report</b> button to continue.').
+                  '</p>');
         $r->print(&Apache::lonstathelpers::MultipleProblemSelector
-                  (undef,'.','problemchoice','Statistics'));
+                  (undef,'problemchoice','Statistics'));
+    }
+}
+
+##
+## get_headers:
+##     return the proper headers for the given response 
+sub get_headers {
+    my ($prob,$partid,$respid,$resptype,$analysis,$output,$purpose,
+        @basic_headers) = @_;
+    my @headers;
+    if ($resptype eq 'essay' && $purpose eq 'display' &&
+        ($output eq 'html')) {# || scalar(@{$prob->parts})!=1)) {
+        @headers = ();
+    } elsif ($resptype =~ /^(option|match|rank)$/) {
+        my $prefix = '_';
+        if ($purpose eq 'display') {
+            $prefix = '';
+        }
+        my @foils = 
+            map { 
+                $prefix.$_; 
+            } sort(keys(%{$analysis->{$partid.'.'.$respid}->{'_Foils'}}));
+        if (scalar(@basic_headers) && $basic_headers[0] eq 'Correct') {
+            @foils = map { ($_ , $_.' Correct') } @foils;
+            shift(@basic_headers);  # Get rid of 'Correct'
+        }
+        @headers = (@foils,@basic_headers);
+    } else {
+        @headers = ('Submission',@basic_headers);
     }
+    return @headers;
 }
 
 #########################################################
 #########################################################
+##
+##    HTML Output Routines
+##
+#########################################################
+#########################################################
+sub prepare_html_output {
+    my ($r,$problems,$students) = @_;
+    my $c = $r->connection();
+    #
+    # Set a flag for the case when there is just one problem
+    my $single_response = 0;
+    if (scalar(@$problems) == 1 &&
+        $problems->[0]->countResponses == 1) {
+        $single_response = 1;
+    }
+    #
+    # Compute the number of columns per response
+    my @extra_resp_headers;
+    if ($ENV{'form.correctans'} eq 'true') {
+        push(@extra_resp_headers,'Correct');
+    } 
+    if ($ENV{'form.prob_status'} eq 'true') {
+        push(@extra_resp_headers,'Award Detail'); 
+        push(@extra_resp_headers,'Time');
+        push(@extra_resp_headers,'Attempt');
+        push(@extra_resp_headers,'Awarded');
+    }
+    my $response_multiplier = scalar(@extra_resp_headers);
+    #
+    # Create the table header
+    my @student_columns = ('username','domain','id');
+    #
+    my %headers;
+    my $student_column_count = scalar(@student_columns);
+    $headers{'problem'} = qq{<th colspan="$student_column_count">\&nbsp;</th>};
+    foreach (@student_columns) {
+        $headers{'student'}.= '<th>'.ucfirst($_).'</th>';
+    }
+    #
+    # we put the headers into the %headers hash
+    my $total_col = scalar(@student_columns);
+    my $nonempty_part_headers = 0;
+    #
+    my %problem_analysis;
+    foreach my $prob (@$problems) {
+        my $src = $prob->src;
+        my %analysis = &Apache::lonstathelpers::get_problem_data($src);
+        $problem_analysis{$prob->src}=\%analysis;
+        #
+        my $prob_span = 0;
+        my $single_part = 0;
+        if (scalar(@{$prob->parts}) == 1) {
+            $single_part = 1;
+        }
+        foreach my $partid (@{$prob->parts}) {
+            my $part_span = 0;
+            my $responses = [$prob->responseIds($partid)];
+            my $resptypes = [$prob->responseType($partid)];
+            for (my $i=0;$i<scalar(@$responses);$i++) {
+                my $respid = $responses->[$i];
+                my @headers = &get_headers($prob,$partid,$respid,
+                                           $resptypes->[$i],
+                                           $problem_analysis{$prob->src},
+                                           'html','display',
+                                           @extra_resp_headers);
+                if (scalar(@headers)>0) {
+                    $total_col += scalar(@headers);
+                    $part_span += scalar(@headers);
+                    $headers{'response'} .=
+                        '<th colspan="'.scalar(@headers).'">'.
+                        &mt('Response [_1]',$responses->[$i]).'</th>';
+                    $headers{'student'}.= '<th>'.join('</th><th><nobr>',
+                                                      @headers).
+                                                          '</nobr></th>';
+                }
+            }
+            if (! $single_part) {
+                my $tmpname = $partid;
+                if ($partid =~/^\d+$/) {
+                    $tmpname = $prob->part_display($partid);
+                }
+                $headers{'part'} .= qq{<th colspan="$part_span">$tmpname</th>};
+                $nonempty_part_headers = 1;
+            } else {
+                $headers{'part'} .= qq{<th colspan="$part_span">&nbsp</th>};
+            }
+            $prob_span += $part_span;
+        }
+        my $title = $prob->compTitle;
+        if ($prob_span > 0) {
+            $headers{'problem'}.= qq{<th colspan="$prob_span">$title</th>};
+        } elsif ($single_response) {
+            $prob_span = scalar(@student_columns);
+            $headers{'problem'} = qq{<th colspan="$prob_span">$title</th>};
+        }
+    }
+    if (exists($headers{'part'})) {
+        $headers{'part'} = qq{<th colspan="$student_column_count">\&nbsp;</th>}.
+            $headers{'part'};
+    }
+    if (exists($headers{'response'})) {
+        $headers{'response'}=
+            qq{<th colspan="$student_column_count">\&nbsp;</th>}.
+            $headers{'response'};
+    }
+    my $full_header = $/.'<table>'.$/;
+    $full_header .= '<tr align="left">'.$headers{'problem'}.'</tr>'.$/;
+    if ($nonempty_part_headers) {
+        $full_header .= '<tr align="left">'.$headers{'part'}.'</tr>'.$/;
+    }
+    $full_header .= '<tr align="left">'.$headers{'response'}.'</tr>'.$/;
+    $full_header .= '<tr align="left">'.$headers{'student'}.'</tr>'.$/;
+    #
+    # Main loop
+    my $count;
+    $r->print($/.$full_header.$/);
+    my $row_class = 'odd';   # css 
+    my $mycount = 10;
+    foreach my $student (@$students) {
+        last if ($mycount-- < 1);
+        my $student_row_data;
+        if ($count++ >= 30) {
+            $r->print('</table>'.$/.$full_header.$/);
+            $count = 0;
+        }
+        last if ($c->aborted());
+        foreach my $field (@student_columns) {
+            $student_row_data .= 
+                '<td valign="top">'.$student->{$field}.'</td>';
+        }
+        #
+        # Figure out what it is we need to output for this student
+        my @essays;
+        my %prob_data;
+        my $maxrow;
+        foreach my $prob (@$problems) {
+            $prob_data{$prob->symb}={};
+            foreach my $partid (@{$prob->parts}) {
+                my @responses = $prob->responseIds($partid);
+                my @response_type = $prob->responseType($partid);
+                for (my $i=0;$i<=$#responses;$i++) {
+                    my $respid  = $responses[$i];
+                    my $results = 
+                        &Apache::loncoursedata::get_response_data_by_student
+                        ($student,$prob->symb(),$respid);
+                    my $resptype = $response_type[$i];
+                    my @headers = &get_headers($prob,$partid,$respid,
+                                               $resptype,
+                                               $problem_analysis{$prob->src},
+                                               'html','normal',
+                                               @extra_resp_headers);
+                    my $width = scalar(@headers);
+                    my $resp_data;
+                    $resp_data->{'fake'} = qq{<td colspan="$width">&nbsp</td>};
+                    if (! defined($results)) {
+                        $results = [];
+                    }
+                    # 
+                    if (scalar(@$results) > $maxrow && $resptype ne 'essay') {
+                        $maxrow = scalar(@$results);
+                    }
+                    for (my $j=scalar(@$results)-1;$j>=0;$j--) {
+                        if ($ENV{'form.all_sub'} ne 'true') {
+                            next if ($j ne scalar(@$results)-1);
+                        }
+                        my $response = &hashify_response($results->[$j],
+                                                         $prob,
+                                                         $student,
+                                                         $partid,
+                                                         $respid);
+                        if ($resptype eq 'essay') {
+                            push(@essays,
+                                 &html_essay_results(\@headers,
+                                                     $prob,$partid,$respid,
+                                                     $response,
+                                                     $single_response).
+                                 '</td>');
+                        } else {
+                            push(@{$resp_data->{'real'}},
+                                 &html_non_essay_results(\@headers,
+                                                         $prob,$partid,$respid,
+                                                         $response,$resptype));
+                        }
+                    }
+                    $prob_data{$prob->symb}->{$partid}->{$respid}=$resp_data;
+                } # end of $i loop
+            } # end of partid loop
+        } # end of prob loop
+        #
+        # if there is no data, skip this student.
+        next if (! $maxrow && ! scalar(@essays));
+        #
+        # Go through the problem data and output a row.
+        if ($row_class eq 'even') {
+            $row_class = 'odd'; 
+        } else {
+            $row_class = 'even'; 
+        }
+        my $printed_something;
+        for (my $rows_output = 0;$rows_output<$maxrow;$rows_output++) {
+            my $html;
+            my $no_data = 1;
+            foreach my $prob (@$problems) {
+                foreach my $partid (@{$prob->parts}) {
+                    my @responses     = $prob->responseIds($partid);
+                    my @response_type = $prob->responseType($partid);
+                    for (my $i=0;$i<=$#responses;$i++) {
+                        my $respid   = $responses[$i];
+                        my $resp_data = 
+                            $prob_data{$prob->symb}->{$partid}->{$respid};
+                        next if ($response_type[$i] eq 'essay');
+                        if (defined($resp_data->{'real'}->[$rows_output])) {
+                            $html .= $resp_data->{'real'}->[$rows_output];
+                            $no_data = 0;
+                        } else {
+                            $html .= $resp_data->{'fake'};
+                        }
+                    }
+                }
+            }
+            if (! $no_data) {
+                $r->print(qq{<tr class="$row_class">$student_row_data$html</tr>}.$/);
+                $printed_something=1;
+            }
+        }
+        if (@essays) {
+            my $tr = qq{<tr class="$row_class">};
+            my $td = qq{<td  valign="top" class="essay" colspan="$total_col">};
+            if (! $printed_something) {
+                $r->print($tr.$student_row_data.'</tr>'.$/);
+            }
+            $r->print($tr.$td.
+                      join('</td></tr>'.$/.$tr.$td,@essays).'</td></tr>'.$/);
+            undef(@essays);
+        }
+    } # end of student loop
+    return;
+}
+
+sub hashify_response {
+    my ($response,$prob,$student,$partid,$respid) =@_;
+    my $resp_hash = {};
+    if ($ENV{'form.correctans'} eq 'true') {
+        $resp_hash->{'Correct'} = 
+            &Apache::lonstathelpers::get_student_answer
+            ($prob,$student->{'username'},$student->{'domain'},
+             $partid,$respid);
+    }
+    $resp_hash->{'Submission'} = 
+        $response->[&Apache::loncoursedata::RDs_submission()];
+    $resp_hash->{'Award Detail'} = 
+        $response->[&Apache::loncoursedata::RDs_awarddetail()];
+    $resp_hash->{'Time'} = 
+        $response->[&Apache::loncoursedata::RDs_timestamp()];
+    $resp_hash->{'Attempt'} =
+        $response->[&Apache::loncoursedata::RDs_tries()];
+    $resp_hash->{'Awarded'} = 
+        $response->[&Apache::loncoursedata::RDs_awarded()];
+    return $resp_hash;
+}
+
+#####################################################
+##
+##     HTML helper routines
+##
+#####################################################
+sub html_essay_results {
+    my ($headers,$prob,$partid,$respid,$response,$single_response)=@_;
+    if (! ref($headers) || ref($headers) ne 'ARRAY') {
+        return '';
+    }
+    # Start of telling them what problem, part, and response
+    my $Str;
+    if (! $single_response) {
+        my $id = $prob->compTitle;
+        if (defined($partid) && $partid ne '0') {
+            $id .= ' '.$prob->part_display($partid);
+        }
+        if (defined($respid)) {
+            $id .= ' '.$respid;
+        }
+        $Str .= '<nobr>'.$id.'</nobr>'.('&nbsp;'x4);
+    }
+    #
+    shift(@$headers); # Get rid of the Submission header
+    my $correct = '';
+    if ($headers->[0] eq 'Correct') {
+        $correct = &html_format_essay_sub($response->{'Correct'});
+        shift(@$headers);
+    }
+    $Str .= '<nobr>'.
+        join('',
+             map {
+                 ('&nbsp;'x4).&mt($_.': [_1]',$response->{$_});
+             } @$headers).'</nobr>';
+    if (@$headers || ! $single_response) {
+        $Str .= '<br />';
+    }
+    $Str .= &html_format_essay_sub($response->{'Submission'});
+    #
+    if (defined($correct) && $correct !~ /^\s*$/) {
+        $Str .= '<hr /><b>'.&mt('Correct').'</b>'.$correct
+    }
+    return $Str;
+}
+
+sub html_format_essay_sub {
+    my ($submission) = @_;
+    return '' if (! defined($submission) || $submission eq '');
+    $submission = &HTML::Entities::decode($submission);
+    $submission =~ s/\\\"/\"/g;
+    $submission =~ s/\\\'/\'/g;
+    $submission =~ s|\\r\\n|$/|g;
+    $submission = &HTML::Entities::encode($submission,'<>&"');
+    $submission =~ s|$/\s*$/|$/</p><p>$/|g;
+    $submission =~ s|\\||g;
+    $submission = '<p>'.$submission.'</p>';
+    return $submission;
+}
 
-sub new_excel_output {
-    my ($r,$Problems,$Students,$ProblemData) = @_;
+sub html_non_essay_results {
+    my ($headers,$prob,$partid,$respid,$response,$resptype) = @_;
+    if (! ref($headers) || ref($headers) ne 'ARRAY' || ! scalar(@$headers)) {
+        return '';
+    }
+    # 
+    my $submission = &HTML::Entities::decode($response->{'Submission'});
+    return '' if (! defined($submission) || $submission eq '');
+    $submission =~ s/\\\"/\"/g;
+    $submission =~ s/\\\'/\'/g;
+    if ($resptype eq 'radiobutton') {
+        $submission = &HTML::Entities::encode($submission,'<>&"');
+        $submission =~ s/=([^=])$//;
+        $submission = '<nobr>'.$submission.'</nobr>';
+    }
+    $response->{'Submission'} = $submission;
+    #
+    my @values;
+    if ($resptype =~ /^(option|match|rank)$/) {
+        my %submission = 
+            map { 
+                my ($foil,$value) = split('=',&Apache::lonnet::unescape($_));
+                ($foil,$value);
+            } split('&',$response->{'Submission'});
+        my %correct;
+        if (exists($response->{'Correct'})) {
+            %correct = 
+                map { 
+                    my ($foil,$value)=split('=',&Apache::lonnet::unescape($_));
+                    ($foil,$value);
+                } split('&',$response->{'Correct'});
+        }
+        #
+        foreach my $original_header (@$headers) {
+            if ($original_header =~ /^_/) {
+                # '_' denotes a foil column
+                my ($header) = ($original_header =~ m/^_(.*)$/);
+                my $option = '';
+                if ( my ($foil) = ($header =~ /(.*) Correct$/)) {
+                    if (exists($correct{$foil})) {
+                        $option = $correct{$foil};
+                    }
+                } elsif (exists($submission{$header})) {
+                    $option = $submission{$header};
+                }
+                push(@values,&HTML::Entities::encode($option));
+            } else {
+                # A normal column
+                push(@values,$response->{$original_header});
+            }
+        }
+    } else {
+        @values = map { $response->{$_}; } @$headers;
+    }
+    my $td = '<td valign="top">';
+    my $str = $td.join('</td>'.$td,@values).'</td>';
+    return $str;
+}
+
+
+#########################################################
+#########################################################
+##
+##    Excel Output Routines
+##
+#########################################################
+#########################################################
+sub prepare_excel_output {
+    my ($r,$Problems,$Students) = @_;
     my $c = $r->connection();
     #
+    #
+    # Determine the number of columns in the spreadsheet
+    my $columncount = 3; # username, domain, id
+    my $response_multiplier = 1;
+    $response_multiplier ++   if ($ENV{'form.correctans'} eq 'true');
+    $response_multiplier += 4 if ($ENV{'form.prob_status'} eq 'true');
+    my $lastprob;
+    foreach my $prob (@$Problems) {
+        $columncount += ($response_multiplier * $prob->countResponses);
+        last if ($columncount > 255);
+        $lastprob = $prob;
+    }
+    if ($columncount > 255) {
+        $r->print('<h1>'.&mt('Unable to complete request').'</h1>'.$/.
+                  '<p>'.&mt('LON-CAPA is unable to produce your Excel spreadsheet because your selections will result in more than 255 columns.  Excel allows only 255 columns in a spreadsheet.').'</p>'.$/.
+                  '<p>'.&mt('Consider selecting fewer problems to generate reports on, or reducing the number of items per problem.  Or use HTML or CSV output.').'</p>'.$/.
+                  '<p>'.&mt('The last problem that will fit in the current spreadsheet is [_1].',$lastprob->compTitle).'</p>');
+        $r->rflush();
+        return;
+    }
+    #
+    # Print out a message telling them what we are doing
     if (scalar(@$Problems) > 1) {
         $r->print('<h2>'.
                   &mt('Preparing Excel spreadsheet of student responses to [_1] problems',
@@ -215,15 +641,17 @@ sub new_excel_output {
     # Student headers
     my @StudentColumns = ('username','domain','id');
     foreach (@StudentColumns) {
-        $worksheet->write($header_row,$cols_output++,$_,$format->{'bold'});
+        $worksheet->write($header_row,$cols_output++,ucfirst($_),
+                          $format->{'bold'});
     }
     # Problem headers
     foreach my $prob (@$Problems) {
-        my $title = &get_title($prob->title,$prob->src);
+        my $title = $prob->compTitle;
         $worksheet->write($title_row,$cols_output,
                           $title,$format->{'h3'});
         foreach my $partid (@{$prob->parts}) {
-            $worksheet->write($partid_row,$cols_output,$partid);
+            $worksheet->write($partid_row,$cols_output,
+                              $prob->part_display($partid));
             my $responses = [$prob->responseIds($partid)];
             my $resptypes = [$prob->responseType($partid)];
             for (my $i=0;$i<scalar(@$responses);$i++) {
@@ -231,6 +659,17 @@ sub new_excel_output {
                                   $resptypes->[$i].', '.$responses->[$i]);
                 $worksheet->write($header_row,$cols_output,'Submission');
                 $cols_output++;
+                if ($ENV{'form.correctans'} eq 'true') {
+                    $worksheet->write($header_row,$cols_output,'Correct');
+                    $cols_output++;
+                }
+                if ($ENV{'form.prob_status'} eq 'true') {
+                    $worksheet->write($header_row,$cols_output++,
+                                      'Award Detail');
+                    $worksheet->write($header_row,$cols_output++,'Attempt');
+                    $worksheet->write($header_row,$cols_output++,'Time');
+                    $worksheet->write($header_row,$cols_output++,'Awarded');
+                }
             }
         }
     }
@@ -240,34 +679,63 @@ sub new_excel_output {
         ($r,'Excel File Compilation Status',
          'Excel File Compilation Progress', 
          scalar(@$Students),'inline',undef,'Statistics','stats_status');
+    my $max_row = $rows_output;
     foreach my $student (@$Students) {
         last if ($c->aborted());
         $cols_output = 0;
+        my $student_row = $max_row;
         foreach my $field (@StudentColumns) {
-            $worksheet->write($rows_output,$cols_output++,
+            $worksheet->write($student_row,$cols_output++,
                               $student->{$field});
         }
+        my $last_student_col = $cols_output-1;
+        my $response_count;
         foreach my $prob (@$Problems) {
             foreach my $partid (@{$prob->parts}) {
                 my @Response = $prob->responseIds($partid);
                 my @ResponseType = $prob->responseType($partid);
                 for (my $i=0;$i<=$#Response;$i++) {
+                    my $response_start_col = $last_student_col + 
+                        $response_count * $response_multiplier + 1;
+                    $response_count++;
                     my $respid   = $Response[$i];
                     my $resptype = $ResponseType[$i];
                     my $results = 
                         &Apache::loncoursedata::get_response_data_by_student
                         ($student,$prob->symb(),$respid);
-                    my $final_response = $results->[-1];
-                    my $submission =
-                        $final_response->[
-                                  &Apache::loncoursedata::RDs_submission()
-                                          ];
-                    $submission=&excel_format_response($submission,$resptype);
-                    $worksheet->write($rows_output,$cols_output++,
-                                      $submission);
+                    if (! defined($results)) {
+                        $results = [];
+                    }
+                    #
+                    $rows_output = $student_row;
+                    #
+                    for (my $j=scalar(@$results)-1;$j>=0;$j--) {
+                        $cols_output = $response_start_col;
+                        my $response = $results->[$j];
+                        if ($ENV{'form.all_sub'} ne 'true') {
+                            next if ($j ne scalar(@$results)-1);
+                        }
+                        my $cols_output = &write_excel_row
+                            ($worksheet,
+                             $rows_output++,$cols_output,
+                             $response,$student,
+                             $prob,$partid,$respid,
+                             $format,$resptype);
+                        if ($rows_output > $max_row) {
+                            $max_row = $rows_output;
+                        }
+                    }
                 }
             }
         }
+        # Fill in the remaining rows with the students data
+        for (my $row = $student_row+1;$row<=$max_row;$row++) {
+            my $cols = 0;
+            foreach my $field (@StudentColumns) {
+                $worksheet->write($row,$cols++,
+                                  $student->{$field});
+            }
+        }
         $rows_output++;
         &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
                                                  'last student');
@@ -289,26 +757,51 @@ sub new_excel_output {
     return;
 }
 
-sub get_title {
-    my ($title,$src) = @_;
-    if ($title eq '') {
-        ($title) = ($src =~ m|/([^/]+)$|);
-    } else {
-        $title =~ s/\&colon;/:/g;
+sub write_excel_row {
+    my ($worksheet,$row,$col,$response,$student,$prob,$partid,$respid,
+        $format,$resptype) = @_;
+    # 
+    my $submission =$response->[&Apache::loncoursedata::RDs_submission()];
+    $submission = &excel_format_response($submission,$resptype);
+    $worksheet->write($row,$col++,$submission);
+    if ($ENV{'form.correctans'} eq 'true') {
+        my $correct = &Apache::lonstathelpers::get_student_answer
+            ($prob,$student->{'username'},$student->{'domain'},
+             $partid,$respid);
+        $correct =&excel_format_response($correct,$resptype);
+        $worksheet->write($row,$col++,$correct);
+    }
+    if ($ENV{'form.prob_status'} eq 'true') {
+        $worksheet->write
+            ($row,$col++,
+             $response->[&Apache::loncoursedata::RDs_awarddetail()]);
+        $worksheet->write
+            ($row,$col++,$response->[&Apache::loncoursedata::RDs_tries()]);
+        $worksheet->write
+            ($row,$col++,
+             &Apache::lonstathelpers::calc_serial
+             ($response->[&Apache::loncoursedata::RDs_timestamp()]),
+             $format->{'date'});
+        $worksheet->write
+            ($row,$col++,$response->[&Apache::loncoursedata::RDs_awarded()]);
     }
-    return $title;
+    return $col;
 }
 
 sub excel_format_response {
     my ($answer,$responsetype) = @_;
     if ($responsetype eq 'radiobutton') {
         $answer =~ s/=([^=])$//;
-    } elsif ($responsetype eq 'option') {
+    } elsif ($responsetype =~ /^(option|match)$/) {
         $answer = join("\n",
                        map { 
                            &Apache::lonnet::unescape($_) ;
                        } sort split('&',$answer)
                        );
+    } elsif ($responsetype eq 'string') {
+        $answer =~ s/\\(n|r)/\n/g;
+        $answer =~ s/(\s*$|^\s*)//g;
+        $answer =~ s/\\\'/\'/g;
     }
     if ($answer =~ m/^=/) {
         $answer = ' '.$answer;
@@ -316,291 +809,6 @@ sub excel_format_response {
     return $answer;
 }
 
-
-=pod
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#########################################################
-#########################################################
-
-my @DefaultColumns = 
-    (
-     {name=>'username',
-      display=>'Student'},
-     {name=>'domain',
-      display=>'Domain'},
-     {name => 'id',
-      display => 'Id'},
-     # FIXME: Probably need to add score
-    );
-
-my @PartColumns = 
-    (
-     {name => 'time',
-      display =>'Time'},
-     {name => 'attempt',
-      display =>'Attempt'},
-     {name => 'awarded',
-      display =>'Award'},
-     {name => 'weight',
-      display =>'Part Weight'},
-     {name => 'score',
-      display =>'Score'},
-     );
-
-my @ResponseColumns = 
-    (
-     {name => 'submission',
-      display =>'Submission'},
-     {name => 'answer',
-      display =>'Correct Answer'},
-     {name => 'awarddetail',
-      display =>'Awarddetail'},
-     );
-
-sub get_response_type {
-    my ($resource,$partid,$respid) = @_;
-    my $response_type = '';
-    for (my $i=0;
-         $i<scalar(@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}});
-         $i++) {
-        if($resource->{'partdata'}->{$partid}->{'ResponseIds'}->[$i] eq $respid){
-            $response_type = 
-                $resource->{'partdata'}->{$partid}->{'ResponseTypes'}->[$i];
-            last;
-        }
-    }
-    return $response_type;
-}
-
-
-#########################################################
-#########################################################
-##
-##    prepare_html_output
-##
-#########################################################
-#########################################################
-sub prepare_html_output {
-    my ($r,$Problems,$Students) = @_;
-    my $problem;
-    my $c = $r->connection();
-    my ($resource,$respid,$partid) = ($problem->{'resource'},
-                                      $problem->{'respid'},
-                                      $problem->{'part'});
-    #
-    if ($ENV{'form.correctans'} eq 'true') {
-        $r->print('<h2>'.&mt('Generating Correct Answers').'</h2>');
-        &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
-                                                   'Statistics',
-                                                   'stats_status');
-    }
-    #
-    $r->print('<h2>'.&mt('Student Responses').'</h2>');
-    #
-    $r->rflush();
-    my $response_type = &get_response_type($resource,$partid,$respid);
-    if (! defined($response_type)) {
-        $r->print('<h2>'.&mt('Unable to determine response type').'</h2>');
-        return;
-    }
-    my $count = 0;
-    my @Columns;
-    if (exists($ENV{'form.concise'}) && $ENV{'form.concise'} eq 'true') {
-        foreach (@DefaultColumns) {
-            if ($_->{'name'} =~ /^(username|domain|id)$/){
-                push(@Columns,$_);
-            }
-        }
-    } else {
-        @Columns = @DefaultColumns;
-    }
-    my $header = '<table>'.$/.&html_headers(\@Columns);
-    if ($response_type eq 'essay') {
-        $header .= &html_essay_headers();
-    } elsif ($response_type eq 'option') {
-        $header .= &html_option_headers();
-    } else {
-        $header .= &html_generic_headers();
-    }
-    $header = '<tr>'.$header.'</tr>';
-    #
-    $r->print($/.$header.$/);
-    foreach my $student (@$Students) {
-        if ($count >= 50) {
-            $r->print('</table>'.$/.$header.$/);
-            $count = 0;
-        }
-        last if ($c->aborted());
-        my $results = &Apache::loncoursedata::get_response_data_by_student
-            ($student,$resource->{'symb'},$respid);
-        next if (! defined($results) || ref($results) ne 'ARRAY');
-        for (my $i=0;$i<scalar(@$results);$i++) {
-            my $response = $results->[$i];
-            if ($ENV{'form.last_sub_only'} eq 'true' && 
-                $i < (scalar(@$results)-1)) {
-                next;
-            }
-            my $data;
-            $data->{'username'} = $student->{'username'};
-            $data->{'domain'}   = $student->{'domain'};
-            $data->{'id'} = $student->{'id'};
-            $data->{'fullname'} = $student->{'fullanem'};
-            $data->{'status'} = $student->{'status'};
-            $data->{'time'} = &Apache::lonlocal::locallocaltime
-                ($response->[&Apache::loncoursedata::RDs_timestamp()]);
-            $data->{'attempt'} = 
-                $response->[&Apache::loncoursedata::RDs_tries()];
-            $data->{'awarded'} = 
-                $response->[&Apache::loncoursedata::RDs_awarded()];
-            $data->{'awarddetail'} = 
-                $response->[&Apache::loncoursedata::RDs_awarddetail()];
-            $data->{'weight'} = &Apache::lonnet::EXT
-                ('resource.'.$partid.'.weight',$resource->{'symb'},
-                 undef,undef,undef);
-            $data->{'score'} = $data->{'weight'} * $data->{'awarded'};
-            my $rowextra = 'bgcolor="#CCCCCC"';
-            if ($count % 2 == 1) {
-                $rowextra = 'bgcolor="#EEEEEE"';
-            }
-            my $row = '<tr '.$rowextra.'>';
-            foreach my $col (@Columns) {
-                $row .= '<td valign="top">'.
-                    $data->{$col->{'name'}}.'</td>';
-            }
-            if ($response_type eq 'essay') {
-                $row .= &html_essay_results
-                    ($response->[&Apache::loncoursedata::RDs_submission()],
-                     $student->{'answer'},
-                     scalar(@Columns),$rowextra);
-            } elsif ($response_type eq 'option') {
-                $row .= &html_option_results
-                    ($response->[&Apache::loncoursedata::RDs_submission()],
-                     $student->{'answer'},
-                     scalar(@Columns),$rowextra);
-            } else {
-                $row .= &html_generic_results
-                    ($response->[&Apache::loncoursedata::RDs_submission()],
-                     $student->{'answer'},
-                     scalar(@Columns),$rowextra);
-            }
-            $row .= '</tr>';
-            $r->print($row.$/);
-            $count++;
-        }
-    }
-    $r->print('</table>'.$/);
-    return;
-}
-
-#####################################################
-##
-##     HTML helper routines
-##
-#####################################################
-sub html_headers {
-    my ($Columns) = @_;
-    my $Str;
-    foreach my $column (@$Columns) {
-        $Str .= '<th align="left">'.$column->{'display'}.'</th>';
-    }
-    return $Str;
-}
-
-sub html_essay {
-    my ($submission,$correct,$tablewidth,$rowextra)=@_;
-    #
-    $submission =~ s|\\r\\n|$/|g;
-    $submission = &HTML::Entities::encode($submission,'<>&"');
-    $submission =~ s|$/\s*$/|$/</p><p>$/|g;
-    $submission =~ s|\\||g;
-    $submission = '<p>'.$submission.'</p>';
-    #
-    my $Str  = '</tr><tr '.$rowextra.'>'.
-        '<td colspan="'.$tablewidth.'">'.$submission.'</td>';
-    if ($ENV{'form.correctans'} eq 'true') {
-        $Str .= '</tr>';
-        if (defined($correct) && $correct !~ /^\s*$/) {
-            $Str .= '<tr '.$rowextra.'><td colspan="'.$tablewidth.'">'.
-                '<b>'.&mt('Correct Answer:').'</b>'.$correct.'</td>';
-        }
-    }
-    $Str .= '</tr>';
-    #
-    return $Str;
-}
-
-sub html_essay_headers {
-    return '';
-}
-
-sub html_generic_headers {
-    my $header ='<th>'.&mt('Submission').'</th>';
-    if ($ENV{'form.correctans'} eq 'true') {
-        $header .= '<th>'.&mt('Correct').'</th>';
-    }
-    return $header;
-}
-
-sub html_option_headers {
-    return &html_generic_headers();
-}
-
-sub html_radiobutton_results {
-    my ($submission,$correct,$tablewidth,$rowclass)=@_;
-    $submission =~ s/=([^=])$//;
-    return &html_generic_results($submission,$correct,$tablewidth,$rowclass);
-}
-
-sub html_generic_results {
-    my ($submission,$correct,$tablewidth,$rowclass)=@_;
-    my $Str .= '<td>'.$submission.'</td>';
-    if ($ENV{'form.correctans'} eq 'true') {
-        $Str .= '<td>'.$correct.'</td>';
-    }
-    $Str .= '</tr>';
-    return $Str;
-}
-
-sub html_option_results {
-    my ($submission,$correct,$tablewidth,$rowclass)=@_;
-    $submission = 
-        '<ul class="sub_studentans">'.
-        '<li>'.join('</li><li>',
-                    map { 
-                        &Apache::lonnet::unescape($_) ;
-                    } sort split('&',$submission)
-                    ).
-                    '</li><ul>';
-    if (defined($correct) && $correct !~ /^\s*$/) {
-        $correct = '<ul class="sub_correctans">'.
-            '<li>'.join('</li><li>',
-                        map { 
-                            &Apache::lonnet::unescape($_) ;
-                        } sort split('&',$correct)
-                        ).
-                        '</li></ul>';
-    }
-    #
-    return &html_generic_results($submission,$correct,$tablewidth,$rowclass);
-}
-
 #########################################################
 #########################################################
 ##
@@ -609,20 +817,8 @@ sub html_option_results {
 #########################################################
 #########################################################
 sub prepare_csv_output {
-    my ($r,$Problems,$Students) = @_;
-    my $problem;
-    #
+    my ($r,$problems,$students) = @_;
     my $c = $r->connection();
-    my ($resource,$respid,$partid) = ($problem->{'resource'},
-                                      $problem->{'respid'},
-                                      $problem->{'part'});
-    #
-    if ($ENV{'form.correctans'} eq 'true') {
-        $r->print('<h2>'.&mt('Generating Correct Answers').'</h2>');
-        &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
-                                                   'Statistics',
-                                                   'stats_status');
-    }
     #
     $r->print('<h2>'.
               &mt('Generating CSV report of student responses').'</h2>');
@@ -631,8 +827,8 @@ sub prepare_csv_output {
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
         ($r,'CSV File Compilation Status',
          'CSV File Compilation Progress', 
-         scalar(@$Students),'inline',undef,'Statistics','stats_status');
-
+         scalar(@$students),'inline',undef,'Statistics','stats_status');
+    
     $r->rflush();
     #
     # Open a file
@@ -648,80 +844,110 @@ sub prepare_csv_output {
         $outputfile = undef;
     }
     #
+    # Compute the number of columns per response
+    my @extra_resp_headers;
+    if ($ENV{'form.correctans'} eq 'true') {
+        push(@extra_resp_headers,'Correct');
+    } 
+    if ($ENV{'form.prob_status'} eq 'true') {
+        push(@extra_resp_headers,'Award Detail'); 
+        push(@extra_resp_headers,'Time');
+        push(@extra_resp_headers,'Attempt');
+        push(@extra_resp_headers,'Awarded');
+    }
+    my $response_multiplier = scalar(@extra_resp_headers);
+    #
+    # Create the table header
+    my @student_columns = ('username','domain','id');
+    #
+    my %headers;
+    push(@{$headers{'student'}},@student_columns);
+    # Pad for the student data
+    foreach my $row ('problem','part','response') {
+        foreach (@student_columns) {
+            push(@{$headers{$row}},'');
+        }
+    }
     #
-    my @Columns;
-    if (exists($ENV{'form.concise'}) && $ENV{'form.concise'} eq 'true') {
-        foreach (@DefaultColumns) {
-            if ($_->{'name'} =~ /^(username|domain|id)$/){
-                push(@Columns,$_);
+    # we put the headers into the %headers hash
+    my $prob_start_idx = 0;
+    foreach my $prob (@$problems) {
+        $headers{'problem'}->[$prob_start_idx] = $prob->compTitle;
+        my $part_start_idx = $prob_start_idx;
+        foreach my $partid (@{$prob->parts}) {
+            $headers{'part'}->[$part_start_idx] = $prob->part_display($partid);
+            my $responses = [$prob->responseIds($partid)];
+            for (my $i=0;$i<scalar(@$responses);$i++) {
+                my $resp_idx = $prob_start_idx + $response_multiplier * $i;
+                $headers{'response'}->[$resp_idx]=
+                    &mt('Response [_1]',$responses->[$i]);
+                for (my $j=0;$j<=$#extra_resp_headers;$j++) {
+                    $headers{'student'}->[$resp_idx+$j]=$extra_resp_headers[$j];
+                }
             }
+            $part_start_idx += scalar(@$responses)*$response_multiplier;
         }
-    } else {
-        @Columns = @DefaultColumns;
+        $prob_start_idx += $prob->countResponses * $response_multiplier;
     }
-    #
-    my $response_type = &get_response_type($resource,$partid,$respid);
-    if (! defined($response_type) || $response_type eq '') {
-        $r->print('<h2>'.&mt('Unable to determine response type').'</h2>');
-        return;
+    foreach my $row ('problem','part','response','student') {
+        print $outputfile '"'.join('","',map { ''; } @student_columns).'","'.
+            join('","',
+                 map { 
+                     &Apache::loncommon::csv_translate($_); 
+                 } @{$headers{$row}}).'"'.$/;
     }
     #
-    my $header = &csv_headers(\@Columns).','.&csv_generic_headers();
-    print $outputfile $header.$/;
-    #
-    foreach my $student (@$Students) {
+    # Main loop
+    foreach my $student (@$students) {
         last if ($c->aborted());
-        my $results = &Apache::loncoursedata::get_response_data_by_student
-            ($student,$resource->{'symb'},$respid);
-        next if (! defined($results) || ref($results) ne 'ARRAY');
-        for (my $i=0;$i<scalar(@$results);$i++) {
-            my $response = $results->[$i];
-            if ($ENV{'form.last_sub_only'} eq 'true' && 
-                $i < (scalar(@$results)-1)) {
-                next;
-            }
-            my $data;
-            $data->{'username'} = $student->{'username'};
-            $data->{'domain'}   = $student->{'domain'};
-            $data->{'id'} = $student->{'id'};
-            $data->{'fullname'} = $student->{'fullanem'};
-            $data->{'status'} = $student->{'status'};
-            $data->{'time'} = &Apache::lonlocal::locallocaltime
-                ($response->[&Apache::loncoursedata::RDs_timestamp()]);
-            $data->{'attempt'} = 
-                $response->[&Apache::loncoursedata::RDs_tries()];
-            $data->{'awarded'} = 
-                $response->[&Apache::loncoursedata::RDs_awarded()];
-            $data->{'awarddetail'} = 
-                $response->[&Apache::loncoursedata::RDs_awarddetail()];
-            $data->{'weight'} = &Apache::lonnet::EXT
-                ('resource.'.$partid.'.weight',$resource->{'symb'},
-                 undef,undef,undef);
-            $data->{'score'} = $data->{'weight'} * $data->{'awarded'};
-            my $rowextra = '';
-            my $row;
-            foreach my $col (@Columns) {
-                $row .= '"'.
-                    &Apache::loncommon::csv_translate($data->{$col->{'name'}}).'",';
+        my @rows;
+        my $prob_start_idx = 0;
+        foreach my $prob (@$problems) {
+            my $part_start_idx = 0;
+            foreach my $partid (@{$prob->parts}) {
+                my @responses = $prob->responseIds($partid);
+                my @response_type = $prob->responseType($partid);
+                for (my $i=0;$i<=$#responses;$i++) {
+                    my $resp_start_idx = $response_multiplier * $i;
+                    my $respid   = $responses[$i];
+                    my $results = 
+                        &Apache::loncoursedata::get_response_data_by_student
+                        ($student,$prob->symb(),$respid);
+                    if (! defined($results)) {
+                        $results = [];
+                    }
+                    for (my $j=0; $j<scalar(@$results);$j++) {
+                        if ($ENV{'form.all_sub'} ne 'true') {
+                            next if ($j != 0);
+                        }
+                        my $idx = scalar(@$results) - $j - 1;
+                        my $response = $results->[$idx];
+                        my @data = &compile_response_data($response,$student,
+                                                          $prob,$partid,
+                                                          $respid);
+                        for (my $k=0;$k<=$#data;$k++) {
+                            $rows[$j]->[$prob_start_idx + $part_start_idx +
+                                        $resp_start_idx + $k] = $data[$k];
+                        }
+                    }
+                }
+                $part_start_idx += scalar(@responses)*$response_multiplier;
             }
-            if ($response_type eq 'option') {
-                $row .= &csv_option_results
-                    ($response->[&Apache::loncoursedata::RDs_submission()],
-                     $student->{'answer'},
-                     scalar(@Columns),$rowextra);
-            } elsif ($response_type eq 'radiobutton') {
-                $row .= &csv_radiobutton_results
-                    ($response->[&Apache::loncoursedata::RDs_submission()],
-                     $student->{'answer'},
-                     scalar(@Columns),$rowextra);
-            } else {
-                $row .= &csv_generic_results
-                    ($response->[&Apache::loncoursedata::RDs_submission()],
-                     $student->{'answer'},
-                     scalar(@Columns),$rowextra);
+            $prob_start_idx += $prob->countResponses * $response_multiplier;
+        }
+        foreach my $row (@rows) {
+            print $outputfile '"'.join('","',
+                                       map { $student->{$_}; }
+                                       @student_columns).'"';
+                                           
+            for (my $i=0;$i<$prob_start_idx;$i++) {
+                my $value = &Apache::loncommon::csv_translate($row->[$i]);
+                $value ||='';
+                print $outputfile ',"'.$value.'"';
             }
-            print $outputfile $row.$/;
+            print $outputfile $/;
         }
+        undef(@rows);
         &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
                                                  'last student');
     }
@@ -737,282 +963,29 @@ sub prepare_csv_output {
     return;
 }
 
-sub csv_headers {
-    my ($Columns) = @_;
-    my $Str;
-    foreach my $column (@$Columns) {
-        $Str .= 
-            '"'.&Apache::loncommon::csv_translate($column->{'display'}).'",';
-    }
-    chop($Str);
-    return $Str;
-}
-
-sub csv_generic_headers {
-    my ($title) = @_;
-    if (! defined($title)) {
-        $title = &mt('Submission');
-    }
-    my $header = '"'.&Apache::loncommon::csv_translate($title).'"';
+sub compile_response_data {
+    my ($response,$student,$prob,$partid,$respid) = @_;
+    my @rowdata;
+    push(@rowdata,&Apache::lonnet::unescape($response->[&Apache::loncoursedata::RDs_submission()]));
     if ($ENV{'form.correctans'} eq 'true') {
-        $header .= ',"'.&Apache::loncommon::csv_translate(&mt('Correct')).'"';
-    }
-    return $header;
-}
-
-#------------------------------------------
-sub csv_essay_results {
-    my ($submission,$correct,$tablewidth,$rowextra)=@_;
-    #
-    $submission =~ s|\\r|\\\\r|g;
-    $submission =~ s|\\n|\\\\n|g;
-    #
-    return &csv_generic_results($submission,$correct,$tablewidth);
-}
-
-#------------------------------------------
-sub csv_radiobutton_results {
-    my ($submission,$correct,$tablewidth,$rowclass)=@_;
-    $submission =~ s/=[^=]*$//;
-    return &csv_generic_results($submission,$correct,$tablewidth,$rowclass);
-}
-
-#------------------------------------------
-sub csv_option_results {
-    my ($submission,$correct,$tablewidth,$rowclass)=@_;
-    $submission = join(',',
-                       map { 
-                           &Apache::lonnet::unescape($_) ;
-                       } sort split('&',$submission)
-                       );
-    if (defined($correct) && $correct !~ /^\s*$/) {
-        $correct =join(',',
-                       map { 
-                           &Apache::lonnet::unescape($_) ;
-                       } sort split('&',$submission));
+        my $correct = &Apache::lonstathelpers::get_student_answer
+            ($prob,$student->{'username'},$student->{'domain'},
+             $partid,$respid);
+        push(@rowdata,$correct);
+    }
+    if ($ENV{'form.prob_status'}) {
+        push(@rowdata,$response->[&Apache::loncoursedata::RDs_awarddetail()]);
+        push(@rowdata,&Apache::lonlocal::locallocaltime
+             ($response->[&Apache::loncoursedata::RDs_timestamp()]));
+        push(@rowdata,$response->[&Apache::loncoursedata::RDs_tries()]);
+        push(@rowdata,$response->[&Apache::loncoursedata::RDs_awarded()]);
     }
-    return &csv_generic_results($submission,$correct,$tablewidth,$rowclass);
-}
-
-#------------------------------------------
-sub csv_generic_results {
-    my ($submission,$correct,$tablewidth,$rowclass)=@_;
-    my $Str .= 
-        '"'.&Apache::loncommon::csv_translate($submission).'"';
-    if ($ENV{'form.correctans'} eq 'true') {
-        $Str .= ',"'.&Apache::loncommon::csv_translate($correct).'"';
-    }
-    return $Str;
+    return @rowdata;
 }
 
 #########################################################
 #########################################################
 ##
-##      Excel output of student answers and correct answers
-##
-#########################################################
-#########################################################
-sub prepare_excel_output {
-    my ($r,$Problems,$Students) = @_;
-    my $c = $r->connection();
-    #
-    $r->print('<h2>'.
-              &mt('Preparing Excel spreadsheet of student responses').
-              '</h2>');
-    if ($ENV{'form.correctans'} eq 'true') {
-        $r->print('<p>'.
-                  &mt('See the status bar above for student answer computation progress').
-                  '</p>');
-        foreach my $problem (@$Problems) {
-            my ($resource,$respid,$partid) = ($problem->{'resource'},
-                                              $problem->{'respid'},
-                                              $problem->{'part'});
-            #
-            &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 @ColumnLabels;
-    my @Columns = @DefaultColumns;
-    my %seen;
-    foreach my $problem (@$Problems) {
-        my ($resource,$respid,$partid) = ($problem->{'resource'},
-                                          $problem->{'respid'},
-                                          $problem->{'part'});
-        my $partkey = $resource->{'symb'}.':'.$partid;
-        if (! $seen{$partkey}) {
-            $ColumnLabels[$#Columns]=$resource->{'title'};
-            push(@ColumnLabels,$partid);
-            push(@Columns,@PartColumns);
-        }
-        push(@Column
-        if ($ENV{'form.correctans'} eq 'true') {
-            push(@Columns,'Computers answer');
-        }
-        $seen{$resource->{'symb'}.':'.$partid} .= ':'.$respid;
-
-    }
-
-#    my ($awarded_col,$weight_col);
-#    for (my $i=0;$i<=$#Columns;$i++) {
-#        if ($Columns[$i]->{'name'} eq 'weight' ) { $weight_col = $i; }
-#        if ($Columns[$i]->{'name'} eq 'awarded') { $awarded_col = $i; }
-#    }
-
-    #
-    # Create excel worksheet
-    my $filename = '/prtspool/'.
-        $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
-        time.'_'.rand(1000000000).'.xls';
-    my $workbook  = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
-    if (! defined($workbook)) {
-        $r->log_error("Error creating excel spreadsheet $filename: $!");
-        $r->print('<p>'.&mt("Unable to create new Excel file.  ".
-                            "This error has been logged.  ".
-                            "Please alert your LON-CAPA administrator").
-                  '</p>');
-        return undef;
-    }
-    #
-    $workbook->set_tempdir('/home/httpd/perl/tmp');
-    #
-    my $format = &Apache::loncommon::define_excel_formats($workbook);
-    my $worksheet  = $workbook->addworksheet('Student Submission Data');
-    #
-    # Make sure we get new weight data instead of data on a 10 minute delay
-    &Apache::lonnet::clear_EXT_cache_status();
-    #
-    # Put on the standard headers and whatnot
-    my $rows_output=0;
-    $worksheet->write($rows_output++,0,$resource->{'title'},$format->{'h1'});
-    $worksheet->write($rows_output++,0,$resource->{'src'},$format->{'h3'});
-    $rows_output++;
-    $worksheet->write_row($rows_output++,0,
-                          [map {$_->{'display'}} @Columns],
-                          $format->{'bold'});
-    #
-    # Populate the worksheet with the student data
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Excel File Compilation Status',
-         'Excel File Compilation Progress', 
-         scalar(@$Students),'inline',undef,'Statistics','stats_status');
-    foreach my $student (@$Students) {
-        last if ($c->aborted());
-        my $results = &Apache::loncoursedata::get_response_data_by_student
-            ($student,$resource->{'symb'},$respid);
-        my %row;
-        $row{'username'} = $student->{'username'};
-        $row{'domain'}   = $student->{'domain'};
-        $row{'id'}       = $student->{'id'};
-        $row{'correct'}  = $student->{'answer'};
-        $row{'weight'} = &Apache::lonnet::EXT
-            ('resource.'.$partid.'.weight',$resource->{'symb'},
-             undef,undef,undef);
-        if (! defined($results) || ref($results) ne 'ARRAY') {
-            $row{'score'} = '='.
-                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                    ($rows_output,$awarded_col)
-                .'*'.
-                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                    ($rows_output,$weight_col);
-            my $cols_output = 0;
-            foreach my $col (@Columns) {
-                if (! exists($row{$col->{'name'}})) {
-                    $cols_output++;
-                    next;
-                }
-                $worksheet->write($rows_output,$cols_output++,
-                                  $row{$col->{'name'}});
-            }
-            $rows_output++;
-        } else {
-            for (my $i=0;$i<scalar(@$results);$i++) {
-                my $response = $results->[$i];
-                if ($ENV{'form.last_sub_only'} eq 'true' && 
-                    $i < (scalar(@$results)-1)) {
-                    next;
-                }
-                delete($row{'time'});
-                delete($row{'attempt'});
-                delete($row{'submission'});
-                delete($row{'awarded'});
-                delete($row{'grading'});
-                delete($row{'score'});
-                my %row_format;
-                #
-                # Time is handled differently
-                $row{'time'} = &Apache::lonstathelpers::calc_serial
-                    ($response->[&Apache::loncoursedata::RDs_timestamp()]);
-                $row_format{'time'}=$format->{'date'};
-                #
-                $row{'attempt'}  = $response->[
-                     &Apache::loncoursedata::RDs_tries()];
-                $row{'submission'} = $response->[
-                     &Apache::loncoursedata::RDs_submission()];
-                if ($row{'submission'} =~ m/^=/) {
-                    # This will be interpreted as a formula.  That is bad!
-                    $row{'submission'} = " ".$row{'submission'};
-                }
-                $row{'awarddetail'} = $response->[
-                     &Apache::loncoursedata::RDs_awarddetail()];
-                $row{'awarded'} = $response->[
-                     &Apache::loncoursedata::RDs_awarded()];
-                $row{'score'} = '='.
-                    &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                        ($rows_output,$awarded_col)
-                    .'*'.
-                    &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                        ($rows_output,$weight_col);
-                my $cols_output = 0;
-                foreach my $col (@Columns) {
-                    $worksheet->write($rows_output,$cols_output++,$row{$col->{'name'}},
-                                      $row_format{$col->{'name'}});
-                }
-                $rows_output++;
-            }
-        } # End of else clause on if (! defined($results) ....
-        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 'last student');
-    }
-    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-    #
-    # Close the excel file
-    $workbook->close();
-    #
-    # Write a link to allow them to download it
-    $r->print('<p><a href="'.$filename.'">'.
-              &mt('Your Excel spreadsheet.').
-              '</a></p>'."\n");
-    $r->print('<script>'.
-              'window.document.Statistics.stats_status.value="'.
-              'Done compiling spreadsheet.  See link below to download.'.
-              '";</script>');
-    $r->rflush();
-    return;
-}
-
-=cut
-
-#########################################################
-#########################################################
-##
 ##   Generic Interface Routines
 ##
 #########################################################
@@ -1020,15 +993,15 @@ sub prepare_excel_output {
 sub CreateInterface {
     ##
     ## Output Selection
-    my $OutputSelector = $/.'<select name="output">'.$/;
+    my $output_selector = $/.'<select name="output">'.$/;
     foreach ('HTML','Excel','CSV') {
-        $OutputSelector .= '    <option value="'.lc($_).'"';
+        $output_selector .= '    <option value="'.lc($_).'"';
         if ($ENV{'form.output'} eq lc($_)) {
-            $OutputSelector .= ' selected ';
+            $output_selector .= ' selected ';
         }
-        $OutputSelector .='>'.&mt($_).'</option>'.$/;
+        $output_selector .='>'.&mt($_).'</option>'.$/;
     } 
-    $OutputSelector .= '</select>'.$/;
+    $output_selector .= '</select>'.$/;
     ##
     ## Environment variable initialization
     my $Str = '';
@@ -1039,7 +1012,7 @@ sub CreateInterface {
     $Str .= '<tr>';
     $Str .= '<th>'.&mt('Sections').'</th>';
     $Str .= '<th>'.&mt('Enrollment Status').'</th>';
-    $Str .= '<th>'.&mt('Output Options').'</th>';
+    $Str .= '<th>'.&mt('Output as [_1]',$output_selector).'</th>';
     $Str .= '</tr>'."\n";
     #
     $Str .= '<tr><td align="center">'."\n";
@@ -1064,31 +1037,33 @@ sub CreateInterface {
     }
     $ans_checkbox .= 'value="true" />';
     #
-    # Only show last submission checkbox
-    my $last_sub_checkbox = '<input type="checkbox" name="last_sub_only" ';
-    if (exists($ENV{'form.last_sub_only'}) && 
-        $ENV{'form.last_sub_only'} eq 'true') {
-        $last_sub_checkbox .= 'checked ';
-    }
-    $last_sub_checkbox.= 'value="true" />';
-    #
-    # Concise view checkbox
-    my $concise_view_checkbox = '<input type="checkbox" name="concise" ';
-    if (exists($ENV{'form.concise'}) && $ENV{'form.concise'} eq 'true') {
-        $concise_view_checkbox .= 'checked ';
+    # Show all submissions checkbox
+    my $all_sub_checkbox = '<input type="checkbox" name="all_sub" ';
+    if (exists($ENV{'form.all_sub'}) && 
+        $ENV{'form.all_sub'} eq 'true') {
+        $all_sub_checkbox .= 'checked ';
+    }
+    $all_sub_checkbox.= 'value="true" />';
+    #
+    # problem status checkbox
+    my $prob_status_checkbox = '<input type="checkbox" name="prob_status" ';
+    if (exists($ENV{'form.prob_status'}) && 
+        $ENV{'form.prob_status'} eq 'true') {
+        $prob_status_checkbox .= 'checked ';
     }
-    $concise_view_checkbox .= 'value="true" />';
+    $prob_status_checkbox .= 'value="true" />';
     #
     $Str .= '<td align="right" halign="top">'.
-#        '<b>'.&mt('Output Format: [_1]',$OutputSelector).'</b><br />'.$/.
         '<label><b>'.
-        &mt('show problem [_1]',$prob_checkbox).'</b></label><br />'.
+        &mt('Show problem [_1]',$prob_checkbox).'</b></label><br />'.
+        '<label><b>'.
+        &mt('Show correct answers [_1]',$ans_checkbox).'</b></label><br />'.
+        '<label><b>'.
+        &mt('Show all submissions [_1]',$all_sub_checkbox).
+        '</b></label><br />'.
         '<label><b>'.
-        &mt('compute correct answers [_1]',$ans_checkbox).'</b></label><br />'.
-#        '<label><b>'.
-#        &mt('final answer only [_1]',$last_sub_checkbox).'</b></label><br />'.
-#        '<label><b>'.
-#        &mt('concise view [_1]',$concise_view_checkbox).'</b></label><br />'.
+        &mt('Show problem grading [_1]',$prob_status_checkbox).
+        '</b></label><br />'.
         '</td>';
     #
     $Str .= '</tr>'."\n";