--- loncom/interface/statistics/lonstudentsubmissions.pm	2005/04/07 06:56:24	1.40
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2011/11/18 22:35:33	1.54.10.4
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.40 2005/04/07 06:56:24 albertel Exp $
+# $Id: lonstudentsubmissions.pm,v 1.54.10.4 2011/11/18 22:35:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,10 @@ use Apache::lonstathelpers;
 use HTML::Entities();
 use Time::Local();
 use Spreadsheet::WriteExcel();
+use Crypt::PasswdMD5;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+  
 
 my @SubmitButtons = ({ name => 'SelectAnother',
                        text => 'Choose a different Problem' },
@@ -63,15 +67,17 @@ sub BuildStudentSubmissionsPage {
     my @Students = @Apache::lonstatistics::Students;
     #
     if (@Students < 1) {
-        $r->print('<h2>There are no students in the sections selected</h2>');
+        $r->print('<div class="LC_warning">'
+                 .&mt('There are no students in the sections selected.')
+                 .'</div>');
     }
     #
     my @CacheButtonHTML = 
         &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status',
-                                   '<h3>'.&mt('Loading student data').'</h3>');
+                                   '<div class="LC_info">'.&mt('Loading student data...').'</div>');
     $r->rflush();
     #
-    if (exists($env{'form.problemchoice'}) && 
+    if ((exists($env{'form.problemchoice'}) || (exists($env{'form.allproblems'}))) && 
         ! exists($env{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
             if ($button->{'name'} eq 'break') {
@@ -89,32 +95,76 @@ sub BuildStudentSubmissionsPage {
         $r->print('<hr />'.$/);
         $r->rflush();
         #
+
+        #
+        # Get resource objects
+        my $navmap = Apache::lonnavmaps::navmap->new();
+
         # Determine which problems we are to analyze
         my @Symbs = 
             &Apache::lonstathelpers::get_selected_symbs('problemchoice');
+        if (defined($navmap)) {
+            if ($env{'form.allproblems'}) {
+                my $iterator = $navmap->getIterator(undef, undef, undef, 1);
+                while (my $curRes = $iterator->next()) {
+                    next if (! ref($curRes));
+                    if ($curRes->is_problem) {
+                        my $symb = $curRes->symb;
+                        unless(grep(/^\Q$symb\E$/,@Symbs)) {
+                            push(@Symbs,$symb);
+                        }
+                    }
+                }
+            }
+        }
         foreach my $selected (@Symbs) {
             $r->print('<input type="hidden" name="problemchoice" value="'.
                       $selected.'" />'.$/);
         }
-        #
-        # Get resource objects
-        my $navmap = Apache::lonnavmaps::navmap->new();
         if (!defined($navmap)) {
-            $r->print('<h1>'.&mt("Internal error").'</h1>');
+            $r->print('<div class="LC_error">'.&mt("Internal error").'</div>');
             return;
         }
         my %already_seen;
-        my @Problems;
+        my (@Problems,$show_named);
+        unless (&Apache::loncommon::needs_gci_custom()) {
+            unless ($env{'form.anonymized'} eq 'true') {
+                $show_named = 1;
+            }
+        }
         foreach my $symb (@Symbs) {
             my $resource = $navmap->getBySymb($symb);
             push(@Problems,$resource);
         }
+        # If these are to be anonymized, do a random shuffle of @Students. 
+        unless ($show_named) {
+            &array_shuffle(\@Students);
+        }
+        my $threshold = $env{'course.'.$env{'request.course.id'}.'.internal.anonsurvey_threshold'};
+        if ($threshold eq '') {
+            my %domconfig =
+                &Apache::lonnet::get_dom('configuration',['coursedefaults'],
+                                        $env{'course.'.$env{'request.course.id'}.'.domain'});
+            if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+                $threshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
+                if ($threshold eq '') {
+                    $threshold = 10;
+                }
+            } else {
+                $threshold = 10;
+            }
+        }
+        unless (&Apache::loncommon::needs_gci_custom()) {
+            $threshold = 0;
+        }
         # 
         $r->print('<h4>'.
                   &Apache::lonstatistics::section_and_enrollment_description().
                   '</h4>');
         if (! scalar(@Problems) || ! defined($Problems[0])) {
             $r->print('resource is undefined');
+        } elsif (!$show_named && @Students < $threshold) {
+            $r->print(&mt('The number of students matching the selection criteria is too few for display of submission data for anonymous surveys.').'<br />'.&mt('There must be at least [quant,_1,student].',$threshold).' '.&mt('Contact the LON-CAPA [_1]Helpdesk[_2] if you need the threshold to be changed for this course.','<a href="/adm/helpdesk?origurl=%2fadm%2fstatistics>','</a>'));
         } else {
             if (scalar(@Problems) == 1) {
                 my $resource = $Problems[0];
@@ -126,11 +176,11 @@ sub BuildStudentSubmissionsPage {
                 }
             }
             if ($env{'form.output'} eq 'excel') {
-                &prepare_excel_output($r,\@Problems,\@Students);
+                &prepare_excel_output($r,\@Problems,\@Students,$show_named);
             } elsif ($env{'form.output'} eq 'csv') {
-                &prepare_csv_output($r,\@Problems,\@Students);
+                &prepare_csv_output($r,\@Problems,\@Students,$show_named);
             } else {
-                &prepare_html_output($r,\@Problems,\@Students);
+                &prepare_html_output($r,\@Problems,\@Students,$show_named);
             }
         }
         $r->print('<hr />');
@@ -142,26 +192,44 @@ sub BuildStudentSubmissionsPage {
                   &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.').
+                  &mt('Please select problems and use the [_1]Prepare Report[_2] button to continue.','<b>','</b>').
                   '</p>');
         $r->print(&Apache::lonstathelpers::MultipleProblemSelector
                   (undef,'problemchoice','Statistics'));
     }
 }
 
+sub array_shuffle {
+    my $array = shift;
+    return unless (ref($array) eq 'ARRAY');
+    my $i = scalar(@$array);
+    my $j;
+    foreach my $item (@$array) {
+        --$i;
+        $j = int(rand($i+1));
+        next if($i == $j);
+        @$array [$i,$j] = @$array[$j,$i];
+    }
+    return @$array;
+}
+
 ##
 ## get_extra_response_headers
 ##
+
 sub get_extra_response_headers {
+    my ($show_named) = @_;
     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');
+    }
+    if ($show_named) { 
+        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');
+        }
     }
     return @extra_resp_headers;
 }
@@ -190,6 +258,8 @@ sub get_headers {
             shift(@basic_headers);  # Get rid of 'Correct'
         }
         @headers = (@foils,@basic_headers);
+    } elsif (lc($resptype) eq 'task') {
+        @headers = ('Grader','Status',@basic_headers,'Submission');
     } else {
         @headers = ('Submission',@basic_headers);
     }
