--- loncom/interface/statistics/lonproblemanalysis.pm 2004/11/12 19:47:29 1.105 +++ loncom/interface/statistics/lonproblemanalysis.pm 2005/03/15 00:51:43 1.119 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.105 2004/11/12 19:47:29 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.119 2005/03/15 00:51:43 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,7 +37,7 @@ use Apache::lonstathelpers(); use Apache::lonstudentsubmissions(); use HTML::Entities(); use Time::Local(); -use Spreadsheet::WriteExcel(); +use capa; my $plotcolors = ['#33ff00', '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933', @@ -52,9 +52,7 @@ my @SubmitButtons = ({ name => 'PrevProb text => 'Next Problem' }, { name => 'break'}, { name => 'SelectAnother', - text => 'Choose a different Problem' }, - { name => 'ExcelOutput', - text => 'Produce Excel Output' }); + text => 'Choose a different Problem' }); sub BuildProblemAnalysisPage { my ($r,$c)=@_; @@ -83,10 +81,7 @@ sub BuildProblemAnalysisPage { &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status'); $r->rflush(); # - # Support for numerical and radio response isn't complete enough to - # include in 1.2 release. - # my $problem_types = '(option|radiobutton|numerical)'; - my $problem_types = '.';#(option)'; + my $problem_types = '(option|radiobutton|numerical)'; if (exists($ENV{'form.problemchoice'}) && ! exists($ENV{'form.SelectAnother'})) { foreach my $button (@SubmitButtons) { @@ -102,6 +97,9 @@ sub BuildProblemAnalysisPage { $r->print($html.(' 'x5)); } # + $r->print(&Apache::lonstathelpers::submission_report_form + ('problem_analysis')); + # $r->print('
'); $r->rflush(); # @@ -109,7 +107,7 @@ sub BuildProblemAnalysisPage { my $current_problem = &Apache::lonstathelpers::get_target_from_id ($ENV{'form.problemchoice'}); # - my ($prev,$curr,$next) = + my ($navmap,$prev,$curr,$next) = &Apache::lonstathelpers::get_prev_curr_next($current_problem, $problem_types, 'response', @@ -132,14 +130,15 @@ sub BuildProblemAnalysisPage { $r->print('resource is undefined'); } else { my $resource = $current_problem->{'resource'}; - $r->print('

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

'); - $r->print('

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

'); + $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'}); + ($resource->src); my $problem_data = $Data{$current_problem->{'part'}. '.'. $current_problem->{'respid'}}; @@ -164,8 +163,7 @@ sub BuildProblemAnalysisPage { &mt('Analyze Problem').'" />'); $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)); } } @@ -189,9 +187,9 @@ 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::enrollment_status, - $resource->{'symb'},$respid); + $resource->symb,$respid); # $problem_analysis->{'answercomputed'} = 1; if ($problem_analysis->{'answercomputed'}) { @@ -201,6 +199,13 @@ sub numerical_response_analysis { 'stats_status'); $r->print(&numerical_one_dimensional_plot($r,600,150,$answers)); } + # + if (ref($response_data) ne 'ARRAY') { + $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++) { my $restriction_function; @@ -253,15 +258,15 @@ sub numerical_response_analysis { $no_data_message = 'No data for [_2] to [_3]'; } # - my ($correct,$intervals,$answers) = - &numerical_response_determine_intervals($r,$resource,$partid, - $respid,$students); + my ($correct,$answers) = + &numerical_determine_answers($r,$resource,$partid, + $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.= ''. ''. ''.''. + &numerical_plot_percent($r,$responses,$stats).''. ''. + &numerical_plot_differences($r,$responses,$stats).''. ''; } if ($post_message ne '') { @@ -297,63 +302,76 @@ 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 = 0.5; - while (my ($interval,$submissions) = each(%$responses)) { - next if ($interval =~ /^_/); - my ($ans,$ans_low,$ans_high) = split(" ",$interval); - my $low_percent = abs(($ans-$ans_low)/$ans); - my $high_percent = abs(($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; + } + } + 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 = $_; + 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 = 100*($submission-$ans)/abs($ans); + 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 $title = &mt('Percent Difference'); + 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, + ($title,'Percent Difference from Correct','Percent of Answers', + $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, {xskip=>1}); # my $table = $graph.$/. @@ -362,64 +380,66 @@ 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)/$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; + $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 Magnitude'); + # + my $title = &mt('Difference between submission and correct'); + 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, + ($title,'Difference from Correct','Percent of Answers', + $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, {xskip=>1}); # my $table = $graph.$/. @@ -431,35 +451,94 @@ sub numerical_classify_responses { my ($full_row_data,$correct,$function) = @_; my %submission_data; my %students; + my %stats; my $max=0; foreach my $row (@$full_row_data) { my %subm = &hashify_attempt($row); if (ref($correct) eq 'HASH') { - $subm{'correct'} = $correct->{$subm{'student'}}; - } else { - $subm{'correct'} = $correct; + 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 $submission = $subm{'submission'}; + my $scaled = '1'; + my ($sname,$sdom) = split(':',$subm{'student'}); + 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'); + my $submission = $scaled; $students{$subm{'student'}}++; + $stats{'submission_count'}++; if (&numerical_submission_is_correct($subm{'award'})) { - $submission_data{'_correct'}++; - $submission_data{'_count'}++; + $stats{'correct_count'}++; $submission_data{$subm{'correct'}}->{$submission}->[0]++; } elsif (&numerical_submission_is_incorrect($subm{'award'})) { - $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 { @@ -489,14 +568,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 .= ''. ''. @@ -512,19 +588,19 @@ sub numerical_bin_table { return $table; } -sub numerical_response_determine_intervals { +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,'Student Answer Compilation Status', + 'Student Answer Compilation Progress', scalar(@$students), + 'inline',undef,'Statistics','stats_status'); # # Read in the cache (if it exists) before we start timing things. &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'}); # my $correct; - # %intervals differs from %answers because it may be possible for two - # students to have the same correct answer but different intervals. - my %intervals; my %answers; foreach my $student (@$students) { last if ($c->aborted()); @@ -537,15 +613,17 @@ sub numerical_response_determine_interva $sdom); # make the key my $key = $partid.'.'.$respid; - my $interval = join(' ',($analysis->{$key.'.answer'}->[0], - $analysis->{$key.'.ans_low'}->[0], - $analysis->{$key.'.ans_high'}->[0])); - $correct->{$sname.':'.$sdom} = $interval; - $intervals{$interval}++; + foreach my $item ('answer','unit','ans_high','ans_low') { + $correct->{$sname.':'.$sdom}->{$item} = + $analysis->{$key.'.'.$item}->[0]; + } $answers{$analysis->{$key.'.answer'}->[0]}++; + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, + &mt('last student')); } &Apache::lonstathelpers::write_analysis_cache(); - return ($correct,\%intervals,\%answers); + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + return ($correct,\%answers); } # @@ -571,7 +649,11 @@ sub numerical_one_dimensional_plot { } } # - my $h_scale = ($width-10)/($max_x-$min_x); + my $min_max_difference = $max_x - $min_x; + if (! defined($min_max_difference) || $min_max_difference == 0) { + $min_max_difference = 1; + } + my $h_scale = ($width-10)/$min_max_difference; # my $ticscale = 5; if ($max_y * $ticscale > $height/2) { @@ -601,7 +683,6 @@ sub numerical_one_dimensional_plot { } $plot .= ''; my $plotresult = &Apache::lonxml::xmlparse($r,'web',$plot); - my $result = '
'. &mt($no_data_message,$plot_num,@extra_data). @@ -273,16 +278,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].'
'. ''.$/; @@ -908,7 +963,6 @@ sub RR_concept_plot { } else { $incorrect_by_concept{$concept->{'name'}} += $foil_data->{$foil}->{$choice}; - } } } @@ -1123,9 +1177,9 @@ 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::enrollment_status, - $resource->{'symb'},$respid); + $resource->symb,$respid); if (! defined($PerformanceData) || ref($PerformanceData) ne 'ARRAY' ) { $r->print('

