--- loncom/interface/statistics/lonstudentsubmissions.pm	2010/09/11 19:08:22	1.54.10.1
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2010/04/12 16:19:34	1.58
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.54.10.1 2010/09/11 19:08:22 raeburn Exp $
+# $Id: lonstudentsubmissions.pm,v 1.58 2010/04/12 16:19:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,6 @@ use Apache::lonstathelpers;
 use HTML::Entities();
 use Time::Local();
 use Spreadsheet::WriteExcel();
-use Crypt::PasswdMD5;
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
   
@@ -110,40 +109,17 @@ sub BuildStudentSubmissionsPage {
             return;
         }
         my %already_seen;
-        my (@Problems,$show_named);
-        unless (&Apache::loncommon::needs_gci_custom()) {
-            $show_named = 1;  
-        }
+        my @Problems;
         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;
-            }
-        }
         # 
         $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 a Domain Coordinator if you need the threshold to be changed for this course.'));
         } else {
             if (scalar(@Problems) == 1) {
                 my $resource = $Problems[0];
@@ -155,11 +131,11 @@ sub BuildStudentSubmissionsPage {
                 }
             }
             if ($env{'form.output'} eq 'excel') {
-                &prepare_excel_output($r,\@Problems,\@Students,$show_named);
+                &prepare_excel_output($r,\@Problems,\@Students);
             } elsif ($env{'form.output'} eq 'csv') {
-                &prepare_csv_output($r,\@Problems,\@Students,$show_named);
+                &prepare_csv_output($r,\@Problems,\@Students);
             } else {
-                &prepare_html_output($r,\@Problems,\@Students,$show_named);
+                &prepare_html_output($r,\@Problems,\@Students);
             }
         }
         $r->print('<hr />');
@@ -178,37 +154,19 @@ sub BuildStudentSubmissionsPage {
     }
 }
 
-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 ($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');
-        }
+    } 
+    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;
 }
@@ -253,9 +211,8 @@ sub get_headers {
 #########################################################
 #########################################################
 sub prepare_html_output {
-    my ($r,$problems,$students,$show_named) = @_;
+    my ($r,$problems,$students) = @_;
     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;
@@ -265,17 +222,14 @@ sub prepare_html_output {
     }
     #
     # Compute the number of columns per response
-    my @extra_resp_headers = &get_extra_response_headers($show_named);
+    my @extra_resp_headers = &get_extra_response_headers();
     #
     # 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);
+    my @student_columns = @Apache::lonstatistics::SelectedStudentData;
+    foreach (@student_columns) {
+        if($_ eq 'all') {
+            @student_columns = ('fullname','username','domain','id','section','status','groups','comments');
         }
-    } else {
-        @student_columns = ('username');
     }
     #
     my %headers;
@@ -376,25 +330,17 @@ sub prepare_html_output {
             $count = 0;
         }
         last if ($c->aborted());
-        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 .= 
+        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 {
+                $student_row_data .= $student->{$field};
             }
-        } 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>';
         }
         #
         # Figure out what it is we need to output for this student
@@ -693,9 +639,8 @@ sub html_non_essay_results {
 #########################################################
 #########################################################
 sub prepare_excel_output {
-    my ($r,$Problems,$Students,$show_named) = @_;
+    my ($r,$Problems,$Students) = @_;
     my $c = $r->connection();
-    my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
     #
     #
     # Determine the number of columns in the spreadsheet
@@ -764,16 +709,7 @@ 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($_),
-                          $format->{'bold'});
-    }
+    my @StudentColumns = ('username','domain','id','section');
     foreach (@StudentColumns) {
         $worksheet->write($header_row,$cols_output++,ucfirst($_),
                           $format->{'bold'});
@@ -820,17 +756,9 @@ 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 $field (@StudentColumns) {
-            if ($show_named) {
-                $worksheet->write($student_row,$cols_output++,
-                                  $student->{$field});
-            } else {
-                $worksheet->write($student_row,$cols_output++,
-                                      $anonid);
-            }
+            $worksheet->write($student_row,$cols_output++,
+                              $student->{$field});
         }
         my $last_student_col = $cols_output-1;
         foreach my $prob (@$Problems) {
@@ -885,13 +813,8 @@ sub prepare_excel_output {
         for (my $row = $student_row+1;$row<$max_row;$row++) {
             my $cols = 0;
             foreach my $field (@StudentColumns) {
-                if ($show_named) {
-                    $worksheet->write($row,$cols++,
-                                      $student->{$field});
-                } else {
-                    $worksheet->write($row,$cols++,
-                                      $anonid);
-                }
+                $worksheet->write($row,$cols++,
+                                  $student->{$field});
             }
         }
         &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
@@ -1001,9 +924,8 @@ sub excel_format_item {
 #########################################################
 #########################################################
 sub prepare_csv_output {
-    my ($r,$problems,$students,$show_named) = @_;
+    my ($r,$problems,$students) = @_;
     my $c = $r->connection();
-    my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
     #
     $r->print('<h2>'.
               &mt('Generating CSV report of student responses').'</h2>');
@@ -1023,24 +945,21 @@ 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;
     }
     #
     # Compute the number of columns per response
-    my @extra_resp_headers = &get_extra_response_headers($show_named);
+    my @extra_resp_headers = &get_extra_response_headers();
     #
     # 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 = ('username','domain','id','section');
     #
     my %headers;
     push(@{$headers{'student'}},@student_columns);
@@ -1089,9 +1008,6 @@ 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}) {
@@ -1132,15 +1048,9 @@ sub prepare_csv_output {
             }
         }
         foreach my $row (@rows) {
-            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;
+            print $outputfile '"'.join('","',
+                                       map { $student->{$_}; }
+                                       @student_columns).'"';
             for (my $i=scalar(@student_columns);$i<$max_column;$i++) {
                 my $value = &Apache::loncommon::csv_translate($row->[$i]);
                 $value ||='';
@@ -1187,7 +1097,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 ';
         }
         $output_selector .='>'.&mt($_).'</option>'.$/;
     } 
@@ -1196,11 +1106,12 @@ sub CreateInterface {
     ## Environment variable initialization
     my $Str = '';
     $Str .= &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports');
-    $Str .= '<br />';
+    $Str .= '<p>';
     $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>';
@@ -1215,6 +1126,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>';
@@ -1249,18 +1164,21 @@ sub CreateInterface {
     }
     $prob_status_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 />'.
-        '</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>';
     #
@@ -1272,6 +1190,7 @@ sub CreateInterface {
                     '<input type="text" name="stats_status"'
                    .' size="60" value="" readonly="readonly" />')
            .'</span></p>';
+    $Str .= '</p>';
     ##
     return $Str;
 }