--- loncom/interface/statistics/lonproblemanalysis.pm 2008/10/23 09:07:51 1.131 +++ loncom/interface/statistics/lonproblemanalysis.pm 2014/02/26 17:46:19 1.146 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.131 2008/10/23 09:07:51 bisitz Exp $ +# $Id: lonproblemanalysis.pm,v 1.146 2014/02/26 17:46:19 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(); @@ -73,12 +74,18 @@ sub BuildProblemAnalysisPage { # &Apache::lonstatistics::PrepareClasslist(); # + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Detailed Problem Analysis')); + &Apache::lonquickgrades::startGradeScreen($r,'statistics'); + $r->print(&CreateInterface()); # my @Students = @Apache::lonstatistics::Students; # if (@Students < 1 && exists($env{'form.firstrun'})) { - $r->print('

There are no students in the sections/groups selected

'); + $r->print('
' + .&mt('There are no students in the sections/groups selected.') + .'
' + ); } # my @CacheButtonHTML = @@ -139,9 +146,12 @@ sub BuildProblemAnalysisPage { my $resource = $current_problem->{'resource'}; $r->print('

'.$resource->compTitle.'

'); $r->print('

'.$resource->src.'

'); - $r->print('

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

'); + $r->print('

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

'); if ($env{'form.show_prob'} eq 'true') { - $r->print(&Apache::lonstathelpers::render_resource($resource)); + $r->print('
' + .&Apache::lonstathelpers::render_resource($resource) + .'
' + ); } $r->rflush(); if (@Students) { @@ -162,7 +172,11 @@ sub BuildProblemAnalysisPage { &numerical_response_analysis($r,$current_problem, $problem_data,\@Students); } else { - $r->print('

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

'); + $r->print('
' + .&mt('Analysis of [_1] is not supported.' + ,$current_problem->{'resptype'}) + .'
' + ); } } } @@ -214,9 +228,10 @@ 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 = ''; @@ -233,7 +248,7 @@ sub numerical_response_analysis { $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); @@ -281,9 +296,9 @@ sub numerical_response_analysis { $restriction_function); if ($stats->{'submission_count'} == 0) { $analysis_html.= - ''; + ''; } else { $analysis_html.= ''; + $analysis_html.= ''; } else { - $analysis_html.= ''; + $analysis_html.= ''; } last; } @@ -1340,8 +1374,12 @@ 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}); } # @@ -1379,8 +1417,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}); # @@ -1391,8 +1433,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 = ''; @@ -1536,7 +1583,7 @@ sub OR_time_analysis { $table .= ''.$/; - $table.= ''.$/; + $table.= ''.$/; } $table .= '
'. + '
'. &mt($no_data_message,$plot_num,@extra_data). - '
'. @@ -385,10 +400,13 @@ sub numerical_plot_percent { if ($max <$_) { $max = $_; last; } } # - my $title = &mt('Percent Difference'); + 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','Percent of Answers', + ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, {xskip=>1}); # @@ -458,10 +476,13 @@ sub numerical_plot_differences { if ($max <$_) { $max = $_; last; } } # - my $title = &mt('Difference between submission and correct'); + 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,'Difference from Correct','Percent of Answers', + ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'}, $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, {xskip=>1}); # @@ -615,10 +636,7 @@ sub numerical_determine_answers { my ($r,$resource,$partid,$respid,$students)=@_; my $c = $r->connection(); # - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'Student Answer Compilation Status', - 'Student Answer Compilation Progress', scalar(@$students), - 'inline',undef,'Statistics','stats_status'); + 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'}); @@ -652,7 +670,7 @@ sub numerical_determine_answers { } $answers{$correct->{$sname.':'.$sdom}{'answer'}}++; &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - &mt('last student')); + 'last student'); } &Apache::lonstathelpers::write_analysis_cache(); &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); @@ -830,9 +848,9 @@ 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; } @@ -846,8 +864,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 = '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 = ''; @@ -863,7 +881,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); # @@ -903,8 +923,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 @@ -951,11 +972,13 @@ sub radio_response_analysis { } } elsif ($no_data_text ne '') { $analysis_html.='
'. + '
'. &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; } @@ -1017,10 +1040,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, @@ -1086,10 +1110,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, @@ -1150,8 +1175,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); } @@ -1217,9 +1244,10 @@ sub OptionResponseAnalysis { $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') { @@ -1234,10 +1262,10 @@ sub OptionResponseAnalysis { $r->print($analysis_html); $r->rflush(); } else { - $r->print('

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

'); + $r->print('
' + .&mt('The analysis you have selected is not supported at this time.') + .'
' + ); } } } @@ -1314,12 +1342,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.') + .'
' + .'
'. @@ -1454,10 +1500,11 @@ 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'}; @@ -1514,7 +1561,7 @@ sub OR_time_analysis { $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).'
 
 
'; # @@ -1547,7 +1594,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; @@ -1582,9 +1633,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, @@ -1593,10 +1648,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, @@ -1625,9 +1684,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, @@ -1723,23 +1786,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; @@ -1747,39 +1810,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++; @@ -1787,7 +1850,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); @@ -1849,17 +1912,18 @@ sub CreateInterface { ## ## Build the menu my $Str = ''; - $Str .= &Apache::lonhtmlcommon::breadcrumbs('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 .= ''; # @@ -1873,35 +1937,35 @@ sub CreateInterface { # ## ## - $Str .= ''; ## ## - $Str .= ''."\n"; - $Str .= '
'.&mt('Sections').''.&mt('Groups').''.&mt('Access Status').' 
'.&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 .= ''; + $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; }