');
if (! scalar(@Problems) || ! defined($Problems[0])) {
$r->print('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.').' '.&mt('There must be at least [quant,_1,student].',$threshold).' '.&mt('Contact the LON-CAPA [_1]Helpdesk[_2] if you need the threshold to be changed for this course.',''.
&mt('Response [_1]',$responses->[$i]).'';
- $headers{'student'}.= '
'.join('
',
+ $headers{'student'}.= '
'.
+ join('
',
@headers).
- '
';
+ '
';
}
}
+ 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{
';
}
#
# Figure out what it is we need to output for this student
@@ -332,8 +442,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{
};
+ $resp_data->{'fake'} = qq{
};
if (! defined($results)) {
$results = [];
}
@@ -342,7 +453,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],
@@ -357,6 +468,14 @@ sub prepare_html_output {
$response,
$single_response).
'');
+ } 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,
@@ -416,13 +535,14 @@ sub prepare_html_output {
undef(@essays);
}
} # end of student loop
+ $r->print(''.$/);
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'},
@@ -430,14 +550,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;
}
@@ -461,7 +594,7 @@ sub html_essay_results {
if (defined($respid)) {
$id .= ' '.$respid;
}
- $Str .= ''.$id.''.(' 'x4);
+ $Str .= ''.$id.''.(' 'x4);
}
#
shift(@$headers); # Get rid of the Submission header
@@ -470,11 +603,11 @@ sub html_essay_results {
$correct = &html_format_essay_sub($response->{'Correct'});
shift(@$headers);
}
- $Str .= ''.
+ $Str .= ''.
join('',
map {
(' 'x4).&mt($_.': [_1]',$response->{$_});
- } @$headers).'';
+ } @$headers).'';
if (@$headers || ! $single_response) {
$Str .= ' ';
}
@@ -500,20 +633,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 = '
';
+ my $str = $td.join('
'.$td,@values).'';
+ 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 = ''.$submission.'';
+ $submission = ''.$submission.'';
}
$response->{'Submission'} = $submission;
#
@@ -521,14 +668,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'});
}
@@ -546,6 +693,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});
@@ -568,18 +717,31 @@ sub html_non_essay_results {
#########################################################
#########################################################
sub prepare_excel_output {
- my ($r,$Problems,$Students) = @_;
+ my ($r,$Problems,$Students,$show_named) = @_;
my $c = $r->connection();
+ my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
#
#
# 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;
}
@@ -606,28 +768,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('
'.&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 ($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;
@@ -639,14 +788,23 @@ 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'});
}
# Problem headers
+ my %start_col;
foreach my $prob (@$Problems) {
my $title = $prob->compTitle;
+ unless (&Apache::loncommon::needs_gci_custom()) {
+ ($title) = ($prob->src =~ m{/([^/]+)$});
+ }
$worksheet->write($title_row,$cols_output,
$title,$format->{'h3'});
foreach my $partid (@{$prob->parts}) {
@@ -655,20 +813,21 @@ sub prepare_excel_output {
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);
}
}
}
@@ -684,43 +843,50 @@ 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;
- my $response_count;
+ my $anonid = &Crypt::PasswdMD5::unix_md5_crypt($student->{'username'},
+ $salt);
+ $anonid = substr($anonid,length($salt)+1);
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') {
+ 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;
}
@@ -729,14 +895,18 @@ 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;$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++,
+ $anonid);
+ }
}
}
- $rows_output++;
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
'last student');
}
@@ -757,56 +927,83 @@ 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()]);
+ #
+ my $submission =
+ &HTML::Entities::decode
+ (&unescape($response->{'Submission'}));
+ if (!$prob->is_task()) {
+ return () if (! defined($submission) || $submission eq '');
}
- return $col;
+ $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('=',&unescape($_));
+ ($foil,$value);
+ } split('&',$response->{'Submission'});
+ my %correct;
+ if (exists($response->{'Correct'})) {
+ %correct =
+ map {
+ my ($foil,$value)=split('=',&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_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;
- }
- if ($answer =~ m/^=/) {
- $answer = ' '.$answer;
+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;
}
#########################################################
@@ -817,8 +1014,9 @@ sub excel_format_response {
#########################################################
#########################################################
sub prepare_csv_output {
- my ($r,$problems,$students) = @_;
+ my ($r,$problems,$students,$show_named) = @_;
my $c = $r->connection();
+ my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
#
$r->print('
'.
&mt('Generating CSV report of student responses').'
');
@@ -834,63 +1032,71 @@ 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('
'
+ .&mt('Problems occurred in writing the CSV file. '
+ .'This error has been logged. '
+ .'Please alert your LON-CAPA administrator.')
+ .'
');
$outputfile = undef;
}
#
# Compute the number of columns per response
- 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');
- }
- my $response_multiplier = scalar(@extra_resp_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 = qw(username domain id section);
+ } else {
+ @student_columns = qw(username);
+ }
#
my %headers;
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;
+ my $title = $prob->compTitle;
+ unless (&Apache::loncommon::needs_gci_custom()) {
+ ($title) = ($prob->src =~ m{/([^/]+)$});
+ }
+ $headers{'problem'}->[$max_column] = $title;
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[$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<=$#extra_resp_headers;$j++) {
- $headers{'student'}->[$resp_idx+$j]=$extra_resp_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($_);
@@ -900,16 +1106,21 @@ sub prepare_csv_output {
# Main loop
foreach my $student (@$students) {
last if ($c->aborted());
+ my $anonid = &Crypt::PasswdMD5::unix_md5_crypt($student->{'username'},
+ $salt);
+ $anonid = substr($anonid,length($salt)+1);
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);
@@ -917,30 +1128,37 @@ sub prepare_csv_output {
$results = [];
}
for (my $j=0; $j[$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++) {
+ my $student_row_data = '';
+ if ($show_named) {
+ $student_row_data = '"'.join('","',
+ map { $student->{$_}; }
+ @student_columns).'"';
+ } else {
+ $student_row_data = '"'.$anonid.'"';
+ }
+ print $outputfile $student_row_data;
+ for (my $i=scalar(@student_columns);$i<$max_column;$i++) {
my $value = &Apache::loncommon::csv_translate($row->[$i]);
$value ||='';
print $outputfile ',"'.$value.'"';
@@ -956,31 +1174,20 @@ 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(' '.
- ''.&mt('Your csv file.').''."\n");
+ ''.&mt('Your CSV file.').''."\n");
$r->rflush();
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;
}
#########################################################
@@ -996,8 +1203,8 @@ sub CreateInterface {
my $output_selector = $/.'