@@ -204,8 +274,9 @@ sub get_headers {
 #########################################################
 #########################################################
 sub prepare_html_output {
-    my ($r,$problems,$students) = @_;
+    my ($r,$problems,$students,$show_named) = @_;
     my $c = $r->connection();
+    my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
     #
     # Set a flag for the case when there is just one problem
     my $single_response = 0;
@@ -215,10 +286,18 @@ sub prepare_html_output {
     }
     #
     # Compute the number of columns per response
-    my @extra_resp_headers = &get_extra_response_headers();
+    my @extra_resp_headers = &get_extra_response_headers($show_named);
     #
     # Create the table header
-    my @student_columns = ('username','domain','id','section');
+    my @student_columns;
+    if ($show_named) {
+        @student_columns = @Apache::lonstatistics::SelectedStudentData;
+        if (grep(/^all$/,@student_columns)) {
+            @student_columns = qw(fullname username domain id section status groups comments);
+        }
+    } else {
+        @student_columns = ('username');
+    }
     #
     my %headers;
     my $student_column_count = scalar(@student_columns);
@@ -258,11 +337,15 @@ sub prepare_html_output {
                     $headers{'response'} .=
                         '<th colspan="'.scalar(@headers).'">'.
                         &mt('Response [_1]',$responses->[$i]).'</th>';
-                    $headers{'student'}.= '<th>'.join('</th><th><nobr>',
+                    $headers{'student'}.= '<th><span class="LC_nobreak">'.
+                                          join('</span></th><th><span class="LC_nobreak">',
                                                       @headers).
-                                                          '</nobr></th>';
+                                                          '</span></th>';
                 }
             }
+            if ($part_span == 0) {
+                next;
+            }
             if (! $single_part) {
                 my $tmpname = $partid;
                 if ($partid =~/^\d+$/) {
@@ -274,11 +357,14 @@ sub prepare_html_output {
                 $headers{'part'} .= qq{<th colspan="$part_span">$tmpname</th>};
                 $nonempty_part_headers = 1;
             } else {
-                $headers{'part'} .= qq{<th colspan="$part_span">&nbsp</th>};
+                $headers{'part'} .= qq{<th colspan="$part_span">&nbsp;</th>};
             }
             $prob_span += $part_span;
         }
         my $title = $prob->compTitle;
+        unless (&Apache::loncommon::needs_gci_custom()) {
+            ($title) = ($prob->src =~ m{/([^/]+)$});
+        }
         if ($prob_span > 0) {
             $headers{'problem'}.= qq{<th colspan="$prob_span">$title</th>};
         } elsif ($single_response) {
@@ -314,9 +400,25 @@ sub prepare_html_output {
             $count = 0;
         }
         last if ($c->aborted());
-        foreach my $field (@student_columns) {
-            $student_row_data .= 
-                '<td valign="top">'.$student->{$field}.'</td>';
+        if ($show_named) {
+            foreach my $field (@student_columns) {
+                $student_row_data .= '<td valign="top">';
+                # handle comments like in lonstudentassessment.pm
+                if($field eq 'comments') {
+                    $student_row_data .= 
+                        '<a href="/adm/'.$student->{'domain'}.'/'.
+                        $student->{'username'}.'/'.'aboutme#coursecomment">'.&mt('Comments').'</a>';
+                } else {
+                    $student_row_data .= $student->{$field};
+                }
+                $student_row_data .= '</td>';
+            }
+        } else {
+            my $anonid = &Crypt::PasswdMD5::unix_md5_crypt($student->{'username'},
+                                                           $salt);
+            $anonid = substr($anonid,length($salt)+1);
+            $student_row_data = '<td valign="top" colspan="'.$student_column_count.'">'.
+                                $anonid.'</td>';
         }
         #
         # Figure out what it is we need to output for this student
@@ -340,8 +442,9 @@ sub prepare_html_output {
                                                'html','normal',
                                                @extra_resp_headers);
                     my $width = scalar(@headers);
+                    next if ($width < 1);
                     my $resp_data;
-                    $resp_data->{'fake'} = qq{<td colspan="$width">&nbsp</td>};
+                    $resp_data->{'fake'} = qq{<td colspan="$width">&nbsp;</td>};
                     if (! defined($results)) {
                         $results = [];
                     }
@@ -365,6 +468,14 @@ sub prepare_html_output {
                                                      $response,
                                                      $single_response).
                                  '</td>');
+			} elsif (lc($resptype) eq 'task') {
+			    my $results = 
+				&html_task_results(\@headers,
+						   $prob,$partid,$respid,
+						   $response,$resptype);
+			    if ($results) {
+				push(@{$resp_data->{'real'}},$results);
+			    }
                         } else {
                             push(@{$resp_data->{'real'}},
                                  &html_non_essay_results(\@headers,
@@ -424,6 +535,7 @@ sub prepare_html_output {
             undef(@essays);
         }
     } # end of student loop
+    $r->print('</table>'.$/);
     return;
 }
 
@@ -438,14 +550,27 @@ sub hashify_response {
     }
     $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()];
+    if ($prob->is_task()) {
+	$resp_hash->{'Grader'} = 
+	    $response->[&Apache::loncoursedata::RDs_response_eval_2()];
+	if ($resp_hash->{'Attempt'} eq '0') {
+	    $resp_hash->{'Attempt'} = '';
+	}
+	$resp_hash->{'Award Detail'} = 
+	    $response->[&Apache::loncoursedata::RDs_part_award()];
+	$resp_hash->{'Status'} = 
+	    $response->[&Apache::loncoursedata::RDs_response_eval()];
+    } else {
+	$resp_hash->{'Award Detail'} = 
+	    $response->[&Apache::loncoursedata::RDs_awarddetail()];
+    }
+
     return $resp_hash;
 }
 
@@ -469,7 +594,7 @@ sub html_essay_results {
         if (defined($respid)) {
             $id .= ' '.$respid;
         }
-        $Str .= '<nobr>'.$id.'</nobr>'.('&nbsp;'x4);
+        $Str .= '<span class="LC_nobreak">'.$id.'</span>'.('&nbsp;'x4);
     }
     #
     shift(@$headers); # Get rid of the Submission header
@@ -478,11 +603,11 @@ sub html_essay_results {
         $correct = &html_format_essay_sub($response->{'Correct'});
         shift(@$headers);
     }
-    $Str .= '<nobr>'.
+    $Str .= '<span class="LC_nobreak">'.
         join('',
              map {
                  ('&nbsp;'x4).&mt($_.': [_1]',$response->{$_});
-             } @$headers).'</nobr>';
+             } @$headers).'</span>';
     if (@$headers || ! $single_response) {
         $Str .= '<br />';
     }
