--- loncom/interface/statistics/lonstudentsubmissions.pm 2004/09/20 19:24:02 1.20 +++ loncom/interface/statistics/lonstudentsubmissions.pm 2005/02/03 00:25:01 1.33 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentsubmissions.pm,v 1.20 2004/09/20 19:24:02 matthew Exp $ +# $Id: lonstudentsubmissions.pm,v 1.33 2005/02/03 00:25:01 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -109,7 +109,7 @@ sub BuildStudentSubmissionsPage { my $resource = $navmap->getBySymb($symb); push(@Problems,$resource); } - # + # if (! scalar(@Problems) || ! defined($Problems[0])) { $r->print('resource is undefined'); } else { @@ -124,7 +124,13 @@ sub BuildStudentSubmissionsPage { $r->rflush(); } } - &new_excel_output($r,\@Problems,\@Students); + if ($ENV{'form.output'} eq 'excel') { + &prepare_excel_output($r,\@Problems,\@Students); + } elsif ($ENV{'form.output'} eq 'csv') { + &prepare_csv_output($r,\@Problems,\@Students); + } else { + &prepare_html_output($r,\@Problems,\@Students); + } } $r->print('
'); } else { @@ -142,22 +148,454 @@ sub BuildStudentSubmissionsPage { } } +## +## get_extra_response_headers +## +sub get_extra_response_headers { + my @extra_resp_headers; + 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'); + } + return @extra_resp_headers; +} + +## +## get_headers: +## return the proper headers for the given response +sub get_headers { + my ($prob,$partid,$respid,$resptype,$analysis,$output,$purpose, + @basic_headers) = @_; + my @headers; + if ($resptype eq 'essay' && $purpose eq 'display' && + ($output eq 'html')) {# || scalar(@{$prob->parts})!=1)) { + @headers = (); + } elsif ($resptype =~ /^(option|match|rank)$/) { + my $prefix = '_'; + if ($purpose eq 'display') { + $prefix = ''; + } + my @foils = + map { + $prefix.$_; + } sort(keys(%{$analysis->{$partid.'.'.$respid}->{'_Foils'}})); + if (scalar(@basic_headers) && $basic_headers[0] eq 'Correct') { + @foils = map { ($_ , $_.' Correct') } @foils; + shift(@basic_headers); # Get rid of 'Correct' + } + @headers = (@foils,@basic_headers); + } else { + @headers = ('Submission',@basic_headers); + } + return @headers; +} + +######################################################### +######################################################### +## +## HTML Output Routines +## ######################################################### ######################################################### +sub prepare_html_output { + my ($r,$problems,$students) = @_; + my $c = $r->connection(); + # + # Set a flag for the case when there is just one problem + my $single_response = 0; + if (scalar(@$problems) == 1 && + $problems->[0]->countResponses == 1) { + $single_response = 1; + } + # + # Compute the number of columns per response + my @extra_resp_headers = &get_extra_response_headers(); + # + # Create the table header + my @student_columns = ('username','domain','id'); + # + my %headers; + my $student_column_count = scalar(@student_columns); + $headers{'problem'} = qq{\ }; + foreach (@student_columns) { + $headers{'student'}.= ''.ucfirst($_).''; + } + # + # we put the headers into the %headers hash + my $total_col = scalar(@student_columns); + my $nonempty_part_headers = 0; + # + my %problem_analysis; + foreach my $prob (@$problems) { + my %analysis = &Apache::lonstathelpers::get_problem_data($prob->src); + $problem_analysis{$prob->src}=\%analysis; + # + my $prob_span = 0; + my $single_part = 0; + if (scalar(@{$prob->parts}) == 1) { + $single_part = 1; + } + foreach my $partid (@{$prob->parts}) { + my $part_span = 0; + my $responses = [$prob->responseIds($partid)]; + my $resptypes = [$prob->responseType($partid)]; + for (my $i=0;$i[$i]; + my @headers = &get_headers($prob,$partid,$respid, + $resptypes->[$i], + $problem_analysis{$prob->src}, + 'html','display', + @extra_resp_headers); + if (scalar(@headers)>0) { + $total_col += scalar(@headers); + $part_span += scalar(@headers); + $headers{'response'} .= + ''. + &mt('Response [_1]',$responses->[$i]).''; + $headers{'student'}.= ''.join('', + @headers). + ''; + } + } + if (! $single_part) { + my $tmpname = $partid; + if ($partid =~/^\d+$/) { + $tmpname = $prob->part_display($partid); + } + $headers{'part'} .= qq{$tmpname}; + $nonempty_part_headers = 1; + } else { + $headers{'part'} .= qq{ }; + } + $prob_span += $part_span; + } + my $title = $prob->compTitle; + if ($prob_span > 0) { + $headers{'problem'}.= qq{$title}; + } elsif ($single_response) { + $prob_span = scalar(@student_columns); + $headers{'problem'} = qq{$title}; + } + } + if (exists($headers{'part'})) { + $headers{'part'} = qq{\ }. + $headers{'part'}; + } + if (exists($headers{'response'})) { + $headers{'response'}= + qq{\ }. + $headers{'response'}; + } + my $full_header = $/.''.$/; + $full_header .= ''.$headers{'problem'}.''.$/; + if ($nonempty_part_headers) { + $full_header .= ''.$headers{'part'}.''.$/; + } + $full_header .= ''.$headers{'response'}.''.$/; + $full_header .= ''.$headers{'student'}.''.$/; + # + # Main loop + my $count; + $r->print($/.$full_header.$/); + my $row_class = 'odd'; # css + foreach my $student (@$students) { + my $student_row_data; + if ($count++ >= 30) { + $r->print('
'.$/.$full_header.$/); + $count = 0; + } + last if ($c->aborted()); + foreach my $field (@student_columns) { + $student_row_data .= + ''.$student->{$field}.''; + } + # + # Figure out what it is we need to output for this student + my @essays; + my %prob_data; + my $maxrow; + foreach my $prob (@$problems) { + $prob_data{$prob->symb}={}; + foreach my $partid (@{$prob->parts}) { + my @responses = $prob->responseIds($partid); + my @response_type = $prob->responseType($partid); + for (my $i=0;$i<=$#responses;$i++) { + my $respid = $responses[$i]; + my $results = + &Apache::loncoursedata::get_response_data_by_student + ($student,$prob->symb(),$respid); + my $resptype = $response_type[$i]; + my @headers = &get_headers($prob,$partid,$respid, + $resptype, + $problem_analysis{$prob->src}, + 'html','normal', + @extra_resp_headers); + my $width = scalar(@headers); + my $resp_data; + $resp_data->{'fake'} = qq{ }; + if (! defined($results)) { + $results = []; + } + # + if (scalar(@$results) > $maxrow && $resptype ne 'essay') { + $maxrow = scalar(@$results); + } + for (my $j=scalar(@$results)-1;$j>=0;$j--) { + if ($ENV{'form.all_sub'} ne 'true') { + next if ($j ne scalar(@$results)-1); + } + my $response = &hashify_response($results->[$j], + $prob, + $student, + $partid, + $respid); + if ($resptype eq 'essay') { + push(@essays, + &html_essay_results(\@headers, + $prob,$partid,$respid, + $response, + $single_response). + ''); + } else { + push(@{$resp_data->{'real'}}, + &html_non_essay_results(\@headers, + $prob,$partid,$respid, + $response,$resptype)); + } + } + $prob_data{$prob->symb}->{$partid}->{$respid}=$resp_data; + } # end of $i loop + } # end of partid loop + } # end of prob loop + # + # if there is no data, skip this student. + next if (! $maxrow && ! scalar(@essays)); + # + # Go through the problem data and output a row. + if ($row_class eq 'even') { + $row_class = 'odd'; + } else { + $row_class = 'even'; + } + my $printed_something; + for (my $rows_output = 0;$rows_output<$maxrow;$rows_output++) { + my $html; + my $no_data = 1; + foreach my $prob (@$problems) { + foreach my $partid (@{$prob->parts}) { + my @responses = $prob->responseIds($partid); + my @response_type = $prob->responseType($partid); + for (my $i=0;$i<=$#responses;$i++) { + my $respid = $responses[$i]; + my $resp_data = + $prob_data{$prob->symb}->{$partid}->{$respid}; + next if ($response_type[$i] eq 'essay'); + if (defined($resp_data->{'real'}->[$rows_output])) { + $html .= $resp_data->{'real'}->[$rows_output]; + $no_data = 0; + } else { + $html .= $resp_data->{'fake'}; + } + } + } + } + if (! $no_data) { + $r->print(qq{$student_row_data$html}.$/); + $printed_something=1; + } + } + if (@essays) { + my $tr = qq{}; + my $td = qq{}; + if (! $printed_something) { + $r->print($tr.$student_row_data.''.$/); + } + $r->print($tr.$td. + join(''.$/.$tr.$td,@essays).''.$/); + undef(@essays); + } + } # end of student loop + return; +} -sub new_excel_output { +sub hashify_response { + my ($response,$prob,$student,$partid,$respid) =@_; + my $resp_hash = {}; + if ($ENV{'form.correctans'} eq 'true') { + $resp_hash->{'Correct'} = + &Apache::lonstathelpers::get_student_answer + ($prob,$student->{'username'},$student->{'domain'}, + $partid,$respid); + } + $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()]; + return $resp_hash; +} + +##################################################### +## +## HTML helper routines +## +##################################################### +sub html_essay_results { + my ($headers,$prob,$partid,$respid,$response,$single_response)=@_; + if (! ref($headers) || ref($headers) ne 'ARRAY') { + return ''; + } + # Start of telling them what problem, part, and response + my $Str; + if (! $single_response) { + my $id = $prob->compTitle; + if (defined($partid) && $partid ne '0') { + $id .= ' '.$prob->part_display($partid); + } + if (defined($respid)) { + $id .= ' '.$respid; + } + $Str .= ''.$id.''.(' 'x4); + } + # + shift(@$headers); # Get rid of the Submission header + my $correct = ''; + if ($headers->[0] eq 'Correct') { + $correct = &html_format_essay_sub($response->{'Correct'}); + shift(@$headers); + } + $Str .= ''. + join('', + map { + (' 'x4).&mt($_.': [_1]',$response->{$_}); + } @$headers).''; + if (@$headers || ! $single_response) { + $Str .= '
'; + } + $Str .= &html_format_essay_sub($response->{'Submission'}); + # + if (defined($correct) && $correct !~ /^\s*$/) { + $Str .= '
'.&mt('Correct').''.$correct + } + return $Str; +} + +sub html_format_essay_sub { + my ($submission) = @_; + return '' if (! defined($submission) || $submission eq ''); + $submission = &HTML::Entities::decode($submission); + $submission =~ s/\\\"/\"/g; + $submission =~ s/\\\'/\'/g; + $submission =~ s|\\r\\n|$/|g; + $submission = &HTML::Entities::encode($submission,'<>&"'); + $submission =~ s|$/\s*$/|$/

