[LON-CAPA-cvs] cvs: loncom /interface/statistics lonstudentsubmissions.pm
matthew
lon-capa-cvs@mail.lon-capa.org
Wed, 02 Feb 2005 18:53:32 -0000
This is a MIME encoded message
--matthew1107370412
Content-Type: text/plain
matthew Wed Feb 2 13:53:32 2005 EDT
Modified files:
/loncom/interface/statistics lonstudentsubmissions.pm
Log:
HTML output of each foil item is done. Excel & CSV output remain to do.
--matthew1107370412
Content-Type: text/plain
Content-Disposition: attachment; filename="matthew-20050202135332.txt"
Index: loncom/interface/statistics/lonstudentsubmissions.pm
diff -u loncom/interface/statistics/lonstudentsubmissions.pm:1.29 loncom/interface/statistics/lonstudentsubmissions.pm:1.30
--- loncom/interface/statistics/lonstudentsubmissions.pm:1.29 Mon Dec 6 11:53:39 2004
+++ loncom/interface/statistics/lonstudentsubmissions.pm Wed Feb 2 13:53:32 2005
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentsubmissions.pm,v 1.29 2004/12/06 16:53:39 matthew Exp $
+# $Id: lonstudentsubmissions.pm,v 1.30 2005/02/02 18:53:32 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -148,6 +148,36 @@
}
}
+##
+## get_headers:
+## return the proper headers for the given response
+sub get_headers {
+ my ($prob,$partid,$respid,$resptype,$analysis,$output,$purpose,
+ @basic_headers) = @_;
+ my @headers;
+ if ($resptype eq 'essay' && $purpose eq 'display' &&
+ ($output eq 'html')) {# || scalar(@{$prob->parts})!=1)) {
+ @headers = ();
+ } elsif ($resptype =~ /^(option|match|rank)$/) {
+ my $prefix = '_';
+ if ($purpose eq 'display') {
+ $prefix = '';
+ }
+ my @foils =
+ map {
+ $prefix.$_;
+ } sort(keys(%{$analysis->{$partid.'.'.$respid}->{'_Foils'}}));
+ if (scalar(@basic_headers) && $basic_headers[0] eq 'Correct') {
+ @foils = map { ($_ , $_.' Correct') } @foils;
+ shift(@basic_headers); # Get rid of 'Correct'
+ }
+ @headers = (@foils,@basic_headers);
+ } else {
+ @headers = ('Submission',@basic_headers);
+ }
+ return @headers;
+}
+
#########################################################
#########################################################
##
@@ -167,17 +197,17 @@
}
#
# Compute the number of columns per response
- my @response_headers = ('Submission');
+ my @extra_resp_headers;
if ($ENV{'form.correctans'} eq 'true') {
- push(@response_headers,'Correct');
+ push(@extra_resp_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');
+ 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(@response_headers);
+ my $response_multiplier = scalar(@extra_resp_headers);
#
# Create the table header
my @student_columns = ('username','domain','id');
@@ -192,7 +222,13 @@
# we put the headers into the %headers hash
my $total_col = scalar(@student_columns);
my $nonempty_part_headers = 0;
+ #
+ my %problem_analysis;
foreach my $prob (@$problems) {
+ my $src = $prob->src;
+ my %analysis = &Apache::lonstathelpers::get_problem_data($src);
+ $problem_analysis{$prob->src}=\%analysis;
+ #
my $prob_span = 0;
my $single_part = 0;
if (scalar(@{$prob->parts}) == 1) {
@@ -203,17 +239,21 @@
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);
+ my $respid = $responses->[$i];
+ my @headers = &get_headers($prob,$partid,$respid,
+ $resptypes->[$i],
+ $problem_analysis{$prob->src},
+ 'html','display',
+ @extra_resp_headers);
+ if (scalar(@headers)>0) {
+ $total_col += scalar(@headers);
+ $part_span += scalar(@headers);
$headers{'response'} .=
- '<th colspan="'.scalar(@response_headers).'">'.
+ '<th colspan="'.scalar(@headers).'">'.
&mt('Response [_1]',$responses->[$i]).'</th>';
- $headers{'student'}.= '<th>'.join('</th><th>',
- @response_headers).
- '</th>';
- $part_span += scalar(@response_headers);
+ $headers{'student'}.= '<th>'.join('</th><th><nobr>',
+ @headers).
+ '</nobr></th>';
}
}
if (! $single_part) {
@@ -257,7 +297,9 @@
my $count;
$r->print($/.$full_header.$/);
my $row_class = 'odd'; # css
+ my $mycount = 10;
foreach my $student (@$students) {
+ last if ($mycount-- < 1);
my $student_row_data;
if ($count++ >= 30) {
$r->print('</table>'.$/.$full_header.$/);
@@ -271,50 +313,58 @@
#
# Figure out what it is we need to output for this student
my @essays;
- my %problem_data;
+ my %prob_data;
my $maxrow;
foreach my $prob (@$problems) {
- my $symb = $prob->symb;
- $problem_data{$symb}={};
+ $prob_data{$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 $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 $respid = $responses[$i];
my $results =
&Apache::loncoursedata::get_response_data_by_student
($student,$prob->symb(),$respid);
+ my $resptype = $response_type[$i];
+ my @headers = &get_headers($prob,$partid,$respid,
+ $resptype,
+ $problem_analysis{$prob->src},
+ 'html','normal',
+ @extra_resp_headers);
+ my $width = scalar(@headers);
+ my $resp_data;
+ $resp_data->{'fake'} = qq{<td colspan="$width"> </td>};
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);
}
+ my $response = &hashify_response($results->[$j],
+ $prob,
+ $student,
+ $partid,
+ $respid);
if ($resptype eq 'essay') {
push(@essays,
- &html_essay_results($student,
+ &html_essay_results(\@headers,
$prob,$partid,$respid,
$response,
$single_response).
'</td>');
} else {
push(@{$resp_data->{'real'}},
- &html_results($student,
- $prob,$partid,$respid,
- $response,$resptype));
+ &html_non_essay_results(\@headers,
+ $prob,$partid,$respid,
+ $response,$resptype));
}
- }
+ }
+ $prob_data{$prob->symb}->{$partid}->{$respid}=$resp_data;
} # end of $i loop
} # end of partid loop
} # end of prob loop
@@ -333,14 +383,13 @@
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};
+ $prob_data{$prob->symb}->{$partid}->{$respid};
next if ($response_type[$i] eq 'essay');
if (defined($resp_data->{'real'}->[$rows_output])) {
$html .= $resp_data->{'real'}->[$rows_output];
@@ -370,24 +419,39 @@
return;
}
+sub hashify_response {
+ my ($response,$prob,$student,$partid,$respid) =@_;
+ my $resp_hash = {};
+ if ($ENV{'form.correctans'} eq 'true') {
+ $resp_hash->{'Correct'} =
+ &Apache::lonstathelpers::get_student_answer
+ ($prob,$student->{'username'},$student->{'domain'},
+ $partid,$respid);
+ }
+ $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()];
+ return $resp_hash;
+}
+
#####################################################
##
## 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::get_student_answer
- ($prob,$student->{'username'},$student->{'domain'},
- $partid,$respid);
- $correct = &html_format_sub($correct,'essay');
+ my ($headers,$prob,$partid,$respid,$response,$single_response)=@_;
+ if (! ref($headers) || ref($headers) ne 'ARRAY') {
+ return '';
}
+ # Start of telling them what problem, part, and response
my $Str;
if (! $single_response) {
my $id = $prob->compTitle;
@@ -399,93 +463,103 @@
}
$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 />';
+ #
+ shift(@$headers); # Get rid of the Submission header
+ my $correct = '';
+ if ($headers->[0] eq 'Correct') {
+ $correct = &html_format_essay_sub($response->{'Correct'});
+ shift(@$headers);
+ }
+ $Str .= '<nobr>'.
+ join('',
+ map {
+ (' 'x4).&mt($_.': [_1]',$response->{$_});
+ } @$headers).'</nobr>';
+ if (@$headers || ! $single_response) {
+ $Str .= '<br />';
}
- $Str .= $submission;
+ $Str .= &html_format_essay_sub($response->{'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::get_student_answer
- ($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_essay_sub {
+ my ($submission) = @_;
+ return '' if (! defined($submission) || $submission eq '');
+ $submission = &HTML::Entities::decode($submission);
+ $submission =~ s/\\\"/\"/g;
+ $submission =~ s/\\\'/\'/g;
+ $submission =~ s|\\r\\n|$/|g;
+ $submission = &HTML::Entities::encode($submission,'<>&"');
+ $submission =~ s|$/\s*$/|$/</p><p>$/|g;
+ $submission =~ s|\\||g;
+ $submission = '<p>'.$submission.'</p>';
+ return $submission;
}
-sub html_format_sub {
- my ($submission,$resptype) = @_;
+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'});
return '' if (! defined($submission) || $submission eq '');
- $submission = &HTML::Entities::decode($submission);
$submission =~ s/\\\"/\"/g;
$submission =~ s/\\\'/\'/g;
- 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') {
+ if ($resptype eq 'radiobutton') {
$submission = &HTML::Entities::encode($submission,'<>&"');
$submission =~ s/=([^=])$//;
- } elsif ($resptype =~ /^(option|match|rank)$/) {
- $submission =
- '<ul class="sub_studentans">'.
- '<li>'.join('</li><li>',
- map { &HTML::Entities::encode($_,'<>&"');
- } map {
- &Apache::lonnet::unescape($_) ;
- } sort split('&',$submission)
- ).
- '</li><ul>';
+ $submission = '<nobr>'.$submission.'</nobr>';
+ }
+ $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,&HTML::Entities::encode($option));
+ } else {
+ # A normal column
+ push(@values,$response->{$original_header});
+ }
+ }
} else {
- $submission = &HTML::Entities::encode($submission,'<>&"');
+ @values = map { $response->{$_}; } @$headers;
}
- return $submission;
+ my $td = '<td valign="top">';
+ my $str = $td.join('</td>'.$td,@values).'</td>';
+ return $str;
}
+
#########################################################
#########################################################
##
@@ -771,17 +845,17 @@
}
#
# Compute the number of columns per response
- my @response_headers = ('Submission');
+ my @extra_resp_headers;
if ($ENV{'form.correctans'} eq 'true') {
- push(@response_headers,'Correct');
+ push(@extra_resp_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');
+ 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(@response_headers);
+ my $response_multiplier = scalar(@extra_resp_headers);
#
# Create the table header
my @student_columns = ('username','domain','id');
@@ -807,8 +881,8 @@
my $resp_idx = $prob_start_idx + $response_multiplier * $i;
$headers{'response'}->[$resp_idx]=
&mt('Response [_1]',$responses->[$i]);
- for (my $j=0;$j<=$#response_headers;$j++) {
- $headers{'student'}->[$resp_idx+$j]=$response_headers[$j];
+ for (my $j=0;$j<=$#extra_resp_headers;$j++) {
+ $headers{'student'}->[$resp_idx+$j]=$extra_resp_headers[$j];
}
}
$part_start_idx += scalar(@$responses)*$response_multiplier;
--matthew1107370412--