--- loncom/interface/statistics/lonstudentsubmissions.pm 2005/02/23 19:41:27 1.35
+++ loncom/interface/statistics/lonstudentsubmissions.pm 2009/04/21 13:28:23 1.54
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentsubmissions.pm,v 1.35 2005/02/23 19:41:27 matthew Exp $
+# $Id: lonstudentsubmissions.pm,v 1.54 2009/04/21 13:28:23 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -27,7 +27,7 @@
package Apache::lonstudentsubmissions;
use strict;
-use Apache::lonnet();
+use Apache::lonnet;
use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::loncoursedata();
@@ -37,6 +37,9 @@ use Apache::lonstathelpers;
use HTML::Entities();
use Time::Local();
use Spreadsheet::WriteExcel();
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
my @SubmitButtons = ({ name => 'SelectAnother',
text => 'Choose a different Problem' },
@@ -63,16 +66,18 @@ sub BuildStudentSubmissionsPage {
my @Students = @Apache::lonstatistics::Students;
#
if (@Students < 1) {
- $r->print('
There are no students in the sections selected ');
+ $r->print(''
+ .&mt('There are no students in the sections selected.')
+ .'
');
}
#
my @CacheButtonHTML =
&Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status',
- ''.&mt('Loading student data').' ');
+ ''.&mt('Loading student data...').'
');
$r->rflush();
#
- if (exists($ENV{'form.problemchoice'}) &&
- ! exists($ENV{'form.SelectAnother'})) {
+ if (exists($env{'form.problemchoice'}) &&
+ ! exists($env{'form.SelectAnother'})) {
foreach my $button (@SubmitButtons) {
if ($button->{'name'} eq 'break') {
$r->print(" \n");
@@ -100,7 +105,7 @@ sub BuildStudentSubmissionsPage {
# Get resource objects
my $navmap = Apache::lonnavmaps::navmap->new();
if (!defined($navmap)) {
- $r->print(''.&mt("Internal error").' ');
+ $r->print(''.&mt("Internal error").'
');
return;
}
my %already_seen;
@@ -110,6 +115,9 @@ sub BuildStudentSubmissionsPage {
push(@Problems,$resource);
}
#
+ $r->print(''.
+ &Apache::lonstatistics::section_and_enrollment_description().
+ ' ');
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,11 +265,15 @@ 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+$/) {
@@ -273,7 +285,7 @@ sub prepare_html_output {
$headers{'part'} .= qq{$tmpname };
$nonempty_part_headers = 1;
} else {
- $headers{'part'} .= qq{  };
+ $headers{'part'} .= qq{ };
}
$prob_span += $part_span;
}
@@ -339,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 = [];
}
@@ -349,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],
@@ -364,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,
@@ -429,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'},
@@ -437,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;
}
@@ -468,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
@@ -477,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 .= ' ';
}
@@ -507,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;
#
@@ -528,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'});
}
@@ -553,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});
@@ -625,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;
@@ -658,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'});
@@ -735,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],
@@ -797,8 +834,10 @@ sub compile_response_data {
#
my $submission =
&HTML::Entities::decode
- (&Apache::lonnet::unescape($response->{'Submission'}));
- return () if (! defined($submission) || $submission eq '');
+ (&unescape($response->{'Submission'}));
+ if (!$prob->is_task()) {
+ return () if (! defined($submission) || $submission eq '');
+ }
$submission =~ s/\\\"/\"/g;
$submission =~ s/\\\'/\'/g;
if ($resptype eq 'radiobutton') {
@@ -810,14 +849,14 @@ sub compile_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'});
}
@@ -888,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;
}
#
@@ -902,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);
@@ -970,7 +1011,7 @@ sub prepare_csv_output {
$results = [];
}
for (my $j=0; $jprint(' '.
- ''.&mt('Your csv file.').' '."\n");
+ ''.&mt('Your CSV file.').' '."\n");
$r->rflush();
return;
}
@@ -1039,7 +1080,7 @@ sub CreateInterface {
my $output_selector = $/.''.$/;
foreach ('HTML','Excel','CSV') {
$output_selector .= ' '.$/;
@@ -1048,74 +1089,84 @@ sub CreateInterface {
##
## Environment variable initialization
my $Str = '';
- $Str .= &Apache::lonhtmlcommon::breadcrumbs
- (undef,'Student Submission Reports');
+ $Str .= &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports');
$Str .= '';
- $Str .= '
'."\n";
- $Str .= '';
+ $Str .= &Apache::loncommon::start_data_table();
+ $Str .= &Apache::loncommon::start_data_table_header_row();
$Str .= ''.&mt('Sections').' ';
- $Str .= ''.&mt('Enrollment Status').' ';
- $Str .= ''.&mt('Output as [_1]',$output_selector).' ';
- $Str .= ' '."\n";
+ $Str .= ''.&mt('Groups').' ';
+ $Str .= ''.&mt('Access Status').' ';
+ $Str .= ''.&mt('Options').' ';
+ $Str .= ''.&mt('Output Format').' ';
+ $Str .= &Apache::loncommon::end_data_table_header_row();
#
- $Str .= ''."\n";
+ $Str .= &Apache::loncommon::start_data_table_row();
+ $Str .= ' '."\n";
$Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
$Str .= ' ';
#
+ $Str .= ''."\n";
+ $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5);
+ $Str .= ' ';
+ #
$Str .= '';
$Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
$Str .= ' ';
#
# Render problem checkbox
my $prob_checkbox = ' ';
#
# problem status checkbox
my $prob_status_checkbox = ''.
- &mt('Show problem [_1]',$prob_checkbox).' '.
+ &mt('Show problem').' '.$prob_checkbox.' '.
''.
- &mt('Show correct answers [_1]',$ans_checkbox).' '.
+ &mt('Show correct answers').' '.$ans_checkbox.' '.
''.
- &mt('Show all submissions [_1]',$all_sub_checkbox).
+ &mt('Show all submissions').' '.$all_sub_checkbox.
' '.
''.
- &mt('Show problem grading [_1]',$prob_status_checkbox).
+ &mt('Show problem grading').' '.$prob_status_checkbox.
' '.
'';
#
- $Str .= ' '."\n";
- $Str .= '
'."\n";
+ $Str .= ''.$output_selector.' ';
+ #
+ $Str .= &Apache::loncommon::end_data_table_row();
+ $Str .= &Apache::loncommon::end_data_table();
#
- $Str .= ''.&mt('Status: [_1]',
- ' ').
- ' '.'';
+ $Str .= ''
+ .&mt('Status: [_1]',
+ ' ')
+ .'
';
+ $Str .= '';
##
return $Str;
}