--- loncom/interface/statistics/lonproblemanalysis.pm 2005/02/16 17:43:20 1.111 +++ loncom/interface/statistics/lonproblemanalysis.pm 2013/12/30 14:19:58 1.142.2.3 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.111 2005/02/16 17:43:20 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.142.2.3 2013/12/30 14:19:58 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,7 +27,7 @@ package Apache::lonproblemanalysis; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::loncoursedata(); @@ -38,6 +38,9 @@ use Apache::lonstudentsubmissions(); use HTML::Entities(); use Time::Local(); use capa; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + my $plotcolors = ['#33ff00', '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933', @@ -59,6 +62,7 @@ sub BuildProblemAnalysisPage { # my %Saveable_Parameters = ('Status' => 'scalar', 'Section' => 'array', + 'Groups' => 'array', 'NumPlots' => 'scalar', 'AnalyzeOver' => 'scalar', ); @@ -69,12 +73,17 @@ sub BuildProblemAnalysisPage { # &Apache::lonstatistics::PrepareClasslist(); # + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Detailed Problem Analysis')); + $r->print(&CreateInterface()); # my @Students = @Apache::lonstatistics::Students; # - if (@Students < 1 && exists($ENV{'form.firstrun'})) { - $r->print('

There are no students in the sections selected

'); + if (@Students < 1 && exists($env{'form.firstrun'})) { + $r->print('
' + .&mt('There are no students in the sections/groups selected.') + .'
' + ); } # my @CacheButtonHTML = @@ -82,8 +91,8 @@ sub BuildProblemAnalysisPage { $r->rflush(); # my $problem_types = '(option|radiobutton|numerical)'; - 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"); @@ -97,70 +106,88 @@ sub BuildProblemAnalysisPage { $r->print($html.(' 'x5)); } # + + # This is commented out pending actual implementation of + # CSV and Excel output. + #$r->print(&Apache::lonstathelpers::submission_report_form + # ('problem_analysis')); + # $r->print('
'); $r->rflush(); # # Determine which problem we are to analyze my $current_problem = &Apache::lonstathelpers::get_target_from_id - ($ENV{'form.problemchoice'}); + ($env{'form.problemchoice'}); # - my ($prev,$curr,$next) = + my ($navmap,$prev,$curr,$next) = &Apache::lonstathelpers::get_prev_curr_next($current_problem, $problem_types, 'response', ); - if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) { + if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) { $current_problem = $prev; - } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) { + } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) { $current_problem = $next; } else { $current_problem = $curr; } # # Store the current problem choice and send it out in the form - $ENV{'form.problemchoice'} = + $env{'form.problemchoice'} = &Apache::lonstathelpers::make_target_id($current_problem); $r->print(''); + $env{'form.problemchoice'}.'" />'); # if (! defined($current_problem->{'resource'})) { $r->print('resource is undefined'); } else { my $resource = $current_problem->{'resource'}; - $r->print('

'.$resource->{'title'}.'

'); - $r->print('

'.$resource->{'src'}.'

'); - if ($ENV{'form.show_prob'} eq 'true') { - $r->print(&Apache::lonstathelpers::render_resource($resource)); + $r->print('

'.$resource->compTitle.'

'); + $r->print('

'.$resource->src.'

'); + $r->print('

'.&Apache::lonstatistics::section_and_enrollment_description().'

'); + if ($env{'form.show_prob'} eq 'true') { + $r->print('
' + .&Apache::lonstathelpers::render_resource($resource) + .'
' + ); } $r->rflush(); - my %Data = &Apache::lonstathelpers::get_problem_data - ($resource->{'src'}); - my $problem_data = $Data{$current_problem->{'part'}. - '.'. - $current_problem->{'respid'}}; - if ($current_problem->{'resptype'} eq 'option') { - &OptionResponseAnalysis($r,$current_problem, - $problem_data, - \@Students); - } elsif ($current_problem->{'resptype'} eq 'radiobutton') { - &radio_response_analysis($r,$current_problem, - $problem_data, - \@Students); - } elsif ($current_problem->{'resptype'} eq 'numerical') { - &numerical_response_analysis($r,$current_problem, - $problem_data,\@Students); - } else { - $r->print('

Analysis of '.$current_problem->{'resptype'}.' is not supported

'); - } + if (@Students) { + my %Data = &Apache::lonstathelpers::get_problem_data + ($resource->src); + my $problem_data = $Data{$current_problem->{'part'}. + '.'. + $current_problem->{'respid'}}; + if ($current_problem->{'resptype'} eq 'option') { + &OptionResponseAnalysis($r,$current_problem, + $problem_data, + \@Students); + } elsif ($current_problem->{'resptype'} eq 'radiobutton') { + &radio_response_analysis($r,$current_problem, + $problem_data, + \@Students); + } elsif ($current_problem->{'resptype'} eq 'numerical') { + &numerical_response_analysis($r,$current_problem, + $problem_data,\@Students); + } else { + $r->print('
' + .&mt('Analysis of [_1] is not supported.' + ,$current_problem->{'resptype'}) + .'
' + ); + } + } } $r->print('
'); } else { - $r->print(''); + my $submit_button = ''; + $r->print($submit_button); $r->print(' 'x5); $r->print('

'.&mt('Please select a problem to analyze').'

'); - $r->print(&Apache::lonstathelpers::ProblemSelector - ($problem_types)); + $r->print(&Apache::lonstathelpers::problem_selector($problem_types, + $submit_button)); } } @@ -175,7 +202,7 @@ sub numerical_response_analysis { my ($r,$problem,$problem_analysis,$students) = @_; my $c = $r->connection(); # - if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) { + if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) { $r->print('Bad request'); } # @@ -184,9 +211,10 @@ sub numerical_response_analysis { $problem->{'respid'}); # Gather student data my $response_data = &Apache::loncoursedata::get_response_data - (\@Apache::lonstatistics::SelectedSections, + ([&Apache::lonstatistics::get_selected_sections()], + [&Apache::lonstatistics::get_selected_groups()], $Apache::lonstatistics::enrollment_status, - $resource->{'symb'},$respid); + $resource->symb,$respid); # $problem_analysis->{'answercomputed'} = 1; if ($problem_analysis->{'answercomputed'}) { @@ -198,26 +226,27 @@ sub numerical_response_analysis { } # if (ref($response_data) ne 'ARRAY') { - $r->print('

'. - &mt('There is no submission data for this resource'). - '

'); + $r->print('
' + .&mt('There is no submission data for this resource.') + .'
' + ); return; } my $analysis_html = ''; - for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) { + for (my $plot_num = 1;$plot_num<=$env{'form.NumPlots'};$plot_num++) { my $restriction_function; my $header_message; my $stats_message; my $post_message; # passed through &mt sooner rather than later my $no_data_message; my @extra_data; - if ($ENV{'form.AnalyzeOver'} eq 'tries') { + if ($env{'form.AnalyzeOver'} eq 'tries') { $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)}; $header_message = 'Attempt [_1]'; $stats_message = '[_1] submissions, [_2] correct, [_3] incorrect'; $post_message = ''; - $no_data_message = 'No data exists for attempt [_1]'; + $no_data_message = 'No data exists for attempt [_1].'; } else { my $starttime = &Apache::lonhtmlcommon::get_date_from_form ('startdate_'.$plot_num); @@ -260,13 +289,14 @@ sub numerical_response_analysis { $respid,$students); if ($c->aborted()) { return; }; # - my $responses = &numerical_classify_responses($response_data,$correct, - $restriction_function); - if ($responses->{'_count'} == 0) { + my ($responses,$stats) = + &numerical_classify_responses($response_data,$correct, + $restriction_function); + if ($stats->{'submission_count'} == 0) { $analysis_html.= - ''; + ''; } else { $analysis_html.= ''. ''. ''.''. + &numerical_plot_percent($r,$responses,$stats).''. ''. + &numerical_plot_differences($r,$responses,$stats).''. ''; } if ($post_message ne '') { @@ -298,63 +328,84 @@ sub numerical_response_analysis { } sub numerical_plot_percent { - my ($r,$responses) = @_; + my ($r,$responses,$stats) = @_; # - my $total = $responses->{'_count'}; + my $total = $stats->{'submission_count'}; return '' if ($total == 0); - my $minbin = 5; - while (my ($interval,$submissions) = each(%$responses)) { - next if ($interval =~ /^_/); - my ($ans,$ans_low,$ans_high) = split(" ",$interval); - my $low_percent = abs(100*($ans-$ans_low)/$ans); - my $high_percent = abs(100*($ans_high-$ans)/$ans); - if ($minbin > $high_percent) { $minbin = $high_percent; } - if ($minbin > $low_percent) { $minbin = $low_percent; } + my $max_bins = 50; + my $lowest_percent = $stats->{'min_percent'}; + my $highest_percent = $stats->{'max_percent'}; + my $percent_spread = $highest_percent - $lowest_percent; + foreach (qw/20 30 40 50 100 200/) { + if ($percent_spread < $_) { + $highest_percent =$_/2; + last; + } + } + $percent_spread = $highest_percent - $lowest_percent; + my $bin_size = 1; + foreach (qw/0.01 0.05 0.1 0.5 1 2 5 10 20 25 50 100/) { + if ($lowest_percent/2 < $_){ + $bin_size = $_; + if ( ($percent_spread/$bin_size) < $max_bins ) { + last; + } + } } - # my @bins; - if ($minbin < 1) { - @bins = ('0.1','0.5','1.0','1.5','2.0','2.5','3.0','4.0','5.0',10,20,50,100); - } elsif ($minbin < 2) { - @bins = ('0.5','1.0','1.5','2.0','2.5','3.0','4.0','5.0',10,20,50,100); - } elsif ($minbin < 5) { - @bins = (1,2,3,4,5,10,25,50,75,100,200); - } elsif ($minbin < 10) { - @bins = (2,4,6,8,10,12,15,20,25,30,50,75,100,200); - } else { - @bins = (5,10,15,20,25,30,50,75,100,200); + for (my $bin = -$highest_percent;$bin<0;$bin+=$bin_size) { + push (@bins,$bin); + } + for (my $bin = 0; $bin<$highest_percent;$bin+=$bin_size) { + push (@bins,$bin); } - my @labels = (1..scalar(@bins)); + push(@bins,$highest_percent); # my @correct; my @incorrect; my @count; - while (my ($interval,$submissions) = each(%$responses)) { - next if ($interval =~ /^_/); - my ($ans,$ans_low,$ans_high) = split(" ",$interval); + while (my ($ans,$submissions) = each(%$responses)) { while (my ($submission,$counts) = each(%$submissions)) { my ($correct_count,$incorrect_count) = @$counts; - my $scaled_value = abs(($submission-$ans)/$ans); - my $bin=0; - for ($bin=0;$bin<$#bins;$bin++) { # not <= for a reason + my $scaled_value = + ($ans) ? 100*($submission-$ans)/abs($ans) + : 0; + if ($scaled_value < $bins[0]) { + $bins[0]=$scaled_value -1; + } + my $bin; + for ($bin=0;$bin<$#bins;$bin++) { last if ($bins[$bin]>$scaled_value); } - $correct[$bin]+=$correct_count; - $incorrect[$bin]+=$incorrect_count; - $count[$bin]+=$correct_count+$incorrect_count; + $correct[$bin-1]+=$correct_count; + $incorrect[$bin-1]+=$incorrect_count; + $count[$bin-1]+=$correct_count+$incorrect_count; } } # - my @plot_correct; - my @plot_incorrect; - for (my $i=0;$i<=$#bins;$i++) { - $plot_correct[$i] = $correct[$i]*100/$total; - $plot_incorrect[$i] = $incorrect[$i]*100/$total; + my @plot_correct = @correct; + my @plot_incorrect = @incorrect; + my $max; + for (my $i=0;$i<$#bins;$i++) { + $plot_correct[$i] *= 100/$total; + $plot_incorrect[$i] *= 100/$total; + if (! defined($max) || + $max < $plot_correct[$i]+$plot_incorrect[$i] ) { + $max = $plot_correct[$i]+$plot_incorrect[$i]; + } + } + foreach (qw/1 5 10 15 20 25 30 40 50 75 100/) { + if ($max <$_) { $max = $_; last; } } - my $title = &mt('Distribution by Percent'); + # + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Percent Difference', + 'xlabel' => 'Percent Difference from Correct', + 'ylabel' => 'Percent of Answers'); + my @labels = (1..scalar(@bins)-1); my $graph = &Apache::loncommon::DrawBarGraph - ($title,'Percent difference from correct','Number of answers', - 100,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, + ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, + $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, {xskip=>1}); # my $table = $graph.$/. @@ -363,64 +414,74 @@ sub numerical_plot_percent { } sub numerical_plot_differences { - my ($r,$responses) = @_; + my ($r,$responses,$stats) = @_; # - my $total = $responses->{'_count'}; + my $total = $stats->{'submission_count'}; return '' if ($total == 0); - my $minbin = undef; - my $maxbin = undef; - while (my ($interval,$submissions) = each(%$responses)) { - next if ($interval =~ /^_/); - my ($ans,$ans_low,$ans_high) = split(" ",$interval); - my $low_diff = abs($ans-$ans_low); - my $high_diff = abs($ans_high-$ans); - if (! defined($maxbin)) { $maxbin = $low_diff;} - if (! defined($minbin)) { $minbin = $low_diff;} - # - if ($minbin > $high_diff) { $minbin = $high_diff; } - if ($minbin > $low_diff ) { $minbin = $low_diff; } - # - if ($maxbin < $high_diff) { $maxbin = $high_diff; } - if ($maxbin < $low_diff ) { $maxbin = $low_diff; } - } - # + my $max_bins = 21; + my $min_bin_size = $stats->{'min_abs'}; + my $low_bin = $stats->{'lowest_ans'}-$stats->{'max_bin_size'}; + my $high_bin = $stats->{'highest_ans'}+$stats->{'max_bin_size'}; + if ($high_bin > 0 && $low_bin > -$high_bin) { + $low_bin = -$high_bin; + } elsif ($low_bin < 0 && $high_bin < -$low_bin) { + $high_bin = -$low_bin; + } + if ($high_bin == $low_bin) { + $high_bin+=1; + $low_bin-=1; + } + if (!$min_bin_size || + ($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) { + $min_bin_size = abs($high_bin - $low_bin) / $max_bins * 2; + } my @bins; - my @labels; - # Hmmmm, should switch to absolute difference - for (my $i=1;$i<=20;$i++) { - push(@bins,$i*$minbin/2); - push(@labels,$i); + for (my $num = $low_bin;$num <= $high_bin;$num+=($min_bin_size/2)) { + push(@bins,$num); } # my @correct; my @incorrect; my @count; - while (my ($interval,$submissions) = each(%$responses)) { - next if ($interval =~ /^_/); - my ($ans,$ans_low,$ans_high) = split(" ",$interval); + while (my ($ans,$submissions) = each(%$responses)) { while (my ($submission,$counts) = each(%$submissions)) { my ($correct_count,$incorrect_count) = @$counts; - my $value = abs($submission-$ans); + my $scaled_value = $submission-$ans; + if ($scaled_value < $bins[0]) { + $bins[0]=$scaled_value-1; + } my $bin=0; - for ($bin=0;$bin<$#bins;$bin++) { # not <= for a reason - last if ($bins[$bin]>$value); + for ($bin=0;$bin<$#bins;$bin++) { + last if ($bins[$bin]>$scaled_value); } - $correct[$bin]+=$correct_count; - $incorrect[$bin]+=$incorrect_count; - $count[$bin]+=$correct_count+$incorrect_count; + $correct[$bin-1]+=$correct_count; + $incorrect[$bin-1]+=$incorrect_count; + $count[$bin-1]+=$correct_count+$incorrect_count; } } - # - my @plot_correct; - my @plot_incorrect; + my @plot_correct = @correct; + my @plot_incorrect = @incorrect; + my $max; for (my $i=0;$i<=$#bins;$i++) { - $plot_correct[$i] = $correct[$i]*100/$total; - $plot_incorrect[$i] = $incorrect[$i]*100/$total; - } - my $title = &mt('Distribution by Magnitude'); + $plot_correct[$i] *= 100/$total; + $plot_incorrect[$i] *= 100/$total; + if (! defined($max) || + $max < $plot_correct[$i]+$plot_incorrect[$i] ) { + $max = $plot_correct[$i]+$plot_incorrect[$i]; + } + } + foreach (qw/1 5 10 15 20 25 30 40 50 75 100/) { + if ($max <$_) { $max = $_; last; } + } + # + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Difference between submission and correct', + 'xlabel' => 'Difference from Correct', + 'ylabel' => 'Percent of Answers'); + my @labels = (1..scalar(@bins)-1); my $graph = &Apache::loncommon::DrawBarGraph - ($title,'magnitude difference from correct','Number of answers', - 100,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, + ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, + $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, {xskip=>1}); # my $table = $graph.$/. @@ -429,60 +490,101 @@ sub numerical_plot_differences { } sub numerical_classify_responses { - &Apache::lonnet::logthis('--------------'); my ($full_row_data,$correct,$function) = @_; my %submission_data; my %students; + my %stats; my $max=0; foreach my $row (@$full_row_data) { -# &Apache::lonnet::logthis(' row = '.join(',',@$row)); my %subm = &hashify_attempt($row); if (ref($correct) eq 'HASH') { - $subm{'correct'} = $correct->{$subm{'student'}}->{'answer'}; - $subm{'unit'} = $correct->{$subm{'student'}}->{'unit'}; + my $s_correct = $correct->{$subm{'student'}}; + $subm{'correct'} = $s_correct->{'answer'}; + foreach my $item ('unit','ans_low','ans_high') { + $subm{$item} = $s_correct->{$item}; + } } else { # This probably never happens.... $subm{'correct'} = $correct->{'answer'}; $subm{'unit'} = $correct->{'unit'}; } + # + my $abs_low =abs($subm{'correct'}-$subm{'ans_low'}); + my $abs_high=abs($subm{'correct'}-$subm{'ans_high'}); + if (! defined($stats{'min_abs'}) || + $stats{'min_abs'} > $abs_low) { + $stats{'min_abs'} = $abs_low; + } + if ($stats{'min_abs'} > $abs_high) { + $stats{'min_abs'} = $abs_high; + } + if (! defined($stats{'max_abs'}) || + $stats{'max_abs'} < $abs_low) { + $stats{'max_abs'} = $abs_low; + } + if ($stats{'max_abs'} < $abs_high) { + $stats{'max_abs'} = $abs_high; + } + my $low_percent; + my $high_percent; + if (defined($subm{'correct'}) && $subm{'correct'} != 0) { + $low_percent = 100 * abs($abs_low / $subm{'correct'}); + $high_percent = 100 * abs($abs_high / $subm{'correct'}); + } + if (! defined($stats{'min_percent'}) || + $stats{'min_percent'} > $low_percent) { + $stats{'min_percent'} = $low_percent; + } + if ($stats{'min_percent'} > $high_percent) { + $stats{'min_percent'} = $high_percent; + } + if (! defined($stats{'max_percent'}) || + $stats{'max_percent'} < $low_percent) { + $stats{'max_percent'} = $low_percent; + } + if ($stats{'max_percent'} < $high_percent) { + $stats{'max_percent'} = $high_percent; + } + if (! defined($stats{'lowest_ans'}) || + $stats{'lowest_ans'} > $subm{'correct'}) { + $stats{'lowest_ans'} = $subm{'correct'}; + } + if (! defined($stats{'highest_ans'}) || + $stats{'highest_ans'} < $subm{'correct'}) { + $stats{'highest_ans'} = $subm{'correct'}; + } + # $subm{'submission'} =~ s/=\d+\s*$//; if (&$function(\%subm)) { my $scaled = '1'; my ($sname,$sdom) = split(':',$subm{'student'}); - # Note that $subm{'unit'} is modified by the following call - # We do not use it again but you should be aware just in case. my ($myunit,$mysub) = ($subm{'unit'},$subm{'submission'}); my $result = &capa::caparesponse_get_real_response($myunit, $mysub, \$scaled); +# &Apache::lonnet::logthis('scaled = '.$scaled.' result ='.$result); next if (! defined($scaled)); - next if ($result ne '6'); +# next if ($result ne '6'); my $submission = $scaled; $students{$subm{'student'}}++; + $stats{'submission_count'}++; if (&numerical_submission_is_correct($subm{'award'})) { - &Apache::lonnet::logthis('correct:'.$submission.':'.$subm{'correct'}); - $submission_data{'_correct'}++; - $submission_data{'_count'}++; + $stats{'correct_count'}++; $submission_data{$subm{'correct'}}->{$submission}->[0]++; } elsif (&numerical_submission_is_incorrect($subm{'award'})) { - &Apache::lonnet::logthis('incorrect:'.$submission.':'.$subm{'correct'}); - $submission_data{'_count'}++; + $stats{'incorrect_count'}++; $submission_data{$subm{'correct'}}->{$submission}->[1]++; } - my $value = - $submission_data{$subm{'correct'}}->{$submission}->[0]+ - $submission_data{$subm{'correct'}}->{$submission}->[1]; - if ($max < $value) { $max = $value; } } } - $submission_data{'_max'} = $max; - $submission_data{'_students'}=scalar(keys(%students)); - return \%submission_data; + $stats{'correct_count'} |= 0; + $stats{'incorrect_count'} |= 0; + $stats{'students'}=scalar(keys(%students)); + return (\%submission_data,\%stats); } sub numerical_submission_is_correct { my ($award) = @_; - &Apache::lonnet::logthis('award = "'.$award.'"'); if ($award =~ /^(APPROX_ANS|EXACT_ANS)$/) { return 1; } else { @@ -508,14 +610,11 @@ sub numerical_bin_table { ''. ''. ''.$/; - for (my $i=0;$i[$i-1]; - } - my $highnum = $bins->[$i]; + for (my $i=0;$i[$i]; + if ($i == 0) { $lownum = '-∞'; } + my $highnum = $bins->[$i+1]; + if ($i == scalar(@{$bins})-2) { $highnum = '∞'; } $table .= ''. ''. @@ -535,7 +634,7 @@ sub numerical_determine_answers { my ($r,$resource,$partid,$respid,$students)=@_; my $c = $r->connection(); # - # FIX ME: May need progress dialog updates + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$students)); # # Read in the cache (if it exists) before we start timing things. &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'}); @@ -553,13 +652,26 @@ sub numerical_determine_answers { $sdom); # make the key my $key = $partid.'.'.$respid; - $correct->{$sname.':'.$sdom}->{'answer'} = - $analysis->{$key.'.answer'}->[0]; - $correct->{$sname.':'.$sdom}->{'unit'} = - $analysis->{$key.'.unit'}->[0]; - $answers{$analysis->{$key.'.answer'}->[0]}++; + # pick one of the possible answers + my $which = 'INTERNAL'; + if (!exists($analysis->{$key}{$which})) { + $which = (sort(keys(%{ $analysis->{$key} })))[0]; + } + foreach my $item ('answer','unit','ans_high','ans_low') { + if (ref($analysis->{$key.'.'.$item}) eq 'ARRAY') { + $correct->{$sname.':'.$sdom}->{$item} = + $analysis->{$key.'.'.$item}[0]; + } else { + $correct->{$sname.':'.$sdom}->{$item} = + $analysis->{$key.'.'.$item}{$which}[0][0]; + } + } + $answers{$correct->{$sname.':'.$sdom}{'answer'}}++; + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, + 'last student'); } &Apache::lonstathelpers::write_analysis_cache(); + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); return ($correct,\%answers); } @@ -680,7 +792,7 @@ sub circle { sub radio_response_analysis { my ($r,$problem,$problem_analysis,$students) = @_; # - if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) { + if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) { $r->print('Bad request'); } # @@ -709,9 +821,10 @@ sub radio_response_analysis { $analysis_html .= $table; # Gather student data my $response_data = &Apache::loncoursedata::get_response_data - (\@Apache::lonstatistics::SelectedSections, + ([&Apache::lonstatistics::get_selected_sections()], + [&Apache::lonstatistics::get_selected_groups()], $Apache::lonstatistics::enrollment_status, - $resource->{'symb'},$respid); + $resource->symb,$respid); my $correct; # either a hash reference or a scalar if ($problem_analysis->{'answercomputed'} || scalar(@$concepts) > 1) { # This takes a while for large classes... @@ -722,7 +835,7 @@ sub radio_response_analysis { my ($idx,@remainder) = split('&',$student->{'answer'}); my ($answer) = ($remainder[$idx]=~/^(.*)=([^=]*)$/); $correct->{$student->{'username'}.':'.$student->{'domain'}}= - &Apache::lonnet::unescape($answer); + &unescape($answer); } } else { foreach my $foil (keys(%$foildata)) { @@ -733,29 +846,29 @@ sub radio_response_analysis { } # if (! defined($response_data) || ref($response_data) ne 'ARRAY' ) { - $analysis_html = '

'. - &mt('There is no submission data for this resource'). - '

'; + $analysis_html = '
' + .&mt('There is no submission data for this resource.') + .'
'; $r->print($analysis_html); return; } # $analysis_html.='
'. + '
'. &mt($no_data_message,$plot_num,@extra_data). - '
'. @@ -274,16 +304,16 @@ sub numerical_response_analysis { '
'. &mt($stats_message, - $responses->{'_count'}, - $responses->{'_correct'}, - $responses->{'_count'}-$responses->{'_correct'}, - $responses->{'_students'}, + $stats->{'submission_count'}, + $stats->{'correct_count'}, + $stats->{'incorrect_count'}, + $stats->{'students'}, @extra_data). '
'. - &numerical_plot_percent($r,$responses).''. - &numerical_plot_differences($r,$responses).'
'.&mt('Correct').''.&mt('Count').'
'.$labels->[$i].'
'; - for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) { + for (my $plot_num = 1;$plot_num<=$env{'form.NumPlots'};$plot_num++) { # classify data ->correct foil -> selected foil my ($restriction_function, $correct_foil_title,$incorrect_foil_title, $pre_graph_text,$post_graph_text, $no_data_text,@extra_data); - if ($ENV{'form.AnalyzeOver'} eq 'tries') { + if ($env{'form.AnalyzeOver'} eq 'tries') { $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)}; - $correct_foil_title = 'Attempt '.$plot_num; - $incorrect_foil_title = 'Attempt '.$plot_num; + $correct_foil_title = &mt('Attempt [_1]',$plot_num); + $incorrect_foil_title = &mt('Attempt [_1]',$plot_num); $pre_graph_text = 'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect'; $post_graph_text = ''; $no_data_text = 'No data exists for attempt [_1]'; - } elsif ($ENV{'form.AnalyzeOver'} eq 'time') { + } elsif ($env{'form.AnalyzeOver'} eq 'time') { my $starttime = &Apache::lonhtmlcommon::get_date_from_form ('startdate_'.$plot_num); my $endtime = &Apache::lonhtmlcommon::get_date_from_form @@ -766,7 +879,9 @@ sub radio_response_analysis { &get_time_from_row($response_data->[-1]), $plot_num); $pre_graph_text = - 'Data from [_6] to [_7]
[_2] submissions from [_5] students, [_3] correct, [_4] incorrect'; + 'Data from [_6] to [_7]' + .'
' + .'[_2] submissions from [_5] students, [_3] correct, [_4] incorrect'; $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime); $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime); # @@ -806,8 +921,9 @@ sub radio_response_analysis { # Concept Plot my $concept_plot = ''; if (scalar(@$concepts) > 1) { + my $title = &mt('Correct Concepts'); $concept_plot = &RR_concept_plot($concepts,$foil_choice_data, - 'Correct Concepts'); + $title); } # % Choosing plot my $choice_plot = &RR_create_percent_selected_plot @@ -825,16 +941,14 @@ sub radio_response_analysis { $choice_plot ne '' || $stacked_plot ne '') { my $correct = $foil_choice_data->{'_correct'}; - if (! defined($correct) || $correct eq '') { - $correct = 0; - } - my $incorrect = + $correct |= 0; + my $incorrect = $foil_choice_data->{'_count'}-$correct; $analysis_html.= ''.$/; @@ -856,11 +970,13 @@ sub radio_response_analysis { } } elsif ($no_data_text ne '') { $analysis_html.=''; + $analysis_html.= ''; } else { - $analysis_html.= ''; + $analysis_html.= ''; } last; } @@ -1247,14 +1372,19 @@ sub OR_tries_analysis { } } # + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Correct Concepts', + 'xlabel' => 'Concept Number', + 'ylabel' => 'Percent Correct'); $concept_graph = &Apache::loncommon::DrawBarGraph - ('Correct Concepts','Concept Number','Percent Correct', + ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, 100,$plotcolors,undef,\@concept_plot_data,{xskip=>1}); } # # Create Foil Plots my $data_count = $response_data{'_total'}->[$try]; my $correct = $response_data{'_correct'}->[$try]; + $correct |= 0; my @Datasets; foreach my $option ('_correct',@{$ORdata->{'_Options'}}) { next if (! exists($foil_plot[$try]->{$option})); @@ -1285,8 +1415,12 @@ sub OR_tries_analysis { push(@Labels,''); } # + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Correct Statements', + 'xlabel' => 'Statement', + 'ylabel' => '% Answered Correct'); my $correct_graph = &Apache::loncommon::DrawBarGraph - ('Correct Statements','Statement','% Answered Correct', + ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, 100,$plotcolors,\@Labels,$Datasets[0],{xskip=>1}); # @@ -1297,8 +1431,12 @@ sub OR_tries_analysis { } my $count = $response_data{'_total'}->[$try] - $response_data{'_correct'}->[$try]; + %lt = &Apache::lonlocal::texthash( + 'title' => 'Incorrect Statements', + 'xlabel' => 'Statement', + 'ylabel' => '% Chosen Incorrectly'); my $incorrect_graph = &Apache::loncommon::DrawBarGraph - ('Incorrect Statements','Statement','% Chosen Incorrectly', + ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, 100,$plotcolors,\@Labels,@Datasets,{xskip=>1}); $analysis_html.= ''.$/; my $concept_correct_plot = ''; @@ -1441,7 +1581,7 @@ sub OR_time_analysis { $table .= ''.$/; - $table.= ''.$/; + $table.= ''.$/; } $table .= '
'. ''. &mt($pre_graph_text, $plot_num,$foil_choice_data->{'_count'}, $correct, - $foil_choice_data->{'_count'}-$correct, + $incorrect, $foil_choice_data->{'_students'}, @extra_data). '
'. + '
'. &mt($no_data_text, $plot_num,$foil_choice_data->{'_count'}, $correct, $foil_choice_data->{'_count'}-$correct, - @extra_data); + @extra_data). + '
'; if (defined($post_graph_text)) { $analysis_html.='
'.$post_graph_text; } @@ -879,7 +995,7 @@ sub ensure_start_end_times { (localtime($last - $sec_in_day*($plot_num-1)))[3..5]; $start = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear); $end = $start + $sec_in_day; - if ($plot_num == $ENV{'form.NumPlots'}) { + if ($plot_num == $env{'form.NumPlots'}) { $start = $first; } } @@ -888,7 +1004,6 @@ sub ensure_start_end_times { sub RR_concept_plot { my ($concepts,$foil_data,$title) = @_; - &Apache::lonnet::logthis('got to RR_concept_plot'); # my %correct_by_concept; my %incorrect_by_concept; @@ -923,10 +1038,11 @@ sub RR_concept_plot { for (my $i=0;$i<=$#correct;$i++) { $correct[$i] = sprintf('%0f',$correct[$i]/$total*100); } - my $xlabel = 'concept'; + my $xlabel = &mt('concept'); + my $ylabel = &mt('Percent Choosing'); my $plot= &Apache::loncommon::DrawBarGraph($title, $xlabel, - 'Percent Choosing', + $ylabel, 100, ['#33ff00','#ff3300'], undef, @@ -936,7 +1052,6 @@ sub RR_concept_plot { sub RR_create_percent_selected_plot { my ($concepts,$foils,$foil_data,$title) = @_; - &Apache::lonnet::logthis('got to RR_create_percent_selected_plot'); # if ($foil_data->{'_count'} == 0) { return ''; }; my %correct_selections; @@ -993,10 +1108,11 @@ sub RR_create_percent_selected_plot { @labels = (1 .. scalar(@correct)); } # - my $xlabel = 'foil chosen'; + my $xlabel = &mt('foil chosen'); + my $ylabel = &mt('Percent Choosing'); my $plot= &Apache::loncommon::DrawBarGraph($title, $xlabel, - 'Percent Choosing', + $ylabel, 100, ['#33ff00','#ff3300'], \@labels, @@ -1008,7 +1124,6 @@ sub RR_create_percent_selected_plot { sub RR_create_stacked_selection_plot { my ($foils,$foil_data,$title,$true_foils)=@_; # - &Apache::lonnet::logthis('got to RR_create_stacked_selection_plot'); my @dataset; # array of array refs - multicolor rows $datasets[row]->[col] my @labels; my $count; @@ -1058,8 +1173,10 @@ sub RR_create_stacked_selection_plot { push(@empty_row,0); } # + my $xlabel = &mt('Correct Foil'); + my $ylabel = &mt('foils chosen Incorrectly'); my $graph = &Apache::loncommon::DrawBarGraph - ($title,'Correct Foil','foils chosen Incorrectly', + ($title,$xlabel,$ylabel, 100,$plotcolors,\@labels,\@empty_row,@dataset); return ($graph,\%count_per_foil); } @@ -1119,32 +1236,34 @@ sub OptionResponseAnalysis { $problem->{'respid'}); # Note: part data is not needed. my $PerformanceData = &Apache::loncoursedata::get_response_data - (\@Apache::lonstatistics::SelectedSections, + ([&Apache::lonstatistics::get_selected_sections()], + [&Apache::lonstatistics::get_selected_groups()], $Apache::lonstatistics::enrollment_status, - $resource->{'symb'},$respid); + $resource->symb,$respid); if (! defined($PerformanceData) || ref($PerformanceData) ne 'ARRAY' ) { - $r->print('