'. @@ -1133,30 +1187,22 @@ sub OptionResponseAnalysis { '

'); } else { $r->rflush(); - if (exists($ENV{'form.ExcelOutput'})) { - my $result = &OR_excel_sheet($r,$resource, - $PerformanceData, - $problem_data); - $r->print($result); + 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') { + my $analysis_html = &OR_time_analysis($PerformanceData, + $problem_data); + $r->print($analysis_html); $r->rflush(); } else { - 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') { - 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('

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

'); } } } @@ -1171,6 +1217,9 @@ sub OR_tries_analysis { my $mintries = 1; my $maxtries = $ENV{'form.NumPlots'}; my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); + if (! defined($Concepts)) { + $Concepts = []; + } my %response_data = &OR_analyze_by_tries($r,$PerformanceData, $mintries,$maxtries); my $analysis = ''; @@ -1264,6 +1313,7 @@ sub OR_tries_analysis { # 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})); @@ -1426,6 +1476,7 @@ 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 .= ''; $Str .= ''; $Str .= ''; -# $Str .= ''; $Str .= ''; $Str .= ''."\n"; ## @@ -1959,17 +1832,6 @@ sub CreateInterface { $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); $Str .= ''; # -# $Str .= '
'. ''.&mt('Distribution of correct answers').''. @@ -652,33 +733,6 @@ sub circle { return &arc($x,$y,$radius,$radius,0,360,$color,$thickness,$filled); } -sub build_student_data_worksheet { - my ($workbook,$format) = @_; - my $rows_output = 3; - my $cols_output = 0; - my $worksheet = $workbook->addworksheet('Student Data'); - $worksheet->write($rows_output++,0,'Student Data',$format->{'h3'}); - my @Headers = ('full name','username','domain','section', - "student\nnumber",'identifier'); - $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'}); - my @Students = @Apache::lonstatistics::Students; - my $studentrows = &Apache::loncoursedata::get_student_data(\@Students); - my %ids; - foreach my $row (@$studentrows) { - my ($mysqlid,$student) = @$row; - $ids{$student}=$mysqlid; - } - foreach my $student (@Students) { - my $name_domain = $student->{'username'}.':'.$student->{'domain'}; - $worksheet->write_row($rows_output++,0, - [$student->{'fullname'}, - $student->{'username'},$student->{'domain'}, - $student->{'section'},$student->{'id'}, - $ids{$name_domain}]); - } - return $worksheet; -} - ######################################################### ######################################################### ## @@ -700,6 +754,9 @@ sub radio_response_analysis { my $analysis_html; my $foildata = $problem_analysis->{'_Foils'}; my ($table,$foils,$concepts) = &build_foil_index($problem_analysis); + if (! defined($concepts)) { + $concepts = []; + } # my %true_foils; my $num_true = 0; @@ -715,9 +772,9 @@ 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::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... @@ -831,16 +888,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.= '
'. ''. &mt($pre_graph_text, $plot_num,$foil_choice_data->{'_count'}, $correct, - $foil_choice_data->{'_count'}-$correct, + $incorrect, $foil_choice_data->{'_students'}, @extra_data). '
'. &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect', @@ -1586,183 +1637,6 @@ sub OR_time_process_data { scalar(keys(%distinct_students))); } -######################################################### -######################################################### -## -## Excel output -## -######################################################### -######################################################### -sub OR_excel_sheet { - my ($r,$resource,$performance_data,$ORdata) = @_; - my $response = ''; - my (undef,$Foils,$Concepts) = &build_foil_index($ORdata); - # - # Create excel worksheet - my $filename = '/prtspool/'. - $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. - time.'_'.rand(1000000000).'.xls'; - my $workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename); - if (! defined($workbook)) { - $r->log_error("Error creating excel spreadsheet $filename: $!"); - $r->print('

