--- loncom/interface/statistics/lonproblemanalysis.pm 2013/12/30 14:19:58 1.142.2.3 +++ loncom/interface/statistics/lonproblemanalysis.pm 2012/12/17 03:51:02 1.143 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.142.2.3 2013/12/30 14:19:58 raeburn Exp $ +# $Id: lonproblemanalysis.pm,v 1.143 2012/12/17 03:51:02 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,7 @@ use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::loncoursedata(); +use Apache::lonquickgrades(); use Apache::lonstatistics; use Apache::lonlocal; use Apache::lonstathelpers(); @@ -74,6 +75,7 @@ sub BuildProblemAnalysisPage { &Apache::lonstatistics::PrepareClasslist(); # $r->print(&Apache::lonhtmlcommon::breadcrumbs('Detailed Problem Analysis')); + &Apache::lonquickgrades::startGradeScreen($r,'statistics'); $r->print(&CreateInterface()); # @@ -398,13 +400,10 @@ sub numerical_plot_percent { if ($max <$_) { $max = $_; last; } } # - my %lt = &Apache::lonlocal::texthash( - 'title' => 'Percent Difference', - 'xlabel' => 'Percent Difference from Correct', - 'ylabel' => 'Percent of Answers'); + my $title = &mt('Percent Difference'); my @labels = (1..scalar(@bins)-1); my $graph = &Apache::loncommon::DrawBarGraph - ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, + ($title,'Percent Difference from Correct','Percent of Answers', $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, {xskip=>1}); # @@ -474,13 +473,10 @@ sub numerical_plot_differences { if ($max <$_) { $max = $_; last; } } # - my %lt = &Apache::lonlocal::texthash( - 'title' => 'Difference between submission and correct', - 'xlabel' => 'Difference from Correct', - 'ylabel' => 'Percent of Answers'); + my $title = &mt('Difference between submission and correct'); my @labels = (1..scalar(@bins)-1); my $graph = &Apache::loncommon::DrawBarGraph - ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, + ($title,'Difference from Correct','Percent of Answers', $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, {xskip=>1}); # @@ -862,8 +858,8 @@ sub radio_response_analysis { $no_data_text,@extra_data); if ($env{'form.AnalyzeOver'} eq 'tries') { $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)}; - $correct_foil_title = &mt('Attempt [_1]',$plot_num); - $incorrect_foil_title = &mt('Attempt [_1]',$plot_num); + $correct_foil_title = 'Attempt '.$plot_num; + $incorrect_foil_title = 'Attempt '.$plot_num; $pre_graph_text = 'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect'; $post_graph_text = ''; @@ -921,9 +917,8 @@ 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, - $title); + 'Correct Concepts'); } # % Choosing plot my $choice_plot = &RR_create_percent_selected_plot @@ -1038,11 +1033,10 @@ sub RR_concept_plot { for (my $i=0;$i<=$#correct;$i++) { $correct[$i] = sprintf('%0f',$correct[$i]/$total*100); } - my $xlabel = &mt('concept'); - my $ylabel = &mt('Percent Choosing'); + my $xlabel = 'concept'; my $plot= &Apache::loncommon::DrawBarGraph($title, $xlabel, - $ylabel, + 'Percent Choosing', 100, ['#33ff00','#ff3300'], undef, @@ -1108,11 +1102,10 @@ sub RR_create_percent_selected_plot { @labels = (1 .. scalar(@correct)); } # - my $xlabel = &mt('foil chosen'); - my $ylabel = &mt('Percent Choosing'); + my $xlabel = 'foil chosen'; my $plot= &Apache::loncommon::DrawBarGraph($title, $xlabel, - $ylabel, + 'Percent Choosing', 100, ['#33ff00','#ff3300'], \@labels, @@ -1173,10 +1166,8 @@ 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,$xlabel,$ylabel, + ($title,'Correct Foil','foils chosen Incorrectly', 100,$plotcolors,\@labels,\@empty_row,@dataset); return ($graph,\%count_per_foil); } @@ -1372,12 +1363,8 @@ sub OR_tries_analysis { } } # - my %lt = &Apache::lonlocal::texthash( - 'title' => 'Correct Concepts', - 'xlabel' => 'Concept Number', - 'ylabel' => 'Percent Correct'); $concept_graph = &Apache::loncommon::DrawBarGraph - ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, + ('Correct Concepts','Concept Number','Percent Correct', 100,$plotcolors,undef,\@concept_plot_data,{xskip=>1}); } # @@ -1415,12 +1402,8 @@ 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 - ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, + ('Correct Statements','Statement','% Answered Correct', 100,$plotcolors,\@Labels,$Datasets[0],{xskip=>1}); # @@ -1431,12 +1414,8 @@ 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 - ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, + ('Incorrect Statements','Statement','% Chosen Incorrectly', 100,$plotcolors,\@Labels,@Datasets,{xskip=>1}); $analysis_html.= ''. @@ -1498,11 +1477,10 @@ 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 instead.'). - '

'. - $table; + $table = '

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

'.$table; } # my $num_plots = $env{'form.NumPlots'}; @@ -1559,7 +1537,7 @@ sub OR_time_analysis { $correct |= 0; ## $table .= ''. - &mt('[quant,_1,submission,submissions,No submissions] from [quant,_2,student], [_3] correct, [_4] incorrect', + &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect', $data_count,$student_count,$correct,$data_count-$correct). ''.$/; my $concept_correct_plot = ''; @@ -1631,13 +1609,9 @@ sub OR_Foil_Time_Analysis { } # # Create the plot - 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'}, + my $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements', + 'Statement Number', + 'Percent Correct', 100, $plotcolors, undef, @@ -1646,14 +1620,10 @@ 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($lt{'title'}, - $lt{'xlabel'}, - $lt{'ylabel'}, + &Apache::loncommon::DrawBarGraph('Incorrect Statements', + 'Statement Number', + 'Incorrect Option Choice', 100, $plotcolors, undef, @@ -1682,13 +1652,9 @@ sub OR_Concept_Time_Analysis { } # # Create the plot - my %lt = &Apache::lonlocal::texthash( - 'title' => 'Correct Concepts', - 'xlabel' => 'Concept Number', - 'ylabel' => 'Percent Correct'); - return &Apache::loncommon::DrawBarGraph($lt{'title'}, - $lt{'xlabel'}, - $lt{'ylabel'}, + return &Apache::loncommon::DrawBarGraph('Correct Concepts', + 'Concept Number', + 'Percent Correct', 100, $plotcolors, undef,