$/|g; + $submission =~ s|\\||g; + $submission = '

'.$submission.'

'; + return $submission; +} + +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'}); + return '' if (! defined($submission) || $submission eq ''); + $submission =~ s/\\\"/\"/g; + $submission =~ s/\\\'/\'/g; + if ($resptype eq 'radiobutton') { + $submission = &HTML::Entities::encode($submission,'<>&"'); + $submission =~ s/=([^=])$//; + $submission = ''.$submission.''; + } + $response->{'Submission'} = $submission; + # + my @values; + if ($resptype =~ /^(option|match|rank)$/) { + my %submission = + map { + my ($foil,$value) = split('=',&Apache::lonnet::unescape($_)); + ($foil,$value); + } split('&',$response->{'Submission'}); + my %correct; + if (exists($response->{'Correct'})) { + %correct = + map { + my ($foil,$value)=split('=',&Apache::lonnet::unescape($_)); + ($foil,$value); + } split('&',$response->{'Correct'}); + } + # + foreach my $original_header (@$headers) { + if ($original_header =~ /^_/) { + # '_' denotes a foil column + my ($header) = ($original_header =~ m/^_(.*)$/); + my $option = ''; + if ( my ($foil) = ($header =~ /(.*) Correct$/)) { + if (exists($correct{$foil})) { + $option = $correct{$foil}; + } + } elsif (exists($submission{$header})) { + $option = $submission{$header}; + } + push(@values,&HTML::Entities::encode($option)); + } else { + # A normal column + push(@values,$response->{$original_header}); + } + } + } else { + @values = map { $response->{$_}; } @$headers; + } + my $td = ''; + my $str = $td.join(''.$td,@values).''; + return $str; +} + + +######################################################### +######################################################### +## +## Excel Output Routines +## +######################################################### +######################################################### +sub prepare_excel_output { my ($r,$Problems,$Students) = @_; my $c = $r->connection(); # # # Determine the number of columns in the spreadsheet my $columncount = 3; # username, domain, id - my $response_multiplier = 1; - $response_multiplier ++ if ($ENV{'form.correctans'} eq 'true'); - $response_multiplier += 4 if ($ENV{'form.prob_status'} eq 'true'); + my @extra_resp_headers = &get_extra_response_headers(); my $lastprob; + my %problem_analysis; foreach my $prob (@$Problems) { - $columncount += ($response_multiplier * $prob->countResponses); + my %analysis = &Apache::lonstathelpers::get_problem_data($prob->src); + $problem_analysis{$prob->src}=\%analysis; + foreach my $partid (@{$prob->parts}) { + my $responses = [$prob->responseIds($partid)]; + my $resptypes = [$prob->responseType($partid)]; + for (my $i=0;$i[$i], + $resptypes->[$i], + $problem_analysis{$prob->src}, + 'excel','display', + @extra_resp_headers); + $columncount += scalar(@headers); + } + } last if ($columncount > 255); $lastprob = $prob; } @@ -165,7 +603,7 @@ sub new_excel_output { $r->print('

