--- loncom/interface/statistics/lonstudentsubmissions.pm 2004/12/06 16:53:39 1.29 +++ loncom/interface/statistics/lonstudentsubmissions.pm 2005/02/23 19:41:27 1.35 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentsubmissions.pm,v 1.29 2004/12/06 16:53:39 matthew Exp $ +# $Id: lonstudentsubmissions.pm,v 1.35 2005/02/23 19:41:27 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -148,6 +148,53 @@ 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; +} + ######################################################### ######################################################### ## @@ -167,17 +214,7 @@ sub prepare_html_output { } # # Compute the number of columns per response - my @response_headers = ('Submission'); - if ($ENV{'form.correctans'} eq 'true') { - push(@response_headers,'Correct'); - } - if ($ENV{'form.prob_status'} eq 'true') { - push(@response_headers,'Award Detail'); - push(@response_headers,'Time'); - push(@response_headers,'Attempt'); - push(@response_headers,'Awarded'); - } - my $response_multiplier = scalar(@response_headers); + my @extra_resp_headers = &get_extra_response_headers(); # # Create the table header my @student_columns = ('username','domain','id'); @@ -192,7 +229,12 @@ sub prepare_html_output { # 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) { @@ -203,17 +245,21 @@ sub prepare_html_output { my $responses = [$prob->responseIds($partid)]; my $resptypes = [$prob->responseType($partid)]; for (my $i=0;$i<scalar(@$responses);$i++) { - if ($resptypes->[$i] eq 'essay') { - # do something clever, like shut up. - } else { - $total_col += scalar(@response_headers); + my $respid = $responses->[$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'} .= - '<th colspan="'.scalar(@response_headers).'">'. + '<th colspan="'.scalar(@headers).'">'. &mt('Response [_1]',$responses->[$i]).'</th>'; - $headers{'student'}.= '<th>'.join('</th><th>', - @response_headers). - '</th>'; - $part_span += scalar(@response_headers); + $headers{'student'}.= '<th>'.join('</th><th><nobr>', + @headers). + '</nobr></th>'; } } if (! $single_part) { @@ -221,6 +267,9 @@ sub prepare_html_output { 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 { @@ -271,50 +320,58 @@ sub prepare_html_output { # # Figure out what it is we need to output for this student my @essays; - my %problem_data; + my %prob_data; my $maxrow; foreach my $prob (@$problems) { - my $symb = $prob->symb; - $problem_data{$symb}={}; + $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 $resptype = $response_type[$i]; - my $width = scalar(@response_headers); - $problem_data{$symb}->{$partid}->{$respid}={}; - my $resp_data = $problem_data{$symb}->{$partid}->{$respid}; - $resp_data->{'fake'} = qq{<td colspan="$width"> </td>}; + 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{<td colspan="$width"> </td>}; if (! defined($results)) { $results = []; } - # + # if (scalar(@$results) > $maxrow && $resptype ne 'essay') { $maxrow = scalar(@$results); } for (my $j=scalar(@$results)-1;$j>=0;$j--) { - my $response = $results->[$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($student, + &html_essay_results(\@headers, $prob,$partid,$respid, $response, $single_response). '</td>'); } else { push(@{$resp_data->{'real'}}, - &html_results($student, - $prob,$partid,$respid, - $response,$resptype)); + &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 @@ -333,14 +390,13 @@ sub prepare_html_output { my $html; my $no_data = 1; foreach my $prob (@$problems) { - my $symb = $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 $resp_data = - $problem_data{$symb}->{$partid}->{$respid}; + $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]; @@ -370,24 +426,39 @@ sub prepare_html_output { return; } +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 ($student,$prob,$partid,$respid,$response,$single_response)=@_; - # - my $submission =$response->[&Apache::loncoursedata::RDs_submission()]; - $submission = &html_format_sub($submission,'essay'); - # - my $correct = ''; - if ($ENV{'form.correctans'} eq 'true') { - $correct = &Apache::lonstathelpers::get_student_answer - ($prob,$student->{'username'},$student->{'domain'}, - $partid,$respid); - $correct = &html_format_sub($correct,'essay'); + 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; @@ -399,93 +470,103 @@ sub html_essay_results { } $Str .= '<nobr>'.$id.'</nobr>'.(' 'x4); } - if ($ENV{'form.prob_status'} eq 'true') { - $Str .= '<nobr>'; - $Str .= $response->[&Apache::loncoursedata::RDs_awarddetail()]. - (' 'x4); - $Str .= &mt('Attempt [_1]', - $response->[&Apache::loncoursedata::RDs_tries()]). - (' 'x4); - $Str .= &Apache::lonlocal::locallocaltime - ($response->[&Apache::loncoursedata::RDs_timestamp()]). - (' 'x4); - $Str .= &mt('Awarded: [_1]', - $response->[&Apache::loncoursedata::RDs_awarded()]). - (' 'x4); - $Str .= '</nobr><br />'; + # + 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 .= '<nobr>'. + join('', + map { + (' 'x4).&mt($_.': [_1]',$response->{$_}); + } @$headers).'</nobr>'; + if (@$headers || ! $single_response) { + $Str .= '<br />'; } - $Str .= $submission; + $Str .= &html_format_essay_sub($response->{'Submission'}); + # if (defined($correct) && $correct !~ /^\s*$/) { $Str .= '<hr /><b>'.&mt('Correct').'</b>'.$correct } return $Str; } -sub html_results { - my ($student,$prob,$partid,$respid,$response,$resptype) = @_; - my $submission =$response->[&Apache::loncoursedata::RDs_submission()]; - $submission = &html_format_sub($submission,$resptype); - my $correct = ''; - if ($ENV{'form.correctans'} eq 'true') { - $correct = &Apache::lonstathelpers::get_student_answer - ($prob,$student->{'username'},$student->{'domain'}, - $partid,$respid); - $correct = &html_format_sub($correct,$resptype); - } - my $Str; - $Str .= '<td valign="top">'.$submission.'</td>'; - if ($ENV{'form.correctans'} eq 'true') { - $Str .= '<td valign="top">'.$correct.'</td>'; - } - if ($ENV{'form.prob_status'} eq 'true') { - $Str .= '<td valign="top">'. - $response->[&Apache::loncoursedata::RDs_awarddetail()]. - '</td>'; - $Str .= '<td valign="top"><nobr>'. - &Apache::lonlocal::locallocaltime - ($response->[&Apache::loncoursedata::RDs_timestamp()]). - '</nobr></td>'; - $Str .= '<td valign="top">'. - $response->[&Apache::loncoursedata::RDs_tries()]. - '</td>'; - $Str .= '<td valign="top">'. - $response->[&Apache::loncoursedata::RDs_awarded()]. - '</td>'; - } - 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*$/|$/</p><p>$/|g; + $submission =~ s|\\||g; + $submission = '<p>'.$submission.'</p>'; + return $submission; } -sub html_format_sub { - my ($submission,$resptype) = @_; +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 = &HTML::Entities::decode($submission); $submission =~ s/\\\"/\"/g; $submission =~ s/\\\'/\'/g; - if ($resptype eq 'essay') { - $submission =~ s|\\r\\n|$/|g; - $submission = &HTML::Entities::encode($submission,'<>&"'); - $submission =~ s|$/\s*$/|$/</p><p>$/|g; - $submission =~ s|\\||g; - $submission = '<p>'.$submission.'</p>'; - } elsif ($resptype eq 'radiobutton') { + if ($resptype eq 'radiobutton') { $submission = &HTML::Entities::encode($submission,'<>&"'); $submission =~ s/=([^=])$//; - } elsif ($resptype =~ /^(option|match|rank)$/) { - $submission = - '<ul class="sub_studentans">'. - '<li>'.join('</li><li>', - map { &HTML::Entities::encode($_,'<>&"'); - } map { - &Apache::lonnet::unescape($_) ; - } sort split('&',$submission) - ). - '</li><ul>'; + $submission = '<nobr>'.$submission.'</nobr>'; + } + $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 { - $submission = &HTML::Entities::encode($submission,'<>&"'); + @values = map { $response->{$_}; } @$headers; } - return $submission; + my $td = '<td valign="top">'; + my $str = $td.join('</td>'.$td,@values).'</td>'; + return $str; } + ######################################################### ######################################################### ## @@ -500,12 +581,24 @@ sub prepare_excel_output { # # 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<scalar(@$responses);$i++) { + my @headers = &get_headers($prob,$partid,$responses->[$i], + $resptypes->[$i], + $problem_analysis{$prob->src}, + 'excel','display', + @extra_resp_headers); + $columncount += scalar(@headers); + } + } last if ($columncount > 255); $lastprob = $prob; } @@ -571,6 +664,7 @@ sub prepare_excel_output { $format->{'bold'}); } # Problem headers + my %start_col; foreach my $prob (@$Problems) { my $title = $prob->compTitle; $worksheet->write($title_row,$cols_output, @@ -581,20 +675,21 @@ sub prepare_excel_output { my $responses = [$prob->responseIds($partid)]; my $resptypes = [$prob->responseType($partid)]; for (my $i=0;$i<scalar(@$responses);$i++) { + $start_col{$prob->symb}->{$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); } } } @@ -615,38 +710,47 @@ sub prepare_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; } @@ -655,14 +759,13 @@ sub prepare_excel_output { } } # Fill in the remaining rows with the students data - for (my $row = $student_row+1;$row<=$max_row;$row++) { + 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'); } @@ -683,56 +786,81 @@ sub prepare_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::get_student_answer - ($prob,$student->{'username'},$student->{'domain'}, - $partid,$respid); - $correct =&excel_format_response($correct,$resptype); - $worksheet->write($row,$col++,$correct); +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]; }; } - 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 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) - ); - } elsif ($responsetype eq 'string') { - $answer =~ s/\\(n|r)/\n/g; - $answer =~ s/(\s*$|^\s*)//g; - $answer =~ s/\\\'/\'/g; + # + 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/=([^=])$//; } - if ($answer =~ m/^=/) { - $answer = ' '.$answer; + $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,&{$format}($option,$header)); + } else { + # A normal column + push(@values,&{$format}($response->{$original_header}, + $original_header)); + } + } + } else { + @values = map { &{$format}($response->{$_},$_); } @$headers; + } + return @values; +} + +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; } - return $answer; + return $item; } ######################################################### @@ -771,17 +899,7 @@ sub prepare_csv_output { } # # Compute the number of columns per response - my @response_headers = ('Submission'); - if ($ENV{'form.correctans'} eq 'true') { - push(@response_headers,'Correct'); - } - if ($ENV{'form.prob_status'} eq 'true') { - push(@response_headers,'Award Detail'); - push(@response_headers,'Time'); - push(@response_headers,'Attempt'); - push(@response_headers,'Awarded'); - } - my $response_multiplier = scalar(@response_headers); + my @extra_resp_headers = &get_extra_response_headers(); # # Create the table header my @student_columns = ('username','domain','id'); @@ -790,33 +908,40 @@ sub prepare_csv_output { push(@{$headers{'student'}},@student_columns); # Pad for the student data foreach my $row ('problem','part','response') { - foreach (@student_columns) { - push(@{$headers{$row}},''); - } + $headers{$row}=[map {''} @student_columns]; } # # we put the headers into the %headers hash - my $prob_start_idx = 0; + my %problem_analysis; + my %start_col; + my $max_column = scalar(@student_columns); foreach my $prob (@$problems) { - $headers{'problem'}->[$prob_start_idx] = $prob->compTitle; - my $part_start_idx = $prob_start_idx; + 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'}->[$part_start_idx] = $prob->part_display($partid); + $headers{'part'}->[$max_column] = $prob->part_display($partid); my $responses = [$prob->responseIds($partid)]; + my $resptypes = [$prob->responseType($partid)]; for (my $i=0;$i<scalar(@$responses);$i++) { - my $resp_idx = $prob_start_idx + $response_multiplier * $i; - $headers{'response'}->[$resp_idx]= + my @headers = &get_headers($prob,$partid,$responses->[$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<=$#response_headers;$j++) { - $headers{'student'}->[$resp_idx+$j]=$response_headers[$j]; + for (my $j=0;$j<=$#headers;$j++) { + $headers{'student'}->[$max_column+$j]=$headers[$j]; } + $max_column += scalar(@headers); } - $part_start_idx += scalar(@$responses)*$response_multiplier; } - $prob_start_idx += $prob->countResponses * $response_multiplier; } foreach my $row ('problem','part','response','student') { - print $outputfile '"'.join('","',map { ''; } @student_columns).'","'. + print $outputfile '"'. join('","', map { &Apache::loncommon::csv_translate($_); @@ -827,15 +952,17 @@ sub prepare_csv_output { foreach my $student (@$students) { last if ($c->aborted()); my @rows; - my $prob_start_idx = 0; foreach my $prob (@$problems) { - my $part_start_idx = 0; foreach my $partid (@{$prob->parts}) { my @responses = $prob->responseIds($partid); my @response_type = $prob->responseType($partid); for (my $i=0;$i<=$#responses;$i++) { - my $resp_start_idx = $response_multiplier * $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); @@ -847,26 +974,27 @@ sub prepare_csv_output { next if ($j != 0); } my $idx = scalar(@$results) - $j - 1; - my $response = $results->[$idx]; - my @data = &compile_response_data($response,$student, + my $response = &hashify_response($results->[$idx], + $prob,$student, + $partid,$respid); + my @data = &compile_response_data(\@headers,$response, $prob,$partid, - $respid); + $respid,$resptype, + \&csv_format_item); + my $resp_start_idx = + $start_col{$prob->symb}->{$partid}->{$respid}; for (my $k=0;$k<=$#data;$k++) { - $rows[$j]->[$prob_start_idx + $part_start_idx + - $resp_start_idx + $k] = $data[$k]; + $rows[$j]->[$resp_start_idx + $k] = $data[$k]; } } } - $part_start_idx += scalar(@responses)*$response_multiplier; } - $prob_start_idx += $prob->countResponses * $response_multiplier; } foreach my $row (@rows) { print $outputfile '"'.join('","', map { $student->{$_}; } @student_columns).'"'; - - for (my $i=0;$i<$prob_start_idx;$i++) { + for (my $i=scalar(@student_columns);$i<$max_column;$i++) { my $value = &Apache::loncommon::csv_translate($row->[$i]); $value ||=''; print $outputfile ',"'.$value.'"'; @@ -889,24 +1017,13 @@ sub prepare_csv_output { return; } -sub compile_response_data { - my ($response,$student,$prob,$partid,$respid) = @_; - my @rowdata; - push(@rowdata,&Apache::lonnet::unescape($response->[&Apache::loncoursedata::RDs_submission()])); - if ($ENV{'form.correctans'} eq 'true') { - my $correct = &Apache::lonstathelpers::get_student_answer - ($prob,$student->{'username'},$student->{'domain'}, - $partid,$respid); - push(@rowdata,$correct); - } - if ($ENV{'form.prob_status'}) { - push(@rowdata,$response->[&Apache::loncoursedata::RDs_awarddetail()]); - push(@rowdata,&Apache::lonlocal::locallocaltime - ($response->[&Apache::loncoursedata::RDs_timestamp()])); - push(@rowdata,$response->[&Apache::loncoursedata::RDs_tries()]); - push(@rowdata,$response->[&Apache::loncoursedata::RDs_awarded()]); +sub csv_format_item { + my ($item,$type) = @_; + if ($type eq 'Time') { + $item = localtime($item); } - return @rowdata; + $item =&Apache::loncommon::csv_translate($item); + return $item; } #########################################################