--- loncom/interface/statistics/lonproblemanalysis.pm 2004/01/30 16:31:36 1.63 +++ loncom/interface/statistics/lonproblemanalysis.pm 2008/12/12 07:26:28 1.134 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.63 2004/01/30 16:31:36 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.134 2008/12/12 07:26:28 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,16 +27,20 @@ package Apache::lonproblemanalysis; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonlocal; -use Apache::lonstathelpers; +use Apache::lonstathelpers(); +use Apache::lonstudentsubmissions(); use HTML::Entities(); use Time::Local(); -use Spreadsheet::WriteExcel(); +use capa; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + my $plotcolors = ['#33ff00', '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933', @@ -50,23 +54,16 @@ my @SubmitButtons = ({ name => 'PrevProb { name => 'NextProblemAnalysis', text => 'Next Problem' }, { name => 'break'}, - { name => 'ClearCache', - text => 'Clear Caches' }, - { name => 'updatecaches', - text => 'Update Student Data' }, { name => 'SelectAnother', - text => 'Choose a different Problem' }, - { name => 'ExcelOutput', - text => 'Produce Excel Output' }); - + text => 'Choose a different Problem' }); sub BuildProblemAnalysisPage { my ($r,$c)=@_; # my %Saveable_Parameters = ('Status' => 'scalar', 'Section' => 'array', + 'Groups' => 'array', 'NumPlots' => 'scalar', - 'AnalyzeAs' => 'scalar', 'AnalyzeOver' => 'scalar', ); &Apache::loncommon::store_course_settings('problem_analysis', @@ -76,31 +73,24 @@ sub BuildProblemAnalysisPage { # &Apache::lonstatistics::PrepareClasslist(); # - $r->print('

'.&mt('Detailed Problem Analysis').'

'); $r->print(&CreateInterface()); # my @Students = @Apache::lonstatistics::Students; # - if (@Students < 1) { - $r->print('

There are no students in the sections selected

'); + if (@Students < 1 && exists($env{'form.firstrun'})) { + $r->print('
' + .&mt('There are no students in the sections/groups selected.') + .'
' + ); } # - &Apache::loncoursedata::clear_internal_caches(); - if (exists($ENV{'form.ClearCache'}) || - exists($ENV{'form.updatecaches'}) || - (exists($ENV{'form.firstanalysis'}) && - $ENV{'form.firstanalysis'} ne 'no')) { - &Apache::lonstatistics::Gather_Full_Student_Data($r); - } - if (! exists($ENV{'form.firstanalysis'})) { - $r->print(''); - } else { - $r->print(''); - } + my @CacheButtonHTML = + &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status'); $r->rflush(); # - if (exists($ENV{'form.problemchoice'}) && - ! exists($ENV{'form.SelectAnother'})) { + my $problem_types = '(option|radiobutton|numerical)'; + if (exists($env{'form.problemchoice'}) && + ! exists($env{'form.SelectAnother'})) { foreach my $button (@SubmitButtons) { if ($button->{'name'} eq 'break') { $r->print("
\n"); @@ -110,253 +100,1119 @@ sub BuildProblemAnalysisPage { $r->print(' 'x5); } } + foreach my $html (@CacheButtonHTML) { + $r->print($html.(' 'x5)); + } + # + + # This is commented out pending actual implementation of + # CSV and Excel output. + #$r->print(&Apache::lonstathelpers::submission_report_form + # ('problem_analysis')); # $r->print('
'); $r->rflush(); # # Determine which problem we are to analyze my $current_problem = &Apache::lonstathelpers::get_target_from_id - ($ENV{'form.problemchoice'}); + ($env{'form.problemchoice'}); # - my ($prev,$curr,$next) = + my ($navmap,$prev,$curr,$next) = &Apache::lonstathelpers::get_prev_curr_next($current_problem, - '(option|radiobutton)', - 'response', + $problem_types, + 'response', ); - if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) { + if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) { $current_problem = $prev; - } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) { + } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) { $current_problem = $next; } else { $current_problem = $curr; } # # Store the current problem choice and send it out in the form - $ENV{'form.problemchoice'} = + $env{'form.problemchoice'} = &Apache::lonstathelpers::make_target_id($current_problem); $r->print(''); + $env{'form.problemchoice'}.'" />'); # if (! defined($current_problem->{'resource'})) { $r->print('resource is undefined'); } else { my $resource = $current_problem->{'resource'}; - $r->print('

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

'); - $r->print('

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

'); - $r->print(&Apache::lonstathelpers::render_resource($resource)); - $r->rflush(); - my %Data = &get_problem_data($resource->{'src'}); - my $ProblemData = $Data{$current_problem->{'part'}. - '.'. - $current_problem->{'respid'}}; - if ($current_problem->{'resptype'} eq 'option') { - &OptionResponseAnalysis($r,$current_problem, - $ProblemData, - \@Students); - } elsif ($current_problem->{'resptype'} eq 'radiobutton') { - &RadioResponseAnalysis($r,$current_problem, - $ProblemData, - \@Students); - } else { - $r->print('

This analysis is not supported

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

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

'); - $r->print(&Apache::lonstathelpers::ProblemSelector - ('(option|radiobutton)')); + $r->print(&Apache::lonstathelpers::problem_selector($problem_types, + $submit_button)); } } - ######################################################### ######################################################### ## -## Radio Response Routines +## Numerical Response Routines ## ######################################################### ######################################################### -sub RadioResponseAnalysis { - my ($r,$problem,$ProblemData,$Students) = @_; - my ($resource,$respid) = ($problem->{'resource'}, - $problem->{'respid'}); - my $analysis_html; - my $PerformanceData = - &Apache::loncoursedata::get_response_data - ($Students,$resource->{'symb'},$respid); - if (! defined($PerformanceData) || - ref($PerformanceData) ne 'ARRAY' ) { - $analysis_html = '

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

'; - $r->print($analysis_html); +sub numerical_response_analysis { + my ($r,$problem,$problem_analysis,$students) = @_; + my $c = $r->connection(); + # + if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) { + $r->print('Bad request'); + } + # + my ($resource,$partid,$respid) = ($problem->{'resource'}, + $problem->{'part'}, + $problem->{'respid'}); + # Gather student data + my $response_data = &Apache::loncoursedata::get_response_data + ([&Apache::lonstatistics::get_selected_sections()], + [&Apache::lonstatistics::get_selected_groups()], + $Apache::lonstatistics::enrollment_status, + $resource->symb,$respid); + # + $problem_analysis->{'answercomputed'} = 1; + if ($problem_analysis->{'answercomputed'}) { + my $answers = + &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$students, + 'Statistics', + '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; } - if (exists($ENV{'form.ExcelOutput'})) { - $analysis_html .= &RR_Excel_output($r,$problem->{'resource'}, - $PerformanceData,$ProblemData); - } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') { - $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'}, - $PerformanceData,$ProblemData); - } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { - $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'}, - $PerformanceData,$ProblemData); - } else { - $analysis_html .= '

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

'; + my $analysis_html = ''; + 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') { + $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].'; + } else { + my $starttime = &Apache::lonhtmlcommon::get_date_from_form + ('startdate_'.$plot_num); + my $endtime = &Apache::lonhtmlcommon::get_date_from_form + ('enddate_'.$plot_num); + ($starttime,$endtime) = &ensure_start_end_times + ($starttime,$endtime, + &get_time_from_row($response_data->[0]), + &get_time_from_row($response_data->[-1]), + $plot_num); + $header_message = 'Data from [_2] to [_3]'; + $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime); + $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime); + # + $stats_message = + '[_1] submissions from [_4] students, [_2] correct, [_3] incorrect'; + # + $post_message = + &mt('Start time: [_1]', + &Apache::lonhtmlcommon::date_setter + ('Statistics','startdate_'.$plot_num,$starttime)). + '
'. + &mt('End time: [_1]', + &Apache::lonhtmlcommon::date_setter + ('Statistics','enddate_'.$plot_num,$endtime)); + $restriction_function = + sub { + my $t = $_[0]->{'timestamp'}; + if ($t >= $starttime && $t < $endtime) { + return 1; + } else { + return 0; + } + }; + $no_data_message = 'No data for [_2] to [_3]'; + } + # + my ($correct,$answers) = + &numerical_determine_answers($r,$resource,$partid, + $respid,$students); + if ($c->aborted()) { return; }; + # + my ($responses,$stats) = + &numerical_classify_responses($response_data,$correct, + $restriction_function); + if ($stats->{'submission_count'} == 0) { + $analysis_html.= + ''; + } else { + $analysis_html.= + ''. + ''. + ''.''. + ''. + ''; + } + if ($post_message ne '') { + $analysis_html .= + ''; + } } + $analysis_html.='
'. + &mt($no_data_message,$plot_num,@extra_data). + '
'. + &mt($header_message,$plot_num,@extra_data). + '
'. + &mt($stats_message, + $stats->{'submission_count'}, + $stats->{'correct_count'}, + $stats->{'incorrect_count'}, + $stats->{'students'}, + @extra_data). + '
'. + &numerical_plot_percent($r,$responses,$stats).''. + &numerical_plot_differences($r,$responses,$stats).'
'.$post_message.'
'; $r->print($analysis_html); + # + return; } -sub RR_Excel_output { - my ($r,$PerformanceData,$ProblemData) = @_; - return '

No!

