--- loncom/interface/statistics/lonproblemanalysis.pm 2005/02/22 05:28:21 1.113 +++ 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.113 2005/02/22 05:28:21 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('<h2>There are no students in the sections selected</h2>'); + if (@Students < 1 && exists($env{'form.firstrun'})) { + $r->print('<div class="LC_warning">' + .&mt('There are no students in the sections/groups selected.') + .'</div>' + ); } # 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("<br />\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('<hr />'); $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('<input type="hidden" name="problemchoice" value="'. - $ENV{'form.problemchoice'}.'" />'); + $env{'form.problemchoice'}.'" />'); # if (! defined($current_problem->{'resource'})) { $r->print('resource is undefined'); } else { my $resource = $current_problem->{'resource'}; - $r->print('<h1>'.$resource->{'title'}.'</h1>'); - $r->print('<h3>'.$resource->{'src'}.'</h3>'); - if ($ENV{'form.show_prob'} eq 'true') { - $r->print(&Apache::lonstathelpers::render_resource($resource)); + $r->print('<h1>'.$resource->compTitle.'</h1>'); + $r->print('<h3>'.$resource->src.'</h3>'); + $r->print('<p>'.&Apache::lonstatistics::section_and_enrollment_description().'</p>'); + if ($env{'form.show_prob'} eq 'true') { + $r->print('<hr />' + .&Apache::lonstathelpers::render_resource($resource) + .'<hr />' + ); } $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('<h2>Analysis of '.$current_problem->{'resptype'}.' is not supported</h2>'); - } + 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('<div class="LC_warning">' + .&mt('Analysis of [_1] is not supported.' + ,$current_problem->{'resptype'}) + .'</div>' + ); + } + } } $r->print('<hr />'); } else { - $r->print('<input type="submit" name="ProblemAnalysis" value="'. - &mt('Analyze Problem').'" />'); + my $submit_button = '<input type="submit" '. + 'name="ProblemAnalysis" value="'. + &mt('Analyze Problem').'" />'; + $r->print($submit_button); $r->print(' 'x5); $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>'); - $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('<h2>'. - &mt('There is no submission data for this resource'). - '</h2>'); + $r->print('<div class="LC_warning">' + .&mt('There is no submission data for this resource.') + .'</div>' + ); return; } my $analysis_html = '<table>'; - 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); @@ -265,9 +294,9 @@ sub numerical_response_analysis { $restriction_function); if ($stats->{'submission_count'} == 0) { $analysis_html.= - '<tr><td colspan="2"><font size="+1"><b>'. + '<tr><td colspan="2"><div class="LC_warning">'. &mt($no_data_message,$plot_num,@extra_data). - '</b></font></td></tr>'; + '</div></td></tr>'; } else { $analysis_html.= '<tr><td colspan="2" align="center"><font size="+1"><b>'. @@ -303,21 +332,34 @@ sub numerical_plot_percent { # my $total = $stats->{'submission_count'}; return '' if ($total == 0); - my $min_bin_size = $stats->{'min_percent'}; - 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; + 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; + } } - if (($high_bin -$low_bin)/$min_bin_size > 1000) { - $min_bin_size = abs($high_bin - $low_bin) / 1000; + $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; - for (my $num = $low_bin;$num <= $high_bin;$num+=($min_bin_size/2)) { - push(@bins,$num); + 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); + } + push(@bins,$highest_percent); # my @correct; my @incorrect; @@ -325,46 +367,45 @@ sub numerical_plot_percent { while (my ($ans,$submissions) = each(%$responses)) { while (my ($submission,$counts) = each(%$submissions)) { my ($correct_count,$incorrect_count) = @$counts; - my $scaled_value = ($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; } } # - # Skip empty bins - my (@plot_correct,@plot_incorrect,@new_bins,@new_count); - my $min_skip = 2; - for (my $i=0;$i<=$#bins;$i++) { - my $sum=0; - for (my $j=-$min_skip;$j<=$min_skip && $i+$j<=$#bins;$j++) { - $sum += $correct[$i+$j] + $incorrect[$i+$j]; - } - if ($sum) { - push(@new_bins,$bins[$i]); - push(@plot_correct,$correct[$i]); - push(@plot_incorrect,$incorrect[$i]); - push(@new_count,$correct[$i]+$incorrect[$i]); - } - } - @correct = @plot_correct; - @incorrect = @plot_incorrect; - @count = @new_count; - @bins = @new_bins; - for (my $i=0;$i<=$#bins;$i++) { + 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('Percent Difference'); - my @labels = (1..scalar(@bins)); + 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.$/. @@ -377,7 +418,7 @@ sub numerical_plot_differences { # my $total = $stats->{'submission_count'}; return '' if ($total == 0); - my $max_bins = 50; + 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'}; @@ -386,7 +427,12 @@ sub numerical_plot_differences { } elsif ($low_bin < 0 && $high_bin < -$low_bin) { $high_bin = -$low_bin; } - if (($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) { + 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; @@ -401,27 +447,41 @@ sub numerical_plot_differences { while (my ($submission,$counts) = each(%$submissions)) { my ($correct_count,$incorrect_count) = @$counts; 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 + 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 = @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('Difference between submission and correct'); - my @labels = (1..scalar(@bins)); + 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','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.$/. @@ -464,8 +524,12 @@ sub numerical_classify_responses { if ($stats{'max_abs'} < $abs_high) { $stats{'max_abs'} = $abs_high; } - my $low_percent = 100 * abs($abs_low / $subm{'correct'}); - my $high_percent = 100 * abs($abs_high / $subm{'correct'}); + 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; @@ -498,7 +562,7 @@ sub numerical_classify_responses { &capa::caparesponse_get_real_response($myunit, $mysub, \$scaled); - &Apache::lonnet::logthis('scaled = '.$scaled.' result ='.$result); +# &Apache::lonnet::logthis('scaled = '.$scaled.' result ='.$result); next if (! defined($scaled)); # next if ($result ne '6'); my $submission = $scaled; @@ -513,6 +577,8 @@ sub numerical_classify_responses { } } } + $stats{'correct_count'} |= 0; + $stats{'incorrect_count'} |= 0; $stats{'students'}=scalar(keys(%students)); return (\%submission_data,\%stats); } @@ -546,7 +612,9 @@ sub numerical_bin_table { '</tr>'.$/; for (my $i=0;$i<scalar(@{$bins}-1);$i++) { my $lownum = $bins->[$i]; + if ($i == 0) { $lownum = '-∞'; } my $highnum = $bins->[$i+1]; + if ($i == scalar(@{$bins})-2) { $highnum = '∞'; } $table .= '<tr>'. '<td>'.$labels->[$i].'</td>'. @@ -566,10 +634,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'}); @@ -587,13 +652,23 @@ sub numerical_determine_answers { $sdom); # make the key my $key = $partid.'.'.$respid; + # 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') { - $correct->{$sname.':'.$sdom}->{$item} = - $analysis->{$key.'.'.$item}->[0]; + 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{$analysis->{$key.'.answer'}->[0]}++; + $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); @@ -717,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'); } # @@ -746,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... @@ -759,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)) { @@ -770,29 +846,29 @@ sub radio_response_analysis { } # if (! defined($response_data) || ref($response_data) ne 'ARRAY' ) { - $analysis_html = '<h2>'. - &mt('There is no submission data for this resource'). - '</h2>'; + $analysis_html = '<div class="LC_warning">' + .&mt('There is no submission data for this resource.') + .'</div>'; $r->print($analysis_html); return; } # $analysis_html.='<table>'; - 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 @@ -803,7 +879,9 @@ sub radio_response_analysis { &get_time_from_row($response_data->[-1]), $plot_num); $pre_graph_text = - 'Data from [_6] to [_7]<br /> [_2] submissions from [_5] students, [_3] correct, [_4] incorrect'; + 'Data from [_6] to [_7]' + .'<br />' + .'[_2] submissions from [_5] students, [_3] correct, [_4] incorrect'; $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime); $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime); # @@ -843,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 @@ -862,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.= '<tr><td colspan="4" align="center">'. '<font size="+1">'. &mt($pre_graph_text, $plot_num,$foil_choice_data->{'_count'}, $correct, - $foil_choice_data->{'_count'}-$correct, + $incorrect, $foil_choice_data->{'_students'}, @extra_data). '</td></tr>'.$/; @@ -893,11 +970,13 @@ sub radio_response_analysis { } } elsif ($no_data_text ne '') { $analysis_html.='<tr><td colspan="4" align="center">'. + '<div class="LC_warning">'. &mt($no_data_text, $plot_num,$foil_choice_data->{'_count'}, $correct, $foil_choice_data->{'_count'}-$correct, - @extra_data); + @extra_data). + '</div>'; if (defined($post_graph_text)) { $analysis_html.='<br />'.$post_graph_text; } @@ -916,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; } } @@ -959,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, @@ -1028,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, @@ -1092,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); } @@ -1153,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('<h2>'. - &mt('There is no student data for this problem.'). - '</h2>'); + $r->print('<div class="LC_warning">' + .&mt('There is no student data for this problem.') + .'</div>' + ); } 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('<h2>'. - &mt('The analysis you have selected is '. - 'not supported at this time'). - '</h2>'); + $r->print('div class="LC_warning"' + .&mt('The analysis you have selected is not supported at this time.') + .'</div>' + ); } } } @@ -1191,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 = []; @@ -1255,12 +1340,18 @@ sub OR_tries_analysis { if (! defined($response_data{'_total'}->[$try]) || $response_data{'_total'}->[$try] == 0) { if ($try > 1) { - $analysis_html.= '<tr><td align="center" colspan="4"><b>'. - &mt('None of the selected students attempted the problem more than [_1] times.',$try-1). - '</b></td></tr>'; + $analysis_html.= '<tr><td colspan="4">' + .'<div class="LC_info">' + .&mt('None of the selected students attempted the problem more than [quant,_1,time].' + ,$try-1) + .'</div>' + .'</td></tr>'; } else { - $analysis_html.= '<tr><td colspan="4" align="center"><b>'. - &mt('None of the selected students have attempted the problem').'</b></td></tr>'; + $analysis_html.= '<tr><td colspan="4">' + .'<div class="LC_info">' + .&mt('None of the selected students have attempted the problem.') + .'</div>' + .'</td></tr>'; } last; } @@ -1281,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})); @@ -1319,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}); # @@ -1331,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.= '<tr><td colspan="4" align="center">'. @@ -1394,13 +1498,14 @@ sub OR_time_analysis { if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); } # if ($num_concepts < 2) { - $table = '<h3>'. - &mt('Not enough data for concept analysis. '. - 'Performing Foil Analysis'). - '</h3>'.$table; + $table = '<p class="LC_info">'. + &mt('Not enough data for concept analysis.'. + ' Performing Foil Analysis instead.'). + '</p>'. + $table; } # - my $num_plots = $ENV{'form.NumPlots'}; + my $num_plots = $env{'form.NumPlots'}; my $num_data = scalar(@$performance_data)-1; # my $current_index; @@ -1451,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 .= '<tr><td colspan="4" align="center"><font size="+1">'. - &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). '</font></td></tr>'.$/; my $concept_correct_plot = ''; @@ -1475,7 +1581,7 @@ sub OR_time_analysis { $table .= '<tr><td colspan="4" align="center">'. &mt('Start time: [_1]',$startdateform).'<br />'. &mt('End time: [_1]',$enddateform).'</td></tr>'.$/; - $table.= '<tr><td colspan="4"> </td></tr>'.$/; + $table.= '<tr><td colspan="4"> </td></tr>'.$/; } $table .= '</table>'; # @@ -1486,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 ('<h2>'.&mt('There is no data to plot').'</h2>',''); + return ('<div class="LC_warning">' + .&mt('There is no data to plot.') + .'</div>' + ,'' + ); } my $analysis_html; my @plotdata; @@ -1521,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, @@ -1532,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, @@ -1564,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, @@ -1662,23 +1784,23 @@ sub build_foil_index { } # # Build up the table of row labels. - my $table = '<table border="1" >'."\n"; + my $table = &Apache::loncommon::start_data_table(); if (@Concepts > 1) { - $table .= '<tr>'. + $table .= &Apache::loncommon::start_data_table_header_row(). '<th>'.&mt('Concept Number').'</th>'. '<th>'.&mt('Concept').'</th>'. '<th>'.&mt('Foil Number').'</th>'. '<th>'.&mt('Foil Name').'</th>'. '<th>'.&mt('Foil Text').'</th>'. '<th>'.&mt('Correct Value').'</th>'. - "</tr>\n"; + &Apache::loncommon::end_data_table_header_row(); } else { - $table .= '<tr>'. + $table .= &Apache::loncommon::start_data_table_header_row(). '<th>'.&mt('Foil Number').'</th>'. '<th>'.&mt('Foil Name').'</th>'. '<th>'.&mt('Foil Text').'</th>'. '<th>'.&mt('Correct Value').'</th>'. - "</tr>\n"; + &Apache::loncommon::end_data_table_header_row(); } my $conceptindex = 1; my $foilindex = 1; @@ -1686,39 +1808,39 @@ sub build_foil_index { my @FoilsInConcept = @{$concept->{'foils'}}; my $firstfoil = shift(@FoilsInConcept); if (@Concepts > 1) { - $table .= '<tr>'. + $table .= &Apache::loncommon::start_data_table_row(). '<td>'.$conceptindex.'</td>'. '<td>'.&HTML::Entities::encode($concept->{'name'},'<>&"').'</td>'. '<td>'.$foilindex++.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').'</td>'. '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'</td>'. - "</tr>\n"; + &Apache::loncommon::end_data_table_row(); } else { - $table .= '<tr>'. + $table .= &Apache::loncommon::start_data_table_row(). '<td>'.$foilindex++.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').'</td>'. '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'</td>'. - "</tr>\n"; + &Apache::loncommon::end_data_table_row(); } foreach my $foilid (@FoilsInConcept) { if (@Concepts > 1) { - $table .= '<tr>'. + $table .= &Apache::loncommon::start_data_table_row(). '<td></td>'. '<td></td>'. '<td>'.$foilindex.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').'</td>'. '<td>'.$Foildata{$foilid}->{'text'}.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'</td>'. - "</tr>\n"; + &Apache::loncommon::end_data_table_row(); } else { - $table .= '<tr>'. + $table .= &Apache::loncommon::start_data_table_row(). '<td>'.$foilindex.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').'</td>'. '<td>'.$Foildata{$foilid}->{'text'}.'</td>'. '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'</td>'. - "</tr>\n"; + &Apache::loncommon::end_data_table_row(); } } continue { $foilindex++; @@ -1726,7 +1848,7 @@ sub build_foil_index { } continue { $conceptindex++; } - $table .= "</table>\n"; + $table .= &Apache::loncommon::end_data_table(); # # Build option index with color stuff return ($table,\@Foils,\@Concepts); @@ -1782,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 .= '<table cellspacing="5">'."\n"; - $Str .= '<tr>'; - $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>'; - $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>'; -# $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>'; - $Str .= '<td align="center"> </td>'; - $Str .= '</tr>'."\n"; + $Str .= '<p>'; + $Str .= &Apache::loncommon::start_data_table(); + $Str .= &Apache::loncommon::start_data_table_header_row(); + $Str .= '<th>'.&mt('Sections').'</th>'; + $Str .= '<th>'.&mt('Groups').'</th>'; + $Str .= '<th>'.&mt('Access Status').'</th>'; + $Str .= '<th>'.&mt('Options').'</th>'; + $Str .= &Apache::loncommon::end_data_table_header_row(); ## ## - $Str .= '<tr><td align="center">'."\n"; + $Str .= &Apache::loncommon::start_data_table_row(); + $Str .= '<td align="center">'."\n"; $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5); $Str .= '</td>'; # + $Str .= '<td align="center">'."\n"; + $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5); + $Str .= '</td>'; + # $Str .= '<td align="center">'; $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); $Str .= '</td>'; # -# $Str .= '<td align="center">'; - 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 .= '<td>'; + $Str .= '<td valign="top">'; ## my $showprob_checkbox = - '<input type="checkbox" name="show_prob" value="true" '; - if ($ENV{'form.show_prob'} eq 'true') { - $showprob_checkbox .= 'checked '; + '<input type="checkbox" name="show_prob" value="true"'; + if ($env{'form.show_prob'} eq 'true') { + $showprob_checkbox .= ' checked="checked"'; } $showprob_checkbox.= ' />'; - $Str.= '<nobr><label>'. - &mt('Show problem [_1]',$showprob_checkbox). - '</label></nobr><br />'; + $Str.= '<span class="LC_nobreak"><label>'. + $showprob_checkbox.' '.&mt('Show problem'). + '</label></span><br />'; ## my $analyze_selector = '<select name="AnalyzeOver" >'; $analyze_selector .= '<option value="tries" '; - if (! exists($ENV{'form.AnalyzeOver'}) || - $ENV{'form.AnalyzeOver'} eq 'tries'){ + if (! exists($env{'form.AnalyzeOver'}) || + $env{'form.AnalyzeOver'} eq 'tries'){ # Default to tries - $analyze_selector .= ' selected '; + $analyze_selector .= ' selected="selected" '; } $analyze_selector .= '>'.&mt('Tries').'</option>'; $analyze_selector .= '<option value="time" '; - $analyze_selector .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'time'); + $analyze_selector .= ' selected ' if ($env{'form.AnalyzeOver'} eq 'time'); $analyze_selector .= '>'.&mt('Time').'</option>'; $analyze_selector .= '</select>'; - $Str .= '<nobr><label>'. + $Str .= '<span class="LC_nobreak"><label>'. &mt('Analyze Over [_1] [_2]', $analyze_selector, &Apache::loncommon::help_open_topic('Analysis_Analyze_Over')). - '</label></nobr><br />'.$/; + '</label></span><br />'.$/; ## my $numplots_selector = '<select name="NumPlots">'; - if (! exists($ENV{'form.NumPlots'}) - || $ENV{'form.NumPlots'} < 1 - || $ENV{'form.NumPlots'} > 20) { - $ENV{'form.NumPlots'} = 5; + if (! exists($env{'form.NumPlots'}) + || $env{'form.NumPlots'} < 1 + || $env{'form.NumPlots'} > 20) { + $env{'form.NumPlots'} = 5; } foreach my $i (1,2,3,4,5,6,7,8,10,15,20) { $numplots_selector .= '<option value="'.$i.'" '; - if ($ENV{'form.NumPlots'} == $i) { $numplots_selector.=' selected '; } + if ($env{'form.NumPlots'} == $i) { $numplots_selector.=' selected="selected" '; } $numplots_selector .= '>'.$i.'</option>'; } - $numplots_selector .= '</select></nobr><br />'; - $Str .= '<nobr><label>'.&mt('Number of Plots [_1]',$numplots_selector). - '</label></nobr>'; + $numplots_selector .= '</select>'; + $Str .= '<span class="LC_nobreak"><label>'.&mt('Number of Plots [_1]',$numplots_selector). + '</label></span><br />'; ## - $Str .= '<nobr><label>'.&mt('Status: [_1]', - '<input type="text" '. - 'name="stats_status" size="60" value="" />' - ). - '</label></nobr>'; $Str .= '</td>'; ## ## - $Str .= '</tr>'."\n"; - $Str .= '</table>'."\n"; + $Str .= &Apache::loncommon::end_data_table_row(); + $Str .= &Apache::loncommon::end_data_table(); + $Str .= '<p class="LC_nobreak"><label>' + .&mt('Status: [_1]', + '<input type="text" name="stats_status"' + .' size="60" value="" readonly="readonly" />') + .'</label></p>'; + $Str .= '</p>'; return $Str; } @@ -1906,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; @@ -1930,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'}++;