'.&mt('Unable to complete request').'

'.$/. '

'.&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.').'

'.$/. '

'.&mt('Consider selecting fewer problems to generate reports on, or reducing the number of items per problem. Or use HTML or CSV output.').'

'.$/. - '

'.&mt('The last problem that will fit in the current spreadsheet is [_1].',&get_title($lastprob->title,$lastprob->src)).'

'); + '

'.&mt('The last problem that will fit in the current spreadsheet is [_1].',$lastprob->compTitle).'

'); $r->rflush(); return; } @@ -223,29 +661,32 @@ sub new_excel_output { $format->{'bold'}); } # Problem headers + my %start_col; foreach my $prob (@$Problems) { - my $title = &get_title($prob->title,$prob->src); + my $title = $prob->compTitle; $worksheet->write($title_row,$cols_output, $title,$format->{'h3'}); foreach my $partid (@{$prob->parts}) { - $worksheet->write($partid_row,$cols_output,$partid); + $worksheet->write($partid_row,$cols_output, + $prob->part_display($partid)); my $responses = [$prob->responseIds($partid)]; my $resptypes = [$prob->responseType($partid)]; for (my $i=0;$isymb}->{$partid}->{$responses->[$i]}= + $cols_output; $worksheet->write($respid_row,$cols_output, $resptypes->[$i].', '.$responses->[$i]); - $worksheet->write($header_row,$cols_output,'Submission'); - $cols_output++; - if ($ENV{'form.correctans'} eq 'true') { - $worksheet->write($header_row,$cols_output,'Correct'); - $cols_output++; - } - if ($ENV{'form.prob_status'} eq 'true') { - $worksheet->write($header_row,$cols_output++, - 'Award Detail'); - $worksheet->write($header_row,$cols_output++,'Attempt'); - $worksheet->write($header_row,$cols_output++,'Time'); - $worksheet->write($header_row,$cols_output++,'Awarded'); + my @headers = &get_headers($prob,$partid,$responses->[$i], + $resptypes->[$i], + $problem_analysis{$prob->src}, + 'excel','display', + @extra_resp_headers); + foreach my $text (@headers) { + if ($text eq 'Time') { + $worksheet->set_column($cols_output,$cols_output,undef, + $format->{'date'}); + } + $worksheet->write($header_row,$cols_output++,$text); } } } @@ -266,38 +707,47 @@ sub new_excel_output { $student->{$field}); } my $last_student_col = $cols_output-1; - my $response_count; foreach my $prob (@$Problems) { foreach my $partid (@{$prob->parts}) { my @Response = $prob->responseIds($partid); my @ResponseType = $prob->responseType($partid); for (my $i=0;$i<=$#Response;$i++) { - my $response_start_col = $last_student_col + - $response_count * $response_multiplier + 1; - $response_count++; my $respid = $Response[$i]; my $resptype = $ResponseType[$i]; my $results = &Apache::loncoursedata::get_response_data_by_student ($student,$prob->symb(),$respid); + my @headers = &get_headers($prob,$partid,$respid, + $resptype, + $problem_analysis{$prob->src}, + 'excel','normal', + @extra_resp_headers); + if (! defined($results)) { $results = []; } # $rows_output = $student_row; # + my $response_start_col = $start_col{$prob->symb}->{$partid}->{$respid}; for (my $j=scalar(@$results)-1;$j>=0;$j--) { $cols_output = $response_start_col; - my $response = $results->[$j]; if ($ENV{'form.all_sub'} ne 'true') { next if ($j ne scalar(@$results)-1); } - my $cols_output = &write_excel_row - ($worksheet, - $rows_output++,$cols_output, - $response,$student, - $prob,$partid,$respid, - $format,$resptype); + my $response = &hashify_response($results->[$j], + $prob, + $student, + $partid, + $respid); + my @response_data = + &compile_response_data(\@headers,$response, + $prob,$partid,$respid, + $resptype, + \&excel_format_item); + $worksheet->write_row($rows_output++,$cols_output, + \@response_data); + $cols_output+=scalar(@response_data); if ($rows_output > $max_row) { $max_row = $rows_output; } @@ -305,6 +755,14 @@ sub new_excel_output { } } } + # Fill in the remaining rows with the students data + for (my $row = $student_row+1;$row<=$max_row;$row++) { + my $cols = 0; + foreach my $field (@StudentColumns) { + $worksheet->write($row,$cols++, + $student->{$field}); + } + } $rows_output++; &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, 'last student'); @@ -326,362 +784,81 @@ sub new_excel_output { return; } -sub write_excel_row { - my ($worksheet,$row,$col,$response,$student,$prob,$partid,$respid, - $format,$resptype) = @_; - # - my $submission =$response->[&Apache::loncoursedata::RDs_submission()]; - $submission = &excel_format_response($submission,$resptype); - $worksheet->write($row,$col++,$submission); - if ($ENV{'form.correctans'} eq 'true') { - my $correct = &Apache::lonstathelpers::analyze_problem_as_student - ($prob,$student->{'username'},$student->{'domain'}, - $partid,$respid); - $correct =&excel_format_response($correct,$resptype); - $worksheet->write($row,$col++,$correct); - } - if ($ENV{'form.prob_status'} eq 'true') { - $worksheet->write - ($row,$col++, - $response->[&Apache::loncoursedata::RDs_awarddetail()]); - $worksheet->write - ($row,$col++,$response->[&Apache::loncoursedata::RDs_tries()]); - $worksheet->write - ($row,$col++, - &Apache::lonstathelpers::calc_serial - ($response->[&Apache::loncoursedata::RDs_timestamp()]), - $format->{'date'}); - $worksheet->write - ($row,$col++,$response->[&Apache::loncoursedata::RDs_awarded()]); - } - return $col; -} - -sub get_title { - my ($title,$src) = @_; - if ($title eq '') { - ($title) = ($src =~ m|/([^/]+)$|); - } else { - $title =~ s/\:/:/g; - } - return $title; -} - -sub excel_format_response { - my ($answer,$responsetype) = @_; - if ($responsetype eq 'radiobutton') { - $answer =~ s/=([^=])$//; - } elsif ($responsetype =~ /^(option|match)$/) { - $answer = join("\n", - map { - &Apache::lonnet::unescape($_) ; - } sort split('&',$answer) - ); - } - if ($answer =~ m/^=/) { - $answer = ' '.$answer; - } - return $answer; -} - -## -## Currently not used -sub get_problem_data { - my ($r,$Problems) = @_; - # - # Analyze - my %Data; - if (scalar(@$Problems) > 5) { - # progress window - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'Problem Analysis Status', - 'Problem Analysis Progress', - scalar(@$Problems), - 'inline',undef,'Statistics','stats_status'); - foreach my $problem (@$Problems) { - $Data{$problem->symb} = - {&Apache::lonstathelpers::get_problem_data - ($problem->src)}; - &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - 'last problem'); - } - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - } else { - foreach my $problem (@$Problems) { - $Data{$problem->symb} = - {&Apache::lonstathelpers::get_problem_data - ($problem->src)}; - } - } - return \%Data; -} - - -=pod - -######################################################### -######################################################### - -my @DefaultColumns = - ( - {name=>'username', - display=>'Student'}, - {name=>'domain', - display=>'Domain'}, - {name => 'id', - display => 'Id'}, - # FIXME: Probably need to add score - ); - -my @PartColumns = - ( - {name => 'time', - display =>'Time'}, - {name => 'attempt', - display =>'Attempt'}, - {name => 'awarded', - display =>'Award'}, - {name => 'weight', - display =>'Part Weight'}, - {name => 'score', - display =>'Score'}, - ); - -my @ResponseColumns = - ( - {name => 'submission', - display =>'Submission'}, - {name => 'answer', - display =>'Correct Answer'}, - {name => 'awarddetail', - display =>'Awarddetail'}, - ); - -sub get_response_type { - my ($resource,$partid,$respid) = @_; - my $response_type = ''; - for (my $i=0; - $i{'partdata'}->{$partid}->{'ResponseIds'}}); - $i++) { - if($resource->{'partdata'}->{$partid}->{'ResponseIds'}->[$i] eq $respid){ - $response_type = - $resource->{'partdata'}->{$partid}->{'ResponseTypes'}->[$i]; - last; - } - } - return $response_type; -} - - -######################################################### -######################################################### -## -## prepare_html_output -## -######################################################### -######################################################### -sub prepare_html_output { - my ($r,$Problems,$Students) = @_; - my $problem; - my $c = $r->connection(); - my ($resource,$respid,$partid) = ($problem->{'resource'}, - $problem->{'respid'}, - $problem->{'part'}); - # - if ($ENV{'form.correctans'} eq 'true') { - $r->print('

