--- loncom/interface/statistics/lonstudentsubmissions.pm	2005/04/07 06:56:24	1.40
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2009/12/16 13:01:01	1.55
@@ -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.55 2009/12/16 13:01:01 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,9 @@ use Apache::lonstathelpers;
 use HTML::Entities();
 use Time::Local();
 use Spreadsheet::WriteExcel();
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+  
 
 my @SubmitButtons = ({ name => 'SelectAnother',
                        text => 'Choose a different Problem' },
@@ -63,12 +66,14 @@ 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'}) && 
@@ -100,7 +105,7 @@ sub BuildStudentSubmissionsPage {
         # 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;
@@ -142,7 +147,7 @@ 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'));
@@ -190,6 +195,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);
     }
@@ -258,11 +265,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,7 +285,7 @@ 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;
         }
@@ -340,8 +351,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 +377,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,
@@ -438,14 +458,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 +502,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 +511,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 +541,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 +576,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'});
         }
@@ -787,8 +834,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 +849,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'});
         }
@@ -882,9 +931,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("Problems occured in writing the csv file.  ".
-                  "This error has been logged.  ".
-                  "Please alert your LON-CAPA administrator.");
+        $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;
     }
     #
@@ -1000,9 +1053,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;
 }
@@ -1038,20 +1091,26 @@ 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 .= &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 +1118,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 +1133,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 +1141,34 @@ 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" />';
     #
     $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).
+        &mt('Show problem grading').' '.$prob_status_checkbox.
         '</b></label><br />'.
         '</td>';
     #
-    $Str .= '</tr>'."\n";
-    $Str .= '</table>'."\n";
+    $Str .= '<td align="center" valign="top">'.$output_selector.'</td>';
+    #
+    $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>';
+    $Str .= '</p>';
     ##
     return $Str;
 }