'; +sub numerical_plot_percent { + my ($r,$responses,$stats) = @_; + # + my $total = $stats->{'submission_count'}; + return '' if ($total == 0); + my $max_bins = 50; + my $lowest_percent = $stats->{'min_percent'}; + my $highest_percent = $stats->{'max_percent'}; + my $percent_spread = $highest_percent - $lowest_percent; + foreach (qw/20 30 40 50 100 200/) { + if ($percent_spread < $_) { + $highest_percent =$_/2; + last; + } + } + $percent_spread = $highest_percent - $lowest_percent; + my $bin_size = 1; + foreach (qw/0.01 0.05 0.1 0.5 1 2 5 10 20 25 50 100/) { + if ($lowest_percent/2 < $_){ + $bin_size = $_; + if ( ($percent_spread/$bin_size) < $max_bins ) { + last; + } + } + } + my @bins; + 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; + my @count; + while (my ($ans,$submissions) = each(%$responses)) { + while (my ($submission,$counts) = each(%$submissions)) { + my ($correct_count,$incorrect_count) = @$counts; + 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-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('Percent Difference'); + my @labels = (1..scalar(@bins)-1); + my $graph = &Apache::loncommon::DrawBarGraph + ($title,'Percent Difference from Correct','Percent of Answers', + $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, + {xskip=>1}); + # + my $table = $graph.$/. + &numerical_bin_table(\@bins,\@labels,\@incorrect,\@correct,\@count).$/; + return $table; } -sub RR_Tries_Analysis { - my ($r,$resource,$PerformanceData,$ProblemData) = @_; +sub numerical_plot_differences { + my ($r,$responses,$stats) = @_; + # + my $total = $stats->{'submission_count'}; + return '' if ($total == 0); + my $max_bins = 21; + my $min_bin_size = $stats->{'min_abs'}; + my $low_bin = $stats->{'lowest_ans'}-$stats->{'max_bin_size'}; + my $high_bin = $stats->{'highest_ans'}+$stats->{'max_bin_size'}; + if ($high_bin > 0 && $low_bin > -$high_bin) { + $low_bin = -$high_bin; + } elsif ($low_bin < 0 && $high_bin < -$low_bin) { + $high_bin = -$low_bin; + } + if ($high_bin == $low_bin) { + $high_bin+=1; + $low_bin-=1; + } + if (!$min_bin_size || + ($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) { + $min_bin_size = abs($high_bin - $low_bin) / $max_bins * 2; + } + my @bins; + for (my $num = $low_bin;$num <= $high_bin;$num+=($min_bin_size/2)) { + push(@bins,$num); + } + # + my @correct; + my @incorrect; + my @count; + while (my ($ans,$submissions) = each(%$responses)) { + 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++) { + last if ($bins[$bin]>$scaled_value); + } + $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)-1); + my $graph = &Apache::loncommon::DrawBarGraph + ($title,'Difference from Correct','Percent of Answers', + $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect, + {xskip=>1}); + # + my $table = $graph.$/. + &numerical_bin_table(\@bins,\@labels,\@incorrect,\@correct,\@count).$/; + return $table; +} + +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') { + my $s_correct = $correct->{$subm{'student'}}; + $subm{'correct'} = $s_correct->{'answer'}; + foreach my $item ('unit','ans_low','ans_high') { + $subm{$item} = $s_correct->{$item}; + } + } else { # This probably never happens.... + $subm{'correct'} = $correct->{'answer'}; + $subm{'unit'} = $correct->{'unit'}; + } + # + my $abs_low =abs($subm{'correct'}-$subm{'ans_low'}); + my $abs_high=abs($subm{'correct'}-$subm{'ans_high'}); + if (! defined($stats{'min_abs'}) || + $stats{'min_abs'} > $abs_low) { + $stats{'min_abs'} = $abs_low; + } + if ($stats{'min_abs'} > $abs_high) { + $stats{'min_abs'} = $abs_high; + } + if (! defined($stats{'max_abs'}) || + $stats{'max_abs'} < $abs_low) { + $stats{'max_abs'} = $abs_low; + } + if ($stats{'max_abs'} < $abs_high) { + $stats{'max_abs'} = $abs_high; + } + my $low_percent; + my $high_percent; + if (defined($subm{'correct'}) && $subm{'correct'} != 0) { + $low_percent = 100 * abs($abs_low / $subm{'correct'}); + $high_percent = 100 * abs($abs_high / $subm{'correct'}); + } + if (! defined($stats{'min_percent'}) || + $stats{'min_percent'} > $low_percent) { + $stats{'min_percent'} = $low_percent; + } + if ($stats{'min_percent'} > $high_percent) { + $stats{'min_percent'} = $high_percent; + } + if (! defined($stats{'max_percent'}) || + $stats{'max_percent'} < $low_percent) { + $stats{'max_percent'} = $low_percent; + } + if ($stats{'max_percent'} < $high_percent) { + $stats{'max_percent'} = $high_percent; + } + if (! defined($stats{'lowest_ans'}) || + $stats{'lowest_ans'} > $subm{'correct'}) { + $stats{'lowest_ans'} = $subm{'correct'}; + } + if (! defined($stats{'highest_ans'}) || + $stats{'highest_ans'} < $subm{'correct'}) { + $stats{'highest_ans'} = $subm{'correct'}; + } + # + $subm{'submission'} =~ s/=\d+\s*$//; + if (&$function(\%subm)) { + my $scaled = '1'; + my ($sname,$sdom) = split(':',$subm{'student'}); + 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'})) { + $stats{'correct_count'}++; + $submission_data{$subm{'correct'}}->{$submission}->[0]++; + } elsif (&numerical_submission_is_incorrect($subm{'award'})) { + $stats{'incorrect_count'}++; + $submission_data{$subm{'correct'}}->{$submission}->[1]++; + } + } + } + $stats{'correct_count'} |= 0; + $stats{'incorrect_count'} |= 0; + $stats{'students'}=scalar(keys(%students)); + return (\%submission_data,\%stats); +} + +sub numerical_submission_is_correct { + my ($award) = @_; + if ($award =~ /^(APPROX_ANS|EXACT_ANS)$/) { + return 1; + } else { + return 0; + } +} + +sub numerical_submission_is_incorrect { + my ($award) = @_; + if ($award =~ /^(INCORRECT)$/) { + return 1; + } else { + return 0; + } +} + +sub numerical_bin_table { + my ($bins,$labels,$incorrect,$correct,$count)=@_; + my $table = + ''. + ''. + ''. + ''. + ''. + ''.$/; + for (my $i=0;$i[$i]; + if ($i == 0) { $lownum = '-∞'; } + my $highnum = $bins->[$i+1]; + if ($i == scalar(@{$bins})-2) { $highnum = '∞'; } + $table .= + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''.$/; + } + $table.= '
'.&mt('Bar').''.&mt('Range').''.&mt('Incorrect').''.&mt('Correct').''.&mt('Count').'
'.$labels->[$i].''.$lownum.' - '.$highnum.''.$incorrect->[$i].''.$correct->[$i].''.$count->[$i].'
'; + return $table; +} + +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'); + # + # Read in the cache (if it exists) before we start timing things. + &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'}); + # + my $correct; + my %answers; + foreach my $student (@$students) { + last if ($c->aborted()); + my $sname = $student->{'username'}; + my $sdom = $student->{'domain'}; + # analyze problem + my $analysis = + &Apache::lonstathelpers::analyze_problem_as_student($resource, + $sname, + $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') { + if (ref($analysis->{$key.'.'.$item}) eq 'ARRAY') { + $correct->{$sname.':'.$sdom}->{$item} = + $analysis->{$key.'.'.$item}[0]; + } else { + $correct->{$sname.':'.$sdom}->{$item} = + $analysis->{$key.'.'.$item}{$which}[0][0]; + } + } + $answers{$correct->{$sname.':'.$sdom}{'answer'}}++; + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, + &mt('last student')); + } + &Apache::lonstathelpers::write_analysis_cache(); + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + return ($correct,\%answers); +} + +# +# Inputs: $r, $width, $height, $data +# $n = number of students +# $data = hashref of $answer => $frequency pairs +sub numerical_one_dimensional_plot { + my ($r,$width,$height,$data)=@_; + # + # Compute data -> image scaling factors + my $max_y = 0; + my $min_x = undef; + my $max_x = undef; + my $n = 0; + while (my ($answer,$count) = each(%$data)) { + $n+=$count; + $max_y = $count if ($max_y < $count); + if (! defined($min_x) || $answer < $min_x) { + $min_x = $answer; + } + if (! defined($max_x) || $answer > $max_x) { + $max_x = $answer; + } + } + # + 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) { + $ticscale = int($height/2/$max_y); + $ticscale = 1 if ($ticscale < 1); + } + # + # Create the plot + my $plot = + qq{}; + while (my ($answer,$count) = each(%$data)) { + my $xloc = 5+$h_scale*($answer - $min_x); + my $top = $height/2-$count*$ticscale; + my $bottom = $height/2+$count*$ticscale; + $plot .= &line($xloc,$top,$xloc,$bottom,'888888',1); + } + # + # Put the scale on last to ensure it is on top of the data. + if ($min_x < 0 && $max_x > 0) { + my $circle_x = 5+$h_scale*abs($min_x); # '0' in data coordinates + my $r = 4; + $plot .= &line(5,$height/2,$circle_x-$r,$height/2,'000000',1); + $plot .= &circle($circle_x,$height/2,$r+1,'000000'); + $plot .= &line($circle_x+$r,$height/2,$width-5,$height/2,'000000',1); + } else { + $plot .= &line(5,$height/2,$width-5,$height/2,'000000',1); + } + $plot .= ''; + my $plotresult = &Apache::lonxml::xmlparse($r,'web',$plot); + my $result = ''. + ''. + ''. + ''. + ''. + ''. + ''. + '
'. + ''.&mt('Distribution of correct answers').''. + '
'.&mt('[_1] students, [_2] distinct correct answers', + $n,scalar(keys(%$data))). + '
'.&mt('Maximum number of coinciding values: [_1]',$max_y). + '
'.$min_x.''.$plotresult.''.$max_x.'
'; + return $result; +} + +## +## Helper subroutines for . +## These should probably go somewhere more suitable soon. +sub line { + my ($x1,$y1,$x2,$y2,$color,$thickness) = @_; + return qq{}; +} + +sub text { + my ($x,$y,$color,$text,$font,$direction) = @_; + if (! defined($font) || $font !~ /^(tiny|small|medium|large|giant)$/) { + $font = 'medium'; + } + if (! defined($direction) || $direction ne 'vertical') { + $direction = ''; + } + return qq{$text}; +} + +sub rectangle { + my ($x1,$y1,$x2,$y2,$color,$thickness,$filled) = @_; + return qq{}; +} + +sub arc { + my ($x,$y,$width,$height,$start,$end,$color,$thickness,$filled)=@_; + return qq{}; +} + +sub circle { + my ($x,$y,$radius,$color,$thickness,$filled)=@_; + return &arc($x,$y,$radius,$radius,0,360,$color,$thickness,$filled); +} + +######################################################### +######################################################### +## +## Radio Response Routines +## +######################################################### +######################################################### +sub radio_response_analysis { + my ($r,$problem,$problem_analysis,$students) = @_; + # + if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) { + $r->print('Bad request'); + } + # + my ($resource,$partid,$respid) = ($problem->{'resource'}, + $problem->{'part'}, + $problem->{'respid'}); + # my $analysis_html; - my $mintries = 1; - my $maxtries = $ENV{'form.NumPlots'}; - my ($table,$Foils,$Concepts) = &build_foil_index($ProblemData); - if ((! defined($Concepts)) || ((@$Concepts < 2) && - ($ENV{'form.AnalyzeAs'} ne 'Foils'))) { - $table = '

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

