--- loncom/interface/statistics/lonstudentsubmissions.pm	2011/11/18 22:35:33	1.54.10.4
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2011/11/21 20:12:36	1.65
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.54.10.4 2011/11/18 22:35:33 raeburn Exp $
+# $Id: lonstudentsubmissions.pm,v 1.65 2011/11/21 20:12:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,14 +30,15 @@ use strict;
 use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
+use Apache::lonquickgrades();
 use Apache::loncoursedata();
 use Apache::lonstatistics;
 use Apache::lonlocal;
 use Apache::lonstathelpers;
+use Apache::lonmsgdisplay();
 use HTML::Entities();
 use Time::Local();
 use Spreadsheet::WriteExcel();
-use Crypt::PasswdMD5;
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
   
@@ -62,6 +63,8 @@ sub BuildStudentSubmissionsPage {
     #
     &Apache::lonstatistics::PrepareClasslist();
     #
+    $r->print( &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports'));
+    &Apache::lonquickgrades::startGradeScreen($r,'statistics');
     $r->print(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
@@ -77,7 +80,11 @@ sub BuildStudentSubmissionsPage {
                                    '<div class="LC_info">'.&mt('Loading student data...').'</div>');
     $r->rflush();
     #
-    if ((exists($env{'form.problemchoice'}) || (exists($env{'form.allproblems'}))) && 
+    my %anoncounter =
+         &Apache::lonnet::dump('nohist_anonsurveys',
+                        $env{'course.'.$env{'request.course.id'}.'.domain'},
+                        $env{'course.'.$env{'request.course.id'}.'.num'});
+    if (exists($env{'form.problemchoice'}) && 
         ! exists($env{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
             if ($button->{'name'} eq 'break') {
@@ -95,51 +102,86 @@ 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);
-                        }
+
+        # If there are multi-part problems with anonymous survey and named
+        # parts check if named was picked for display.
+        #
+        my %mixed_named; 
+        foreach my $envkey (%env) {
+            if ($envkey =~ /^form\.mixed_(\d+:\d+)$/) {
+                my $item = $1; 
+                if ($env{$envkey} =~ /^symb_(.+)$/) {
+                    my $symb = &unescape($1);
+                    if (ref($mixed_named{$symb}) eq 'ARRAY') {
+                        push(@{$mixed_named{$symb}},$item);
+                    } else {
+                        @{$mixed_named{$symb}} = ($item);
                     }
                 }
             }
         }
-        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)) {
+            foreach my $selected (@Symbs) {
+                $r->print('<input type="hidden" name="problemchoice" value="'.
+                          &escape($selected).'" />'.$/);
+                if (ref($mixed_named{$selected}) eq 'ARRAY') {
+                    foreach my $item (@{$mixed_named{$selected}}) {
+                        $r->print('<input type="hidden" name="mixed_'.$item.'" value="'.&escape($selected).'" />'.$/);
+                    }
+                }
+            }
             $r->print('<div class="LC_error">'.&mt("Internal error").'</div>');
             return;
         }
         my %already_seen;
-        my (@Problems,$show_named);
-        unless (&Apache::loncommon::needs_gci_custom()) {
-            unless ($env{'form.anonymized'} eq 'true') {
-                $show_named = 1;
-            }
-        }
+        my (@Problems,@anonProbs,@namedProbs,$show_named);
         foreach my $symb (@Symbs) {
             my $resource = $navmap->getBySymb($symb);
-            push(@Problems,$resource);
+            my ($hasanon,$hasnamed);
+            if (ref($resource)) {
+                foreach my $partid (@{$resource->parts}) {
+                    if (($anoncounter{$symb."\0".$partid}) || ($resource->is_anonsurvey($partid))) {
+                        unless (exists($mixed_named{$symb})) {
+                            $hasanon = 1;
+                        }
+                    } else {
+                        $hasnamed = 1;
+                    }
+                }
+                if ($hasanon) {
+                    push(@anonProbs,$resource);
+                } elsif ($hasnamed) {
+                    push(@namedProbs,$resource);
+                }
+            }
+        }
+        if (@namedProbs > 0) {
+            @Problems = @namedProbs;
+            $show_named = 1;
+        } elsif (@anonProbs > 0) {
+            @Problems = @anonProbs;
+        } 
+        foreach my $selected (@Symbs) {
+            $r->print('<input type="hidden" name="problemchoice" value="'.
+                      &escape($selected).'" />'.$/);
+            if (ref($mixed_named{$selected}) eq 'ARRAY') {
+                foreach my $item (@{$mixed_named{$selected}}) {
+                    $r->print('<input type="hidden" name="mixed_'.$item.'" value="'.&escape($selected).'" />'.$/);
+                }
+            }
         }
         # 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 =
@@ -154,17 +196,13 @@ sub BuildStudentSubmissionsPage {
                 $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');
+            $r->print(&mt('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>'));
+            $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 a Domain Coordinator if you need the threshold to be changed for this course.'));
         } else {
             if (scalar(@Problems) == 1) {
                 my $resource = $Problems[0];
@@ -176,11 +214,11 @@ sub BuildStudentSubmissionsPage {
                 }
             }
             if ($env{'form.output'} eq 'excel') {
-                &prepare_excel_output($r,\@Problems,\@Students,$show_named);
+                &prepare_excel_output($r,\@Problems,\@Students,\%anoncounter,$show_named);
             } elsif ($env{'form.output'} eq 'csv') {
-                &prepare_csv_output($r,\@Problems,\@Students,$show_named);
+                &prepare_csv_output($r,\@Problems,\@Students,\%anoncounter,$show_named);
             } else {
-                &prepare_html_output($r,\@Problems,\@Students,$show_named);
+                &prepare_html_output($r,\@Problems,\@Students,\%anoncounter,$show_named);
             }
         }
         $r->print('<hr />');
@@ -189,13 +227,13 @@ sub BuildStudentSubmissionsPage {
                   &mt('Prepare Report').'" />');
         $r->print('&nbsp;'x5);
         $r->print('<p>'.
-                  &mt('Computing correct answers greatly increasese the amount of time required to prepare a report.').
+                  &mt('Computing correct answers greatly increases the amount of time required to prepare a report.').
                   '</p>');
         $r->print('<p>'.
                   &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'));
+                  (undef,'problemchoice','Statistics',\%anoncounter));
     }
 }
 
@@ -216,7 +254,6 @@ sub array_shuffle {
 ##
 ## get_extra_response_headers
 ##
-
 sub get_extra_response_headers {
     my ($show_named) = @_;
     my @extra_resp_headers;
@@ -274,9 +311,8 @@ sub get_headers {
 #########################################################
 #########################################################
 sub prepare_html_output {
-    my ($r,$problems,$students,$show_named) = @_;
+    my ($r,$problems,$students,$anoncounter,$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;
@@ -289,38 +325,37 @@ sub prepare_html_output {
     my @extra_resp_headers = &get_extra_response_headers($show_named);
     #
     # Create the table header
-    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 @student_columns = &get_student_columns($show_named);
     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>';
+    foreach my $field (@student_columns) {
+        $headers{'student'}.= '<th>'.ucfirst($field).'</th>';
     }
     #
     # we put the headers into the %headers hash
-    my $total_col = scalar(@student_columns);
+    my $total_col = $student_column_count;
     my $nonempty_part_headers = 0;
     #
     my %problem_analysis;
     foreach my $prob (@$problems) {
         my %analysis = &Apache::lonstathelpers::get_problem_data($prob->src);
         $problem_analysis{$prob->src}=\%analysis;
+        my $symb = $prob->symb();
         #
         my $prob_span = 0;
         my $single_part = 0;
         if (scalar(@{$prob->parts}) == 1) {
             $single_part = 1;
         }
+        my $shown_parts = 0;
         foreach my $partid (@{$prob->parts}) {
+            if (($prob->is_anonsurvey($partid)) || ($anoncounter->{$symb."\0".$partid})) {
+                next if ($show_named);
+            } else {
+                next unless ($show_named);
+            }
+            $shown_parts ++;
             my $part_span = 0;
             my $responses = [$prob->responseIds($partid)];
             my $resptypes = [$prob->responseType($partid)];
@@ -361,10 +396,8 @@ sub prepare_html_output {
             }
             $prob_span += $part_span;
         }
+        next if (!$shown_parts);
         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) {
@@ -414,11 +447,7 @@ sub prepare_html_output {
                 $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>';
+            $student_row_data = '<td valign="top" colspan="'.$student_column_count.'">'.&mt('Anonymized').'</td>';
         }
         #
         # Figure out what it is we need to output for this student
@@ -426,8 +455,14 @@ sub prepare_html_output {
         my %prob_data;
         my $maxrow;
         foreach my $prob (@$problems) {
-            $prob_data{$prob->symb}={};
+            my $symb = $prob->symb;
+            $prob_data{$symb}={};
             foreach my $partid (@{$prob->parts}) {
+                if (($prob->is_anonsurvey($partid)) || ($anoncounter->{$symb."\0".$partid})) {
+                    next if ($show_named);
+                } else {
+                    next unless ($show_named);
+                }
                 my @responses = $prob->responseIds($partid);
                 my @response_type = $prob->responseType($partid);
                 for (my $i=0;$i<=$#responses;$i++) {
@@ -717,20 +752,26 @@ sub html_non_essay_results {
 #########################################################
 #########################################################
 sub prepare_excel_output {
-    my ($r,$Problems,$Students,$show_named) = @_;
+    my ($r,$Problems,$Students,$anoncounter,$show_named) = @_;
     my $c = $r->connection();
-    my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
     #
     #
     # Determine the number of columns in the spreadsheet
     my $columncount = 3; # username, domain, id
-    my @extra_resp_headers = &get_extra_response_headers();
+    my @extra_resp_headers = &get_extra_response_headers($show_named);
     my $lastprob;
     my %problem_analysis;
     foreach my $prob (@$Problems) {
+        my $symb = $prob->symb();
         my %analysis = &Apache::lonstathelpers::get_problem_data($prob->src);
         $problem_analysis{$prob->src}=\%analysis;
         foreach my $partid (@{$prob->parts}) {
+            if (($prob->is_anonsurvey($partid)) || ($anoncounter->{$symb."\0".$partid})) {
+                next if ($show_named);
+            } else {
+                next unless ($show_named);
+            }
+
             my $responses = [$prob->responseIds($partid)];
             my $resptypes = [$prob->responseType($partid)];
             for (my $i=0;$i<scalar(@$responses);$i++) {
@@ -748,8 +789,10 @@ sub prepare_excel_output {
     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>');
+                  '<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>'.$/);
+        if (ref($lastprob)) {
+            $r->print('<p>'.&mt('The last problem that will fit in the current spreadsheet is [_1].',$lastprob->compTitle).'</p>');
+        }
         $r->rflush();
         return;
     }
@@ -788,26 +831,24 @@ 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;
-    if ($show_named) {
-        @StudentColumns = qw(username domain id section);
-    } else {
-        @StudentColumns = qw(username);
-    }
-    foreach (@StudentColumns) {
-        $worksheet->write($header_row,$cols_output++,ucfirst($_),
+    my @StudentColumns = &get_student_columns($show_named);
+    foreach my $field (@StudentColumns) {
+        $worksheet->write($header_row,$cols_output++,ucfirst($field),
                           $format->{'bold'});
     }
     # Problem headers
     my %start_col;
     foreach my $prob (@$Problems) {
         my $title = $prob->compTitle;
-        unless (&Apache::loncommon::needs_gci_custom()) {
-            ($title) = ($prob->src =~ m{/([^/]+)$});
-        }
+        my $symb = $prob->symb();
         $worksheet->write($title_row,$cols_output,
                           $title,$format->{'h3'});
         foreach my $partid (@{$prob->parts}) {
+            if (($prob->is_anonsurvey($partid)) || ($anoncounter->{$symb."\0".$partid})) {
+                next if ($show_named);
+            } else {
+                next unless ($show_named);
+            }
             $worksheet->write($partid_row,$cols_output,
                               $prob->part_display($partid));
             my $responses = [$prob->responseIds($partid)];
@@ -843,11 +884,14 @@ sub prepare_excel_output {
         last if ($c->aborted());
         $cols_output = 0;
         my $student_row = $max_row;
-        my $anonid = &Crypt::PasswdMD5::unix_md5_crypt($student->{'username'},
-                                                       $salt);
-        $anonid = substr($anonid,length($salt)+1);
         foreach my $prob (@$Problems) {
+            my $symb = $prob->symb();
             foreach my $partid (@{$prob->parts}) {
+                if (($prob->is_anonsurvey($partid)) || ($anoncounter->{$symb."\0".$partid})) {
+                    next if ($show_named);
+                } else {
+                    next unless ($show_named);
+                }
                 my @Response = $prob->responseIds($partid);
                 my @ResponseType = $prob->responseType($partid);
                 for (my $i=0;$i<=$#Response;$i++) {
@@ -894,16 +938,20 @@ sub prepare_excel_output {
                 }
             }
         }
-        # Fill in the remaining rows with the students data
+        # Prepend current student's user information to all rows  
         for (my $row = $student_row;$row<$max_row;$row++) {
             my $cols = 0;
             foreach my $field (@StudentColumns) {
                 if ($show_named) {
-                    $worksheet->write($row,$cols++,
-                                      $student->{$field});
+                    my $value = $student->{$field};
+                    if ($field eq 'comments') {
+                        $value = &Apache::lonmsgdisplay::retrieve_instructor_comments
+                                 ($student->{'username'},$student->{'domain'});
+                    }
+                    $worksheet->write($row,$cols++,$value);
                 } else {
                     $worksheet->write($row,$cols++,
-                                      $anonid);
+                                      &mt('Anonymized'));
                 }
             }
         }
@@ -1014,9 +1062,8 @@ sub excel_format_item {
 #########################################################
 #########################################################
 sub prepare_csv_output {
-    my ($r,$problems,$students,$show_named) = @_;
+    my ($r,$problems,$students,$anoncounter,$show_named) = @_;
     my $c = $r->connection();
-    my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
     #
     $r->print('<h2>'.
               &mt('Generating CSV report of student responses').'</h2>');
@@ -1036,11 +1083,13 @@ 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('<div class="LC_error">'
-                 .&mt('Problems occurred in writing the CSV file. '
-                     .'This error has been logged. '
-                     .'Please alert your LON-CAPA administrator.')
-                 .'</div>');
+        $r->print(
+            '<p class="LC_error">'
+           .&mt('Problems occurred in writing the CSV file.')
+           .' '.&mt('This error has been logged.')
+           .' '.&mt('Please alert your LON-CAPA administrator.')
+           .'</p>'
+        );
         $outputfile = undef;
     }
     #
@@ -1048,12 +1097,8 @@ sub prepare_csv_output {
     my @extra_resp_headers = &get_extra_response_headers($show_named);
     #
     # Create the table header
-    my @student_columns;
-    if ($show_named) {
-        @student_columns = qw(username domain id section);
-    } else {
-        @student_columns = qw(username);
-    }
+    my @student_columns = &get_student_columns($show_named);
+    my $student_column_count = scalar(@student_columns);
     #
     my %headers;
     push(@{$headers{'student'}},@student_columns);
@@ -1065,16 +1110,18 @@ sub prepare_csv_output {
     # we put the headers into the %headers hash
     my %problem_analysis;
     my %start_col;
-    my $max_column = scalar(@student_columns);
+    my $max_column = $student_column_count;
     foreach my $prob (@$problems) {
+        my $symb = $prob->symb();
         my %analysis = &Apache::lonstathelpers::get_problem_data($prob->src);
         $problem_analysis{$prob->src}=\%analysis;
-        my $title = $prob->compTitle;
-        unless (&Apache::loncommon::needs_gci_custom()) {
-            ($title) = ($prob->src =~ m{/([^/]+)$});
-        }
-        $headers{'problem'}->[$max_column] = $title;
+        $headers{'problem'}->[$max_column] = $prob->compTitle;
         foreach my $partid (@{$prob->parts}) {
+            if (($prob->is_anonsurvey($partid)) || ($anoncounter->{$symb."\0".$partid})) {
+                next if ($show_named);
+            } else {
+                next unless ($show_named);
+            }
             $headers{'part'}->[$max_column] = $prob->part_display($partid);
             my $responses = [$prob->responseIds($partid)];
             my $resptypes = [$prob->responseType($partid)];
@@ -1106,12 +1153,15 @@ 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) {
+            my $symb = $prob->symb;
             foreach my $partid (@{$prob->parts}) {
+                if (($prob->is_anonsurvey($partid)) || ($anoncounter->{$symb."\0".$partid})) {
+                    next if ($show_named); 
+                } else {
+                    next unless ($show_named);
+                }
                 my @responses = $prob->responseIds($partid);
                 my @response_type = $prob->responseType($partid);
                 for (my $i=0;$i<=$#responses;$i++) {
@@ -1151,14 +1201,20 @@ sub prepare_csv_output {
         foreach my $row (@rows) {
             my $student_row_data = '';
             if ($show_named) {
-                $student_row_data = '"'.join('","',
-                                        map { $student->{$_}; }
-                                        @student_columns).'"';
+                foreach my $field (@student_columns) {
+                    my $value = $student->{$field};
+                    if ($field eq 'comments') {
+                        $value = &Apache::lonmsgdisplay::retrieve_instructor_comments
+                                 ($student->{'username'},$student->{'domain'});
+                    }
+                    $student_row_data .= '"'.&Apache::loncommon::csv_translate($value).'",';
+                }
+                $student_row_data =~ s/,$//;
             } else {
-                $student_row_data = '"'.$anonid.'"';
+                $student_row_data = '"'.&mt('Anonymized').'"';
             }
             print $outputfile $student_row_data;
-            for (my $i=scalar(@student_columns);$i<$max_column;$i++) {
+            for (my $i=$student_column_count;$i<$max_column;$i++) {
                 my $value = &Apache::loncommon::csv_translate($row->[$i]);
                 $value ||='';
                 print $outputfile ',"'.$value.'"';
@@ -1204,7 +1260,7 @@ sub CreateInterface {
     foreach ('HTML','Excel','CSV') {
         $output_selector .= '    <option value="'.lc($_).'"';
         if ($env{'form.output'} eq lc($_)) {
-            $output_selector .= ' selected="selected" ';
+            $output_selector .= ' selected="selected"';
         }
         $output_selector .='>'.&mt($_).'</option>'.$/;
     } 
@@ -1212,12 +1268,12 @@ sub CreateInterface {
     ##
     ## Environment variable initialization
     my $Str = '';
-    $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('Groups').'</th>';
+    $Str .= '<th>'.&mt('Student Data').&Apache::loncommon::help_open_topic("Chart_Student_Data").'</th>';
     $Str .= '<th>'.&mt('Access Status').'</th>';
     $Str .= '<th>'.&mt('Options').'</th>';
     $Str .= '<th>'.&mt('Output Format').'</th>';
@@ -1232,6 +1288,10 @@ sub CreateInterface {
     $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5);
     $Str .= '</td>';
     #
+    $Str .= '<td align="center">'."\n";
+    $Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple', 5,undef);
+    $Str .= '</td>';
+    #
     $Str .= '<td align="center">';
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
     $Str .= '</td>';
@@ -1265,37 +1325,22 @@ sub CreateInterface {
         $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').' '.$prob_checkbox.'</b></label><br />'.
-        '<label><b>'.
-        &mt('Show correct answers').' '.$ans_checkbox.'</b></label><br />'.
-        '<label><b>'.
-        &mt('Show all submissions').' '.$all_sub_checkbox.
-        '</b></label><br />'.
-        '<label><b>'.
-        &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 valign="top">'
+       .'<label>'
+       .$prob_checkbox.&mt('Show problem')
+       .'</label><br />'
+       .'<label>'
+       .' '.$ans_checkbox.&mt('Show correct answers')
+       .'</label><br />'
+       .'<label>'
+       .$all_sub_checkbox.&mt('Show all submissions')
+       .'</label><br />'
+       .'<label>'
+       .$prob_status_checkbox.&mt('Show problem grading')
+       .'</label>'
+       .'</td>';
     #
     $Str .= '<td align="center" valign="top">'.$output_selector.'</td>';
     #
@@ -1311,6 +1356,20 @@ sub CreateInterface {
     return $Str;
 }
 
+sub get_student_columns {
+    my ($show_named) = @_; 
+    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');
+    }
+    return @student_columns;
+} 
+
 1;
 
 __END__