[LON-CAPA-cvs] cvs: loncom /interface/statistics lonstudentsubmissions.pm
matthew
lon-capa-cvs@mail.lon-capa.org
Wed, 22 Sep 2004 15:38:49 -0000
This is a MIME encoded message
--matthew1095867529
Content-Type: text/plain
matthew Wed Sep 22 11:38:49 2004 EDT
Modified files:
/loncom/interface/statistics lonstudentsubmissions.pm
Log:
Complete re-write of html output to support multiple problem & part output.
Seems to work pretty well and produce relatively no-ugly output.
--matthew1095867529
Content-Type: text/plain
Content-Disposition: attachment; filename="matthew-20040922113849.txt"
Index: loncom/interface/statistics/lonstudentsubmissions.pm
diff -u loncom/interface/statistics/lonstudentsubmissions.pm:1.20 loncom/interface/statistics/lonstudentsubmissions.pm:1.21
--- loncom/interface/statistics/lonstudentsubmissions.pm:1.20 Mon Sep 20 15:24:02 2004
+++ loncom/interface/statistics/lonstudentsubmissions.pm Wed Sep 22 11:38:49 2004
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentsubmissions.pm,v 1.20 2004/09/20 19:24:02 matthew Exp $
+# $Id: lonstudentsubmissions.pm,v 1.21 2004/09/22 15:38:49 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -124,7 +124,11 @@
$r->rflush();
}
}
- &new_excel_output($r,\@Problems,\@Students);
+ if ($ENV{'form.output'} eq 'excel') {
+ &prepare_excel_output($r,\@Problems,\@Students);
+ } else {
+ &prepare_html_output($r,\@Problems,\@Students);
+ }
}
$r->print('<hr />');
} else {
@@ -144,8 +148,343 @@
#########################################################
#########################################################
+##
+## HTML Output Routines
+##
+#########################################################
+#########################################################
+sub prepare_html_output {
+ my ($r,$problems,$students) = @_;
+ my $c = $r->connection();
+ #
+ # Set a flag for the case when there is just one problem
+ my $single_response = 0;
+ if (scalar(@$problems) == 1 &&
+ $problems->[0]->countResponses == 1) {
+ $single_response = 1;
+ }
+ #
+ # 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);
+ #
+ # Create the table header
+ my @student_columns = ('username','domain','id');
+ #
+ my %headers;
+ my $student_column_count = scalar(@student_columns);
+ $headers{'problem'} = qq{<th colspan="$student_column_count">\ </th>};
+ foreach (@student_columns) {
+ $headers{'student'}.= '<th>'.ucfirst($_).'</th>';
+ }
+ #
+ # we put the headers into the %headers hash
+ my $total_col = scalar(@student_columns);
+ my $nonempty_part_headers = 0;
+ foreach my $prob (@$problems) {
+ my $prob_span = 0;
+ my $single_part = 0;
+ if (scalar(@{$prob->parts}) == 1) {
+ $single_part = 1;
+ }
+ foreach my $partid (@{$prob->parts}) {
+ my $part_span = 0;
+ 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);
+ $headers{'response'} .=
+ '<th colspan="'.scalar(@response_headers).'">'.
+ &mt('Response [_1]',$responses->[$i]).'</th>';
+ $headers{'student'}.= '<th>'.join('</th><th>',
+ @response_headers).
+ '</th>';
+ $part_span += scalar(@response_headers);
+ }
+ }
+ if (! $single_part) {
+ my $tmpname = $partid;
+ if ($partid =~/^\d+$/) {
+ $tmpname = &mt('Part [_1]',$partid);
+ }
+ $headers{'part'} .= qq{<th colspan="$part_span">$tmpname</th>};
+ $nonempty_part_headers = 1;
+ } else {
+ $headers{'part'} .= qq{<th colspan="$part_span"> </th>};
+ }
+ $prob_span += $part_span;
+ }
+ my $title = &get_title($prob->title,$prob->src);
+ if ($prob_span > 0) {
+ $headers{'problem'}.= qq{<th colspan="$prob_span">$title</th>};
+ } elsif ($single_response) {
+ $prob_span = scalar(@student_columns);
+ $headers{'problem'} = qq{<th colspan="$prob_span">$title</th>};
+ }
+ }
+ if (exists($headers{'part'})) {
+ $headers{'part'} = qq{<th colspan="$student_column_count">\ </th>}.
+ $headers{'part'};
+ }
+ if (exists($headers{'response'})) {
+ $headers{'response'}=
+ qq{<th colspan="$student_column_count">\ </th>}.
+ $headers{'response'};
+ }
+ my $full_header = $/.'<table>'.$/;
+ $full_header .= '<tr align="left">'.$headers{'problem'}.'</tr>'.$/;
+ if ($nonempty_part_headers) {
+ $full_header .= '<tr align="left">'.$headers{'part'}.'</tr>'.$/;
+ }
+ $full_header .= '<tr align="left">'.$headers{'response'}.'</tr>'.$/;
+ $full_header .= '<tr align="left">'.$headers{'student'}.'</tr>'.$/;
+ #
+ # Main loop
+ my $count;
+ $r->print($/.$full_header.$/);
+ my $row_class = 'odd'; # css
+ foreach my $student (@$students) {
+ my $student_row_data;
+ if ($count++ >= 30) {
+ $r->print('</table>'.$/.$full_header.$/);
+ $count = 0;
+ }
+ last if ($c->aborted());
+ foreach my $field (@student_columns) {
+ $student_row_data .=
+ '<td valign="top">'.$student->{$field}.'</td>';
+ }
+ #
+ # Figure out what it is we need to output for this student
+ my @essays;
+ my %problem_data;
+ my $maxrow;
+ foreach my $prob (@$problems) {
+ my $symb = $prob->symb;
+ $problem_data{$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 $results =
+ &Apache::loncoursedata::get_response_data_by_student
+ ($student,$prob->symb(),$respid);
+ 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);
+ }
+ if ($resptype eq 'essay') {
+ push(@essays,
+ &html_essay_results($student,
+ $prob,$partid,$respid,
+ $response,
+ $single_response).
+ '</td>');
+ } else {
+ push(@{$resp_data->{'real'}},
+ &html_results($student,
+ $prob,$partid,$respid,
+ $response,$resptype));
+ }
+ }
+ } # end of $i loop
+ } # end of partid loop
+ } # end of prob loop
+ #
+ # if there is no data, skip this student.
+ next if (! $maxrow && ! scalar(@essays));
+ #
+ # Go through the problem data and output a row.
+ if ($row_class eq 'even') {
+ $row_class = 'odd';
+ } else {
+ $row_class = 'even';
+ }
+ my $printed_something;
+ for (my $rows_output = 0;$rows_output<$maxrow;$rows_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};
+ next if ($response_type[$i] eq 'essay');
+ if (defined($resp_data->{'real'}->[$rows_output])) {
+ $html .= $resp_data->{'real'}->[$rows_output];
+ $no_data = 0;
+ } else {
+ $html .= $resp_data->{'fake'};
+ }
+ }
+ }
+ }
+ if (! $no_data) {
+ $r->print(qq{<tr class="$row_class">$student_row_data$html</tr>}.$/);
+ $printed_something=1;
+ }
+ }
+ if (@essays) {
+ my $tr = qq{<tr class="$row_class">};
+ my $td = qq{<td valign="top" class="essay" colspan="$total_col">};
+ if (! $printed_something) {
+ $r->print($tr.$student_row_data.'</tr>'.$/);
+ }
+ $r->print($tr.$td.
+ join('</td></tr>'.$/.$tr.$td,@essays).'</td></tr>'.$/);
+ undef(@essays);
+ }
+ } # end of student loop
+ return;
+}
+
+#####################################################
+##
+## 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::analyze_problem_as_student
+ ($prob,$student->{'username'},$student->{'domain'},
+ $partid,$respid);
+ $correct = &html_format_sub($correct,'essay');
+ }
+ my $Str;
+ if (! $single_response) {
+ my $id = &get_title($prob->title,$prob->src);
+ if (defined($partid) && $partid ne '0') {
+ $id .= ' '.$partid;
+ }
+ if (defined($respid)) {
+ $id .= ' '.$respid;
+ }
+ $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 />';
+ }
+ $Str .= $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::analyze_problem_as_student
+ ($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_sub {
+ my ($submission,$resptype) = @_;
+ return '' if (! defined($submission) || $submission eq '');
+ 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') {
+ $submission =~ s/=([^=])$//;
+ } elsif ($resptype =~ /^(option|match|rank)$/) {
+ $submission =
+ '<ul class="sub_studentans">'.
+ '<li>'.join('</li><li>',
+ map {
+ &Apache::lonnet::unescape($_) ;
+ } sort split('&',$submission)
+ ).
+ '</li><ul>';
+ }
+ return $submission;
+}
-sub new_excel_output {
+#########################################################
+#########################################################
+##
+## Excel Output Routines
+##
+#########################################################
+#########################################################
+sub prepare_excel_output {
my ($r,$Problems,$Students) = @_;
my $c = $r->connection();
#
@@ -421,271 +760,6 @@
#########################################################
#########################################################
-
-my @DefaultColumns =
- (
- {name=>'username',
- display=>'Student'},
- {name=>'domain',
- display=>'Domain'},
- {name => 'id',
- display => 'Id'},
- # FIXME: Probably need to add score
- );
-
-my @PartColumns =
- (
- {name => 'time',
- display =>'Time'},
- {name => 'attempt',
- display =>'Attempt'},
- {name => 'awarded',
- display =>'Award'},
- {name => 'weight',
- display =>'Part Weight'},
- {name => 'score',
- display =>'Score'},
- );
-
-my @ResponseColumns =
- (
- {name => 'submission',
- display =>'Submission'},
- {name => 'answer',
- display =>'Correct Answer'},
- {name => 'awarddetail',
- display =>'Awarddetail'},
- );
-
-sub get_response_type {
- my ($resource,$partid,$respid) = @_;
- my $response_type = '';
- for (my $i=0;
- $i<scalar(@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}});
- $i++) {
- if($resource->{'partdata'}->{$partid}->{'ResponseIds'}->[$i] eq $respid){
- $response_type =
- $resource->{'partdata'}->{$partid}->{'ResponseTypes'}->[$i];
- last;
- }
- }
- return $response_type;
-}
-
-
-#########################################################
-#########################################################
-##
-## prepare_html_output
-##
-#########################################################
-#########################################################
-sub prepare_html_output {
- my ($r,$Problems,$Students) = @_;
- my $problem;
- my $c = $r->connection();
- my ($resource,$respid,$partid) = ($problem->{'resource'},
- $problem->{'respid'},
- $problem->{'part'});
- #
- if ($ENV{'form.correctans'} eq 'true') {
- $r->print('<h2>'.&mt('Generating Correct Answers').'</h2>');
- &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
- 'Statistics',
- 'stats_status');
- }
- #
- $r->print('<h2>'.&mt('Student Responses').'</h2>');
- #
- $r->rflush();
- my $response_type = &get_response_type($resource,$partid,$respid);
- if (! defined($response_type)) {
- $r->print('<h2>'.&mt('Unable to determine response type').'</h2>');
- return;
- }
- my $count = 0;
- my @Columns;
- if (exists($ENV{'form.concise'}) && $ENV{'form.concise'} eq 'true') {
- foreach (@DefaultColumns) {
- if ($_->{'name'} =~ /^(username|domain|id)$/){
- push(@Columns,$_);
- }
- }
- } else {
- @Columns = @DefaultColumns;
- }
- my $header = '<table>'.$/.&html_headers(\@Columns);
- if ($response_type eq 'essay') {
- $header .= &html_essay_headers();
- } elsif ($response_type eq 'option') {
- $header .= &html_option_headers();
- } else {
- $header .= &html_generic_headers();
- }
- $header = '<tr>'.$header.'</tr>';
- #
- $r->print($/.$header.$/);
- foreach my $student (@$Students) {
- if ($count >= 50) {
- $r->print('</table>'.$/.$header.$/);
- $count = 0;
- }
- last if ($c->aborted());
- my $results = &Apache::loncoursedata::get_response_data_by_student
- ($student,$resource->{'symb'},$respid);
- next if (! defined($results) || ref($results) ne 'ARRAY');
- for (my $i=0;$i<scalar(@$results);$i++) {
- my $response = $results->[$i];
- if ($ENV{'form.last_sub_only'} eq 'true' &&
- $i < (scalar(@$results)-1)) {
- next;
- }
- my $data;
- $data->{'username'} = $student->{'username'};
- $data->{'domain'} = $student->{'domain'};
- $data->{'id'} = $student->{'id'};
- $data->{'fullname'} = $student->{'fullanem'};
- $data->{'status'} = $student->{'status'};
- $data->{'time'} = &Apache::lonlocal::locallocaltime
- ($response->[&Apache::loncoursedata::RDs_timestamp()]);
- $data->{'attempt'} =
- $response->[&Apache::loncoursedata::RDs_tries()];
- $data->{'awarded'} =
- $response->[&Apache::loncoursedata::RDs_awarded()];
- $data->{'awarddetail'} =
- $response->[&Apache::loncoursedata::RDs_awarddetail()];
- $data->{'weight'} = &Apache::lonnet::EXT
- ('resource.'.$partid.'.weight',$resource->{'symb'},
- undef,undef,undef);
- $data->{'score'} = $data->{'weight'} * $data->{'awarded'};
- my $rowextra = 'bgcolor="#CCCCCC"';
- if ($count % 2 == 1) {
- $rowextra = 'bgcolor="#EEEEEE"';
- }
- my $row = '<tr '.$rowextra.'>';
- foreach my $col (@Columns) {
- $row .= '<td valign="top">'.
- $data->{$col->{'name'}}.'</td>';
- }
- if ($response_type eq 'essay') {
- $row .= &html_essay_results
- ($response->[&Apache::loncoursedata::RDs_submission()],
- $student->{'answer'},
- scalar(@Columns),$rowextra);
- } elsif ($response_type eq 'option') {
- $row .= &html_option_results
- ($response->[&Apache::loncoursedata::RDs_submission()],
- $student->{'answer'},
- scalar(@Columns),$rowextra);
- } else {
- $row .= &html_generic_results
- ($response->[&Apache::loncoursedata::RDs_submission()],
- $student->{'answer'},
- scalar(@Columns),$rowextra);
- }
- $row .= '</tr>';
- $r->print($row.$/);
- $count++;
- }
- }
- $r->print('</table>'.$/);
- return;
-}
-
-#####################################################
-##
-## HTML helper routines
-##
-#####################################################
-sub html_headers {
- my ($Columns) = @_;
- my $Str;
- foreach my $column (@$Columns) {
- $Str .= '<th align="left">'.$column->{'display'}.'</th>';
- }
- return $Str;
-}
-
-sub html_essay {
- my ($submission,$correct,$tablewidth,$rowextra)=@_;
- #
- $submission =~ s|\\r\\n|$/|g;
- $submission = &HTML::Entities::encode($submission,'<>&"');
- $submission =~ s|$/\s*$/|$/</p><p>$/|g;
- $submission =~ s|\\||g;
- $submission = '<p>'.$submission.'</p>';
- #
- my $Str = '</tr><tr '.$rowextra.'>'.
- '<td colspan="'.$tablewidth.'">'.$submission.'</td>';
- if ($ENV{'form.correctans'} eq 'true') {
- $Str .= '</tr>';
- if (defined($correct) && $correct !~ /^\s*$/) {
- $Str .= '<tr '.$rowextra.'><td colspan="'.$tablewidth.'">'.
- '<b>'.&mt('Correct Answer:').'</b>'.$correct.'</td>';
- }
- }
- $Str .= '</tr>';
- #
- return $Str;
-}
-
-sub html_essay_headers {
- return '';
-}
-
-sub html_generic_headers {
- my $header ='<th>'.&mt('Submission').'</th>';
- if ($ENV{'form.correctans'} eq 'true') {
- $header .= '<th>'.&mt('Correct').'</th>';
- }
- return $header;
-}
-
-sub html_option_headers {
- return &html_generic_headers();
-}
-
-sub html_radiobutton_results {
- my ($submission,$correct,$tablewidth,$rowclass)=@_;
- $submission =~ s/=([^=])$//;
- return &html_generic_results($submission,$correct,$tablewidth,$rowclass);
-}
-
-sub html_generic_results {
- my ($submission,$correct,$tablewidth,$rowclass)=@_;
- my $Str .= '<td>'.$submission.'</td>';
- if ($ENV{'form.correctans'} eq 'true') {
- $Str .= '<td>'.$correct.'</td>';
- }
- $Str .= '</tr>';
- return $Str;
-}
-
-sub html_option_results {
- my ($submission,$correct,$tablewidth,$rowclass)=@_;
- $submission =
- '<ul class="sub_studentans">'.
- '<li>'.join('</li><li>',
- map {
- &Apache::lonnet::unescape($_) ;
- } sort split('&',$submission)
- ).
- '</li><ul>';
- if (defined($correct) && $correct !~ /^\s*$/) {
- $correct = '<ul class="sub_correctans">'.
- '<li>'.join('</li><li>',
- map {
- &Apache::lonnet::unescape($_) ;
- } sort split('&',$correct)
- ).
- '</li></ul>';
- }
- #
- return &html_generic_results($submission,$correct,$tablewidth,$rowclass);
-}
-
-#########################################################
-#########################################################
##
## CSV output of student answers
##
@@ -888,201 +962,6 @@
return $Str;
}
-#########################################################
-#########################################################
-##
-## Excel output of student answers and correct answers
-##
-#########################################################
-#########################################################
-sub prepare_excel_output {
- my ($r,$Problems,$Students) = @_;
- my $c = $r->connection();
- #
- $r->print('<h2>'.
- &mt('Preparing Excel spreadsheet of student responses').
- '</h2>');
- if ($ENV{'form.correctans'} eq 'true') {
- $r->print('<p>'.
- &mt('See the status bar above for student answer computation progress').
- '</p>');
- foreach my $problem (@$Problems) {
- my ($resource,$respid,$partid) = ($problem->{'resource'},
- $problem->{'respid'},
- $problem->{'part'});
- #
- &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
- 'Statistics',
- 'stats_status');
- }
- $r->print('<script>'.
- 'window.document.Statistics.stats_status.value="'.
- 'Done computing student answers. Compiling spreadsheet.'.
- '";</script>');
- }
- #
- $r->rflush();
-
-
- my @ColumnLabels;
- my @Columns = @DefaultColumns;
- my %seen;
- foreach my $problem (@$Problems) {
- my ($resource,$respid,$partid) = ($problem->{'resource'},
- $problem->{'respid'},
- $problem->{'part'});
- my $partkey = $resource->{'symb'}.':'.$partid;
- if (! $seen{$partkey}) {
- $ColumnLabels[$#Columns]=$resource->{'title'};
- push(@ColumnLabels,$partid);
- push(@Columns,@PartColumns);
- }
- push(@Column
- if ($ENV{'form.correctans'} eq 'true') {
- push(@Columns,'Computers answer');
- }
- $seen{$resource->{'symb'}.':'.$partid} .= ':'.$respid;
-
- }
-
-# my ($awarded_col,$weight_col);
-# for (my $i=0;$i<=$#Columns;$i++) {
-# if ($Columns[$i]->{'name'} eq 'weight' ) { $weight_col = $i; }
-# if ($Columns[$i]->{'name'} eq 'awarded') { $awarded_col = $i; }
-# }
-
- #
- # Create excel worksheet
- 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('<p>'.&mt("Unable to create new Excel file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator").
- '</p>');
- return undef;
- }
- #
- $workbook->set_tempdir('/home/httpd/perl/tmp');
- #
- my $format = &Apache::loncommon::define_excel_formats($workbook);
- my $worksheet = $workbook->addworksheet('Student Submission Data');
- #
- # Make sure we get new weight data instead of data on a 10 minute delay
- &Apache::lonnet::clear_EXT_cache_status();
- #
- # Put on the standard headers and whatnot
- my $rows_output=0;
- $worksheet->write($rows_output++,0,$resource->{'title'},$format->{'h1'});
- $worksheet->write($rows_output++,0,$resource->{'src'},$format->{'h3'});
- $rows_output++;
- $worksheet->write_row($rows_output++,0,
- [map {$_->{'display'}} @Columns],
- $format->{'bold'});
- #
- # Populate the worksheet with the student data
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,'Excel File Compilation Status',
- 'Excel File Compilation Progress',
- scalar(@$Students),'inline',undef,'Statistics','stats_status');
- foreach my $student (@$Students) {
- last if ($c->aborted());
- my $results = &Apache::loncoursedata::get_response_data_by_student
- ($student,$resource->{'symb'},$respid);
- my %row;
- $row{'username'} = $student->{'username'};
- $row{'domain'} = $student->{'domain'};
- $row{'id'} = $student->{'id'};
- $row{'correct'} = $student->{'answer'};
- $row{'weight'} = &Apache::lonnet::EXT
- ('resource.'.$partid.'.weight',$resource->{'symb'},
- undef,undef,undef);
- if (! defined($results) || ref($results) ne 'ARRAY') {
- $row{'score'} = '='.
- &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
- ($rows_output,$awarded_col)
- .'*'.
- &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
- ($rows_output,$weight_col);
- my $cols_output = 0;
- foreach my $col (@Columns) {
- if (! exists($row{$col->{'name'}})) {
- $cols_output++;
- next;
- }
- $worksheet->write($rows_output,$cols_output++,
- $row{$col->{'name'}});
- }
- $rows_output++;
- } else {
- for (my $i=0;$i<scalar(@$results);$i++) {
- my $response = $results->[$i];
- if ($ENV{'form.last_sub_only'} eq 'true' &&
- $i < (scalar(@$results)-1)) {
- next;
- }
- delete($row{'time'});
- delete($row{'attempt'});
- delete($row{'submission'});
- delete($row{'awarded'});
- delete($row{'grading'});
- delete($row{'score'});
- my %row_format;
- #
- # Time is handled differently
- $row{'time'} = &Apache::lonstathelpers::calc_serial
- ($response->[&Apache::loncoursedata::RDs_timestamp()]);
- $row_format{'time'}=$format->{'date'};
- #
- $row{'attempt'} = $response->[
- &Apache::loncoursedata::RDs_tries()];
- $row{'submission'} = $response->[
- &Apache::loncoursedata::RDs_submission()];
- if ($row{'submission'} =~ m/^=/) {
- # This will be interpreted as a formula. That is bad!
- $row{'submission'} = " ".$row{'submission'};
- }
- $row{'awarddetail'} = $response->[
- &Apache::loncoursedata::RDs_awarddetail()];
- $row{'awarded'} = $response->[
- &Apache::loncoursedata::RDs_awarded()];
- $row{'score'} = '='.
- &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
- ($rows_output,$awarded_col)
- .'*'.
- &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
- ($rows_output,$weight_col);
- my $cols_output = 0;
- foreach my $col (@Columns) {
- $worksheet->write($rows_output,$cols_output++,$row{$col->{'name'}},
- $row_format{$col->{'name'}});
- }
- $rows_output++;
- }
- } # End of else clause on if (! defined($results) ....
- &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 'last student');
- }
- &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- #
- # Close the excel file
- $workbook->close();
- #
- # Write a link to allow them to download it
- $r->print('<p><a href="'.$filename.'">'.
- &mt('Your Excel spreadsheet.').
- '</a></p>'."\n");
- $r->print('<script>'.
- 'window.document.Statistics.stats_status.value="'.
- 'Done compiling spreadsheet. See link below to download.'.
- '";</script>');
- $r->rflush();
- return;
-}
-
=cut
#########################################################
@@ -1096,7 +975,8 @@
##
## Output Selection
my $output_selector = $/.'<select name="output">'.$/;
- foreach ('HTML','Excel','CSV') {
+# foreach ('HTML','Excel','CSV') {
+ foreach ('HTML','Excel') {
$output_selector .= ' <option value="'.lc($_).'"';
if ($ENV{'form.output'} eq lc($_)) {
$output_selector .= ' selected ';
@@ -1114,7 +994,7 @@
$Str .= '<tr>';
$Str .= '<th>'.&mt('Sections').'</th>';
$Str .= '<th>'.&mt('Enrollment Status').'</th>';
- $Str .= '<th>'.&mt('Output Options').'</th>';
+ $Str .= '<th>'.&mt('Output as [_1]',$output_selector).'</th>';
$Str .= '</tr>'."\n";
#
$Str .= '<tr><td align="center">'."\n";
--matthew1095867529--