'.$table; - $ENV{'form.AnalyzeAs'} = 'Foils'; + 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; + if (! $problem_analysis->{'answercomputed'}) { + foreach my $foil (@$foils) { + if ($foildata->{$foil}->{'value'} eq 'true') { + $true_foils{$foil}++; + } + } + $num_true = scalar(keys(%true_foils)); + } + # $analysis_html .= $table; - my @TryData = &RR_tries_data_analysis($r,$PerformanceData); -# if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, - \@TryData,$ProblemData); -# } else { -# $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries, -# $Concepts, -# \@TryData, -# $ProblemData); -# } - return $analysis_html; -} - -sub RR_tries_data_analysis { - my ($r,$Attempt_data) = @_; - my @TryData; - foreach my $attempt (@$Attempt_data) { - my %Attempt = &hashify_attempt($attempt); - my ($answer,undef) = split('=',$Attempt{'submission'}); - $TryData[$Attempt{'tries'}]->{$answer}++; - } - return @TryData; -} - -sub RR_Time_Analysis { - my ($r,$PerformanceData,$ProblemData) = @_; - my $html; - return $html; -} - -sub RR_Tries_Foil_Analysis { - my ($min,$max,$Foils,$TryData,$ProblemData) = @_; - my $html; - # - # Compute the data neccessary to make the plots - for (my $try=$min;$try<=$max;$try++) { - my @PlotData_Correct; - my @PlotData_Incorrect; - next if ($try > scalar(@{$TryData})); - next if (! defined($TryData->[$try])); - my %DataSet = %{$TryData->[$try]}; - my $total = 0; - foreach my $foilid (@$Foils) { - $total += $DataSet{$foilid}; + # Gather student data + my $response_data = &Apache::loncoursedata::get_response_data + ([&Apache::lonstatistics::get_selected_sections()], + [&Apache::lonstatistics::get_selected_groups()], + $Apache::lonstatistics::enrollment_status, + $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... + &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$students, + 'Statistics', + 'stats_status'); + foreach my $student (@$students) { + my ($idx,@remainder) = split('&',$student->{'answer'}); + my ($answer) = ($remainder[$idx]=~/^(.*)=([^=]*)$/); + $correct->{$student->{'username'}.':'.$student->{'domain'}}= + &unescape($answer); } - foreach my $foilid (@$Foils) { - if ($total == 0) { - push (@PlotData_Correct,0); - push (@PlotData_Incorrect,0); + } else { + foreach my $foil (keys(%$foildata)) { + if ($foildata->{$foil}->{'value'} eq 'true') { + $correct = $foildata->{$foil}->{'name'}; + } + } + } + # + if (! defined($response_data) || ref($response_data) ne 'ARRAY' ) { + $analysis_html = '
' + .&mt('There is no submission data for this resource.') + .'
'; + $r->print($analysis_html); + return; + } + # + $analysis_html.=''; + 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') { + $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)}; + $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 = ''; + $no_data_text = 'No data exists for attempt [_1]'; + } 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 + ('enddate_'.$plot_num); + ($starttime,$endtime) = &ensure_start_end_times + ($starttime,$endtime, + &get_time_from_row($response_data->[0]), + &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'; + $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime); + $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime); + # + $post_graph_text = + &mt('Start time: [_1]', + &Apache::lonhtmlcommon::date_setter + ('Statistics','startdate_'.$plot_num,$starttime)). + '
'. + &mt('End time: [_1]', + &Apache::lonhtmlcommon::date_setter + ('Statistics','enddate_'.$plot_num,$endtime)); + $restriction_function = + sub { + my $t = $_[0]->{'timestamp'}; + if ($t >= $starttime && $t < $endtime) { + return 1; + } else { + return 0; + } + }; + $no_data_text = 'No data for [_5] to [_6]'; + } + my $foil_choice_data = + &classify_response_data($response_data,$correct, + $restriction_function); + # &Apache::lonstathelpers::log_hash_ref($foil_choice_data); + my $answers; + if (ref($correct)) { + my %tmp; + foreach my $foil (values(%$correct)) { + $tmp{$foil}++; + } + $answers = [keys(%tmp)]; + } else { + $answers = [$correct]; + } + # Concept Plot + my $concept_plot = ''; + if (scalar(@$concepts) > 1) { + $concept_plot = &RR_concept_plot($concepts,$foil_choice_data, + 'Correct Concepts'); + } + # % Choosing plot + my $choice_plot = &RR_create_percent_selected_plot + ($concepts,$foils,$foil_choice_data,$correct_foil_title); + # for each correct foil, how did they mark it? (stacked bar graph) + my ($stacked_plot,$count_by_foil); + if ($problem_analysis->{'answercomputed'} || $num_true > 1) { + ($stacked_plot,$count_by_foil) = + &RR_create_stacked_selection_plot($foils,$foil_choice_data, + $incorrect_foil_title, + \%true_foils); + } + # + if ($concept_plot ne '' || + $choice_plot ne '' || + $stacked_plot ne '') { + my $correct = $foil_choice_data->{'_correct'}; + $correct |= 0; + my $incorrect = $foil_choice_data->{'_count'}-$correct; + $analysis_html.= ''.$/; + $analysis_html.= + ''. + ''. + ''; + if ($stacked_plot ne '') { + $analysis_html .= + ''. + ''; } else { - if ($ProblemData->{'_Foils'}->{$foilid}->{'value'} eq 'true') { - push (@PlotData_Correct, - int(100*$DataSet{$foilid}/$total)); - push (@PlotData_Incorrect,0); + $analysis_html .= (''x2); + } + $analysis_html.=''.$/; + if (defined($post_graph_text)) { + $analysis_html.= ''.$/; + } + } elsif ($no_data_text ne '') { + $analysis_html.=''.$/; + } + } # end of loop for plots + $analysis_html.='
'. + ''. + &mt($pre_graph_text, + $plot_num,$foil_choice_data->{'_count'}, + $correct, + $incorrect, + $foil_choice_data->{'_students'}, + @extra_data). + '
'.$concept_plot.''.$choice_plot.''.$stacked_plot.''.&build_foil_key($foils,$count_by_foil).'
'. + $post_graph_text.'
'. + '
'. + &mt($no_data_text, + $plot_num,$foil_choice_data->{'_count'}, + $correct, + $foil_choice_data->{'_count'}-$correct, + @extra_data). + '
'; + if (defined($post_graph_text)) { + $analysis_html.='
'.$post_graph_text; + } + $analysis_html.='
'; + $r->print($analysis_html); +} + +sub ensure_start_end_times { + my ($start,$end,$first,$last,$plot_num) = @_; + if (! defined($start) || ! defined($end)) { + my $sec_in_day = 86400; + my ($sday,$smon,$syear) = + (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'}) { + $start = $first; + } + } + return ($start,$end); +} + +sub RR_concept_plot { + my ($concepts,$foil_data,$title) = @_; + # + my %correct_by_concept; + my %incorrect_by_concept; + my %true; + foreach my $concept (@$concepts) { + foreach my $foil (@{$concept->{'foils'}}) { + next if (! exists($foil_data->{$foil})); + foreach my $choice (keys(%{$foil_data->{$foil}})) { + if ($choice eq $foil) { + $correct_by_concept{$concept->{'name'}} += + $foil_data->{$foil}->{$choice}; } else { - push (@PlotData_Correct,0); - push (@PlotData_Incorrect, - int(100*$DataSet{$foilid}/$total)); + $incorrect_by_concept{$concept->{'name'}} += + $foil_data->{$foil}->{$choice}; } } } - my $title='Attempt '.$try; - my $xlabel = $total.' Submissions'; - $html.= &Apache::loncommon::DrawBarGraph($title, - $xlabel, - 'Percent Choosing', - 100, - ['#33ff00','#ff3300'], - \@PlotData_Correct, - \@PlotData_Incorrect); - } - return $html; -} - -sub RR_Tries_Concept_Analysis { - my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_; - my $html; - return $html; -} - -sub RR_Time_Foil_Analysis { - my ($min,$max,$Foils,$ResponseData,$ProblemData) = @_; - my $html; - return $html; -} - -sub RR_Time_Concept_Analysis { - my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_; - my $html; - return $html; + } + # + # need arrays for incorrect and correct because we want to use different + # colors for them + my @correct; + # + my $total =0; + for (my $i=0;$i[$i]; + $correct[$i] = $correct_by_concept{$concept->{'name'}}; + $total += $correct_by_concept{$concept->{'name'}}+ + $incorrect_by_concept{$concept->{'name'}}; + } + if ($total == 0) { return ''; }; + for (my $i=0;$i<=$#correct;$i++) { + $correct[$i] = sprintf('%0f',$correct[$i]/$total*100); + } + my $xlabel = 'concept'; + my $plot= &Apache::loncommon::DrawBarGraph($title, + $xlabel, + 'Percent Choosing', + 100, + ['#33ff00','#ff3300'], + undef, + \@correct); + return $plot; +} + +sub RR_create_percent_selected_plot { + my ($concepts,$foils,$foil_data,$title) = @_; + # + if ($foil_data->{'_count'} == 0) { return ''; }; + my %correct_selections; + my %incorrect_selections; + foreach my $foil (@$foils) { + # foil_data has format $foil_data->{true_foil}->{selected foil}=count + next if (! exists($foil_data->{$foil})); + while (my ($f,$count)= each(%{$foil_data->{$foil}})) { + if ($f eq $foil) { + $correct_selections{$foil} += $count; + } else { + $incorrect_selections{$f} += $count; + } + } + } + # + # need arrays for incorrect and correct because we want to use different + # colors for them + my @correct; + my @incorrect; + # + my $total = $foil_data->{'_count'}; + for (my $i=0;$i[$i]; + $correct[$i] = $correct_selections{$foil}; + $incorrect[$i] = $incorrect_selections{$foil}; + } + for (my $i=0;$i<=$#correct;$i++) { + $correct[$i] = sprintf('%2f',$correct[$i]/$total*100); + } + for (my $i=0;$i<=$#incorrect;$i++) { + $incorrect[$i] = sprintf('%2f',$incorrect[$i]/$total*100); + } + # + # Put a blank in the data sets between concepts, if there are concepts + my @labels; + if (defined($concepts) && scalar(@$concepts) > 1) { + my @new_correct; + my @new_incorrect; + my $foil_count = 0; + foreach my $concept (@$concepts) { + foreach (@{$concept->{'foils'}}) { + push(@new_correct, $correct[$foil_count]); + push(@new_incorrect,$incorrect[$foil_count]); + push(@labels,++$foil_count); + } + push(@new_correct,''); + push(@new_incorrect,''); + push(@labels,''); + } + @correct = @new_correct; + @incorrect = @new_incorrect; + } else { + @labels = (1 .. scalar(@correct)); + } + # + my $xlabel = 'foil chosen'; + my $plot= &Apache::loncommon::DrawBarGraph($title, + $xlabel, + 'Percent Choosing', + 100, + ['#33ff00','#ff3300'], + \@labels, + \@correct, + \@incorrect); + return $plot; +} + +sub RR_create_stacked_selection_plot { + my ($foils,$foil_data,$title,$true_foils)=@_; + # + my @dataset; # array of array refs - multicolor rows $datasets[row]->[col] + my @labels; + my $count; + my %column; # maps foil name to column in @datasets + for (my $i=0;$i[$i]; + if (defined($true_foils) && scalar(keys(%$true_foils)) > 0 ) { + next if (! $true_foils->{$foil} ); + push(@labels,$i+1); + } else { + next if (! exists($foil_data->{$foil})); + push(@labels,$i+1); + } + next if (! exists($foil_data->{$foils->[$i]})); + $column{$foil}= $count++; + for (my $j=0;$j{$foil}->{$foils->[$j]}; + } + $dataset[$j]->[$column{$foil}]=$value; + } + } + # + return '' if (! scalar(keys(%column))); + # + my $grand_total = 0; + my %count_per_foil; + while (my ($foil,$bar) = each (%column)) { + my $bar_total = 0; + for (my $j=0;$j[$bar]; + } + next if ($bar_total == 0); + for (my $j=0;$j[$bar] = + sprintf('%2f',$dataset[$j]->[$bar]/$bar_total * 100); + } + $count_per_foil{$foil}=' ( '.$bar_total.' )'; + $grand_total += $bar_total; + } + if ($grand_total == 0) { + return ('',undef); + } + my @empty_row = (); + foreach (@{$dataset[0]}) { + push(@empty_row,0); + } + # + my $graph = &Apache::loncommon::DrawBarGraph + ($title,'Correct Foil','foils chosen Incorrectly', + 100,$plotcolors,\@labels,\@empty_row,@dataset); + return ($graph,\%count_per_foil); } -sub get_Radio_problem_data { - my ($url) = @_; - my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze')); - (my $garbage,$Answ)=split('_HASH_REF__',$Answ,2); - my %Answer = &Apache::lonnet::str2hash($Answ); - my %Partdata; - foreach my $part (@{$Answer{'parts'}}) { - while (my($key,$value) = each(%Answer)) { -# if (ref($value) eq 'ARRAY') { -# &Apache::lonnet::logthis('is ref part:'.$part.' '.$key.'='.join(',',@$value)); -# } else { -# &Apache::lonnet::logthis('notref part:'.$part.' '.$key.'='.$value); -# } - next if ($key !~ /^$part/); - $key =~ s/^$part\.//; - if ($key eq 'foils') { - $Partdata{$part}->{'_Foils'}=$value; - } elsif ($key eq 'options') { - $Partdata{$part}->{'_Options'}=$value; - } elsif ($key eq 'shown') { - $Partdata{$part}->{'_Shown'}=$value; - } elsif ($key =~ /^foil.value.(.*)$/) { - $Partdata{$part}->{$1}->{'value'}=$value; - } elsif ($key =~ /^foil.text.(.*)$/) { - $Partdata{$part}->{$1}->{'text'}=$value; +######################################################### +######################################################### +## +## Misc routines +## +######################################################### +######################################################### + +# if $correct is a hash ref, it is assumed to be indexed by student names. +# the values are assumed to be hash refs with a key of 'answer'. +sub classify_response_data { + my ($full_row_data,$correct,$function) = @_; + my %submission_data; + my %students; + 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; + } + $subm{'submission'} =~ s/=\d+\s*$//; + if (&$function(\%subm)) { + $students{$subm{'student'}}++; + $submission_data{'_count'}++; + if (&submission_is_correct($subm{'award'})) { + $submission_data{'_correct'}++; + } + + if($max<++$submission_data{$subm{'correct'}}->{$subm{'submission'}}) { + $max=$submission_data{$subm{'correct'}}->{$subm{'submission'}}; } } } - return %Partdata; + $submission_data{'_max'} = $max; + $submission_data{'_students'}=scalar(keys(%students)); + return \%submission_data; } + ######################################################### ######################################################### ## @@ -365,225 +1221,217 @@ sub get_Radio_problem_data { ######################################################### ######################################################### sub OptionResponseAnalysis { - my ($r,$problem,$ProblemData,$Students) = @_; + my ($r,$problem,$problem_data,$Students) = @_; my ($resource,$respid) = ($problem->{'resource'}, $problem->{'respid'}); # Note: part data is not needed. - my $PerformanceData = - &Apache::loncoursedata::get_response_data - ($Students,$resource->{'symb'},$respid); + my $PerformanceData = &Apache::loncoursedata::get_response_data + ([&Apache::lonstatistics::get_selected_sections()], + [&Apache::lonstatistics::get_selected_groups()], + $Apache::lonstatistics::enrollment_status, + $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 (exists($ENV{'form.ExcelOutput'})) { - my $result = &OR_excel_sheet($r,$resource, - $PerformanceData, - $ProblemData); - $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, - $ProblemData); - $r->print($analysis_html); - $r->rflush(); - } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { - my $analysis_html = &OR_time_analysis($PerformanceData, - $ProblemData); - $r->print($analysis_html); - $r->rflush(); - } else { - $r->print('

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

'); - } + $r->print('div class="LC_warning"' + .&mt('The analysis you have selected is not supported at this time.') + .'' + ); } } } ######################################################### # -# Option Response: Tries Analysis +# Option Response: tries Analysis # ######################################################### 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 ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) { - $table = '

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

'.$table; - $ENV{'form.AnalyzeAs'} = 'Foils'; + if (! defined($Concepts)) { + $Concepts = []; } - my %ResponseData = &OR_analyze_by_tries($r,$PerformanceData, + my %response_data = &OR_analyze_by_tries($r,$PerformanceData, $mintries,$maxtries); my $analysis = ''; - if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $analysis = &OR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, - \%ResponseData,$ORdata); - } else { - $analysis = &OR_Tries_Concept_Analysis($mintries,$maxtries, - $Concepts,\%ResponseData,$ORdata); - } - $table .= $analysis; - return $table; -} - -sub OR_Tries_Foil_Analysis { - my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_; - my %ResponseData = %$respdat; - # - # Compute the data neccessary to make the plots - my @PlotData; - foreach my $foilid (@$Foils) { - for (my $i=$mintries;$i<=$maxtries;$i++) { - if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) { - push(@{$PlotData[$i]->{'_correct'}},0); - } else { - push(@{$PlotData[$i]->{'_correct'}}, - 100*$ResponseData{$foilid}->[$i]->{'_correct'}/ - $ResponseData{$foilid}->[$i]->{'_total'}); - } - foreach my $option (@{$ORdata->{'_Options'}}) { - push(@{$PlotData[$i]->{'_total'}}, - $ResponseData{$foilid}->[$i]->{'_total'}); - if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) { - push (@{$PlotData[$i]->{$option}},0); + # + # Compute the data necessary to make the plots + my @foil_plot; + my @concept_data; + for (my $j=0;$j<=scalar(@$Concepts);$j++) { + my $concept = $Concepts->[$j]; + foreach my $foilid (@{$concept->{'foils'}}) { + for (my $try=$mintries;$try<=$maxtries;$try++) { + # concept analysis data + $concept_data[$j]->[$try]->{'_correct'} += + $response_data{$foilid}->[$try]->{'_correct'}; + $concept_data[$j]->[$try]->{'_total'} += + $response_data{$foilid}->[$try]->{'_total'}; + # + # foil analysis data + if ($response_data{$foilid}->[$try]->{'_total'} == 0) { + push(@{$foil_plot[$try]->{'_correct'}},0); } else { - if ($ResponseData{$foilid}->[$i]->{'_total'} == - $ResponseData{$foilid}->[$i]->{'_correct'}) { - push(@{$PlotData[$i]->{$option}},0); + push(@{$foil_plot[$try]->{'_correct'}}, + 100*$response_data{$foilid}->[$try]->{'_correct'}/ + $response_data{$foilid}->[$try]->{'_total'}); + } + foreach my $option (@{$ORdata->{'_Options'}}) { + push(@{$foil_plot[$try]->{'_total'}}, + $response_data{$foilid}->[$try]->{'_total'}); + if ($response_data{$foilid}->[$try]->{'_total'} == 0) { + push (@{$foil_plot[$try]->{$option}},0); } else { - push (@{$PlotData[$i]->{$option}}, - 100 * $ResponseData{$foilid}->[$i]->{$option} / - ($ResponseData{$foilid}->[$i]->{'_total'} - - $ResponseData{$foilid}->[$i]->{'_correct'})); + if ($response_data{$foilid}->[$try]->{'_total'} == + $response_data{$foilid}->[$try]->{'_correct'}) { + push(@{$foil_plot[$try]->{$option}},0); + } else { + push (@{$foil_plot[$try]->{$option}}, + 100 * + $response_data{$foilid}->[$try]->{$option} / + ($response_data{$foilid}->[$try]->{'_total'} + - + $response_data{$foilid}->[$try]->{'_correct'} + )); + } } - } + } # End of foreach my $option } - } - } + } # End of foreach my $foilid + } # End of concept loops # # Build a table for the plots - my $analysis_html = "\n"; - my $foilkey = &build_option_index($ORdata); - for (my $i=$mintries;$i<=$maxtries;$i++) { - my $count = $ResponseData{'_total'}->[$i]; - if ($count == 0) { - $count = 'no submissions'; - } elsif ($count == 1) { - $count = '1 submission'; - } else { - $count = $count.' submissions'; + my $analysis_html = "
\n"; + my $optionkey = &build_option_index($ORdata); + my $num_concepts = 1; + if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); } + # + for (my $try=$mintries;$try<=$maxtries;$try++) { + if (! defined($response_data{'_total'}->[$try]) || + $response_data{'_total'}->[$try] == 0) { + if ($try > 1) { + $analysis_html.= ''; + } else { + $analysis_html.= ''; + } + last; } - my $title = 'Attempt '.$i.', '.$count; + my $concept_graph=''; + if ($num_concepts > 1) { + # + # Create concept plot + my @concept_plot_data; + for (my $j=0;$j<=$#concept_data;$j++) { + my $total = $concept_data[$j]->[$try]->{'_total'}; + if ($total == 0) { + $concept_plot_data[$j] = 0; + } else { + $concept_plot_data[$j] = 100 * + sprintf('%0.3f', + $concept_data[$j]->[$try]->{'_correct'} / + $total); + } + } + # + $concept_graph = &Apache::loncommon::DrawBarGraph + ('Correct Concepts','Concept Number','Percent Correct', + 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($PlotData[$i]->{$option})); - push(@Datasets,$PlotData[$i]->{$option}); + next if (! exists($foil_plot[$try]->{$option})); + push(@Datasets,$foil_plot[$try]->{$option}); } - my $correctgraph = &Apache::loncommon::DrawBarGraph - ($title,'Foil Number','Percent Correct', - 100,$plotcolors,$Datasets[0]); - $analysis_html.= ''; - ## - ## - next if (! defined($Datasets[0])); - for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) { - $Datasets[0]->[$i]=0; - } - $count = $ResponseData{'_total'}->[$i]-$ResponseData{'_correct'}->[$i]; - if ($count == 0) { - $count = 'no submissions'; - } elsif ($count == 1) { - $count = '1 submission'; - } else { - $count = $count.' submissions'; + # + # Put a blank in the data set between concepts + for (my $set =0;$set<=$#Datasets;$set++) { + my @Data = @{$Datasets[$set]}; + my $idx = 0; + foreach my $concept (@{$Concepts}) { + foreach my $foilid (@{$concept->{'foils'}}) { + $Datasets[$set]->[$idx++]=shift(@Data); + } + if ($concept->{'name'} ne $Concepts->[-1]->{'name'}) { + $Datasets[$set]->[$idx++] = 0; + } + } } - $title = 'Attempt '.$i.', '.$count; - my $incorrectgraph = &Apache::loncommon::DrawBarGraph - ($title,'Foil Number','% Option Chosen Incorrectly', - 100,$plotcolors,@Datasets); - $analysis_html.= ''; - $analysis_html.= '\n"; - } - $analysis_html .= "
' + .'
' + .&mt('None of the selected students attempted the problem more than [_1] times.' + ,$try-1) + .'
' + .'
' + .'
' + .&mt('None of the selected students have attempted the problem.') + .'
' + .'
'.$correctgraph.''.$incorrectgraph.''.$foilkey."
\n"; - return $analysis_html; -} - -sub OR_Tries_Concept_Analysis { - my ($mintries,$maxtries,$Concepts,$respdat,$ORdata) = @_; - my %ResponseData = %$respdat; - my $analysis_html = "\n"; - # - # Compute the data neccessary to make the plots - my @PlotData; - # Concept analysis - # - # Note: we do not bother with characterizing the students incorrect - # answers at the concept level because an incorrect answer for one foil - # may be a correct answer for another foil. - my %ConceptData; - foreach my $concept (@{$Concepts}) { - for (my $i=$mintries;$i<=$maxtries;$i++) { - # - # Gather the per-attempt data - my $cdata = $ConceptData{$concept}->[$i]; + # + # Set up the labels needed for the bar graph + my @Labels; + my $idx = 1; + foreach my $concept (@{$Concepts}) { foreach my $foilid (@{$concept->{'foils'}}) { - $cdata->{'_correct'} += - $ResponseData{$foilid}->[$i]->{'_correct'}; - $cdata->{'_total'} += - $ResponseData{$foilid}->[$i]->{'_total'}; - } - push (@{$PlotData[$i]->{'_total'}},$cdata->{'_total'}); - if ($cdata->{'_total'} == 0) { - push (@{$PlotData[$i]->{'_correct'}},0); - } else { - push (@{$PlotData[$i]->{'_correct'}}, - 100*$cdata->{'_correct'}/$cdata->{'_total'}); - } + push(@Labels,$idx++); + } + push(@Labels,''); } - } - # Build a table for the plots - for (my $i=$mintries;$i<=$maxtries;$i++) { - my $minstu = $PlotData[$i]->{'_total'}->[0]; - my $maxstu = $PlotData[$i]->{'_total'}->[0]; - foreach my $count (@{$PlotData[$i]->{'_total'}}) { - if ($minstu > $count) { - $minstu = $count; - } - if ($maxstu < $count) { - $maxstu = $count; - } - } - $maxstu = 0 if (! defined($maxstu)); - $minstu = 0 if (! defined($minstu)); - my $title; - my $count = $ResponseData{'_total'}->[$i]; - if ($count == 0) { - $count = 'no submissions'; - } elsif ($count == 1) { - $count = '1 submission'; - } else { - $count = $count.' submissions'; + # + my $correct_graph = &Apache::loncommon::DrawBarGraph + ('Correct Statements','Statement','% Answered Correct', + 100,$plotcolors,\@Labels,$Datasets[0],{xskip=>1}); + + # + # + next if (! defined($Datasets[0])); + for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) { + $Datasets[0]->[$i]=0; } - $title = 'Attempt '.$i.', '.$count; - my $graphlink = &Apache::loncommon::DrawBarGraph - ($title,'Concept Number','Percent Correct', - 100,$plotcolors,$PlotData[$i]->{'_correct'}); - $analysis_html.= '\n"; + my $count = $response_data{'_total'}->[$try] - + $response_data{'_correct'}->[$try]; + my $incorrect_graph = &Apache::loncommon::DrawBarGraph + ('Incorrect Statements','Statement','% Chosen Incorrectly', + 100,$plotcolors,\@Labels,@Datasets,{xskip=>1}); + $analysis_html.= + ''.$/. + ''. + ''. + ''. + ''. + ''.$/; } $analysis_html .= "
'.$graphlink."
'. + ''. + &mt('Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect', + $try,$data_count,$correct,$data_count-$correct). + ''.'
'.$concept_graph.''.$correct_graph.''.$incorrect_graph.''.$optionkey.''. + '
\n"; - return $analysis_html; + $table .= $analysis_html; + return $table; } sub OR_analyze_by_tries { @@ -591,11 +1439,14 @@ sub OR_analyze_by_tries { my %Trydata; $mintries = 1 if (! defined($mintries) || $mintries < 1); $maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries); + my @students; foreach my $row (@$PerformanceData) { next if (! defined($row)); my $tries = &get_tries_from_row($row); my %Row = &Process_OR_Row($row); next if (! %Row); + my $student_id = $row->[&Apache::loncoursedata::RD_student_id()]; + $students[$tries]->{$student_id}++; while (my ($foilid,$href) = each(%Row)) { if (! ref($href)) { $Trydata{$foilid}->[$tries] += $href; @@ -606,6 +1457,9 @@ sub OR_analyze_by_tries { } } } + for (my $try=$mintries;$try<=$maxtries;$try++) { + $Trydata{'_studentcount'}->[$try] = scalar(keys(%{$students[$try]})); + } return %Trydata; } @@ -615,19 +1469,23 @@ sub OR_analyze_by_tries { # ######################################################### sub OR_time_analysis { - my ($PerformanceData,$ORdata) = @_; + my ($performance_data,$ORdata) = @_; my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); - if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) { + my $foilkey = &build_option_index($ORdata); + my $num_concepts = 1; + if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); } + # + if ($num_concepts < 2) { $table = '

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

