');
if (! scalar(@Problems) || ! defined($Problems[0])) {
$r->print('resource is undefined');
} else {
@@ -117,16 +125,14 @@ sub BuildStudentSubmissionsPage {
my $resource = $Problems[0];
$r->print('
'.$resource->title.'
');
$r->print('
'.$resource->src.'
');
- if ($ENV{'form.renderprob'} eq 'true') {
- $r->print(
- &Apache::lonstathelpers::render_resource({src => $resource->src})
- );
+ if ($env{'form.renderprob'} eq 'true') {
+ $r->print(&Apache::lonstathelpers::render_resource($resource));
$r->rflush();
}
}
- if ($ENV{'form.output'} eq 'excel') {
+ if ($env{'form.output'} eq 'excel') {
&prepare_excel_output($r,\@Problems,\@Students);
- } elsif ($ENV{'form.output'} eq 'csv') {
+ } elsif ($env{'form.output'} eq 'csv') {
&prepare_csv_output($r,\@Problems,\@Students);
} else {
&prepare_html_output($r,\@Problems,\@Students);
@@ -141,7 +147,7 @@ sub BuildStudentSubmissionsPage {
&mt('Computing correct answers greatly increasese the amount of time required to prepare a report.').
'');
$r->print('
'.
- &mt('please select problems and use the Prepare Report button to continue.').
+ &mt('Please select problems and use the [_1]Prepare Report[_2] button to continue.','','').
'
');
$r->print(&Apache::lonstathelpers::MultipleProblemSelector
(undef,'problemchoice','Statistics'));
@@ -153,10 +159,10 @@ sub BuildStudentSubmissionsPage {
##
sub get_extra_response_headers {
my @extra_resp_headers;
- if ($ENV{'form.correctans'} eq 'true') {
+ if ($env{'form.correctans'} eq 'true') {
push(@extra_resp_headers,'Correct');
}
- if ($ENV{'form.prob_status'} eq 'true') {
+ if ($env{'form.prob_status'} eq 'true') {
push(@extra_resp_headers,'Award Detail');
push(@extra_resp_headers,'Time');
push(@extra_resp_headers,'Attempt');
@@ -189,6 +195,8 @@ sub get_headers {
shift(@basic_headers); # Get rid of 'Correct'
}
@headers = (@foils,@basic_headers);
+ } elsif (lc($resptype) eq 'task') {
+ @headers = ('Grader','Status',@basic_headers,'Submission');
} else {
@headers = ('Submission',@basic_headers);
}
@@ -217,7 +225,7 @@ sub prepare_html_output {
my @extra_resp_headers = &get_extra_response_headers();
#
# Create the table header
- my @student_columns = ('username','domain','id');
+ my @student_columns = ('username','domain','id','section');
#
my %headers;
my $student_column_count = scalar(@student_columns);
@@ -257,16 +265,23 @@ sub prepare_html_output {
$headers{'response'} .=
'
'.
&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{
$tmpname
};
$nonempty_part_headers = 1;
} else {
@@ -336,8 +351,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 = [];
}
@@ -346,7 +362,7 @@ sub prepare_html_output {
$maxrow = scalar(@$results);
}
for (my $j=scalar(@$results)-1;$j>=0;$j--) {
- if ($ENV{'form.all_sub'} ne 'true') {
+ if ($env{'form.all_sub'} ne 'true') {
next if ($j ne scalar(@$results)-1);
}
my $response = &hashify_response($results->[$j],
@@ -361,6 +377,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,
@@ -426,7 +450,7 @@ sub prepare_html_output {
sub hashify_response {
my ($response,$prob,$student,$partid,$respid) =@_;
my $resp_hash = {};
- if ($ENV{'form.correctans'} eq 'true') {
+ if ($env{'form.correctans'} eq 'true') {
$resp_hash->{'Correct'} =
&Apache::lonstathelpers::get_student_answer
($prob,$student->{'username'},$student->{'domain'},
@@ -434,14 +458,27 @@ sub hashify_response {
}
$resp_hash->{'Submission'} =
$response->[&Apache::loncoursedata::RDs_submission()];
- $resp_hash->{'Award Detail'} =
- $response->[&Apache::loncoursedata::RDs_awarddetail()];
$resp_hash->{'Time'} =
$response->[&Apache::loncoursedata::RDs_timestamp()];
$resp_hash->{'Attempt'} =
$response->[&Apache::loncoursedata::RDs_tries()];
$resp_hash->{'Awarded'} =
$response->[&Apache::loncoursedata::RDs_awarded()];
+ if ($prob->is_task()) {
+ $resp_hash->{'Grader'} =
+ $response->[&Apache::loncoursedata::RDs_response_eval_2()];
+ if ($resp_hash->{'Attempt'} eq '0') {
+ $resp_hash->{'Attempt'} = '';
+ }
+ $resp_hash->{'Award Detail'} =
+ $response->[&Apache::loncoursedata::RDs_part_award()];
+ $resp_hash->{'Status'} =
+ $response->[&Apache::loncoursedata::RDs_response_eval()];
+ } else {
+ $resp_hash->{'Award Detail'} =
+ $response->[&Apache::loncoursedata::RDs_awarddetail()];
+ }
+
return $resp_hash;
}
@@ -465,7 +502,7 @@ sub html_essay_results {
if (defined($respid)) {
$id .= ' '.$respid;
}
- $Str .= ''.$id.''.(' 'x4);
+ $Str .= ''.$id.''.(' 'x4);
}
#
shift(@$headers); # Get rid of the Submission header
@@ -474,11 +511,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 .= ' ';
}
@@ -504,20 +541,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;
#
@@ -525,14 +576,14 @@ sub html_non_essay_results {
if ($resptype =~ /^(option|match|rank)$/) {
my %submission =
map {
- my ($foil,$value) = split('=',&Apache::lonnet::unescape($_));
+ my ($foil,$value) = split('=',&unescape($_));
($foil,$value);
} split('&',$response->{'Submission'});
my %correct;
if (exists($response->{'Correct'})) {
%correct =
map {
- my ($foil,$value)=split('=',&Apache::lonnet::unescape($_));
+ my ($foil,$value)=split('=',&unescape($_));
($foil,$value);
} split('&',$response->{'Correct'});
}
@@ -550,6 +601,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});
@@ -622,28 +675,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;
@@ -655,7 +695,7 @@ 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 = ('username','domain','id','section');
foreach (@StudentColumns) {
$worksheet->write($header_row,$cols_output++,ucfirst($_),
$format->{'bold'});
@@ -732,7 +772,7 @@ sub prepare_excel_output {
my $response_start_col = $start_col{$prob->symb}->{$partid}->{$respid};
for (my $j=scalar(@$results)-1;$j>=0;$j--) {
$cols_output = $response_start_col;
- if ($ENV{'form.all_sub'} ne 'true') {
+ if ($env{'form.all_sub'} ne 'true') {
next if ($j ne scalar(@$results)-1);
}
my $response = &hashify_response($results->[$j],
@@ -741,8 +781,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 +796,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 +823,21 @@ 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
+ (&unescape($response->{'Submission'}));
+ if (!$prob->is_task()) {
+ return () if (! defined($submission) || $submission eq '');
+ }
$submission =~ s/\\\"/\"/g;
$submission =~ s/\\\'/\'/g;
if ($resptype eq 'radiobutton') {
@@ -801,14 +849,14 @@ sub excel_response_data {
if ($resptype =~ /^(option|match|rank)$/) {
my %submission =
map {
- my ($foil,$value) = split('=',&Apache::lonnet::unescape($_));
+ my ($foil,$value) = split('=',&unescape($_));
($foil,$value);
} split('&',$response->{'Submission'});
my %correct;
if (exists($response->{'Correct'})) {
%correct =
map {
- my ($foil,$value)=split('=',&Apache::lonnet::unescape($_));
+ my ($foil,$value)=split('=',&unescape($_));
($foil,$value);
} split('&',$response->{'Correct'});
}
@@ -825,16 +873,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 +889,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;
@@ -880,13 +927,15 @@ 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;
}
#
@@ -894,7 +943,7 @@ sub prepare_csv_output {
my @extra_resp_headers = &get_extra_response_headers();
#
# Create the table header
- my @student_columns = ('username','domain','id');
+ my @student_columns = ('username','domain','id','section');
#
my %headers;
push(@{$headers{'student'}},@student_columns);
@@ -941,9 +990,7 @@ sub prepare_csv_output {
}
#
# Main loop
- my $mycount = 10;
foreach my $student (@$students) {
- last if ($mycount-- <0);
last if ($c->aborted());
my @rows;
foreach my $prob (@$problems) {
@@ -964,7 +1011,7 @@ sub prepare_csv_output {
$results = [];
}
for (my $j=0; $jsymb}->{$partid}->{$respid};
for (my $k=0;$k<=$#data;$k++) {
@@ -1003,71 +1051,18 @@ 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 ($headers,$response,$prob,$partid,$respid,$resptype) = @_;
- if (! ref($headers) || ref($headers) ne 'ARRAY' || ! scalar(@$headers)) {
- return ();
- }
- #
- my $submission =
- &HTML::Entities::decode
- (&Apache::lonnet::unescape($response->{'Submission'}));
- return () if (! defined($submission) || $submission eq '');
- $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,&csv_format_item($option,$header));
- } else {
- # A normal column
- push(@values,
- &csv_format_item($response->{$original_header},
- $original_header));
- }
- }
- } else {
- @values = map { &csv_format_item($response->{$_},$_); } @$headers;
- }
- return @values;
-}
-
sub csv_format_item {
my ($item,$type) = @_;
if ($type eq 'Time') {
$item = localtime($item);
- }
+ }
$item =&Apache::loncommon::csv_translate($item);
return $item;
}
@@ -1085,7 +1080,7 @@ sub CreateInterface {
my $output_selector = $/.'