'. - &mt('There is no student data for this problem.'). - '

'); + $r->print('
' + .&mt('There is no student data for this problem.') + .'
' + ); } else { $r->rflush(); - if ($ENV{'form.AnalyzeOver'} eq 'tries') { + if ($env{'form.AnalyzeOver'} eq 'tries') { my $analysis_html = &OR_tries_analysis($r, $PerformanceData, $problem_data); $r->print($analysis_html); $r->rflush(); - } elsif ($ENV{'form.AnalyzeOver'} eq 'time') { + } elsif ($env{'form.AnalyzeOver'} eq 'time') { my $analysis_html = &OR_time_analysis($PerformanceData, $problem_data); $r->print($analysis_html); $r->rflush(); } else { - $r->print('

'. - &mt('The analysis you have selected is '. - 'not supported at this time'). - '

'); + $r->print('div class="LC_warning"' + .&mt('The analysis you have selected is not supported at this time.') + .'' + ); } } } @@ -1157,7 +1276,7 @@ sub OptionResponseAnalysis { sub OR_tries_analysis { my ($r,$PerformanceData,$ORdata) = @_; my $mintries = 1; - my $maxtries = $ENV{'form.NumPlots'}; + my $maxtries = $env{'form.NumPlots'}; my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); if (! defined($Concepts)) { $Concepts = []; @@ -1221,12 +1340,18 @@ sub OR_tries_analysis { if (! defined($response_data{'_total'}->[$try]) || $response_data{'_total'}->[$try] == 0) { if ($try > 1) { - $analysis_html.= '
'. - &mt('None of the selected students attempted the problem more than [_1] times.',$try-1). - '
' + .'
' + .&mt('None of the selected students attempted the problem more than [quant,_1,time].' + ,$try-1) + .'
' + .'
'. - &mt('None of the selected students have attempted the problem').'
' + .'
' + .&mt('None of the selected students have attempted the problem.') + .'
' + .'
'. @@ -1360,13 +1498,14 @@ sub OR_time_analysis { if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); } # if ($num_concepts < 2) { - $table = '