'.&mt('Generating Correct Answers').'

'); - &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students, - 'Statistics', - 'stats_status'); - } - # - $r->print('

'.&mt('Student Responses').'

'); - # - $r->rflush(); - my $response_type = &get_response_type($resource,$partid,$respid); - if (! defined($response_type)) { - $r->print('

'.&mt('Unable to determine response type').'

'); - return; - } - my $count = 0; - my @Columns; - if (exists($ENV{'form.concise'}) && $ENV{'form.concise'} eq 'true') { - foreach (@DefaultColumns) { - if ($_->{'name'} =~ /^(username|domain|id)$/){ - push(@Columns,$_); - } - } - } else { - @Columns = @DefaultColumns; - } - my $header = ''.$/.&html_headers(\@Columns); - if ($response_type eq 'essay') { - $header .= &html_essay_headers(); - } elsif ($response_type eq 'option') { - $header .= &html_option_headers(); - } else { - $header .= &html_generic_headers(); - } - $header = ''.$header.''; - # - $r->print($/.$header.$/); - foreach my $student (@$Students) { - if ($count >= 50) { - $r->print('
'.$/.$header.$/); - $count = 0; +sub compile_response_data { + my ($headers,$response,$prob,$partid,$respid,$resptype,$format) = @_; + if (! ref($headers) || ref($headers) ne 'ARRAY' || ! scalar(@$headers)) { + return (); + } + if (ref($format) ne 'CODE') { + $format = sub { return $_[0]; }; + } + # + my $submission = + &HTML::Entities::decode + (&Apache::lonnet::unescape($response->{'Submission'})); + return () if (! defined($submission) || $submission eq ''); + $submission =~ s/\\\"/\"/g; + $submission =~ s/\\\'/\'/g; + if ($resptype eq 'radiobutton') { + $submission =~ s/=([^=])$//; + } + $response->{'Submission'} = $submission; + # + my @values; + if ($resptype =~ /^(option|match|rank)$/) { + my %submission = + map { + my ($foil,$value) = split('=',&Apache::lonnet::unescape($_)); + ($foil,$value); + } split('&',$response->{'Submission'}); + my %correct; + if (exists($response->{'Correct'})) { + %correct = + map { + my ($foil,$value)=split('=',&Apache::lonnet::unescape($_)); + ($foil,$value); + } split('&',$response->{'Correct'}); } - last if ($c->aborted()); - my $results = &Apache::loncoursedata::get_response_data_by_student - ($student,$resource->{'symb'},$respid); - next if (! defined($results) || ref($results) ne 'ARRAY'); - for (my $i=0;$i[$i]; - if ($ENV{'form.last_sub_only'} eq 'true' && - $i < (scalar(@$results)-1)) { - next; - } - my $data; - $data->{'username'} = $student->{'username'}; - $data->{'domain'} = $student->{'domain'}; - $data->{'id'} = $student->{'id'}; - $data->{'fullname'} = $student->{'fullanem'}; - $data->{'status'} = $student->{'status'}; - $data->{'time'} = &Apache::lonlocal::locallocaltime - ($response->[&Apache::loncoursedata::RDs_timestamp()]); - $data->{'attempt'} = - $response->[&Apache::loncoursedata::RDs_tries()]; - $data->{'awarded'} = - $response->[&Apache::loncoursedata::RDs_awarded()]; - $data->{'awarddetail'} = - $response->[&Apache::loncoursedata::RDs_awarddetail()]; - $data->{'weight'} = &Apache::lonnet::EXT - ('resource.'.$partid.'.weight',$resource->{'symb'}, - undef,undef,undef); - $data->{'score'} = $data->{'weight'} * $data->{'awarded'}; - my $rowextra = 'bgcolor="#CCCCCC"'; - if ($count % 2 == 1) { - $rowextra = 'bgcolor="#EEEEEE"'; - } - my $row = ''; - foreach my $col (@Columns) { - $row .= ''. - $data->{$col->{'name'}}.''; - } - if ($response_type eq 'essay') { - $row .= &html_essay_results - ($response->[&Apache::loncoursedata::RDs_submission()], - $student->{'answer'}, - scalar(@Columns),$rowextra); - } elsif ($response_type eq 'option') { - $row .= &html_option_results - ($response->[&Apache::loncoursedata::RDs_submission()], - $student->{'answer'}, - scalar(@Columns),$rowextra); + # + foreach my $original_header (@$headers) { + if ($original_header =~ /^_/) { + # '_' denotes a foil column + my ($header) = ($original_header =~ m/^_(.*)$/); + my $option = ''; + if ( my ($foil) = ($header =~ /(.*) Correct$/)) { + if (exists($correct{$foil})) { + $option = $correct{$foil}; + } + } elsif (exists($submission{$header})) { + $option = $submission{$header}; + } + push(@values,&{$format}($option,$header)); } else { - $row .= &html_generic_results - ($response->[&Apache::loncoursedata::RDs_submission()], - $student->{'answer'}, - scalar(@Columns),$rowextra); + # A normal column + push(@values,&{$format}($response->{$original_header}, + $original_header)); } - $row .= ''; - $r->print($row.$/); - $count++; } + } else { + @values = map { &{$format}($response->{$_},$_); } @$headers; } - $r->print(''.$/); - return; -} - -##################################################### -## -## HTML helper routines -## -##################################################### -sub html_headers { - my ($Columns) = @_; - my $Str; - foreach my $column (@$Columns) { - $Str .= ''.$column->{'display'}.''; - } - return $Str; + return @values; } -sub html_essay { - my ($submission,$correct,$tablewidth,$rowextra)=@_; - # - $submission =~ s|\\r\\n|$/|g; - $submission = &HTML::Entities::encode($submission,'<>&"'); - $submission =~ s|$/\s*$/|$/

