[$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()];
- my $rowextra = 'bgcolor="#CCCCCC"';
- if ($count % 2 == 1) {
- $rowextra = 'bgcolor="#EEEEEE"';
- }
- my $row = '';
- foreach my $col (@Columns) {
- $row .= '| '.
- $data->{$col->{'name'}}.' | ';
- }
- if ($response_type eq 'essay') {
- $row .= &html_essay
- ($response->[&Apache::loncoursedata::RDs_submission()],
- $student->{'answer'},
- scalar(@Columns),$rowextra);
- } elsif ($response_type eq 'option') {
- $row .= &html_option
- ($response->[&Apache::loncoursedata::RDs_submission()],
- $student->{'answer'},
- scalar(@Columns),$rowextra);
- } else {
- $row .= &html_generic
- ($response->[&Apache::loncoursedata::RDs_submission()],
- $student->{'answer'},
- scalar(@Columns),$rowextra);
+ # 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{ | };
+ 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).
+ '');
+ } 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'};
+ }
+ }
}
- $row .= '
';
- $r->print($row.$/);
- $count++;
+ }
+ if (! $no_data) {
+ $r->print(qq{$student_row_data$html
}.$/);
+ $printed_something=1;
}
}
- $r->print(''.$/);
- }
+ if (@essays) {
+ my $tr = qq{};
+ my $td = qq{| };
+ if (! $printed_something) {
+ $r->print($tr.$student_row_data.' |
'.$/);
+ }
+ $r->print($tr.$td.
+ join(''.$/.$tr.$td,@essays).''.$/);
+ undef(@essays);
+ }
+ } # end of student loop
return;
}
@@ -298,139 +373,156 @@ sub prepare_html_output {
## HTML helper routines
##
#####################################################
-sub html_headers {
- my ($Columns) = @_;
- my $Str;
- foreach my $column (@$Columns) {
- $Str .= ''.$column->{'display'}.' | ';
- }
- return $Str;
-}
-
-sub html_essay {
- my ($submission,$correct,$tablewidth,$rowextra)=@_;
+sub html_essay_results {
+ my ($student,$prob,$partid,$respid,$response,$single_response)=@_;
#
- $submission =~ s|\\r\\n|$/|g;
- $submission = &HTML::Entities::encode($submission,'<>&"');
- $submission =~ s|$/\s*$/|$/$/|g;
- $submission =~ s|\\||g;
- $submission = '
'.$submission.'
';
+ my $submission =$response->[&Apache::loncoursedata::RDs_submission()];
+ $submission = &html_format_sub($submission,'essay');
#
- my $Str = ''.
- '| '.$submission.' | ';
+ my $correct = '';
if ($ENV{'form.correctans'} eq 'true') {
- $Str .= '
';
- if (defined($correct) && $correct !~ /^\s*$/) {
- $Str .= '| '.
- ''.&mt('Correct Answer:').''.$correct.' | ';
+ $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 .= ''.$id.''.(' 'x4);
+ }
+ if ($ENV{'form.prob_status'} eq 'true') {
+ $Str .= '';
+ $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 .= '
';
+ }
+ $Str .= $submission;
+ if (defined($correct) && $correct !~ /^\s*$/) {
+ $Str .= '
'.&mt('Correct').''.$correct
}
- $Str .= '
';
- #
return $Str;
}
-sub html_essay_headers {
- return '';
-}
-
-sub html_generic_headers {
- my $header =''.&mt('Submission').' | ';
+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') {
- $header .= ''.&mt('Correct').' | ';
+ $correct = &Apache::lonstathelpers::analyze_problem_as_student
+ ($prob,$student->{'username'},$student->{'domain'},
+ $partid,$respid);
+ $correct = &html_format_sub($correct,$resptype);
}
- return $header;
-}
-
-sub html_radiobutton {
- my ($submission,$correct,$tablewidth,$rowclass)=@_;
- $submission =~ s/=([^=])$//;
- return &html_generic_results($submission,$correct,$tablewidth,$rowclass);
-}
-
-sub html_generic {
- my ($submission,$correct,$tablewidth,$rowclass)=@_;
- my $Str .= ''.$submission.' | ';
+ my $Str;
+ $Str .= ''.$submission.' | ';
if ($ENV{'form.correctans'} eq 'true') {
- $Str .= ''.$correct.' | ';
+ $Str .= ''.$correct.' | ';
+ }
+ if ($ENV{'form.prob_status'} eq 'true') {
+ $Str .= ''.
+ $response->[&Apache::loncoursedata::RDs_awarddetail()].
+ ' | ';
+ $Str .= ''.
+ &Apache::lonlocal::locallocaltime
+ ($response->[&Apache::loncoursedata::RDs_timestamp()]).
+ ' | ';
+ $Str .= ''.
+ $response->[&Apache::loncoursedata::RDs_tries()].
+ ' | ';
+ $Str .= ''.
+ $response->[&Apache::loncoursedata::RDs_awarded()].
+ ' | ';
}
- $Str .= '';
return $Str;
}
-sub html_option_headers {
- return &html_generic_headers();
-}
-
-sub html_option {
- my ($submission,$correct,$tablewidth,$rowclass)=@_;
- $submission =
- ''.
- '- '.join('
- ',
- map {
- &Apache::lonnet::unescape($_) ;
- } sort split('&',$submission)
- ).
- '