'. - &mt('Not enough data for concept analysis. '. - 'Performing Foil Analysis'). - '

'.$table; + $table = '

'. + &mt('Not enough data for concept analysis.'. + ' Performing Foil Analysis instead.'). + '

'. + $table; } # - my $num_plots = $ENV{'form.NumPlots'}; + my $num_plots = $env{'form.NumPlots'}; my $num_data = scalar(@$performance_data)-1; # my $current_index; @@ -1417,9 +1556,10 @@ sub OR_time_analysis { ## my ($processed_time_data,$correct,$data_count,$student_count) = &OR_time_process_data($performance_data,$begin_index,$end_index); + $correct |= 0; ## $table .= '
'. - &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect', + &mt('[quant,_1,submission,submissions,No submissions] from [quant,_2,student], [_3] correct, [_4] incorrect', $data_count,$student_count,$correct,$data_count-$correct). '
'. &mt('Start time: [_1]',$startdateform).'
'. &mt('End time: [_1]',$enddateform).'
 
 
'; # @@ -1452,7 +1592,11 @@ sub OR_Foil_Time_Analysis { my ($processed_time_data,$correct,$data_count,$student_count, $ORdata,$Foils,$Concepts) = @_; if ($data_count <= 0) { - return ('

'.&mt('There is no data to plot').'

