--- loncom/interface/statistics/lonstudentsubmissions.pm	2005/02/23 01:21:46	1.34
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2006/05/05 20:03:43	1.44
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.34 2005/02/23 01:21:46 matthew Exp $
+# $Id: lonstudentsubmissions.pm,v 1.44 2006/05/05 20:03:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,7 +27,7 @@
 package Apache::lonstudentsubmissions;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
@@ -71,8 +71,8 @@ sub BuildStudentSubmissionsPage {
                                    '<h3>'.&mt('Loading student data').'</h3>');
     $r->rflush();
     #
-    if (exists($ENV{'form.problemchoice'}) && 
-        ! exists($ENV{'form.SelectAnother'})) {
+    if (exists($env{'form.problemchoice'}) && 
+        ! exists($env{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
             if ($button->{'name'} eq 'break') {
                 $r->print("<br />\n");
@@ -110,6 +110,9 @@ sub BuildStudentSubmissionsPage {
             push(@Problems,$resource);
         }
         # 
+        $r->print('<h4>'.
+                  &Apache::lonstatistics::section_and_enrollment_description().
+                  '</h4>');
         if (! scalar(@Problems) || ! defined($Problems[0])) {
             $r->print('resource is undefined');
         } else {
@@ -117,16 +120,14 @@ sub BuildStudentSubmissionsPage {
                 my $resource = $Problems[0];
                 $r->print('<h1>'.$resource->title.'</h1>');
                 $r->print('<h3>'.$resource->src.'</h3>');
-                if ($ENV{'form.renderprob'} eq 'true') {
-                    $r->print(
-                              &Apache::lonstathelpers::render_resource({src => $resource->src})
-                              );
+                if ($env{'form.renderprob'} eq 'true') {
+                    $r->print(&Apache::lonstathelpers::render_resource($resource));
                     $r->rflush();
                 }
             }
-            if ($ENV{'form.output'} eq 'excel') {
+            if ($env{'form.output'} eq 'excel') {
                 &prepare_excel_output($r,\@Problems,\@Students);
-            } elsif ($ENV{'form.output'} eq 'csv') {
+            } elsif ($env{'form.output'} eq 'csv') {
                 &prepare_csv_output($r,\@Problems,\@Students);
             } else {
                 &prepare_html_output($r,\@Problems,\@Students);
@@ -153,10 +154,10 @@ sub BuildStudentSubmissionsPage {
 ##
 sub get_extra_response_headers {
     my @extra_resp_headers;
-    if ($ENV{'form.correctans'} eq 'true') {
+    if ($env{'form.correctans'} eq 'true') {
         push(@extra_resp_headers,'Correct');
     } 
-    if ($ENV{'form.prob_status'} eq 'true') {
+    if ($env{'form.prob_status'} eq 'true') {
         push(@extra_resp_headers,'Award Detail'); 
         push(@extra_resp_headers,'Time');
         push(@extra_resp_headers,'Attempt');
@@ -189,6 +190,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);
     }
@@ -217,7 +220,7 @@ sub prepare_html_output {
     my @extra_resp_headers = &get_extra_response_headers();
     #
     # Create the table header
-    my @student_columns = ('username','domain','id');
+    my @student_columns = ('username','domain','id','section');
     #
     my %headers;
     my $student_column_count = scalar(@student_columns);
@@ -262,11 +265,17 @@ sub prepare_html_output {
                                                           '</nobr></th>';
                 }
             }
+            if ($part_span == 0) {
+                next;
+            }
             if (! $single_part) {
                 my $tmpname = $partid;
                 if ($partid =~/^\d+$/) {
                     $tmpname = $prob->part_display($partid);
                 }
+                if ($tmpname !~ /^part/) {
+                    $tmpname = 'Part '.$tmpname;
+                }
                 $headers{'part'} .= qq{<th colspan="$part_span">$tmpname</th>};
                 $nonempty_part_headers = 1;
             } else {
@@ -336,8 +345,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 = [];
                     }
@@ -346,7 +356,7 @@ sub prepare_html_output {
                         $maxrow = scalar(@$results);
                     }
                     for (my $j=scalar(@$results)-1;$j>=0;$j--) {
-                        if ($ENV{'form.all_sub'} ne 'true') {
+                        if ($env{'form.all_sub'} ne 'true') {
                             next if ($j ne scalar(@$results)-1);
                         }
                         my $response = &hashify_response($results->[$j],
@@ -361,6 +371,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,
@@ -426,7 +444,7 @@ sub prepare_html_output {
 sub hashify_response {
     my ($response,$prob,$student,$partid,$respid) =@_;
     my $resp_hash = {};
-    if ($ENV{'form.correctans'} eq 'true') {
+    if ($env{'form.correctans'} eq 'true') {
         $resp_hash->{'Correct'} = 
             &Apache::lonstathelpers::get_student_answer
             ($prob,$student->{'username'},$student->{'domain'},
@@ -434,14 +452,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;
 }
 
@@ -504,13 +535,27 @@ 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(&Apache::lonnet::unescape($response->{'Submission'})); 
     return '' if (! defined($submission) || $submission eq '');
     $submission =~ s/\\\"/\"/g;
     $submission =~ s/\\\'/\'/g;
@@ -550,6 +595,8 @@ sub html_non_essay_results {
                     $option = $submission{$header};
                 }
                 push(@values,&HTML::Entities::encode($option));
+            } elsif ($original_header eq 'Time') {
+                push(@values,&Apache::lonlocal::locallocaltime($response->{$original_header}));
             } else {
                 # A normal column
                 push(@values,$response->{$original_header});
@@ -622,28 +669,15 @@ sub prepare_excel_output {
     $r->rflush();
     #
     # Create the excel spreadsheet
-    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 ($workbook,$filename,$format) = 
+        &Apache::loncommon::create_workbook($r);
+    return if (! defined($workbook));
     my $worksheet  = $workbook->addworksheet('Student Submission Data');
     #
     # Add headers to the worksheet
     my $rows_output = 0;
     $worksheet->write($rows_output++,0,
-                    $ENV{'course.'.$ENV{'request.course.id'}.'.description'},
+                    $env{'course.'.$env{'request.course.id'}.'.description'},
                       $format->{'h1'});
     $rows_output++;
     my $cols_output = 0;
@@ -655,7 +689,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 = ('username','domain','id');
+    my @StudentColumns = ('username','domain','id','section');
     foreach (@StudentColumns) {
         $worksheet->write($header_row,$cols_output++,ucfirst($_),
                           $format->{'bold'});
@@ -732,7 +766,7 @@ sub prepare_excel_output {
                     my $response_start_col = $start_col{$prob->symb}->{$partid}->{$respid};
                     for (my $j=scalar(@$results)-1;$j>=0;$j--) {
                         $cols_output = $response_start_col;
-                        if ($ENV{'form.all_sub'} ne 'true') {
+                        if ($env{'form.all_sub'} ne 'true') {
                             next if ($j ne scalar(@$results)-1);
                         }
                         my $response = &hashify_response($results->[$j],
@@ -795,7 +829,9 @@ sub compile_response_data {
     my $submission = 
         &HTML::Entities::decode
         (&Apache::lonnet::unescape($response->{'Submission'}));
-    return () if (! defined($submission) || $submission eq '');
+    if (!$prob->is_task()) {
+	return () if (! defined($submission) || $submission eq '');
+    }
     $submission =~ s/\\\"/\"/g;
     $submission =~ s/\\\'/\'/g;
     if ($resptype eq 'radiobutton') {
@@ -885,7 +921,7 @@ sub prepare_csv_output {
     # Open a file
     my $outputfile;
     my $filename = '/prtspool/'.
-        $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+        $env{'user.name'}.'_'.$env{'user.domain'}.'_'.
             time.'_'.rand(1000000000).'.csv';
     unless ($outputfile = Apache::File->new('>/home/httpd'.$filename)) {
         $r->log_error("Couldn't open $filename for output $!");
@@ -899,7 +935,7 @@ sub prepare_csv_output {
     my @extra_resp_headers = &get_extra_response_headers();
     #
     # Create the table header
-    my @student_columns = ('username','domain','id');
+    my @student_columns = ('username','domain','id','section');
     #
     my %headers;
     push(@{$headers{'student'}},@student_columns);
@@ -967,7 +1003,7 @@ sub prepare_csv_output {
                         $results = [];
                     }
                     for (my $j=0; $j<scalar(@$results);$j++) {
-                        if ($ENV{'form.all_sub'} ne 'true') {
+                        if ($env{'form.all_sub'} ne 'true') {
                             next if ($j != 0);
                         }
                         my $idx = scalar(@$results) - $j - 1;
@@ -1036,7 +1072,7 @@ sub CreateInterface {
     my $output_selector = $/.'<select name="output">'.$/;
     foreach ('HTML','Excel','CSV') {
         $output_selector .= '    <option value="'.lc($_).'"';
-        if ($ENV{'form.output'} eq lc($_)) {
+        if ($env{'form.output'} eq lc($_)) {
             $output_selector .= ' selected ';
         }
         $output_selector .='>'.&mt($_).'</option>'.$/;
@@ -1045,12 +1081,12 @@ sub CreateInterface {
     ##
     ## Environment variable initialization
     my $Str = '';
-    $Str .= &Apache::lonhtmlcommon::breadcrumbs
-        (undef,'Student Submission Reports');
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports');
     $Str .= '<p>';
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<th>'.&mt('Sections').'</th>';
+    $Str .= '<th>'.&mt('Groups').'</th>';
     $Str .= '<th>'.&mt('Enrollment Status').'</th>';
     $Str .= '<th>'.&mt('Output as [_1]',$output_selector).'</th>';
     $Str .= '</tr>'."\n";
@@ -1059,41 +1095,45 @@ sub CreateInterface {
     $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>';
     #
     # Render problem checkbox
     my $prob_checkbox = '<input type="checkbox" name="renderprob" ';
-    if (exists($ENV{'form.renderprob'}) && $ENV{'form.renderprob'} eq 'true') {
+    if (exists($env{'form.renderprob'}) && $env{'form.renderprob'} eq 'true') {
         $prob_checkbox .= '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') {
+    if (exists($env{'form.correctans'}) && $env{'form.correctans'} eq 'true') {
         $ans_checkbox .= 'checked ';
     }
     $ans_checkbox .= 'value="true" />';
     #
     # 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') {
+    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') {
+    if (exists($env{'form.prob_status'}) && 
+        $env{'form.prob_status'} eq 'true') {
         $prob_status_checkbox .= 'checked ';
     }
     $prob_status_checkbox .= 'value="true" />';
     #
-    $Str .= '<td align="right" halign="top">'.
+    $Str .= '<td align="right" valign="top">'.
         '<label><b>'.
         &mt('Show problem [_1]',$prob_checkbox).'</b></label><br />'.
         '<label><b>'.
@@ -1109,7 +1149,7 @@ sub CreateInterface {
     $Str .= '</tr>'."\n";
     $Str .= '</table>'."\n";
     #
-    $Str .= '<nobr>'.&mt('Status: [_1]',
+    $Str .= '<p><nobr>'.&mt('Status: [_1]',
                          '<input type="text" '.
                          'name="stats_status" size="60" value="" />').
             '</nobr>'.'</p>';