--- loncom/interface/statistics/lonstudentsubmissions.pm	2009/04/21 13:28:23	1.54
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2010/04/12 16:28:22	1.59
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.54 2009/04/21 13:28:23 bisitz Exp $
+# $Id: lonstudentsubmissions.pm,v 1.59 2010/04/12 16:28:22 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -225,7 +225,12 @@ sub prepare_html_output {
     my @extra_resp_headers = &get_extra_response_headers();
     #
     # Create the table header
-    my @student_columns = ('username','domain','id','section');
+    my @student_columns = @Apache::lonstatistics::SelectedStudentData;
+    foreach (@student_columns) {
+        if($_ eq 'all') {
+            @student_columns = ('fullname','username','domain','id','section','status','groups','comments');
+        }
+    }
     #
     my %headers;
     my $student_column_count = scalar(@student_columns);
@@ -326,8 +331,16 @@ sub prepare_html_output {
         }
         last if ($c->aborted());
         foreach my $field (@student_columns) {
-            $student_row_data .= 
-                '<td valign="top">'.$student->{$field}.'</td>';
+            $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>';
         }
         #
         # Figure out what it is we need to output for this student
@@ -444,6 +457,7 @@ sub prepare_html_output {
             undef(@essays);
         }
     } # end of student loop
+    $r->print('</table>'.$/);
     return;
 }
 
@@ -931,11 +945,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;
     }
     #
@@ -1081,7 +1097,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>'.$/;
     } 
@@ -1090,11 +1106,12 @@ sub CreateInterface {
     ## Environment variable initialization
     my $Str = '';
     $Str .= &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports');
-    $Str .= '<p>';
+    $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>';
@@ -1109,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>';
@@ -1143,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>';
     #
@@ -1166,7 +1190,6 @@ sub CreateInterface {
                     '<input type="text" name="stats_status"'
                    .' size="60" value="" readonly="readonly" />')
            .'</span></p>';
-    $Str .= '</p>';
     ##
     return $Str;
 }