@@ -508,20 +633,34 @@ sub html_format_essay_sub {
     return $submission;
 }
 
+sub html_task_results {
+    my ($headers,$prob,$partid,$respid,$response,$resptype) = @_;
+    if (! ref($headers) || ref($headers) ne 'ARRAY' || ! scalar(@$headers)) {
+        return '';
+    }
+
+    my @values;
+    @values = map { $response->{$_}; } @$headers;
+
+    my $td = '<td valign="top">';
+    my $str = $td.join('</td>'.$td,@values).'</td>';
+    return $str;
+}
+
 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'});
+    my $submission = &HTML::Entities::decode(&unescape($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>';
+        $submission = '<span class="LC_nobreak">'.$submission.'</span>';
     }
     $response->{'Submission'} = $submission;
     #
@@ -529,14 +668,14 @@ sub html_non_essay_results {
     if ($resptype =~ /^(option|match|rank)$/) {
         my %submission = 
             map { 
-                my ($foil,$value) = split('=',&Apache::lonnet::unescape($_));
+                my ($foil,$value) = split('=',&unescape($_));
                 ($foil,$value);
             } split('&',$response->{'Submission'});
         my %correct;
         if (exists($response->{'Correct'})) {
             %correct = 
                 map { 
-                    my ($foil,$value)=split('=',&Apache::lonnet::unescape($_));
+                    my ($foil,$value)=split('=',&unescape($_));
                     ($foil,$value);
                 } split('&',$response->{'Correct'});
         }
@@ -578,8 +717,9 @@ sub html_non_essay_results {
 #########################################################
 #########################################################
 sub prepare_excel_output {
-    my ($r,$Problems,$Students) = @_;
+    my ($r,$Problems,$Students,$show_named) = @_;
     my $c = $r->connection();
+    my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
     #
     #
     # Determine the number of columns in the spreadsheet
@@ -648,7 +788,12 @@ sub prepare_excel_output {
     $worksheet->write($partid_row,0,'Part ID',$format->{'bold'});
     $worksheet->write($respid_row,0,'Response ID',$format->{'bold'});
     # Student headers
-    my @StudentColumns = ('username','domain','id','section');
+    my @StudentColumns;
+    if ($show_named) {
+        @StudentColumns = qw(username domain id section);
+    } else {
+        @StudentColumns = qw(username);
+    }
     foreach (@StudentColumns) {
         $worksheet->write($header_row,$cols_output++,ucfirst($_),
                           $format->{'bold'});
@@ -657,6 +802,9 @@ sub prepare_excel_output {
     my %start_col;
     foreach my $prob (@$Problems) {
         my $title = $prob->compTitle;
+        unless (&Apache::loncommon::needs_gci_custom()) {
+            ($title) = ($prob->src =~ m{/([^/]+)$});
+        }
         $worksheet->write($title_row,$cols_output,
                           $title,$format->{'h3'});
         foreach my $partid (@{$prob->parts}) {
@@ -695,11 +843,9 @@ sub prepare_excel_output {
         last if ($c->aborted());
         $cols_output = 0;
         my $student_row = $max_row;
-        foreach my $field (@StudentColumns) {
-            $worksheet->write($student_row,$cols_output++,
-                              $student->{$field});
-        }
-        my $last_student_col = $cols_output-1;
+        my $anonid = &Crypt::PasswdMD5::unix_md5_crypt($student->{'username'},
+                                                       $salt);
+        $anonid = substr($anonid,length($salt)+1);
         foreach my $prob (@$Problems) {
             foreach my $partid (@{$prob->parts}) {
                 my @Response = $prob->responseIds($partid);
@@ -749,11 +895,16 @@ sub prepare_excel_output {
             }
         }
         # Fill in the remaining rows with the students data
-        for (my $row = $student_row+1;$row<$max_row;$row++) {
+        for (my $row = $student_row;$row<$max_row;$row++) {
             my $cols = 0;
             foreach my $field (@StudentColumns) {
-                $worksheet->write($row,$cols++,
-                                  $student->{$field});
+                if ($show_named) {
+                    $worksheet->write($row,$cols++,
+                                      $student->{$field});
+                } else {
+                    $worksheet->write($row,$cols++,
+                                      $anonid);
+                }
             }
         }
         &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
@@ -787,8 +938,10 @@ sub compile_response_data {
     #
     my $submission = 
         &HTML::Entities::decode
-        (&Apache::lonnet::unescape($response->{'Submission'}));
-    return () if (! defined($submission) || $submission eq '');
+        (&unescape($response->{'Submission'}));
+    if (!$prob->is_task()) {
+	return () if (! defined($submission) || $submission eq '');
+    }
     $submission =~ s/\\\"/\"/g;
     $submission =~ s/\\\'/\'/g;
     if ($resptype eq 'radiobutton') {
@@ -800,14 +953,14 @@ sub compile_response_data {
     if ($resptype =~ /^(option|match|rank)$/) {
         my %submission = 
             map { 
-                my ($foil,$value) = split('=',&Apache::lonnet::unescape($_));
+                my ($foil,$value) = split('=',&unescape($_));
                 ($foil,$value);
             } split('&',$response->{'Submission'});
         my %correct;
         if (exists($response->{'Correct'})) {
             %correct = 
                 map { 
-                    my ($foil,$value)=split('=',&Apache::lonnet::unescape($_));
+                    my ($foil,$value)=split('=',&unescape($_));
                     ($foil,$value);
                 } split('&',$response->{'Correct'});
         }
@@ -861,8 +1014,9 @@ sub excel_format_item {
 #########################################################
 #########################################################
 sub prepare_csv_output {
-    my ($r,$problems,$students) = @_;
+    my ($r,$problems,$students,$show_named) = @_;
     my $c = $r->connection();
+    my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
     #
     $r->print('<h2>'.
               &mt('Generating CSV report of student responses').'</h2>');
@@ -882,17 +1036,24 @@ sub prepare_csv_output {
             time.'_'.rand(1000000000).'.csv';
     unless ($outputfile = Apache::File->new('>/home/httpd'.$filename)) {
         $r->log_error("Couldn't open $filename for output $!");
-        $r->print("Problems occured in writing the csv file.  ".
-                  "This error has been logged.  ".
-                  "Please alert your LON-CAPA administrator.");
+        $r->print('<div class="LC_error">'
+                 .&mt('Problems occurred in writing the CSV file. '
+                     .'This error has been logged. '
+                     .'Please alert your LON-CAPA administrator.')
+                 .'</div>');
         $outputfile = undef;
     }
     #
     # Compute the number of columns per response
-    my @extra_resp_headers = &get_extra_response_headers();
+    my @extra_resp_headers = &get_extra_response_headers($show_named);
     #
     # Create the table header
-    my @student_columns = ('username','domain','id','section');
+    my @student_columns;
+    if ($show_named) {
+        @student_columns = qw(username domain id section);
+    } else {
+        @student_columns = qw(username);
+    }
     #
     my %headers;
     push(@{$headers{'student'}},@student_columns);
@@ -908,7 +1069,11 @@ sub prepare_csv_output {
     foreach my $prob (@$problems) {
         my %analysis = &Apache::lonstathelpers::get_problem_data($prob->src);
         $problem_analysis{$prob->src}=\%analysis;
-        $headers{'problem'}->[$max_column] = $prob->compTitle;
+        my $title = $prob->compTitle;
+        unless (&Apache::loncommon::needs_gci_custom()) {
+            ($title) = ($prob->src =~ m{/([^/]+)$});
+        }
+        $headers{'problem'}->[$max_column] = $title;
         foreach my $partid (@{$prob->parts}) {
             $headers{'part'}->[$max_column] = $prob->part_display($partid);
             my $responses = [$prob->responseIds($partid)];
@@ -941,6 +1106,9 @@ sub prepare_csv_output {
     # Main loop
     foreach my $student (@$students) {
         last if ($c->aborted());
+        my $anonid = &Crypt::PasswdMD5::unix_md5_crypt($student->{'username'},
+                                                       $salt);
+       $anonid = substr($anonid,length($salt)+1);
         my @rows;
         foreach my $prob (@$problems) {
             foreach my $partid (@{$prob->parts}) {
@@ -981,9 +1149,15 @@ sub prepare_csv_output {
             }
         }
         foreach my $row (@rows) {
-            print $outputfile '"'.join('","',
-                                       map { $student->{$_}; }
-                                       @student_columns).'"';
+            my $student_row_data = '';
+            if ($show_named) {
+                $student_row_data = '"'.join('","',
+                                        map { $student->{$_}; }
+                                        @student_columns).'"';
+            } else {
+                $student_row_data = '"'.$anonid.'"';
+            }
+            print $outputfile $student_row_data;
             for (my $i=scalar(@student_columns);$i<$max_column;$i++) {
                 my $value = &Apache::loncommon::csv_translate($row->[$i]);
                 $value ||='';
@@ -1000,9 +1174,9 @@ sub prepare_csv_output {
     # Close the progress window
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     #
-    # Tell the user where to get their csv file
+    # Tell the user where to get their CSV file
     $r->print('<br />'.
-              '<a href="'.$filename.'">'.&mt('Your csv file.').'</a>'."\n");
+              '<a href="'.$filename.'">'.&mt('Your CSV file.').'</a>'."\n");
     $r->rflush();
     return;
 }
@@ -1030,7 +1204,7 @@ sub CreateInterface {
     foreach ('HTML','Excel','CSV') {
         $output_selector .= '    <option value="'.lc($_).'"';
         if ($env{'form.output'} eq lc($_)) {
-            $output_selector .= ' selected ';
+            $output_selector .= ' selected="selected" ';
         }
         $output_selector .='>'.&mt($_).'</option>'.$/;
     } 
@@ -1038,20 +1212,26 @@ sub CreateInterface {
     ##
     ## Environment variable initialization
     my $Str = '';
-    $Str .= &Apache::lonhtmlcommon::breadcrumbs
-        (undef,'Student Submission Reports');
-    $Str .= '<p>';
-    $Str .= '<table cellspacing="5">'."\n";
-    $Str .= '<tr>';
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports');
+    $Str .= '<br />';
+    $Str .= &Apache::loncommon::start_data_table();
+    $Str .= &Apache::loncommon::start_data_table_header_row();
     $Str .= '<th>'.&mt('Sections').'</th>';
-    $Str .= '<th>'.&mt('Enrollment Status').'</th>';
-    $Str .= '<th>'.&mt('Output as [_1]',$output_selector).'</th>';
-    $Str .= '</tr>'."\n";
+    $Str .= '<th>'.&mt('Groups').'</th>';
+    $Str .= '<th>'.&mt('Access Status').'</th>';
+    $Str .= '<th>'.&mt('Options').'</th>';
+    $Str .= '<th>'.&mt('Output Format').'</th>';
+    $Str .= &Apache::loncommon::end_data_table_header_row();
     #
-    $Str .= '<tr><td align="center">'."\n";
+    $Str .= &Apache::loncommon::start_data_table_row();
+    $Str .= '<td align="center">'."\n";
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $Str .= '</td>';
     #
+    $Str .= '<td align="center">'."\n";
+    $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5);
+    $Str .= '</td>';
+    #
     $Str .= '<td align="center">';
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
     $Str .= '</td>';
@@ -1059,14 +1239,14 @@ sub CreateInterface {
     # Render problem checkbox
     my $prob_checkbox = '<input type="checkbox" name="renderprob" ';
     if (exists($env{'form.renderprob'}) && $env{'form.renderprob'} eq 'true') {
-        $prob_checkbox .= 'checked ';
+        $prob_checkbox .= 'checked="checked" ';
     }
     $prob_checkbox .= 'value="true" />';
     #
     # Compute correct answers checkbox
     my $ans_checkbox = '<input type="checkbox" name="correctans" ';
     if (exists($env{'form.correctans'}) && $env{'form.correctans'} eq 'true') {
-        $ans_checkbox .= 'checked ';
+        $ans_checkbox .= 'checked="checked" ';
     }
     $ans_checkbox .= 'value="true" />';
     #
@@ -1074,7 +1254,7 @@ sub CreateInterface {
     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 .= 'checked="checked" ';
     }
     $all_sub_checkbox.= 'value="true" />';
     #
@@ -1082,30 +1262,51 @@ sub CreateInterface {
     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 ';
+        $prob_status_checkbox .= 'checked="checked" ';
     }
     $prob_status_checkbox .= 'value="true" />';
-    #
+    my $anon_checkbox;
+    unless (&Apache::loncommon::needs_gci_custom()) {
+        #
+        # anonymized checkbox
+        #
+        $anon_checkbox = '<input type="checkbox" name="anonymized" ';
+        if (exists($env{'form.anonymized'}) &&
+            $env{'form.anonymized'} eq 'true') {
+            $anon_checkbox .= 'checked="checked" ';
+        }
+        $anon_checkbox .= ' value="true" />';
+    }
+
     $Str .= '<td align="right" valign="top">'.
         '<label><b>'.
-        &mt('Show problem [_1]',$prob_checkbox).'</b></label><br />'.
+        &mt('Show problem').' '.$prob_checkbox.'</b></label><br />'.
         '<label><b>'.
-        &mt('Show correct answers [_1]',$ans_checkbox).'</b></label><br />'.
+        &mt('Show correct answers').' '.$ans_checkbox.'</b></label><br />'.
         '<label><b>'.
-        &mt('Show all submissions [_1]',$all_sub_checkbox).
+        &mt('Show all submissions').' '.$all_sub_checkbox.
         '</b></label><br />'.
         '<label><b>'.
-        &mt('Show problem grading [_1]',$prob_status_checkbox).
-        '</b></label><br />'.
-        '</td>';
+        &mt('Show problem grading').' '.$prob_status_checkbox.
+        '</b></label><br />';
+
+    unless (&Apache::loncommon::needs_gci_custom()) {
+        $Str .= '<label><b>'.
+                &mt('Anonymized').' '.$anon_checkbox.
+                '</b></label><br />';
+    }
+    $Str .= '</td>';
+    #
+    $Str .= '<td align="center" valign="top">'.$output_selector.'</td>';
     #
-    $Str .= '</tr>'."\n";
-    $Str .= '</table>'."\n";
+    $Str .= &Apache::loncommon::end_data_table_row();
+    $Str .= &Apache::loncommon::end_data_table();
     #
-    $Str .= '<nobr>'.&mt('Status: [_1]',
-                         '<input type="text" '.
-                         'name="stats_status" size="60" value="" />').
-            '</nobr>'.'</p>';    
+    $Str .= '<p><span class="LC_nobreak">'
+           .&mt('Status: [_1]',
+                    '<input type="text" name="stats_status"'
+                   .' size="60" value="" readonly="readonly" />')
+           .'</span></p>';
     ##
     return $Str;
 }