',''); + return ('
' + .&mt('There is no data to plot.') + .'
' + ,'' + ); } my $analysis_html; my @plotdata; @@ -1487,9 +1631,13 @@ sub OR_Foil_Time_Analysis { } # # Create the plot - my $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements', - 'Statement Number', - 'Percent Correct', + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Correct Statements', + 'xlabel' => 'Statement Number', + 'ylabel' => 'Percent Correct'); + my $correct_plot = &Apache::loncommon::DrawBarGraph($lt{'title'}, + $lt{'xlabel'}, + $lt{'ylabel'}, 100, $plotcolors, undef, @@ -1498,10 +1646,14 @@ sub OR_Foil_Time_Analysis { for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) { $plotdata[0]->[$j]=0; } + %lt = &Apache::lonlocal::texthash( + 'title' => 'Incorrect Statements', + 'xlabel' => 'Statement Number', + 'ylabel' => 'Incorrect Option Choice'); my $incorrect_plot = - &Apache::loncommon::DrawBarGraph('Incorrect Statements', - 'Statement Number', - 'Incorrect Option Choice', + &Apache::loncommon::DrawBarGraph($lt{'title'}, + $lt{'xlabel'}, + $lt{'ylabel'}, 100, $plotcolors, undef, @@ -1530,9 +1682,13 @@ sub OR_Concept_Time_Analysis { } # # Create the plot - return &Apache::loncommon::DrawBarGraph('Correct Concepts', - 'Concept Number', - 'Percent Correct', + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Correct Concepts', + 'xlabel' => 'Concept Number', + 'ylabel' => 'Percent Correct'); + return &Apache::loncommon::DrawBarGraph($lt{'title'}, + $lt{'xlabel'}, + $lt{'ylabel'}, 100, $plotcolors, undef, @@ -1628,23 +1784,23 @@ sub build_foil_index { } # # Build up the table of row labels. - my $table = ''."\n"; + my $table = &Apache::loncommon::start_data_table(); if (@Concepts > 1) { - $table .= ''. + $table .= &Apache::loncommon::start_data_table_header_row(). ''. ''. ''. ''. ''. ''. - "\n"; + &Apache::loncommon::end_data_table_header_row(); } else { - $table .= ''. + $table .= &Apache::loncommon::start_data_table_header_row(). ''. ''. ''. ''. - "\n"; + &Apache::loncommon::end_data_table_header_row(); } my $conceptindex = 1; my $foilindex = 1; @@ -1652,39 +1808,39 @@ sub build_foil_index { my @FoilsInConcept = @{$concept->{'foils'}}; my $firstfoil = shift(@FoilsInConcept); if (@Concepts > 1) { - $table .= ''. + $table .= &Apache::loncommon::start_data_table_row(). ''. ''. ''. ''. ''. ''. - "\n"; + &Apache::loncommon::end_data_table_row(); } else { - $table .= ''. + $table .= &Apache::loncommon::start_data_table_row(). ''. ''. ''. ''. - "\n"; + &Apache::loncommon::end_data_table_row(); } foreach my $foilid (@FoilsInConcept) { if (@Concepts > 1) { - $table .= ''. + $table .= &Apache::loncommon::start_data_table_row(). ''. ''. ''. ''. ''. ''. - "\n"; + &Apache::loncommon::end_data_table_row(); } else { - $table .= ''. + $table .= &Apache::loncommon::start_data_table_row(). ''. ''. ''. ''. - "\n"; + &Apache::loncommon::end_data_table_row(); } } continue { $foilindex++; @@ -1692,7 +1848,7 @@ sub build_foil_index { } continue { $conceptindex++; } - $table .= "
'.&mt('Concept Number').''.&mt('Concept').''.&mt('Foil Number').''.&mt('Foil Name').''.&mt('Foil Text').''.&mt('Correct Value').'
'.&mt('Foil Number').''.&mt('Foil Name').''.&mt('Foil Text').''.&mt('Correct Value').'
'.$conceptindex.''.&HTML::Entities::encode($concept->{'name'},'<>&"').''.$foilindex++.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').''.$Foildata{$firstfoil}->{'text'}.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'
'.$foilindex++.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').''.$Foildata{$firstfoil}->{'text'}.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'
'.$foilindex.''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').''.$Foildata{$foilid}->{'text'}.''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'
'.$foilindex.''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').''.$Foildata{$foilid}->{'text'}.''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'
\n"; + $table .= &Apache::loncommon::end_data_table(); # # Build option index with color stuff return ($table,\@Foils,\@Concepts); @@ -1748,99 +1904,93 @@ sub build_foil_key { sub CreateInterface { ## ## Environment variable initialization - if (! exists$ENV{'form.AnalyzeOver'}) { - $ENV{'form.AnalyzeOver'} = 'tries'; + if (! exists($env{'form.AnalyzeOver'})) { + $env{'form.AnalyzeOver'} = 'tries'; } ## ## Build the menu my $Str = ''; - $Str .= &Apache::lonhtmlcommon::breadcrumbs - (undef,'Detailed Problem Analysis'); - $Str .= ''."\n"; - $Str .= ''; - $Str .= ''; - $Str .= ''; -# $Str .= ''; - $Str .= ''; - $Str .= ''."\n"; + $Str .= '

