--- loncom/interface/statistics/lonstudentsubmissions.pm 2004/06/25 20:43:33 1.12 +++ loncom/interface/statistics/lonstudentsubmissions.pm 2004/08/31 15:22:51 1.13 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentsubmissions.pm,v 1.12 2004/06/25 20:43:33 matthew Exp $ +# $Id: lonstudentsubmissions.pm,v 1.13 2004/08/31 15:22:51 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -162,19 +162,36 @@ sub prepare_excel_output { &mt('See the status bar above for student answer computation progress'). '

'); # - &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students, - 'Statistics','stats_status'); + if ($ENV{'form.correctans'} eq 'true') { + &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students, + 'Statistics', + 'stats_status'); + } # $r->print(''); $r->rflush(); - my @Columns = ( 'username','domain','attempt','time', - 'submission','correct', 'grading','awarded','weight', - 'score'); - my $awarded_col = 7; - my $weight_col = 8; + my @Columns; + push(@Columns,'username'); + push(@Columns,'domain'); + push(@Columns,'attempt'); + push(@Columns,'time'); + push(@Columns,'submission'); + if ($ENV{'form.correctans'} eq 'true') { push(@Columns,'correct'); } + push(@Columns,'grading'); + push(@Columns,'awarded'); + push(@Columns,'weight'); + push(@Columns,'score'); + my ($awarded_col,$weight_col); + if ($ENV{'form.correctans'} eq 'true') { + $awarded_col = 7; + $weight_col = 8; + } else { + $awarded_col = 6; + $weight_col = 7; + } # # Create excel worksheet my $filename = '/prtspool/'. @@ -213,7 +230,7 @@ sub prepare_excel_output { my %row; $row{'username'} = $student->{'username'}; $row{'domain'} = $student->{'domain'}; - $row{'correct'} = $student->{'answer'}; + $row{'correct'} = $student->{'answer'}; $row{'weight'} = &Apache::lonnet::EXT ('resource.'.$partid.'.weight',$resource->{'symb'}, undef,undef,undef); @@ -309,6 +326,7 @@ sub CreateInterface { $Str .= ''; $Str .= ''.&mt('Sections').''; $Str .= ''.&mt('Enrollment Status').''; + $Str .= ' '; $Str .= ''."\n"; # $Str .= ''."\n"; @@ -319,6 +337,14 @@ sub CreateInterface { $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); $Str .= ''; # + my $checkbox = ''. + &mt('compute correct answers [_1]',$checkbox).''.''; + # $Str .= ''."\n"; $Str .= ''."\n"; #