'.&mt("Unable to create new Excel file. ". - "This error has been logged. ". - "Please alert your LON-CAPA administrator"). - '

'); - return undef; - } - # - $workbook->set_tempdir('/home/httpd/perl/tmp'); - my $format = &Apache::loncommon::define_excel_formats($workbook); - # - # Create and populate main worksheets - my $problem_data_sheet = $workbook->addworksheet('Problem Data'); - my $student_data_sheet = &build_student_data_worksheet($workbook,$format); - my $response_data_sheet = $workbook->addworksheet('Response Data'); - foreach my $sheet ($problem_data_sheet,$student_data_sheet, - $response_data_sheet) { - $sheet->write(0,0,$resource->{'title'},$format->{'h2'}); - $sheet->write(1,0,$resource->{'src'},$format->{'h3'}); - } - # - my $result; - $result = &OR_build_problem_data_worksheet($problem_data_sheet,$format, - $Concepts,$ORdata); - if ($result ne 'okay') { - # Do something useful - } - $result = &OR_build_response_data_worksheet($response_data_sheet,$format, - $performance_data,$Foils, - $ORdata); - if ($result ne 'okay') { - # Do something useful - } - $response_data_sheet->activate(); - # - # Close the excel file - $workbook->close(); - # - # Write a link to allow them to download it - $result .= '

'.&mt('Excel Raw Data Output').'

'. - '

'. - &mt('Your Excel spreadsheet.'). - '