'.$table; - $ENV{'form.AnalyzeAs'} = 'Foils'; + ''.$table; } - my $num_plots = $ENV{'form.NumPlots'}; - my $num_data = scalar(@$PerformanceData)-1; - my $percent = sprintf('%2f',100/$num_plots); # + my $num_plots = $env{'form.NumPlots'}; + my $num_data = scalar(@$performance_data)-1; + # + my $current_index; $table .= "\n"; for (my $i=0;$i<$num_plots;$i++) { ## @@ -637,16 +1495,20 @@ sub OR_time_analysis { ('enddate_'.$i); if (! defined($starttime) || ! defined($endtime)) { my $sec_in_day = 86400; - my $last_sub_time = &get_time_from_row($PerformanceData->[-1]); - my ($sday,$smon,$syear); - (undef,undef,undef,$sday,$smon,$syear) = - localtime($last_sub_time - $sec_in_day*$i); + my $last_sub_time = &get_time_from_row($performance_data->[-1]); + my ($sday,$smon,$syear) = + (localtime($last_sub_time - $sec_in_day*$i))[3..5]; $starttime = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear); $endtime = $starttime + $sec_in_day; if ($i == ($num_plots -1 )) { - $starttime = &get_time_from_row($PerformanceData->[0]); + $starttime = &get_time_from_row($performance_data->[0]); } } + $table .= ''.$/; my $startdateform = &Apache::lonhtmlcommon::date_setter ('Statistics','startdate_'.$i,$starttime); my $enddateform = &Apache::lonhtmlcommon::date_setter @@ -655,585 +1517,185 @@ sub OR_time_analysis { my $begin_index; my $end_index; my $j; - while (++$j < scalar(@$PerformanceData)) { - last if (&get_time_from_row($PerformanceData->[$j]) + while (++$j < scalar(@$performance_data)) { + last if (&get_time_from_row($performance_data->[$j]) > $starttime); } $begin_index = $j; - while (++$j < scalar(@$PerformanceData)) { - last if (&get_time_from_row($PerformanceData->[$j]) > $endtime); + while ($j < scalar(@$performance_data)) { + if (&get_time_from_row($performance_data->[$j]) > $endtime) { + last; + } else { + $j++; + } } $end_index = $j; ## - my $interval = { - begin_index => $begin_index, - end_index => $end_index, - startdateform => $startdateform, - enddateform => $enddateform, - }; - if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $table .= &OR_Foil_Time_Analysis($PerformanceData,$ORdata,$Foils, - $interval); - } else { - $table .= &OR_Concept_Time_Analysis($PerformanceData,$ORdata, - $Concepts,$interval); - } + my ($processed_time_data,$correct,$data_count,$student_count) = + &OR_time_process_data($performance_data,$begin_index,$end_index); + $correct |= 0; + ## + $table .= ''.$/; + my $concept_correct_plot = ''; + if ($num_concepts > 1) { + $concept_correct_plot = + &OR_Concept_Time_Analysis($processed_time_data, + $correct,$data_count,$student_count, + $ORdata,$Concepts); + } + my ($foil_correct_plot,$foil_incorrect_plot) = + &OR_Foil_Time_Analysis($processed_time_data, + $correct,$data_count,$student_count, + $ORdata,$Foils,$Concepts); + $table .= ''. + ''. + ''. + ''. + ''.$/; + $table .= ''.$/; + $table.= ''.$/; } + $table .= '
'. + &mt('Data from [_1] to [_2]', + &Apache::lonlocal::locallocaltime($starttime), + &Apache::lonlocal::locallocaltime($endtime)). + '
'. + &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect', + $data_count,$student_count,$correct,$data_count-$correct). + '
'.$concept_correct_plot.''.$foil_correct_plot.''.$foil_incorrect_plot.''.$foilkey.'
'. + &mt('Start time: [_1]',$startdateform).'
'. + &mt('End time: [_1]',$enddateform).'
 