'; + $Str .= &Apache::loncommon::start_data_table(); + $Str .= &Apache::loncommon::start_data_table_header_row(); + $Str .= '

'; + $Str .= ''; + $Str .= ''; + $Str .= ''; + $Str .= &Apache::loncommon::end_data_table_header_row(); ## ## - $Str .= ''; # + $Str .= ''; + # $Str .= ''; # -# $Str .= ''; ## ## - $Str .= ''."\n"; - $Str .= '
'.&mt('Sections').''.&mt('Enrollment Status').''.&mt('Sequences and Folders').' 
'.&mt('Sections').''.&mt('Groups').''.&mt('Access Status').''.&mt('Options').'
'."\n"; + $Str .= &Apache::loncommon::start_data_table_row(); + $Str .= ''."\n"; $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5); $Str .= ''."\n"; + $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5); + $Str .= ''; $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); $Str .= ''; - my $only_seq_with_assessments = sub { - my $s=shift; - if ($s->{'num_assess'} < 1) { - return 0; - } else { - return 1; - } - }; - &Apache::lonstatistics::MapSelect('Maps','multiple,all',5, - $only_seq_with_assessments); ## ## - $Str .= ''; + $Str .= ''; ## my $showprob_checkbox = - '
'; + $Str.= '
'; ## my $analyze_selector = ''; - $Str .= '
'.$/; + '
'.$/; ## my $numplots_selector = '
'; - $Str .= ''; + $numplots_selector .= ''; + $Str .= '
'; ## - $Str .= ''; $Str .= '
'."\n"; + $Str .= &Apache::loncommon::end_data_table_row(); + $Str .= &Apache::loncommon::end_data_table(); + $Str .= '

