--- loncom/interface/statistics/lonstudentsubmissions.pm 2005/02/02 21:19:53 1.31
+++ loncom/interface/statistics/lonstudentsubmissions.pm 2005/03/10 17:28:59 1.36
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentsubmissions.pm,v 1.31 2005/02/02 21:19:53 matthew Exp $
+# $Id: lonstudentsubmissions.pm,v 1.36 2005/03/10 17:28:59 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -118,9 +118,7 @@ sub BuildStudentSubmissionsPage {
$r->print(''.$resource->title.'
');
$r->print(''.$resource->src.'
');
if ($ENV{'form.renderprob'} eq 'true') {
- $r->print(
- &Apache::lonstathelpers::render_resource({src => $resource->src})
- );
+ $r->print(&Apache::lonstathelpers::render_resource($resource));
$r->rflush();
}
}
@@ -267,6 +265,9 @@ sub prepare_html_output {
if ($partid =~/^\d+$/) {
$tmpname = $prob->part_display($partid);
}
+ if ($tmpname !~ /^part/) {
+ $tmpname = 'Part '.$tmpname;
+ }
$headers{'part'} .= qq{$tmpname | };
$nonempty_part_headers = 1;
} else {
@@ -622,22 +623,9 @@ 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
@@ -741,8 +729,10 @@ sub prepare_excel_output {
$partid,
$respid);
my @response_data =
- &excel_response_data(\@headers,$prob,$partid,
- $respid,$response,$resptype);
+ &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);
@@ -754,14 +744,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');
}
@@ -782,14 +771,19 @@ sub prepare_excel_output {
return;
}
-sub excel_response_data {
- my ($headers,$prob,$partid,$respid,$response,$resptype) = @_;
+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($response->{'Submission'});
- return '' if (! defined($submission) || $submission eq '');
+ 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') {
@@ -825,16 +819,15 @@ sub excel_response_data {
} elsif (exists($submission{$header})) {
$option = $submission{$header};
}
- push(@values,&excel_format_item($option,$header));
+ push(@values,&{$format}($option,$header));
} else {
# A normal column
- push(@values,
- &excel_format_item($response->{$original_header},
+ push(@values,&{$format}($response->{$original_header},
$original_header));
}
}
} else {
- @values = map { &excel_format_item($response->{$_},$_); } @$headers;
+ @values = map { &{$format}($response->{$_},$_); } @$headers;
}
return @values;
}
@@ -842,7 +835,7 @@ sub excel_response_data {
sub excel_format_item {
my ($item,$type) = @_;
if ($type eq 'Time') {
- &Apache::lonstathelpers::calc_serial($item);
+ $item = &Apache::lonstathelpers::calc_serial($item);
} else {
if ($item =~ m/^=/) {
$item = ' '.$item;
@@ -891,17 +884,7 @@ sub prepare_csv_output {
}
#
# 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();
#
# Create the table header
my @student_columns = ('username','domain','id');
@@ -910,33 +893,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[$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($_);
@@ -947,15 +937,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);
@@ -967,26 +959,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.'"';
@@ -1009,24 +1002,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;
}
#########################################################