'; # return $table; } sub OR_Foil_Time_Analysis { - my ($PerformanceData,$ORdata,$Foils,$interval) = @_; + my ($processed_time_data,$correct,$data_count,$student_count, + $ORdata,$Foils,$Concepts) = @_; + if ($data_count <= 0) { + return ('
' + .&mt('There is no data to plot.') + .'
' + ,'' + ); + } my $analysis_html; - my $foilkey = &build_option_index($ORdata); - my ($begin_index,$end_index) = ($interval->{'begin_index'}, - $interval->{'end_index'}); - my %TimeData; - # - # Compute the number getting the foils correct or incorrects - for (my $j=$begin_index;$j<=$end_index;$j++) { - my $row = $PerformanceData->[$j]; - next if (! defined($row)); - my %Row = &Process_OR_Row($row); - while (my ($foilid,$href) = each(%Row)) { - if (! ref($href)) { - $TimeData{$foilid} += $href; - next; + my @plotdata; + my @labels; + foreach my $concept (@{$Concepts}) { + foreach my $foil (@{$concept->{'foils'}}) { + push(@labels,scalar(@labels)+1); + my $total = $processed_time_data->{$foil}->{'_total'}; + if ($total == 0) { + push(@{$plotdata[0]},0); + } else { + push(@{$plotdata[0]}, + 100 * $processed_time_data->{$foil}->{'_correct'} / $total); } - while (my ($option,$value) = each(%$href)) { - $TimeData{$foilid}->{$option}+=$value; + my $total_incorrect = $total - $processed_time_data->{$foil}->{'_correct'}; + for (my $i=0;$i{'_Options'}});$i++) { + my $option = $ORdata->{'_Options'}->[$i]; + if ($total_incorrect == 0) { + push(@{$plotdata[$i+1]},0); + } else { + push(@{$plotdata[$i+1]}, + 100 * $processed_time_data->{$foil}->{$option} / $total_incorrect); + } } } - } - my @Plotdata; - foreach my $foil (@$Foils) { - my $total = $TimeData{$foil}->{'_total'}; - if ($total == 0) { - push(@{$Plotdata[0]},0); - } else { - push(@{$Plotdata[0]}, - 100 * $TimeData{$foil}->{'_correct'} / $total); - } - my $total_incorrect = $total - $TimeData{$foil}->{'_correct'}; - my $optionidx = 1; - foreach my $option (@{$ORdata->{'_Options'}}) { - if ($total_incorrect == 0) { - push(@{$Plotdata[$optionidx]},0); - } else { - push(@{$Plotdata[$optionidx]}, - 100 * $TimeData{$foil}->{$option} / $total_incorrect); - } - } continue { - $optionidx++; + # Put in a blank one + push(@labels,''); + push(@{$plotdata[0]},0); + for (my $i=0;$i{'_Options'}});$i++) { + push(@{$plotdata[$i+1]},0); } } # # Create the plot - my $count = $end_index-$begin_index; - my $title; - if ($count == 0) { - $title = 'no submissions'; - } elsif ($count == 1) { - $title = 'one submission'; - } else { - $title = $count.' submissions'; - } - my $correctplot = &Apache::loncommon::DrawBarGraph($title, - 'Foil Number', - 'Percent Correct', - 100, - $plotcolors, - $Plotdata[0]); - for (my $j=0; $j< scalar(@{$Plotdata[0]});$j++) { - $Plotdata[0]->[$j]=0; - } - $count = $end_index-$begin_index-$TimeData{'_correct'}; - if ($count == 0) { - $title = 'no submissions'; - } elsif ($count == 1) { - $title = 'one submission'; - } else { - $title = $count.' submissions'; - } - my $incorrectplot = &Apache::loncommon::DrawBarGraph($title, - 'Foil Number', - 'Incorrect Option Choice', - 100, - $plotcolors, - @Plotdata); - $analysis_html.=''. - ''.$correctplot.''. - ''.$incorrectplot.''. - ''.$foilkey.''."\n"; - $analysis_html.= ''.''. - 'Start Time:'. - '  '.$interval->{'startdateform'}.'
'. - 'End Time  : '. - ' '.$interval->{'enddateform'}.'
'. -# 'Plot Title  :'. -# (" "x3).$interval->{'titleform'}. - ''. - "\n"; - return $analysis_html; + my $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements', + 'Statement Number', + 'Percent Correct', + 100, + $plotcolors, + undef, + $plotdata[0], + {xskip=>1}); + for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) { + $plotdata[0]->[$j]=0; + } + my $incorrect_plot = + &Apache::loncommon::DrawBarGraph('Incorrect Statements', + 'Statement Number', + 'Incorrect Option Choice', + 100, + $plotcolors, + undef, + @plotdata,{xskip=>1}); + return ($correct_plot,$incorrect_plot); } sub OR_Concept_Time_Analysis { - my ($PerformanceData,$ORdata,$Concepts,$interval) = @_; - my $analysis_html; - ## - ## Determine starttime, endtime, startindex, endindex - my ($begin_index,$end_index) = ($interval->{'begin_index'}, - $interval->{'end_index'}); - my %TimeData; - # - # Compute the number getting the foils correct or incorrects - for (my $j=$begin_index;$j<=$end_index;$j++) { - my $row = $PerformanceData->[$j]; - next if (! defined($row)); - my %Row = &Process_OR_Row($row); - while (my ($foilid,$href) = each(%Row)) { - if (! ref($href)) { - $TimeData{$foilid} += $href; - next; - } - while (my ($option,$value) = each(%$href)) { - $TimeData{$foilid}->{$option}+=$value; - } - } - } + my ($processed_time_data,$correct,$data_count,$student_count, + $ORdata,$Concepts) = @_; + return '' if ($data_count == 0); # # Put the data in plottable form - my @Plotdata; + my @plotdata; foreach my $concept (@$Concepts) { my ($total,$correct); foreach my $foil (@{$concept->{'foils'}}) { - $total += $TimeData{$foil}->{'_total'}; - $correct += $TimeData{$foil}->{'_correct'}; + $total += $processed_time_data->{$foil}->{'_total'}; + $correct += $processed_time_data->{$foil}->{'_correct'}; } if ($total == 0) { - push(@Plotdata,0); + push(@plotdata,0); } else { - push(@Plotdata,100 * $correct / $total); + push(@plotdata,100 * $correct / $total); } } # # Create the plot - my $title = ($end_index - $begin_index).' submissions'; - my $correctplot = &Apache::loncommon::DrawBarGraph($title, - 'Concept Number', - 'Percent Correct', - 100, - $plotcolors, - \@Plotdata); - $analysis_html.=''. - ''.$correctplot.''. - ''. - 'Start Time:  '.$interval->{'startdateform'}.'
'. - 'End Time  : '. - ' '.$interval->{'enddateform'}.'
'. -# 'Plot Title  :'.(" "x3). -# $interval->{'titleform'}. - ''. - "\n"; - return $analysis_html; -} - -######################################################### -######################################################### -## -## Excel output -## -######################################################### -######################################################### -sub OR_excel_sheet { - my ($r,$resource,$PerformanceData,$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 &Apache::loncommon::DrawBarGraph('Correct Concepts', + 'Concept Number', + 'Percent Correct', + 100, + $plotcolors, + undef, + \@plotdata,{xskip=>1}); +} + +sub OR_time_process_data { + my ($performance_data,$begin_index,$end_index)=@_; + my %processed_time_data; + my %distinct_students; + my ($correct,$data_count); + if (($begin_index == $end_index) && + ($end_index != scalar(@$performance_data)-1)) { return undef; } - # - $workbook->set_tempdir('/home/httpd/perl/tmp'); - # - # Define some potentially useful formats - my $format; - $format->{'header'} = $workbook->add_format(bold => 1, - bottom => 1, - align => 'center'); - $format->{'bold'} = $workbook->add_format(bold=>1); - $format->{'h1'} = $workbook->add_format(bold=>1, size=>18); - $format->{'h2'} = $workbook->add_format(bold=>1, size=>16); - $format->{'h3'} = $workbook->add_format(bold=>1, size=>14); - $format->{'date'} = $workbook->add_format(num_format=> - 'mmm d yyyy hh:mm AM/PM'); - # - # Create and populate main worksheets - my $problem_data_sheet = $workbook->addworksheet('Problem Data'); - my $student_data_sheet = $workbook->addworksheet('Student Data'); - 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_student_data_worksheet($student_data_sheet,$format); - if ($result ne 'okay') { - # Do something useful - } - $result = &OR_build_response_data_worksheet($response_data_sheet,$format, - $PerformanceData,$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_student_data_worksheet { - my ($worksheet,$format) = @_; - my $rows_output = 3; - my $cols_output = 0; - $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; -} - -sub OR_build_response_data_worksheet { - my ($worksheet,$format,$PerformanceData,$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 (@$PerformanceData) { - next if (! defined($row)); - my ($student,$award,$grading,$submission,$time,$tries) = @$row; - my @Foilgrades = split('&',$grading); - my @Foilsubs = split('&',$submission); - my %ResponseData; - for (my $j=0;$j<=$#Foilgrades;$j++) { - my ($foilid,$correct) = split('=',$Foilgrades[$j]); - my (undef,$submission) = split('=',$Foilsubs[$j]); - $submission = &Apache::lonnet::unescape($submission); - $ResponseData{$foilid.' submission'}=$submission; - $ResponseData{$foilid.' award'}=$correct; - } - $worksheet->write($rows_output,$cols_output++,$student); - $worksheet->write($rows_output,$cols_output++, - &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++, - $ResponseData{$foilid.' submission'}); - $worksheet->write($rows_output,$cols_output++, - $ResponseData{$foilid.' award'}); + # Be sure we include the last one if we are asked for it. + # That we have to correct here (and not when $end_index is + # given a value) should probably be considered a bug. + if ($end_index == scalar(@$performance_data)-1) { + $end_index++; + } + my $count; + for (my $i=$begin_index;$i<$end_index;$i++) { + my $attempt = $performance_data->[$i]; + $count++; + next if (! defined($attempt)); + my %attempt = &Process_OR_Row($attempt); + $data_count++; + $correct += $attempt{'_correct'}; + $distinct_students{$attempt->[&Apache::loncoursedata::RD_student_id()]}++; + while (my ($foilid,$href) = each(%attempt)) { + if (! ref($href)) { + $processed_time_data{$foilid} += $href; + next; + } + while (my ($option,$value) = each(%$href)) { + $processed_time_data{$foilid}->{$option}+=$value; + } } - $rows_output++; - $cols_output = 0; } - return; -} - - -## -## The following is copied from datecalc1.pl, part of the -## Spreadsheet::WriteExcel CPAN module. -## -## -###################################################################### -# -# Demonstration of writing date/time cells to Excel spreadsheets, -# using UNIX/Perl time as source of date/time. -# -# Copyright 2000, Andrew Benham, adsb@bigfoot.com -# -###################################################################### -# -# UNIX/Perl time is the time since the Epoch (00:00:00 GMT, 1 Jan 1970) -# measured in seconds. -# -# An Excel file can use exactly one of two different date/time systems. -# In these systems, a floating point number represents the number of days -# (and fractional parts of the day) since a start point. The floating point -# number is referred to as a 'serial'. -# The two systems ('1900' and '1904') use different starting points: -# '1900'; '1.00' is 1 Jan 1900 BUT 1900 is erroneously regarded as -# a leap year - see: -# http://support.microsoft.com/support/kb/articles/Q181/3/70.asp -# for the excuse^H^H^H^H^H^Hreason. -# '1904'; '1.00' is 2 Jan 1904. -# -# The '1904' system is the default for Apple Macs. Windows versions of -# Excel have the option to use the '1904' system. -# -# Note that Visual Basic's "DateSerial" function does NOT erroneously -# regard 1900 as a leap year, and thus its serials do not agree with -# the 1900 serials of Excel for dates before 1 Mar 1900. -# -# Note that StarOffice (at least at version 5.2) does NOT erroneously -# regard 1900 as a leap year, and thus its serials do not agree with -# the 1900 serials of Excel for dates before 1 Mar 1900. -# -###################################################################### -# -# Calculation description -# ======================= -# -# 1900 system -# ----------- -# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 70 years after 1 Jan 1900. -# Of those 70 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68) -# were leap years with an extra day. -# Thus there were 17 + 70*365 days = 25567 days between 1 Jan 1900 and -# 1 Jan 1970. -# In the 1900 system, '1' is 1 Jan 1900, but as 1900 was not a leap year -# 1 Jan 1900 should really be '2', so 1 Jan 1970 is '25569'. -# -# 1904 system -# ----------- -# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 66 years after 1 Jan 1904. -# Of those 66 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68) -# were leap years with an extra day. -# Thus there were 17 + 66*365 days = 24107 days between 1 Jan 1904 and -# 1 Jan 1970. -# In the 1904 system, 2 Jan 1904 being '1', 1 Jan 1970 is '24107'. -# -###################################################################### -# -# Copyright (c) 2000, Andrew Benham. -# This program is free software. It may be used, redistributed and/or -# modified under the same terms as Perl itself. -# -# Andrew Benham, adsb@bigfoot.com -# London, United Kingdom -# 11 Nov 2000 -# -###################################################################### - -# Use 1900 date system on all platforms other than Apple Mac (for which -# use 1904 date system). -my $DATE_SYSTEM = ($^O eq 'MacOS') ? 1 : 0; - -#----------------------------------------------------------- -# calc_serial() -# -# Called with (up to) 2 parameters. -# 1. Unix timestamp. If omitted, uses current time. -# 2. GMT flag. Set to '1' to return serial in GMT. -# If omitted, returns serial in appropriate timezone. -# -# Returns date/time serial according to $DATE_SYSTEM selected -#----------------------------------------------------------- -sub calc_serial { - my $time = (defined $_[0]) ? $_[0] : time(); - my $gmtflag = (defined $_[1]) ? $_[1] : 0; - - # Divide timestamp by number of seconds in a day. - # This gives a date serial with '0' on 1 Jan 1970. - my $serial = $time / 86400; - - # Adjust the date serial by the offset appropriate to the - # currently selected system (1900/1904). - if ($DATE_SYSTEM == 0) { # use 1900 system - $serial += 25569; - } else { # use 1904 system - $serial += 24107; - } - - unless ($gmtflag) { - # Now have a 'raw' serial with the right offset. But this - # gives a serial in GMT, which is false unless the timezone - # is GMT. We need to adjust the serial by the appropriate - # timezone offset. - # Calculate the appropriate timezone offset by seeing what - # the differences between localtime and gmtime for the given - # time are. - - my @gmtime = gmtime($time); - my @ltime = localtime($time); - - # For the first 7 elements of the two arrays, adjust the - # date serial where the elements differ. - for (0 .. 6) { - my $diff = $ltime[$_] - $gmtime[$_]; - if ($diff) { - $serial += _adjustment($diff,$_); - } - } - } - - # Perpetuate the error that 1900 was a leap year by decrementing - # the serial if we're using the 1900 system and the date is prior to - # 1 Mar 1900. This has the effect of making serial value '60' - # 29 Feb 1900. - - # This fix only has any effect if UNIX/Perl time on the platform - # can represent 1900. Many can't. - - unless ($DATE_SYSTEM) { - $serial-- if ($serial < 61); # '61' is 1 Mar 1900 - } - return $serial; -} - -sub _adjustment { - # Based on the difference in the localtime/gmtime array elements - # number, return the adjustment required to the serial. - - # We only look at some elements of the localtime/gmtime arrays: - # seconds unlikely to be different as all known timezones - # have an offset of integral multiples of 15 minutes, - # but it's easy to do. - # minutes will be different for timezone offsets which are - # not an exact number of hours. - # hours very likely to be different. - # weekday will differ when localtime/gmtime difference - # straddles midnight. - # - # Assume that difference between localtime and gmtime is less than - # 5 days, then don't have to do maths for day of month, month number, - # year number, etc... - - my ($delta,$element) = @_; - my $adjust = 0; - - if ($element == 0) { # Seconds - $adjust = $delta/86400; # 60 * 60 * 24 - } elsif ($element == 1) { # Minutes - $adjust = $delta/1440; # 60 * 24 - } elsif ($element == 2) { # Hours - $adjust = $delta/24; # 24 - } elsif ($element == 6) { # Day of week number - # Catch difference straddling Sat/Sun in either direction - $delta += 7 if ($delta < -4); - $delta -= 7 if ($delta > 4); - - $adjust = $delta; - } - return $adjust; + return (\%processed_time_data,$correct,$data_count, + scalar(keys(%distinct_students))); } sub build_foil_index { @@ -1264,15 +1726,15 @@ sub build_foil_index { my $a1 = lc($a); my $b1 = lc($b); if (exists($Numbers{$a1})) { - $a = $Numbers{$a1}; + $a1 = $Numbers{$a1}; } if (exists($Numbers{$b1})) { - $b = $Numbers{$b1}; + $b1 = $Numbers{$b1}; } - if (($a =~/^\d+$/) && ($b =~/^\d+$/)) { - return $a <=> $b; + if (($a1 =~/^\d+$/) && ($b1 =~/^\d+$/)) { + return $a1 <=> $b1; } else { - return $a cmp $b; + return $a1 cmp $b1; } }; my @Concepts; @@ -1287,23 +1749,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; @@ -1311,39 +1773,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++; @@ -1351,7 +1813,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'}).''.&HTML::Entities::encode($concept->{'name'},'<>&"').''.$foilindex++.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).''.&HTML::Entities::encode($Foildata{$firstfoil}->{'text'}).''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'
'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').''.$Foildata{$firstfoil}->{'text'}.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'
'.$foilindex++.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).''.&HTML::Entities::encode($Foildata{$firstfoil}->{'text'}).''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'
'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').''.$Foildata{$firstfoil}->{'text'}.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'
'.$foilindex.''.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).''.&HTML::Entities::encode($Foildata{$foilid}->{'text'}).''.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'
'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').''.$Foildata{$foilid}->{'text'}.''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'
'.$foilindex.''.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).''.&HTML::Entities::encode($Foildata{$foilid}->{'text'}).''.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'
'.&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); @@ -1363,11 +1825,12 @@ sub build_option_index { my $optionindex = 0; my @Rows; foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) { + my $color = $plotcolors->[$optionindex++]; push (@Rows, ''. - ''. - (' 'x4).''. - ''.&HTML::Entities::encode($option).''. + ''. + ''.('*'x3).''.''. + ''.&HTML::Entities::encode($option,'<>&"').''. "\n"); } shift(@Rows); # Throw away 'correct option chosen' color @@ -1375,6 +1838,27 @@ sub build_option_index { $table .= "\n"; } +sub build_foil_key { + my ($foils,$extra_data)= @_; + if (! defined($extra_data)) { $extra_data = {}; } + my $table = "\n"; + my $foil_index = 0; + my @rows; + foreach my $foil (&mt('correct foil chosen'),@{$foils}) { + my $color = $plotcolors->[$foil_index++]; + push (@rows, + ''. + ''. + ''. + "\n"); + } + shift(@rows); # Throw away 'correct foil chosen' color + $table .= join('',reverse(@rows)); + $table .= "
'. + ''.('*'x4).''.&HTML::Entities::encode($foil,'<>&"'). + (' 'x2).$extra_data->{$foil}.'
\n"; +} + ######################################################### ######################################################### ## @@ -1385,102 +1869,94 @@ sub build_option_index { 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 .= ''."\n"; - $Str .= ''; - $Str .= ''; - $Str .= ''; -# $Str .= ''; - $Str .= ''; - $Str .= ''."\n"; + $Str .= &Apache::lonhtmlcommon::breadcrumbs('Detailed Problem Analysis'); + $Str .= '

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

