--- loncom/interface/statistics/lonstudentsubmissions.pm 2005/02/03 00:25:01 1.33 +++ loncom/interface/statistics/lonstudentsubmissions.pm 2011/11/18 21:56:19 1.63.2.2 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentsubmissions.pm,v 1.33 2005/02/03 00:25:01 matthew Exp $ +# $Id: lonstudentsubmissions.pm,v 1.63.2.2 2011/11/18 21:56:19 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(); @@ -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,16 +66,22 @@ 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'}) && - ! exists($ENV{'form.SelectAnother'})) { + 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') { $r->print("<br />\n"); @@ -92,44 +101,120 @@ sub BuildStudentSubmissionsPage { # Determine which problems we are to analyze my @Symbs = &Apache::lonstathelpers::get_selected_symbs('problemchoice'); - foreach my $selected (@Symbs) { - $r->print('<input type="hidden" name="problemchoice" value="'. - $selected.'" />'.$/); + + # 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); + } + } + } } # # Get resource objects my $navmap = Apache::lonnavmaps::navmap->new(); if (!defined($navmap)) { - $r->print('<h1>'.&mt("Internal error").'</h1>'); + 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; + 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 = + &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'); + $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 a Domain Coordinator if you need the threshold to be changed for this course.')); } else { if (scalar(@Problems) == 1) { 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') { - &prepare_excel_output($r,\@Problems,\@Students); - } elsif ($ENV{'form.output'} eq 'csv') { - &prepare_csv_output($r,\@Problems,\@Students); + if ($env{'form.output'} eq 'excel') { + &prepare_excel_output($r,\@Problems,\@Students,\%anoncounter,$show_named); + } elsif ($env{'form.output'} eq 'csv') { + &prepare_csv_output($r,\@Problems,\@Students,\%anoncounter,$show_named); } else { - &prepare_html_output($r,\@Problems,\@Students); + &prepare_html_output($r,\@Problems,\@Students,\%anoncounter,$show_named); } } $r->print('<hr />'); @@ -138,29 +223,46 @@ sub BuildStudentSubmissionsPage { &mt('Prepare Report').'" />'); $r->print(' '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 <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')); + (undef,'problemchoice','Statistics',\%anoncounter)); } } +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') { + if ($env{'form.correctans'} eq 'true') { push(@extra_resp_headers,'Correct'); - } - 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 ($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'); + } } return @extra_resp_headers; } @@ -189,6 +291,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); } @@ -203,7 +307,7 @@ sub get_headers { ######################################################### ######################################################### sub prepare_html_output { - my ($r,$problems,$students) = @_; + my ($r,$problems,$students,$anoncounter,$show_named) = @_; my $c = $r->connection(); # # Set a flag for the case when there is just one problem @@ -214,10 +318,18 @@ sub prepare_html_output { } # # Compute the number of columns per response - my @extra_resp_headers = &get_extra_response_headers(); + my @extra_resp_headers = &get_extra_response_headers($show_named); # # Create the table header - my @student_columns = ('username','domain','id'); + 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 %headers; my $student_column_count = scalar(@student_columns); @@ -234,13 +346,21 @@ sub prepare_html_output { 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)]; @@ -257,23 +377,31 @@ 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+$/) { $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 { - $headers{'part'} .= qq{<th colspan="$part_span"> </th>}; + $headers{'part'} .= qq{<th colspan="$part_span"> </th>}; } $prob_span += $part_span; } + next if (!$shown_parts); my $title = $prob->compTitle; if ($prob_span > 0) { $headers{'problem'}.= qq{<th colspan="$prob_span">$title</th>}; @@ -310,9 +438,21 @@ sub prepare_html_output { $count = 0; } last if ($c->aborted()); - foreach my $field (@student_columns) { - $student_row_data .= - '<td valign="top">'.$student->{$field}.'</td>'; + 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 .= + '<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 = '<td valign="top" colspan="'.$student_column_count.'">'.&mt('Anonymized').'</td>'; } # # Figure out what it is we need to output for this student @@ -320,8 +460,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++) { @@ -336,8 +482,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"> </td>}; + $resp_data->{'fake'} = qq{<td colspan="$width"> </td>}; if (! defined($results)) { $results = []; } @@ -346,7 +493,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 +508,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, @@ -420,13 +575,14 @@ sub prepare_html_output { undef(@essays); } } # end of student loop + $r->print('</table>'.$/); return; } 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 +590,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; } @@ -465,7 +634,7 @@ sub html_essay_results { if (defined($respid)) { $id .= ' '.$respid; } - $Str .= '<nobr>'.$id.'</nobr>'.(' 'x4); + $Str .= '<span class="LC_nobreak">'.$id.'</span>'.(' 'x4); } # shift(@$headers); # Get rid of the Submission header @@ -474,11 +643,11 @@ sub html_essay_results { $correct = &html_format_essay_sub($response->{'Correct'}); shift(@$headers); } - $Str .= '<nobr>'. + $Str .= '<span class="LC_nobreak">'. join('', map { (' 'x4).&mt($_.': [_1]',$response->{$_}); - } @$headers).'</nobr>'; + } @$headers).'</span>'; if (@$headers || ! $single_response) { $Str .= '<br />'; } @@ -504,20 +673,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; # @@ -525,14 +708,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'}); } @@ -550,6 +733,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}); @@ -572,19 +757,26 @@ sub html_non_essay_results { ######################################################### ######################################################### sub prepare_excel_output { - my ($r,$Problems,$Students) = @_; + my ($r,$Problems,$Students,$anoncounter,$show_named) = @_; my $c = $r->connection(); # # # 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++) { @@ -602,8 +794,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; } @@ -622,28 +816,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 +836,12 @@ 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; + if ($show_named) { + @StudentColumns = qw(username domain id section); + } else { + @StudentColumns = qw(username); + } foreach (@StudentColumns) { $worksheet->write($header_row,$cols_output++,ucfirst($_), $format->{'bold'}); @@ -664,9 +850,15 @@ sub prepare_excel_output { my %start_col; foreach my $prob (@$Problems) { my $title = $prob->compTitle; + 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)]; @@ -702,13 +894,14 @@ sub prepare_excel_output { last if ($c->aborted()); $cols_output = 0; my $student_row = $max_row; - foreach my $field (@StudentColumns) { - $worksheet->write($student_row,$cols_output++, - $student->{$field}); - } - my $last_student_col = $cols_output-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++) { @@ -732,7 +925,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], @@ -755,15 +948,19 @@ sub prepare_excel_output { } } } - # Fill in the remaining rows with the students data - for (my $row = $student_row+1;$row<=$max_row;$row++) { + # 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) { - $worksheet->write($row,$cols++, - $student->{$field}); + if ($show_named) { + $worksheet->write($row,$cols++, + $student->{$field}); + } else { + $worksheet->write($row,$cols++, + &mt('Anonymized')); + } } } - $rows_output++; &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, 'last student'); } @@ -795,8 +992,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') { @@ -808,14 +1007,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'}); } @@ -869,7 +1068,7 @@ sub excel_format_item { ######################################################### ######################################################### sub prepare_csv_output { - my ($r,$problems,$students) = @_; + my ($r,$problems,$students,$anoncounter,$show_named) = @_; my $c = $r->connection(); # $r->print('<h2>'. @@ -886,21 +1085,31 @@ 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 $!"); - $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; } # # Compute the number of columns per response - my @extra_resp_headers = &get_extra_response_headers(); + my @extra_resp_headers = &get_extra_response_headers($show_named); # # Create the table header - my @student_columns = ('username','domain','id'); + my @student_columns = ('username','domain','id','section'); + if ($show_named) { + @student_columns = qw(username domain id section); + } else { + @student_columns = qw(username); + } + my $student_column_count = scalar(@student_columns); # my %headers; push(@{$headers{'student'}},@student_columns); @@ -914,10 +1123,16 @@ sub prepare_csv_output { my %start_col; my $max_column = scalar(@student_columns); foreach my $prob (@$problems) { + my $symb = $prob->symb(); my %analysis = &Apache::lonstathelpers::get_problem_data($prob->src); $problem_analysis{$prob->src}=\%analysis; $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)]; @@ -951,7 +1166,13 @@ sub prepare_csv_output { last if ($c->aborted()); 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++) { @@ -968,7 +1189,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; @@ -989,10 +1210,16 @@ sub prepare_csv_output { } } foreach my $row (@rows) { - print $outputfile '"'.join('","', - map { $student->{$_}; } - @student_columns).'"'; - for (my $i=scalar(@student_columns);$i<$max_column;$i++) { + my $student_row_data = ''; + if ($show_named) { + $student_row_data = '"'.join('","', + map { $student->{$_}; } + @student_columns).'"'; + } else { + $student_row_data = '"'.&mt('Anonymized').'"'; + } + print $outputfile $student_row_data; + for (my $i=$student_column_count;$i<$max_column;$i++) { my $value = &Apache::loncommon::csv_translate($row->[$i]); $value ||=''; print $outputfile ',"'.$value.'"'; @@ -1008,9 +1235,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; } @@ -1037,8 +1264,8 @@ sub CreateInterface { my $output_selector = $/.'<select name="output">'.$/; foreach ('HTML','Excel','CSV') { $output_selector .= ' <option value="'.lc($_).'"'; - if ($ENV{'form.output'} eq lc($_)) { - $output_selector .= ' selected '; + if ($env{'form.output'} eq lc($_)) { + $output_selector .= ' selected="selected"'; } $output_selector .='>'.&mt($_).'</option>'.$/; } @@ -1046,74 +1273,91 @@ sub CreateInterface { ## ## Environment variable initialization my $Str = ''; - $Str .= &Apache::lonhtmlcommon::breadcrumbs - (undef,'Student Submission Reports'); - $Str .= '<p>'; - $Str .= '<table cellspacing="5">'."\n"; - $Str .= '<tr>'; + $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('Enrollment Status').'</th>'; - $Str .= '<th>'.&mt('Output as [_1]',$output_selector).'</th>'; - $Str .= '</tr>'."\n"; + $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>'; + $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">'."\n"; + $Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple', 5,undef); + $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') { - $prob_checkbox .= 'checked '; + if (exists($env{'form.renderprob'}) && $env{'form.renderprob'} eq 'true') { + $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 '; + if (exists($env{'form.correctans'}) && $env{'form.correctans'} eq 'true') { + $ans_checkbox .= 'checked="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') { - $all_sub_checkbox .= 'checked '; + if (exists($env{'form.all_sub'}) && + $env{'form.all_sub'} eq 'true') { + $all_sub_checkbox .= 'checked="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') { - $prob_status_checkbox .= 'checked '; + if (exists($env{'form.prob_status'}) && + $env{'form.prob_status'} eq 'true') { + $prob_status_checkbox .= 'checked="checked" '; } $prob_status_checkbox .= 'value="true" />'; # - $Str .= '<td align="right" halign="top">'. - '<label><b>'. - &mt('Show problem [_1]',$prob_checkbox).'</b></label><br />'. - '<label><b>'. - &mt('Show correct answers [_1]',$ans_checkbox).'</b></label><br />'. - '<label><b>'. - &mt('Show all submissions [_1]',$all_sub_checkbox). - '</b></label><br />'. - '<label><b>'. - &mt('Show problem grading [_1]',$prob_status_checkbox). - '</b></label><br />'. - '</td>'; - # - $Str .= '</tr>'."\n"; - $Str .= '</table>'."\n"; - # - $Str .= '<nobr>'.&mt('Status: [_1]', - '<input type="text" '. - 'name="stats_status" size="60" value="" />'). - '</nobr>'.'</p>'; + $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>'; + # + $Str .= &Apache::loncommon::end_data_table_row(); + $Str .= &Apache::loncommon::end_data_table(); + # + $Str .= '<p><span class="LC_nobreak">' + .&mt('Status: [_1]', + '<input type="text" name="stats_status"' + .' size="60" value="" readonly="readonly" />') + .'</span></p>'; ## return $Str; }