'."\n"; - return $result; -} - -sub OR_build_problem_data_worksheet { - my ($worksheet,$format,$Concepts,$ORdata) = @_; - my $rows_output = 3; - my $cols_output = 0; - $worksheet->write($rows_output++,0,'Problem Structure',$format->{'h3'}); - ## - ## - my @Headers; - if (@$Concepts > 1) { - @Headers = ("Concept\nNumber",'Concept',"Foil\nNumber", - 'Foil Name','Foil Text','Correct value'); - } else { - @Headers = ('Foil Number','FoilName','Foil Text','Correct value'); - } - $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'}); - my %Foildata = %{$ORdata->{'_Foils'}}; - my $conceptindex = 1; - my $foilindex = 1; - foreach my $concept (@$Concepts) { - my @FoilsInConcept = @{$concept->{'foils'}}; - my $firstfoil = shift(@FoilsInConcept); - if (@$Concepts > 1) { - $worksheet->write_row($rows_output++,0, - [$conceptindex, - $concept->{'name'}, - $foilindex++, - $Foildata{$firstfoil}->{'name'}, - $Foildata{$firstfoil}->{'text'}, - $Foildata{$firstfoil}->{'value'},]); - } else { - $worksheet->write_row($rows_output++,0, - [ $foilindex++, - $Foildata{$firstfoil}->{'name'}, - $Foildata{$firstfoil}->{'text'}, - $Foildata{$firstfoil}->{'value'},]); - } - foreach my $foilid (@FoilsInConcept) { - if (@$Concepts > 1) { - $worksheet->write_row($rows_output++,0, - ['', - '', - $foilindex, - $Foildata{$foilid}->{'name'}, - $Foildata{$foilid}->{'text'}, - $Foildata{$foilid}->{'value'},]); - } else { - $worksheet->write_row($rows_output++,0, - [$foilindex, - $Foildata{$foilid}->{'name'}, - $Foildata{$foilid}->{'text'}, - $Foildata{$foilid}->{'value'},]); - } - } continue { - $foilindex++; - } - } continue { - $conceptindex++; - } - $rows_output++; - $rows_output++; - ## - ## Option data output - $worksheet->write($rows_output++,0,'Options',$format->{'header'}); - foreach my $string (@{$ORdata->{'_Options'}}) { - $worksheet->write($rows_output++,0,$string); - } - return 'okay'; -} - -sub OR_build_response_data_worksheet { - my ($worksheet,$format,$performance_data,$Foils,$ORdata)=@_; - my $rows_output = 3; - my $cols_output = 0; - $worksheet->write($rows_output++,0,'Response Data',$format->{'h3'}); - $worksheet->set_column(1,1,20); - $worksheet->set_column(2,2,13); - my @Headers = ('identifier','time','award detail','attempt'); - foreach my $foil (@$Foils) { - push (@Headers,$foil.' submission'); - push (@Headers,$foil.' grading'); - } - $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'}); - # - foreach my $row (@$performance_data) { - next if (! defined($row)); - my ($student,$award,$grading,$submission,$time,$tries) = @$row; - my @Foilgrades = split('&',$grading); - my @Foilsubs = split('&',$submission); - my %response_data; - for (my $j=0;$j<=$#Foilgrades;$j++) { - my ($foilid,$correct) = split('=',$Foilgrades[$j]); - my (undef,$submission) = split('=',$Foilsubs[$j]); - $submission = &Apache::lonnet::unescape($submission); - $response_data{$foilid.' submission'}=$submission; - $response_data{$foilid.' award'}=$correct; - } - $worksheet->write($rows_output,$cols_output++,$student); - $worksheet->write($rows_output,$cols_output++, - &Apache::lonstathelpers::calc_serial($time),$format->{'date'}); - $worksheet->write($rows_output,$cols_output++,$award); - $worksheet->write($rows_output,$cols_output++,$tries); - foreach my $foilid (@$Foils) { - $worksheet->write($rows_output,$cols_output++, - $response_data{$foilid.' submission'}); - $worksheet->write($rows_output,$cols_output++, - $response_data{$foilid.' award'}); - } - $rows_output++; - $cols_output = 0; - } - return; -} - sub build_foil_index { my ($ORdata) = @_; return if (! exists($ORdata->{'_Foils'})); @@ -1946,7 +1820,6 @@ sub CreateInterface { $Str .= '
'.&mt('Sections').''.&mt('Enrollment Status').''.&mt('Sequences and Folders').' 
'; - 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 .= '';