'; + $Str .= ''; + $Str .= ''; + $Str .= ''; + $Str .= &Apache::loncommon::end_data_table_header_row(); ## ## - $Str .= ''; # + $Str .= ''; + # $Str .= ''; # -# $Str .= ''; ## ## - $Str .= ''."\n"; - $Str .= '
'.&mt('Sections').''.&mt('Enrollment Status').''.&mt('Sequences and Folders').' 
'.&mt('Sections').''.&mt('Groups').''.&mt('Access Status').''.&mt('Options').'
'."\n"; + $Str .= &Apache::loncommon::start_data_table_row(); + $Str .= ''."\n"; $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5); $Str .= ''."\n"; + $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5); + $Str .= ''; $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); $Str .= ''; - my $only_seq_with_assessments = sub { - my $s=shift; - if ($s->{'num_assess'} < 1) { - return 0; - } else { - return 1; - } - }; - &Apache::lonstatistics::MapSelect('Maps','multiple,all',5, - $only_seq_with_assessments); ## ## - $Str .= ''; - { # These braces are here to organize the code, not scope it. - { - $Str .= ''.&mt('Analyze Over '); - $Str .= &Apache::loncommon::help_open_topic - ('Analysis_Analyze_Over'); - $Str .=''; - $Str .= '
'; - } - { - $Str .= ''.&mt('Analyze as '); - $Str .= &Apache::loncommon::help_open_topic - ('Analysis_Analyze_as'); - $Str .='
'; - } - { - $Str .= '
'.&mt('Number of Plots:'); - $Str .= &Apache::loncommon::help_open_topic - ('Analysis_num_plots'); - $Str .= ''; - } - } + $Str .= '		'; + ## + my $showprob_checkbox = + '
'; + ## + my $analyze_selector = ''; + $Str .= '
'.$/; + ## + my $numplots_selector = ''; + $Str .= '
'; + ## $Str .= '
'."\n"; + $Str .= &Apache::loncommon::end_data_table_row(); + $Str .= &Apache::loncommon::end_data_table(); + $Str .= '