$/|g; - $submission =~ s|\\||g; - $submission = '

'.$submission.'

'; - # - my $Str = ''. - ''.$submission.''; - if ($ENV{'form.correctans'} eq 'true') { - $Str .= ''; - if (defined($correct) && $correct !~ /^\s*$/) { - $Str .= ''. - ''.&mt('Correct Answer:').''.$correct.''; +sub excel_format_item { + my ($item,$type) = @_; + if ($type eq 'Time') { + $item = &Apache::lonstathelpers::calc_serial($item); + } else { + if ($item =~ m/^=/) { + $item = ' '.$item; } + $item =~ s/\\r//g; + $item =~ s/\\n/\n/g; + $item =~ s/(\s*$|^\s*)//g; + $item =~ s/\\\'/\'/g; } - $Str .= ''; - # - return $Str; -} - -sub html_essay_headers { - return ''; -} - -sub html_generic_headers { - my $header =''.&mt('Submission').''; - if ($ENV{'form.correctans'} eq 'true') { - $header .= ''.&mt('Correct').''; - } - return $header; -} - -sub html_option_headers { - return &html_generic_headers(); -} - -sub html_radiobutton_results { - my ($submission,$correct,$tablewidth,$rowclass)=@_; - $submission =~ s/=([^=])$//; - return &html_generic_results($submission,$correct,$tablewidth,$rowclass); -} - -sub html_generic_results { - my ($submission,$correct,$tablewidth,$rowclass)=@_; - my $Str .= ''.$submission.''; - if ($ENV{'form.correctans'} eq 'true') { - $Str .= ''.$correct.''; - } - $Str .= ''; - return $Str; -} - -sub html_option_results { - my ($submission,$correct,$tablewidth,$rowclass)=@_; - $submission = - '
    '. - '
  • '.join('
  • ', - map { - &Apache::lonnet::unescape($_) ; - } sort split('&',$submission) - ). - '
      • '; - if (defined($correct) && $correct !~ /^\s*$/) { - $correct = '
        '. - '
      • '.join('
      • ', - map { - &Apache::lonnet::unescape($_) ; - } sort split('&',$correct) - ). - '
      '; - } - # - return &html_generic_results($submission,$correct,$tablewidth,$rowclass); + return $item; } ######################################################### @@ -692,20 +869,8 @@ sub html_option_results { ######################################################### ######################################################### sub prepare_csv_output { - my ($r,$Problems,$Students) = @_; - my $problem; - # + my ($r,$problems,$students) = @_; my $c = $r->connection(); - my ($resource,$respid,$partid) = ($problem->{'resource'}, - $problem->{'respid'}, - $problem->{'part'}); - # - if ($ENV{'form.correctans'} eq 'true') { - $r->print('

      '.&mt('Generating Correct Answers').'

      '); - &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students, - 'Statistics', - 'stats_status'); - } # $r->print('

      '. &mt('Generating CSV report of student responses').'

      '); @@ -714,8 +879,8 @@ sub prepare_csv_output { my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin ($r,'CSV File Compilation Status', 'CSV File Compilation Progress', - scalar(@$Students),'inline',undef,'Statistics','stats_status'); - + scalar(@$students),'inline',undef,'Statistics','stats_status'); + $r->rflush(); # # Open a file @@ -731,80 +896,110 @@ sub prepare_csv_output { $outputfile = undef; } # + # Compute the number of columns per response + my @extra_resp_headers = &get_extra_response_headers(); + # + # Create the table header + my @student_columns = ('username','domain','id'); # - my @Columns; - if (exists($ENV{'form.concise'}) && $ENV{'form.concise'} eq 'true') { - foreach (@DefaultColumns) { - if ($_->{'name'} =~ /^(username|domain|id)$/){ - push(@Columns,$_); + my %headers; + push(@{$headers{'student'}},@student_columns); + # Pad for the student data + foreach my $row ('problem','part','response') { + $headers{$row}=[map {''} @student_columns]; + } + # + # we put the headers into the %headers hash + my %problem_analysis; + my %start_col; + my $max_column = scalar(@student_columns); + foreach my $prob (@$problems) { + 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}) { + $headers{'part'}->[$max_column] = $prob->part_display($partid); + my $responses = [$prob->responseIds($partid)]; + my $resptypes = [$prob->responseType($partid)]; + for (my $i=0;$i[$i], + $resptypes->[$i], + $problem_analysis{$prob->src}, + 'csv','display', + @extra_resp_headers); + $start_col{$prob->symb}->{$partid}->{$responses->[$i]}= + $max_column; + $headers{'response'}->[$max_column]= + &mt('Response [_1]',$responses->[$i]); + for (my $j=0;$j<=$#headers;$j++) { + $headers{'student'}->[$max_column+$j]=$headers[$j]; + } + $max_column += scalar(@headers); } } - } else { - @Columns = @DefaultColumns; } - # - my $response_type = &get_response_type($resource,$partid,$respid); - if (! defined($response_type) || $response_type eq '') { - $r->print('

      '.&mt('Unable to determine response type').'

      '); - return; + foreach my $row ('problem','part','response','student') { + print $outputfile '"'. + join('","', + map { + &Apache::loncommon::csv_translate($_); + } @{$headers{$row}}).'"'.$/; } # - my $header = &csv_headers(\@Columns).','.&csv_generic_headers(); - print $outputfile $header.$/; - # - foreach my $student (@$Students) { + # Main loop + foreach my $student (@$students) { last if ($c->aborted()); - my $results = &Apache::loncoursedata::get_response_data_by_student - ($student,$resource->{'symb'},$respid); - next if (! defined($results) || ref($results) ne 'ARRAY'); - for (my $i=0;$i[$i]; - if ($ENV{'form.last_sub_only'} eq 'true' && - $i < (scalar(@$results)-1)) { - next; - } - my $data; - $data->{'username'} = $student->{'username'}; - $data->{'domain'} = $student->{'domain'}; - $data->{'id'} = $student->{'id'}; - $data->{'fullname'} = $student->{'fullanem'}; - $data->{'status'} = $student->{'status'}; - $data->{'time'} = &Apache::lonlocal::locallocaltime - ($response->[&Apache::loncoursedata::RDs_timestamp()]); - $data->{'attempt'} = - $response->[&Apache::loncoursedata::RDs_tries()]; - $data->{'awarded'} = - $response->[&Apache::loncoursedata::RDs_awarded()]; - $data->{'awarddetail'} = - $response->[&Apache::loncoursedata::RDs_awarddetail()]; - $data->{'weight'} = &Apache::lonnet::EXT - ('resource.'.$partid.'.weight',$resource->{'symb'}, - undef,undef,undef); - $data->{'score'} = $data->{'weight'} * $data->{'awarded'}; - my $rowextra = ''; - my $row; - foreach my $col (@Columns) { - $row .= '"'. - &Apache::loncommon::csv_translate($data->{$col->{'name'}}).'",'; + my @rows; + foreach my $prob (@$problems) { + foreach my $partid (@{$prob->parts}) { + my @responses = $prob->responseIds($partid); + my @response_type = $prob->responseType($partid); + for (my $i=0;$i<=$#responses;$i++) { + my $respid = $responses[$i]; + my $resptype = $response_type[$i]; + my @headers = &get_headers($prob,$partid,$respid,$resptype, + $problem_analysis{$prob->src}, + 'csv','normal', + @extra_resp_headers); + my $results = + &Apache::loncoursedata::get_response_data_by_student + ($student,$prob->symb(),$respid); + if (! defined($results)) { + $results = []; + } + for (my $j=0; $j[$idx], + $prob,$student, + $partid,$respid); + my @data = &compile_response_data(\@headers,$response, + $prob,$partid, + $respid,$resptype, + \&csv_format_item); + my $resp_start_idx = + $start_col{$prob->symb}->{$partid}->{$respid}; + for (my $k=0;$k<=$#data;$k++) { + $rows[$j]->[$resp_start_idx + $k] = $data[$k]; + } + } + } } - if ($response_type eq 'option') { - $row .= &csv_option_results - ($response->[&Apache::loncoursedata::RDs_submission()], - $student->{'answer'}, - scalar(@Columns),$rowextra); - } elsif ($response_type eq 'radiobutton') { - $row .= &csv_radiobutton_results - ($response->[&Apache::loncoursedata::RDs_submission()], - $student->{'answer'}, - scalar(@Columns),$rowextra); - } else { - $row .= &csv_generic_results - ($response->[&Apache::loncoursedata::RDs_submission()], - $student->{'answer'}, - scalar(@Columns),$rowextra); + } + foreach my $row (@rows) { + 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 ||=''; + print $outputfile ',"'.$value.'"'; } - print $outputfile $row.$/; + print $outputfile $/; } + undef(@rows); &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, 'last student'); } @@ -820,271 +1015,15 @@ sub prepare_csv_output { return; } -sub csv_headers { - my ($Columns) = @_; - my $Str; - foreach my $column (@$Columns) { - $Str .= - '"'.&Apache::loncommon::csv_translate($column->{'display'}).'",'; +sub csv_format_item { + my ($item,$type) = @_; + if ($type eq 'Time') { + $item = localtime($item); } - chop($Str); - return $Str; + $item =&Apache::loncommon::csv_translate($item); + return $item; } -sub csv_generic_headers { - my ($title) = @_; - if (! defined($title)) { - $title = &mt('Submission'); - } - my $header = '"'.&Apache::loncommon::csv_translate($title).'"'; - if ($ENV{'form.correctans'} eq 'true') { - $header .= ',"'.&Apache::loncommon::csv_translate(&mt('Correct')).'"'; - } - return $header; -} - -#------------------------------------------ -sub csv_essay_results { - my ($submission,$correct,$tablewidth,$rowextra)=@_; - # - $submission =~ s|\\r|\\\\r|g; - $submission =~ s|\\n|\\\\n|g; - # - return &csv_generic_results($submission,$correct,$tablewidth); -} - -#------------------------------------------ -sub csv_radiobutton_results { - my ($submission,$correct,$tablewidth,$rowclass)=@_; - $submission =~ s/=[^=]*$//; - return &csv_generic_results($submission,$correct,$tablewidth,$rowclass); -} - -#------------------------------------------ -sub csv_option_results { - my ($submission,$correct,$tablewidth,$rowclass)=@_; - $submission = join(',', - map { - &Apache::lonnet::unescape($_) ; - } sort split('&',$submission) - ); - if (defined($correct) && $correct !~ /^\s*$/) { - $correct =join(',', - map { - &Apache::lonnet::unescape($_) ; - } sort split('&',$submission)); - } - return &csv_generic_results($submission,$correct,$tablewidth,$rowclass); -} - -#------------------------------------------ -sub csv_generic_results { - my ($submission,$correct,$tablewidth,$rowclass)=@_; - my $Str .= - '"'.&Apache::loncommon::csv_translate($submission).'"'; - if ($ENV{'form.correctans'} eq 'true') { - $Str .= ',"'.&Apache::loncommon::csv_translate($correct).'"'; - } - return $Str; -} - -######################################################### -######################################################### -## -## Excel output of student answers and correct answers -## -######################################################### -######################################################### -sub prepare_excel_output { - my ($r,$Problems,$Students) = @_; - my $c = $r->connection(); - # - $r->print('

      '. - &mt('Preparing Excel spreadsheet of student responses'). - '

      '); - if ($ENV{'form.correctans'} eq 'true') { - $r->print('

      '. - &mt('See the status bar above for student answer computation progress'). - '

      '); - foreach my $problem (@$Problems) { - my ($resource,$respid,$partid) = ($problem->{'resource'}, - $problem->{'respid'}, - $problem->{'part'}); - # - &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students, - 'Statistics', - 'stats_status'); - } - $r->print(''); - } - # - $r->rflush(); - - - my @ColumnLabels; - my @Columns = @DefaultColumns; - my %seen; - foreach my $problem (@$Problems) { - my ($resource,$respid,$partid) = ($problem->{'resource'}, - $problem->{'respid'}, - $problem->{'part'}); - my $partkey = $resource->{'symb'}.':'.$partid; - if (! $seen{$partkey}) { - $ColumnLabels[$#Columns]=$resource->{'title'}; - push(@ColumnLabels,$partid); - push(@Columns,@PartColumns); - } - push(@Column - if ($ENV{'form.correctans'} eq 'true') { - push(@Columns,'Computers answer'); - } - $seen{$resource->{'symb'}.':'.$partid} .= ':'.$respid; - - } - -# my ($awarded_col,$weight_col); -# for (my $i=0;$i<=$#Columns;$i++) { -# if ($Columns[$i]->{'name'} eq 'weight' ) { $weight_col = $i; } -# if ($Columns[$i]->{'name'} eq 'awarded') { $awarded_col = $i; } -# } - - # - # Create excel worksheet - 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('

      '.&mt("Unable to create new Excel file. ". - "This error has been logged. ". - "Please alert your LON-CAPA administrator"). - '

      '); - return undef; - } - # - $workbook->set_tempdir('/home/httpd/perl/tmp'); - # - my $format = &Apache::loncommon::define_excel_formats($workbook); - my $worksheet = $workbook->addworksheet('Student Submission Data'); - # - # Make sure we get new weight data instead of data on a 10 minute delay - &Apache::lonnet::clear_EXT_cache_status(); - # - # Put on the standard headers and whatnot - my $rows_output=0; - $worksheet->write($rows_output++,0,$resource->{'title'},$format->{'h1'}); - $worksheet->write($rows_output++,0,$resource->{'src'},$format->{'h3'}); - $rows_output++; - $worksheet->write_row($rows_output++,0, - [map {$_->{'display'}} @Columns], - $format->{'bold'}); - # - # Populate the worksheet with the student data - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'Excel File Compilation Status', - 'Excel File Compilation Progress', - scalar(@$Students),'inline',undef,'Statistics','stats_status'); - foreach my $student (@$Students) { - last if ($c->aborted()); - my $results = &Apache::loncoursedata::get_response_data_by_student - ($student,$resource->{'symb'},$respid); - my %row; - $row{'username'} = $student->{'username'}; - $row{'domain'} = $student->{'domain'}; - $row{'id'} = $student->{'id'}; - $row{'correct'} = $student->{'answer'}; - $row{'weight'} = &Apache::lonnet::EXT - ('resource.'.$partid.'.weight',$resource->{'symb'}, - undef,undef,undef); - if (! defined($results) || ref($results) ne 'ARRAY') { - $row{'score'} = '='. - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$awarded_col) - .'*'. - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$weight_col); - my $cols_output = 0; - foreach my $col (@Columns) { - if (! exists($row{$col->{'name'}})) { - $cols_output++; - next; - } - $worksheet->write($rows_output,$cols_output++, - $row{$col->{'name'}}); - } - $rows_output++; - } else { - for (my $i=0;$i[$i]; - if ($ENV{'form.last_sub_only'} eq 'true' && - $i < (scalar(@$results)-1)) { - next; - } - delete($row{'time'}); - delete($row{'attempt'}); - delete($row{'submission'}); - delete($row{'awarded'}); - delete($row{'grading'}); - delete($row{'score'}); - my %row_format; - # - # Time is handled differently - $row{'time'} = &Apache::lonstathelpers::calc_serial - ($response->[&Apache::loncoursedata::RDs_timestamp()]); - $row_format{'time'}=$format->{'date'}; - # - $row{'attempt'} = $response->[ - &Apache::loncoursedata::RDs_tries()]; - $row{'submission'} = $response->[ - &Apache::loncoursedata::RDs_submission()]; - if ($row{'submission'} =~ m/^=/) { - # This will be interpreted as a formula. That is bad! - $row{'submission'} = " ".$row{'submission'}; - } - $row{'awarddetail'} = $response->[ - &Apache::loncoursedata::RDs_awarddetail()]; - $row{'awarded'} = $response->[ - &Apache::loncoursedata::RDs_awarded()]; - $row{'score'} = '='. - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$awarded_col) - .'*'. - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$weight_col); - my $cols_output = 0; - foreach my $col (@Columns) { - $worksheet->write($rows_output,$cols_output++,$row{$col->{'name'}}, - $row_format{$col->{'name'}}); - } - $rows_output++; - } - } # End of else clause on if (! defined($results) .... - &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - 'last student'); - } - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - # - # Close the excel file - $workbook->close(); - # - # Write a link to allow them to download it - $r->print('

      '. - &mt('Your Excel spreadsheet.'). - '

      '."\n"); - $r->print(''); - $r->rflush(); - return; -} - -=cut - ######################################################### ######################################################### ## @@ -1114,7 +1053,7 @@ sub CreateInterface { $Str .= ''; $Str .= ''.&mt('Sections').''; $Str .= ''.&mt('Enrollment Status').''; - $Str .= ''.&mt('Output Options').''; + $Str .= ''.&mt('Output as [_1]',$output_selector).''; $Str .= ''."\n"; # $Str .= ''."\n";