'; + $Str .= '

'; return $Str; } @@ -1872,7 +2022,7 @@ sub hashify_attempt { my %attempt; $attempt{'student'} = $row->[&Apache::loncoursedata::RD_sname()]; $attempt{'tries'} = $row->[&Apache::loncoursedata::RD_tries()]; - $attempt{'submission'} = &Apache::lonnet::unescape($row->[&Apache::loncoursedata::RD_submission()]); + $attempt{'submission'} = &unescape($row->[&Apache::loncoursedata::RD_submission()]); $attempt{'award'} = $row->[&Apache::loncoursedata::RD_awarddetail()]; $attempt{'timestamp'} = $row->[&Apache::loncoursedata::RD_timestamp()]; return %attempt; @@ -1896,12 +2046,12 @@ sub Process_OR_Row { my @Foilsubs = split('&',$submission); for (my $j=0;$j<=$#Foilgrades;$j++) { my ($foilid,$correct) = split('=',$Foilgrades[$j]); - $foilid = &Apache::lonnet::unescape($foilid); + $foilid = &unescape($foilid); my (undef,$submission) = split('=',$Foilsubs[$j]); if ($correct) { $RowData{$foilid}->{'_correct'}++; } else { - $submission = &Apache::lonnet::unescape($submission); + $submission = &unescape($submission); $RowData{$foilid}->{$submission}++; } $RowData{$foilid}->{'_total'}++;