'; + $Str .= '

'; return $Str; } @@ -1510,8 +1986,9 @@ sub get_tries_from_row { sub hashify_attempt { my ($row) = @_; my %attempt; + $attempt{'student'} = $row->[&Apache::loncoursedata::RD_sname()]; $attempt{'tries'} = $row->[&Apache::loncoursedata::RD_tries()]; - $attempt{'submission'} = $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; @@ -1520,14 +1997,14 @@ sub hashify_attempt { sub Process_OR_Row { my ($row) = @_; my %RowData; - my $student_id = $row->[&Apache::loncoursedata::RD_student_id()]; +# my $student_id = $row->[&Apache::loncoursedata::RD_student_id()]; my $award = $row->[&Apache::loncoursedata::RD_awarddetail()]; my $grading = $row->[&Apache::loncoursedata::RD_response_eval()]; my $submission = $row->[&Apache::loncoursedata::RD_submission()]; my $time = $row->[&Apache::loncoursedata::RD_timestamp()]; - my $tries = $row->[&Apache::loncoursedata::RD_tries()]; +# my $tries = $row->[&Apache::loncoursedata::RD_tries()]; return undef if ($award eq 'MISSING_ANSWER'); - if ($award =~ /(APPROX_ANS|EXACT_ANS)/) { + if (&submission_is_correct($award)) { $RowData{'_correct'} = 1; } $RowData{'_total'} = 1; @@ -1535,12 +2012,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'}++; @@ -1548,58 +2025,15 @@ sub Process_OR_Row { return %RowData; } -## -## get problem data and put it into a useful data structure. -## note: we must force each foil and option to not begin or end with -## spaces as they are stored without such data. -## -sub get_problem_data { - my ($url) = @_; - my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze')); - (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2); - my %Answer; - %Answer=&Apache::lonnet::str2hash($Answ); - my %Partdata; - foreach my $part (@{$Answer{'parts'}}) { - while (my($key,$value) = each(%Answer)) { - next if ($key !~ /^$part/); - $key =~ s/^$part\.//; - if (ref($value) eq 'ARRAY') { - if ($key eq 'options') { - $Partdata{$part}->{'_Options'}=$value; - } elsif ($key eq 'concepts') { - $Partdata{$part}->{'_Concepts'}=$value; - } elsif ($key =~ /^concept\.(.*)$/) { - my $concept = $1; - foreach my $foil (@$value) { - $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}= - $concept; - } - } - } else { - if ($key=~ /^foil\.text\.(.*)$/) { - my $foil = $1; - $Partdata{$part}->{'_Foils'}->{$foil}->{'name'}=$foil; - $value =~ s/(\s*$|^\s*)//g; - $Partdata{$part}->{'_Foils'}->{$foil}->{'text'}=$value; - } elsif ($key =~ /^foil\.value\.(.*)$/) { - my $foil = $1; - $Partdata{$part}->{'_Foils'}->{$foil}->{'value'}=$value; - } - } - } +sub submission_is_correct { + my ($award) = @_; + if ($award =~ /(APPROX_ANS|EXACT_ANS)/) { + return 1; + } else { + return 0; } - return %Partdata; } 1; __END__ - -##### -# partdata{part}->{_Foils}->{foilid}->{'name'} = $ -# ->{'text'} = $ -# ->{'value'} = $ -# ->{'_Concept'} = $ -# partdata{part}->{_Options} = @ -# partdata{part}->{_Concepts} = @