--- loncom/interface/statistics/lonproblemanalysis.pm 2003/10/14 22:02:49 1.38 +++ loncom/interface/statistics/lonproblemanalysis.pm 2004/10/27 17:47:13 1.96 @@ -1,7 +1,6 @@ # The LearningOnline Network with CAPA # - -# $Id: lonproblemanalysis.pm,v 1.38 2003/10/14 22:02:49 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.96 2004/10/27 17:47:13 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,7 +24,6 @@ # # http://www.lon-capa.org/ # - package Apache::lonproblemanalysis; use strict; @@ -35,93 +33,139 @@ use Apache::lonhtmlcommon(); use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonlocal; +use Apache::lonstathelpers(); +use Apache::lonstudentsubmissions(); use HTML::Entities(); +use Time::Local(); +use Spreadsheet::WriteExcel(); + +my $plotcolors = ['#33ff00', + '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933', + '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66', + ]; + +my @SubmitButtons = ({ name => 'PrevProblemAnalysis', + text => 'Previous Problem' }, + { name => 'ProblemAnalysis', + text => 'Analyze Problem Again' }, + { name => 'NextProblemAnalysis', + text => 'Next Problem' }, + { name => 'break'}, + { name => 'SelectAnother', + text => 'Choose a different Problem' }, + { name => 'ExcelOutput', + text => 'Produce Excel Output' }); sub BuildProblemAnalysisPage { my ($r,$c)=@_; - $r->print('

'.&mt('Option Response Problem Analysis').'

'); + # + my %Saveable_Parameters = ('Status' => 'scalar', + 'Section' => 'array', + 'NumPlots' => 'scalar', + 'AnalyzeOver' => 'scalar', + ); + &Apache::loncommon::store_course_settings('problem_analysis', + \%Saveable_Parameters); + &Apache::loncommon::restore_course_settings('problem_analysis', + \%Saveable_Parameters); + # + &Apache::lonstatistics::PrepareClasslist(); + # $r->print(&CreateInterface()); # my @Students = @Apache::lonstatistics::Students; # - if (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(''); + if (@Students < 1 && exists($ENV{'form.firstrun'})) { + $r->print('

There are no students in the sections selected

'); } + # + my @CacheButtonHTML = + &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)'; if (exists($ENV{'form.problemchoice'}) && ! exists($ENV{'form.SelectAnother'})) { - $r->print(''); - $r->print(' 'x5); - $r->print(''); - $r->print(' 'x5); - $r->print(''); - $r->print(' 'x5); - $r->print(''); - $r->print(''); - $r->print(' 'x5); + foreach my $button (@SubmitButtons) { + if ($button->{'name'} eq 'break') { + $r->print("
\n"); + } else { + $r->print(''); + $r->print(' 'x5); + } + } + foreach my $html (@CacheButtonHTML) { + $r->print($html.(' 'x5)); + } # $r->print('
'); + $r->rflush(); # - my ($symb,$part,$resid) = &get_problem_symb( - &Apache::lonnet::unescape($ENV{'form.problemchoice'}) - ); - # - my $resource = &get_resource_from_symb($symb); - if (defined($resource)) { - my %Data = &get_problem_data($resource->{'src'}); - my $ORdata = $Data{$part.'.'.$resid}; - ## - ## Render the problem - my $base; - ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|); - $base = "http://".$ENV{'SERVER_NAME'}.$base; - my $rendered_problem = - &Apache::lonnet::ssi_body($resource->{'src'}); - $rendered_problem =~ s/<\s*form\s*/)|<\/nop>|g; - $r->print('
'. - ''. - $rendered_problem. - '
'); - ## - ## Analyze the problem - my $PerformanceData = - &Apache::loncoursedata::get_optionresponse_data - (\@Students,$symb,$resid); - if (defined($PerformanceData) && - ref($PerformanceData) eq 'ARRAY') { - if ($ENV{'form.AnalyzeOver'} eq 'Tries') { - my $analysis_html = &tries_analysis($PerformanceData, - $ORdata); - $r->print($analysis_html); - } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { - my $analysis_html = &time_analysis($PerformanceData, - $ORdata); - $r->print($analysis_html); - } else { - $r->print('

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

'); + # Determine which problem we are to analyze + my $current_problem = &Apache::lonstathelpers::get_target_from_id + ($ENV{'form.problemchoice'}); + # + my ($prev,$curr,$next) = + &Apache::lonstathelpers::get_prev_curr_next($current_problem, + $problem_types, + 'response', + ); + if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) { + $current_problem = $prev; + } 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'} = + &Apache::lonstathelpers::make_target_id($current_problem); + $r->print(''); + # + if (! defined($current_problem->{'resource'})) { + $r->print('resource is undefined'); + } else { + my $resource = $current_problem->{'resource'}; + $r->print('

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

'); + $r->print('

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

'); + 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'}); + 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') { + &RadioResponseAnalysis($r,$current_problem, + $problem_data, + \@Students); + } elsif ($current_problem->{'resptype'} eq 'numerical') { + ## + ## analyze all responses of a problem at once + my $res = $current_problem->{'resource'}; + foreach my $partid (@{$res->{'parts'}}) { + $current_problem->{'part'} = $partid; + foreach my $respid (@{$res->{'partdata'}->{$partid}->{'ResponseIds'}}) { + $current_problem->{'respid'}=$respid; + &NumericalResponseAnalysis($r,$current_problem, + $problem_data,\@Students); + } } } else { - $r->print('

'. - &mt('There is no student data for this problem.'). - '

'); + $r->print('

This analysis is not supported

'); } - } else { - $r->print('resource is undefined'); } $r->print('
'); } else { @@ -129,7 +173,8 @@ sub BuildProblemAnalysisPage { &mt('Analyze Problem').'" />'); $r->print(' 'x5); $r->print('

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

'); - $r->print(&OptionResponseProblemSelector()); + $r->print(&Apache::lonstathelpers::ProblemSelector + ($problem_types)); } } @@ -137,392 +182,1525 @@ sub BuildProblemAnalysisPage { ######################################################### ######################################################### ## -## Misc interface routines use by analysis code +## Numerical Response Routines ## ######################################################### ######################################################### -sub build_foil_index { - my ($ORdata) = @_; - my %Foildata = %{$ORdata->{'Foils'}}; - my @Foils = sort(keys(%Foildata)); - my %Concepts; - foreach my $foilid (@Foils) { - push(@{$Concepts{$Foildata{$foilid}->{'Concept'}}}, - $foilid); +sub NumericalResponseAnalysis { + my ($r,$problem,$problem_data,$Students) = @_; + my $c = $r->connection(); + my ($resource,$partid,$respid) = ($problem->{'resource'}, + $problem->{'part'}, + $problem->{'respid'}); + # + if (scalar(@{$resource->{'parts'}})>1) { + if (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) { + $r->print('

'. + &mt('Part [_1], response [_2].',$partid,$respid). + '

'); + } else { + $r->print('

'. + &mt('Part [_1]',$partid,$respid). + '

'); + } + } elsif (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) { + $r->print('

'.&mt('Response [_1]',$respid).'

'); } - undef(@Foils); - # Having gathered the concept information in a hash, we now translate it - # into an array because we need to be consistent about order. - # Also put the foils in order, too. - my $sortfunction = sub { - my %Numbers = (one => 1, - two => 2, - three => 3, - four => 4, - five => 5, - six => 6, - seven => 7, - eight => 8, - nine => 9, - ten => 10,); - my $a1 = $a; - my $b1 = $b; - if (exists($Numbers{$a})) { - $a1 = $Numbers{$a}; + # + my $analysis_html; + my $PerformanceData = &Apache::loncoursedata::get_response_data + (\@Apache::lonstatistics::SelectedSections, + $Apache::lonstatistics::enrollment_status, + $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); + return; + } + # + # This next call causes all the waiting around that people complain about + &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students, + 'Statistics', + 'stats_status'); + return if ($c->aborted()); + # + # Collate the data + my %Data; + foreach my $student (@$Students) { + my $answer = $student->{'answer'}; + $Data{$answer}++; + } + my @Labels = sort {$a <=> $b } keys(%Data); + my @PlotData = @Data{@Labels}; + # + my $width = 500; + my $height = 100; + my $plot = &one_dimensional_plot($r,500,100,scalar(@$Students), + \@Labels,\@PlotData); + $r->print($plot); + return; +} + +sub one_dimensional_plot { + my ($r,$width,$height,$N,$Labels,$Data)=@_; + # + # Compute data -> image scaling factors + my $min = $Labels->[0]; + my $max = $Labels->[-1]; + if ($max == $min) { + $max =$min+1; + } + my $h_scale = ($width-10)/($max-$min); + # + my $max_y = 0; + foreach (@$Data) { + $max_y = $_ if ($max_y < $_); + } + 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{}; + for (my $idx=0;$idx[$idx] - $min); + my $top = $height/2-$Data->[$idx]*$ticscale; + my $bottom = $height/2+$Data->[$idx]*$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 < 0 && $max > 0) { + my $circle_x = 5+$h_scale*abs($min); # '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 $title = 'Distribution of correct answers'; + my $result = ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + '
'. + ''.$title.' (N='.$N.')'. + ''. + '
'.$min.''.$plotresult.''.$max.'
'. + 'Maximum Number of Coinciding Values: '.$max_y. + '
'; + 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); +} + +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; +} + +######################################################### +######################################################### +## +## Radio Response Routines +## +######################################################### +######################################################### +sub RadioResponseAnalysis { + my ($r,$problem,$problem_analysis,$students) = @_; + if ($ENV{'form.AnalyzeOver'} eq 'tries') { + &RR_tries_analysis($r,$problem,$problem_analysis,$students); + } elsif ($ENV{'form.AnalyzeOver'} eq 'time') { + &RR_static_time_analysis($r,$problem,$problem_analysis,$students); + } else { + $r->print('Bad request'); + } + return; +} + +sub RR_computed_tries_analysis { + my ($r,$problem,$problem_analysis) = @_; + my ($resource,$partid,$respid) = ($problem->{'resource'}, + $problem->{'part'}, + $problem->{'respid'}); + $r->print('The tries answer you seek must be computed'); + # Gather student data + # for each try + # loop through data, classifying it by + # correct foil -> selected foil + # if there is concept data + # make a concept correct plot + # for each correct foil + # make a plot of the data +} + +sub RR_computed_time_analysis { + my ($r,$problem,$problem_analysis) = @_; + my ($resource,$partid,$respid) = ($problem->{'resource'}, + $problem->{'part'}, + $problem->{'respid'}); + $r->print('The time answer you seek must be computed'); + # Gather student data + # for time division + # limit to between start time & end time + # loop through data, classifying it by + # correct foil -> selected foil + # if there is concept data + # make a concept correct plot + # for each correct foil + # make a plot of the data +} + +sub RR_tries_analysis { + my ($r,$problem,$problem_analysis,$students) = @_; + my ($resource,$partid,$respid) = ($problem->{'resource'}, + $problem->{'part'}, + $problem->{'respid'}); + # + my $analysis_html; + my $foildata = $problem_analysis->{'_Foils'}; + my ($table,$foils,$concepts) = &build_foil_index($problem_analysis); + $analysis_html .= $table; + # Gather student data + my $response_data = &Apache::loncoursedata::get_response_data + (\@Apache::lonstatistics::SelectedSections, + $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'}}= + &Apache::lonnet::unescape($answer); } - if (exists($Numbers{$b})) { - $b1 = $Numbers{$b}; + } else { + foreach my $foil (keys(%$foildata)) { + if ($foildata->{$foil}->{'value'} eq 'true') { + $correct = $foildata->{$foil}->{'name'}; + last; + } } - $a1 cmp $b1; - }; - my @Concepts; - foreach my $concept (sort $sortfunction (keys(%Concepts))) { - push(@Concepts,{name => $concept, - foils => [@{$Concepts{$concept}}]}); - push(@Foils,(@{$Concepts{$concept}})); + } + 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; } # - # Build up the table of row labels. - my $table = ''."\n"; - $table .= ''. - ''. - ''. - ''. - ''. - ''. - ''. - "\n"; - my $conceptindex = 1; - my $foilindex = 1; - foreach my $concept (@Concepts) { - my @FoilsInConcept = @{$concept->{'foils'}}; - my $firstfoil = shift(@FoilsInConcept); - $table .= ''. - ''. - ''. - ''. - ''. - ''. - ''. - "\n"; - foreach my $foilid (@FoilsInConcept) { - $table .= ''. - ''. - ''. - ''. - ''. - ''. - ''. - "\n"; - } continue { - $foilindex++; + $analysis_html.='
'.&mt('Concept Number').''.&mt('Concept').''.&mt('Foil Number').''.&mt('Foil Name').''.&mt('Foil Text').''.&mt('Correct Value').'
'.$conceptindex.''.$concept->{'name'}.''.$foilindex++.''.$Foildata{$firstfoil}->{'name'}.''.$Foildata{$firstfoil}->{'text'}.''.$Foildata{$firstfoil}->{'value'}.'
'.$foilindex.''.$Foildata{$foilid}->{'name'}.''.$Foildata{$foilid}->{'text'}.''.$Foildata{$foilid}->{'value'}.'
'; + for (my $try = 1;$try<=$ENV{'form.NumPlots'};$try++) { + # classify data ->correct foil -> selected foil + my $attempt_restriction_function = + my $foil_choice_data = + &RR_classify_response_data($response_data,$correct, + sub {($_[0]->{'tries'} == $try?1:0)}); + 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, + '% choosing'); + } + # % Choosing plot + my $choice_plot = &RR_create_percent_selected_plot + ($foils,$foil_choice_data,'Attempt '.$try); + # for each correct foil, how did they mark it? (stacked bar graph) + my ($stacked_plot,$count_by_foil) = + &RR_create_stacked_selection_plot($foils,$foil_choice_data,''); + # + if ($concept_plot ne '' || + $choice_plot ne '' || + $stacked_plot ne '') { + $analysis_html.= + ''. + ''. + ''; + if ($stacked_plot ne '') { + $analysis_html .= + ''. + ''; + } else { + $analysis_html .= (''x2); + } + $analysis_html.=''.$/; } - } continue { - $conceptindex++; } - $table .= "
'.$concept_plot.''.$choice_plot.''.$stacked_plot.''.&build_foil_key($foils,$count_by_foil).'
\n"; - return ($table,\@Foils,\@Concepts); + $analysis_html.=''; + $r->print($analysis_html); +} + + +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 { + $incorrect_by_concept{$concept->{'name'}} += + $foil_data->{$foil}->{$choice}; + + } + } + } + } + # + # 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'; + $title.= ' (N='.$total.')'; + my $plot= &Apache::loncommon::DrawBarGraph($title, + $xlabel, + 'Percent Choosing', + 100, + ['#33ff00','#ff3300'], + undef, + \@correct); + return $plot; +} + + +sub RR_create_percent_selected_plot { + my ($foils,$foil_data,$title) = @_; + # + my %foil_selections; + my %true; + foreach my $foil (@$foils) { + # foil_data has format $foil_data->{true_foil}->{selected foil} + next if (! exists($foil_data->{$foil})); + $true{$foil}++; + while (my ($f,$count)= each(%{$foil_data->{$foil}})) { + $foil_selections{$f}+=$count; + } + } + # + # need arrays for incorrect and correct because we want to use different + # colors for them + my @correct; + my @incorrect; + # + my $total =0; + for (my $i=0;$i[$i]; + if ($true{$foil}) { + $correct[$i] = $foil_selections{$foil}; + $incorrect[$i] = 0; + } else { + $correct[$i] = 0; + $incorrect[$i] = $foil_selections{$foil}; + } + $total+=$foil_selections{$foil}; + } + if ($total == 0) { return ''; }; + for (my $i=0;$i<=$#correct;$i++) { + $correct[$i] = sprintf('%0f',$correct[$i]/$total*100); + } + for (my $i=0;$i<=$#incorrect;$i++) { + $incorrect[$i] = sprintf('%0f',$incorrect[$i]/$total*100); + } + my $xlabel = 'foil chosen'; + $title.= ' (N='.$total.')'; + my $plot= &Apache::loncommon::DrawBarGraph($title, + $xlabel, + 'Percent Choosing', + 100, + ['#33ff00','#ff3300'], + undef, + \@correct, + \@incorrect); + return $plot; +} + + +sub RR_create_stacked_selection_plot { + my ($foils,$foil_data,$title)=@_; + # + my @correct_choice; # the green row + my @dataset; # array of array refs - multicolor rows. + my %filled; + my @labels; + my $count=-1; + my %column; + for (my $i=0;$i{$foils->[$i]})); + my $correct_foil = $foils->[$i]; + push(@labels,$i+1); + $column{$correct_foil}= ++$count; + for (my $j=0;$j{$correct_foil}->{$foils->[$j]}; + } + $dataset[$j]->[$column{$correct_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}=' (N='.$bar_total.')'; + $grand_total += $bar_total; + } + if ($grand_total == 0) { + return ('',undef); + } + my @empty_row = (); + foreach (@{$dataset[0]}) { + push(@empty_row,0); + } + # + $title .= ' (N='.$grand_total.')'; + my $graph = &Apache::loncommon::DrawBarGraph + ($title,'Correct Foil','foils chosen Incorrectly', + 100,$plotcolors,\@labels,\@empty_row,@dataset); + return ($graph,\%count_per_foil); +} + + +# 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 RR_classify_response_data { + my ($full_row_data,$correct,$function) = @_; + my %submission_data; + 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)) { + $submission_data{$subm{'correct'}}->{$subm{'submission'}}++; + } + } + return \%submission_data; } +sub RR_static_time_analysis { + my ($r,$problem,$problem_analysis) = @_; + my ($resource,$partid,$respid) = ($problem->{'resource'}, + $problem->{'part'}, + $problem->{'respid'}); + $r->print('

The time answer you seek is static

'); + my $analysis_html; + # Gather student data + my $response_data = &Apache::loncoursedata::get_response_data + (\@Apache::lonstatistics::SelectedSections, + $Apache::lonstatistics::enrollment_status, + $resource->{'symb'},$respid); + 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; + } + # for time division + + # limit to between start time & end time + # loop through data, classifying it by + # correct foil -> selected foil + # if there is concept data + # make a concept correct plot + # for each correct foil + # make a plot of the data + +} + + +=pod + + + } elsif ($ENV{'form.AnalyzeOver'} eq 'tries') { + $analysis_html .= &RR_tries_Analysis($r,$problem->{'resource'}, + $PerformanceData,$problem_data); + } elsif ($ENV{'form.AnalyzeOver'} eq 'time') { + $analysis_html .= &RR_time_Analysis($r,$problem->{'resource'}, + $PerformanceData,$problem_data); + } else { + $analysis_html .= '

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

'; + } + $r->print($analysis_html); +} + +sub RR_Excel_output { + my ($r,$PerformanceData,$problem_data) = @_; + return '

No!

'; +} + +sub RR_tries_Analysis { + my ($r,$resource,$PerformanceData,$problem_data) = @_; + my $analysis_html; + my $mintries = 1; + my $maxtries = $ENV{'form.NumPlots'}; + my ($table,$Foils,$Concepts) = &build_foil_index($problem_data); + if ((! defined($Concepts)) || (@$Concepts < 2)) { + $table = '

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

'.$table; + } + $analysis_html .= $table; + my @TryData = &RR_tries_data_analysis($r,$PerformanceData); + $analysis_html .= &RR_tries_Foil_Analysis($mintries,$maxtries,$Foils, + \@TryData,$problem_data); + 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,$problem_data) = @_; + my $html; + return $html; +} + +sub RR_tries_Foil_Analysis { + my ($min,$max,$Foils,$TryData,$problem_data) = @_; + 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}; + } + foreach my $foilid (@$Foils) { + if ($total == 0) { + push (@PlotData_Correct,0); + push (@PlotData_Incorrect,0); + } else { + if ($problem_data->{'_Foils'}->{$foilid}->{'value'} eq 'true') { + push (@PlotData_Correct, + int(100*$DataSet{$foilid}/$total)); + push (@PlotData_Incorrect,0); + } else { + push (@PlotData_Correct,0); + push (@PlotData_Incorrect, + int(100*$DataSet{$foilid}/$total)); + } + } + } + my $title='Attempt '.$try.' (N='.$total.')'; + my $xlabel = 'Foil Chosen'; + $html.= &Apache::loncommon::DrawBarGraph($title, + $xlabel, + 'Percent Choosing', + 100, + ['#33ff00','#ff3300'], + undef, + \@PlotData_Correct, + \@PlotData_Incorrect); + } + return $html; +} + +sub RR_tries_Concept_Analysis { + my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_; + my $html; + return $html; +} + +sub RR_time_Foil_Analysis { + my ($min,$max,$Foils,$ResponseData,$problem_data) = @_; + my $html; + return $html; +} + +sub RR_time_Concept_Analysis { + my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_; + my $html; + return $html; +} + + +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; + } + } + } + return %Partdata; +} + +=cut + ######################################################### ######################################################### ## -## Tries Analysis +## Option Response Routines ## ######################################################### ######################################################### -sub tries_analysis { - my ($PerformanceData,$ORdata) = @_; +sub OptionResponseAnalysis { + 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 + (\@Apache::lonstatistics::SelectedSections, + $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.'). + '

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

'); + } + } + } +} + +######################################################### +# +# Option Response: tries Analysis +# +######################################################### +sub OR_tries_analysis { + my ($r,$PerformanceData,$ORdata) = @_; my $mintries = 1; my $maxtries = $ENV{'form.NumPlots'}; - my %ResponseData = &analyze_option_data_by_tries($PerformanceData, - $mintries,$maxtries); my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); + my %response_data = &OR_analyze_by_tries($r,$PerformanceData, + $mintries,$maxtries); + my $analysis = ''; # - # Compute the data neccessary to make the plots - my @PlotData; - my $xlabel; - if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $xlabel = 'Foil Number'; - foreach my $foilid (@$Foils) { - for (my $i=$mintries;$i<=$maxtries;$i++) { + # 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'}; # - # Gather the per-attempt data - my $percent; - if ($ResponseData{$foilid}->[$i]->{'total'} == 0) { - $percent = 0; + # foil analysis data + if ($response_data{$foilid}->[$try]->{'_total'} == 0) { + push(@{$foil_plot[$try]->{'_correct'}},0); } else { - $percent = $ResponseData{$foilid}->[$i]->{'correct'} / - $ResponseData{$foilid}->[$i]->{'total'}; + push(@{$foil_plot[$try]->{'_correct'}}, + 100*$response_data{$foilid}->[$try]->{'_correct'}/ + $response_data{$foilid}->[$try]->{'_total'}); } - push (@{$PlotData[$i]->{'total'}}, - $ResponseData{$foilid}->[$i]->{'total'}); - push (@{$PlotData[$i]->{'good'}},100 * $percent); - push (@{$PlotData[$i]->{'bad'}}, 100 *(1-$percent)); + 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 { + 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 $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; } - } else { - # Concept analysis - $xlabel = 'Concept Number'; - foreach my $concept (@$Concepts) { - for (my $i=$mintries;$i<=$maxtries;$i++) { - # - # Gather the per-attempt data - my ($correct,$incorrect,$total); - foreach my $foil (@{$concept->{'foils'}}) { - $correct += $ResponseData{$foil}->[$i]->{'correct'}; - $incorrect += $ResponseData{$foil}->[$i]->{'incorrect'}; - $total += $ResponseData{$foil}->[$i]->{'total'}; - } - push (@{$PlotData[$i]->{'correct'}}, $correct); - push (@{$PlotData[$i]->{'incorrect'}},$incorrect); - push (@{$PlotData[$i]->{'total'}}, $total); - my $percent; + 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) { - $percent = 0; + $concept_plot_data[$j] = 0; } else { - $percent = $correct/$total; + $concept_plot_data[$j] = 100 * + sprintf('%0.3f', + $concept_data[$j]->[$try]->{'_correct'} / + $total); } - push (@{$PlotData[$i]->{'good'}},100*$percent); - push (@{$PlotData[$i]->{'bad'}},100*(1-$percent)); } + # + $concept_graph = &Apache::loncommon::DrawBarGraph + ('Correct Concepts','Concept Number','Percent Correct', + 100,$plotcolors,undef,\@concept_plot_data); } - } - # - # Build a table for the plots - $table .= "
'. + &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').'
\n"; - my @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 (! $maxstu); - $minstu = 0 if (! $minstu); - my $title; - if ($maxstu == $minstu) { - $title = 'Attempt '.$i.', '.$maxstu.' students'; - } else { - $title = 'Attempt '.$i.', '.$minstu.'-'.$maxstu.' students'; - } - my $graphlink = &Apache::loncommon::DrawGraph($title, - $xlabel, - 'Percent Correct', - 100, - $PlotData[$i]->{'good'}, - $PlotData[$i]->{'bad'}); - push(@Plots,$graphlink); - } - # - # Should this be something the user can set? Too many dialogs! - my $plots_per_row = 2; - while (my $plotlink = shift(@Plots)) { - $table .= ''; - for (my $i=1;$i<$plots_per_row;$i++) { - if ($plotlink = shift(@Plots)) { - $table .= ''; - } else { - $table .= ''; + # + # Create Foil Plots + my $data_count = $response_data{'_total'}->[$try]; + my $correct = $response_data{'_correct'}->[$try]; + my @Datasets; + foreach my $option ('_correct',@{$ORdata->{'_Options'}}) { + next if (! exists($foil_plot[$try]->{$option})); + push(@Datasets,$foil_plot[$try]->{$option}); + } + # + # 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; + } + } + } + # + # Set up the labels needed for the bar graph + my @Labels; + my $idx = 1; + foreach my $concept (@{$Concepts}) { + foreach my $foilid (@{$concept->{'foils'}}) { + push(@Labels,$idx++); } + push(@Labels,''); } - $table .= "\n"; + # + my $correct_graph = &Apache::loncommon::DrawBarGraph + ('Correct Statements','Statement','% Answered Correct', + 100,$plotcolors,\@Labels,$Datasets[0]); + + # + # + next if (! defined($Datasets[0])); + for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) { + $Datasets[0]->[$i]=0; + } + 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); + $analysis_html.= + ''.$/. + ''. + ''. + ''. + ''. + ''.$/; } - $table .= "
'.$plotlink.''.$plotlink.'
'. + ''. + &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 ($table); + $analysis_html .= "\n"; + $table .= $analysis_html; + return $table; } -sub analyze_option_data_by_tries { - my ($PerformanceData,$mintries,$maxtries) = @_; +sub OR_analyze_by_tries { + my ($r,$PerformanceData,$mintries,$maxtries) = @_; 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 ($grading,$submission,$time,$tries) = @$row; - my @Foilgrades = split('&',$grading); - my @Foilsubs = split('&',$submission); - for (my $numtries = 1; $numtries <= $maxtries; $numtries++) { - if ($tries == $numtries) { - foreach my $foilgrade (@Foilgrades) { - my ($foilid,$correct) = split('=',$foilgrade); - if ($correct) { - $Trydata{$foilid}->[$numtries]->{'correct'}++; - } else { - $Trydata{$foilid}->[$numtries]->{'incorrect'}++; - } - } + 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; + next; + } + while (my ($option,$value) = each(%$href)) { + $Trydata{$foilid}->[$tries]->{$option}+=$value; } } } - foreach my $foilid (keys(%Trydata)) { - foreach my $tryhash (@{$Trydata{$foilid}}) { - next if ((! exists($tryhash->{'correct'}) && - ! exists($tryhash->{'incorrect'})) || - ($tryhash->{'correct'} < 1 && - $tryhash->{'incorrect'} < 1)); - $tryhash->{'total'} = $tryhash->{'correct'} + - $tryhash->{'incorrect'}; - } + for (my $try=$mintries;$try<=$maxtries;$try++) { + $Trydata{'_studentcount'}->[$try] = scalar(keys(%{$students[$try]})); } return %Trydata; } ######################################################### +# +# Option Response: Time Analysis +# ######################################################### -## -## Time Analysis -## -######################################################### -######################################################### -sub time_analysis { - my ($PerformanceData,$ORdata) = @_; - my $num_plots = $ENV{'form.NumPlots'}; +sub OR_time_analysis { + my ($performance_data,$ORdata) = @_; my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); - my $num_data = scalar(@$PerformanceData)-1; - my $percent = sprintf('%2f',100/$num_plots); + 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; + } + # + 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++) { + ## my $starttime = &Apache::lonhtmlcommon::get_date_from_form ('startdate_'.$i); my $endtime = &Apache::lonhtmlcommon::get_date_from_form ('enddate_'.$i); - my ($begin_index,$end_index,$plottitle,$plothtml,$data); if (! defined($starttime) || ! defined($endtime)) { - $begin_index = $i*int($num_data/$num_plots); - $end_index = ($i+1)*int($num_data/$num_plots); - my $lownum = sprintf('%2.1f',$i*$percent); - $lownum =~ s/(\.0)$//; - my $highnum = sprintf('%2.1f',($i+1)*$percent); - $highnum =~ s/(\.0)$//; - $plottitle = $lownum.'% to '.$highnum.'% of submissions'; - } else { - my $j; - while (++$j < scalar(@$PerformanceData)) { - last if ($PerformanceData->[$j]->[2] > $starttime); - } - $begin_index = $j; - while (++$j < scalar(@$PerformanceData)) { - last if ($PerformanceData->[$j]->[2] > $endtime); - } - $end_index = $j; - $plottitle = $ENV{'form.plottitle_'.$i}; - } - ($plothtml,$starttime,$endtime,$data) = - &analyze_option_data_by_time($PerformanceData, - $begin_index,$end_index, - $plottitle, - @$Concepts); + my $sec_in_day = 86400; + 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($performance_data->[0]); + } + } + $table .= ''.$/; my $startdateform = &Apache::lonhtmlcommon::date_setter ('Statistics','startdate_'.$i,$starttime); my $enddateform = &Apache::lonhtmlcommon::date_setter ('Statistics','enddate_'.$i,$endtime); - $table.="\n"; + # + my $begin_index; + my $end_index; + my $j; + while (++$j < scalar(@$performance_data)) { + last if (&get_time_from_row($performance_data->[$j]) + > $starttime); + } + $begin_index = $j; + while ($j < scalar(@$performance_data)) { + if (&get_time_from_row($performance_data->[$j]) > $endtime) { + last; + } else { + $j++; + } + } + $end_index = $j; + ## + my ($processed_time_data,$correct,$data_count,$student_count) = + &OR_time_process_data($performance_data,$begin_index,$end_index); + ## + $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)). + '
".$plothtml.''. - "Start Time:  ".$startdateform."
". - "End Time  : "." ".$enddateform."
". - 'Plot Title  :'.(" "x3). - '
'. - "
'. + &mt('[_1] submissions from [_2] students submitting, [_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).'
 
\n"; + $table .= ''; + # return $table; } -sub analyze_option_data_by_time { - my ($PerformanceData,$begin_index,$end_index,$description,@Concepts) = @_; - my %TimeData; - # - # Get the start and end times for this segment of the plot - my $starttime = $PerformanceData->[$begin_index]->[2]; - my $endtime = $PerformanceData->[$end_index ]->[2]; - # - # Compute the number getting the foils correct or incorrects - for (my $i=$begin_index;$i<=$end_index;$i++) { - my $row = $PerformanceData->[$i]; - next if (! defined($row)); - my ($grading,$submission,$time,$tries) = @$row; - my @Foilgrades = split('&',$grading); - my @Foilsubs = split('&',$submission); - foreach my $foilgrade (@Foilgrades) { - my ($foilid,$correct) = split('=',$foilgrade); - if ($correct) { - $TimeData{$foilid}->{'correct'}++; +sub OR_Foil_Time_Analysis { + my ($processed_time_data,$correct,$data_count,$student_count, + $ORdata,$Foils,$Concepts) = @_; + if ($data_count <= 0) { + return ('

'.&mt('There is no data to plot').'

',''); + } + my $analysis_html; + 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 { - $TimeData{$foilid}->{'incorrect'}++; + push(@{$plotdata[0]}, + 100 * $processed_time_data->{$foil}->{'_correct'} / $total); + } + 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); + } } } + # Put in a blank one + push(@labels,''); + push(@{$plotdata[0]},0); + for (my $i=0;$i{'_Options'}});$i++) { + push(@{$plotdata[$i+1]},0); + } } # - # Compute the total and percent correct - my @Plotdata1; - my @Plotdata2; - foreach my $concept (@Concepts) { - my ($correct,$incorrect,$total); - foreach my $foilid (@{$concept->{'foils'}}) { - if (! exists($TimeData{$foilid}->{'correct'})) { - $TimeData{$foilid}->{'correct'} = 0; - } - if (! exists($TimeData{$foilid}->{'incorrect'})) { - $incorrect = 0; - $TimeData{$foilid}->{'incorrect'} = 0; - } - $correct += $TimeData{$foilid}->{'correct'}; - $incorrect += $TimeData{$foilid}->{'incorrect'}; - $total += $TimeData{$foilid}->{'correct'}+ - $TimeData{$foilid}->{'incorrect'}; - $TimeData{$foilid}->{'total'} = $TimeData{$foilid}->{'correct'} + - $TimeData{$foilid}->{'incorrect'}; - my $percent; - if ($TimeData{$foilid}->{'total'} == 0) { - $percent = 0; - } else { - $percent = $TimeData{$foilid}->{'correct'} / - $TimeData{$foilid}->{'total'}; + # Create the plot + my $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements', + 'Statement Number', + 'Percent Correct', + 100, + $plotcolors, + undef, + $plotdata[0]); + 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); + return ($correct_plot,$incorrect_plot); +} + +sub OR_Concept_Time_Analysis { + my ($processed_time_data,$correct,$data_count,$student_count, + $ORdata,$Concepts) = @_; + return '' if ($data_count == 0); + # + # Put the data in plottable form + my @plotdata; + foreach my $concept (@$Concepts) { + my ($total,$correct); + foreach my $foil (@{$concept->{'foils'}}) { + $total += $processed_time_data->{$foil}->{'_total'}; + $correct += $processed_time_data->{$foil}->{'_correct'}; + } + if ($total == 0) { + push(@plotdata,0); + } else { + push(@plotdata,100 * $correct / $total); + } + } + # + # Create the plot + return &Apache::loncommon::DrawBarGraph('Correct Concepts', + 'Concept Number', + 'Percent Correct', + 100, + $plotcolors, + undef, + \@plotdata); +} + +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; + } + # 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++; + } + &Apache::lonnet::logthis(' '.$begin_index.':'.$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; } - $TimeData{$foilid}->{'percent_corr'} = 100 * $percent; - if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - push (@Plotdata1, $TimeData{$foilid}->{'percent_corr'}); - push (@Plotdata2,100-$TimeData{$foilid}->{'percent_corr'}); + while (my ($option,$value) = each(%$href)) { + $processed_time_data{$foilid}->{$option}+=$value; } } - if ($ENV{'form.AnalyzeAs'} ne 'Foils') { - if ($total == 0) { - push (@Plotdata1,0); - push (@Plotdata2,100); + } + &Apache::lonnet::logthis('count = '.$count); + return (\%processed_time_data,$correct,$data_count, + 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 { - push (@Plotdata1,100 * $correct / $total); - push (@Plotdata2,100 * (1-$correct / $total)); - } + $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'}); # - # Create the plot - my $xlabel; - if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $xlabel = 'Foil Number'; + 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'})); + my %Foildata = %{$ORdata->{'_Foils'}}; + my @Foils = sort(keys(%Foildata)); + my %Concepts; + foreach my $foilid (@Foils) { + push(@{$Concepts{$Foildata{$foilid}->{'_Concept'}}}, + $foilid); + } + undef(@Foils); + # Having gathered the concept information in a hash, we now translate it + # into an array because we need to be consistent about order. + # Also put the foils in order, too. + my $sortfunction = sub { + my %Numbers = (one => 1, + two => 2, + three => 3, + four => 4, + five => 5, + six => 6, + seven => 7, + eight => 8, + nine => 9, + ten => 10,); + my $a1 = lc($a); + my $b1 = lc($b); + if (exists($Numbers{$a1})) { + $a1 = $Numbers{$a1}; + } + if (exists($Numbers{$b1})) { + $b1 = $Numbers{$b1}; + } + if (($a1 =~/^\d+$/) && ($b1 =~/^\d+$/)) { + return $a1 <=> $b1; + } else { + return $a1 cmp $b1; + } + }; + my @Concepts; + foreach my $concept (sort $sortfunction (keys(%Concepts))) { + if (! defined($Concepts{$concept})) { + $Concepts{$concept}=[]; +# next; + } + push(@Concepts,{ name => $concept, + foils => [@{$Concepts{$concept}}]}); + push(@Foils,(@{$Concepts{$concept}})); + } + # + # Build up the table of row labels. + my $table = ''."\n"; + if (@Concepts > 1) { + $table .= ''. + ''. + ''. + ''. + ''. + ''. + ''. + "\n"; } else { - $xlabel = 'Concept Number'; + $table .= ''. + ''. + ''. + ''. + ''. + "\n"; + } + my $conceptindex = 1; + my $foilindex = 1; + foreach my $concept (@Concepts) { + my @FoilsInConcept = @{$concept->{'foils'}}; + my $firstfoil = shift(@FoilsInConcept); + if (@Concepts > 1) { + $table .= ''. + ''. + ''. + ''. + ''. + ''. + ''. + "\n"; + } else { + $table .= ''. + ''. + ''. + ''. + ''. + "\n"; + } + foreach my $foilid (@FoilsInConcept) { + if (@Concepts > 1) { + $table .= ''. + ''. + ''. + ''. + ''. + ''. + ''. + "\n"; + } else { + $table .= ''. + ''. + ''. + ''. + ''. + "\n"; + } + } continue { + $foilindex++; + } + } continue { + $conceptindex++; } - my $graphlink = &Apache::loncommon::DrawGraph - ($description,#'Time Interval Analysis', - $xlabel, - 'Percent Correct / Incorrect', - 100, - \@Plotdata1,\@Plotdata2); + $table .= "
'.&mt('Concept Number').''.&mt('Concept').''.&mt('Foil Number').''.&mt('Foil Name').''.&mt('Foil Text').''.&mt('Correct Value').'
'.&mt('Foil Number').''.&mt('Foil Name').''.&mt('Foil Text').''.&mt('Correct Value').'
'.$conceptindex.''.&HTML::Entities::encode($concept->{'name'},'<>&"').''.$foilindex++.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').''.$Foildata{$firstfoil}->{'text'}.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'
'.$foilindex++.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').''.$Foildata{$firstfoil}->{'text'}.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'
'.$foilindex.''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').''.$Foildata{$foilid}->{'text'}.''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'
'.$foilindex.''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').''.$Foildata{$foilid}->{'text'}.''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'
\n"; # - return ($graphlink,$starttime,$endtime,\%TimeData); + # Build option index with color stuff + return ($table,\@Foils,\@Concepts); +} + +sub build_option_index { + my ($ORdata)= @_; + my $table = "\n"; + my $optionindex = 0; + my @Rows; + foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) { + my $color = $plotcolors->[$optionindex++]; + push (@Rows, + ''. + ''. + ''. + "\n"); + } + shift(@Rows); # Throw away 'correct option chosen' color + $table .= join('',reverse(@Rows)); + $table .= "
'. + ''.('*'x3).''.''.&HTML::Entities::encode($option,'<>&"').'
\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"; } ######################################################### ######################################################### ## -## Interface +## Generic Interface Routines ## ######################################################### ######################################################### @@ -530,11 +1708,13 @@ sub CreateInterface { ## ## Environment variable initialization if (! exists$ENV{'form.AnalyzeOver'}) { - $ENV{'form.AnalyzeOver'} = 'Tries'; + $ENV{'form.AnalyzeOver'} = 'tries'; } ## ## Build the menu my $Str = ''; + $Str .= &Apache::lonhtmlcommon::breadcrumbs + (undef,'Detailed Problem Analysis'); $Str .= ''."\n"; $Str .= ''; $Str .= ''; @@ -566,168 +1746,126 @@ sub CreateInterface { ## ## $Str .= ''; ## ## $Str .= ''."\n"; $Str .= '
'.&mt('Sections').''; - { # These braces are here to organize the code, not scope it. - { - $Str .= ''.&mt('Analyze Over '); - $Str .='
'; - } - { - $Str .= ''.&mt('Analyze as '); - $Str .='
'; - } - { - $Str .= '
'.&mt('Number of Plots:'); - $Str .= ''; - } + ## + my $showprob_checkbox = + '
'; + ## + my $analyze_selector = ''; + $Str .= '
'.$/; + ## + my $numplots_selector = '
'; + $Str .= ''; + ## + $Str .= ''; $Str .= '
'."\n"; - return ($Str); -} - -sub OptionResponseProblemSelector { - my $Str; - $Str = "\n\n"; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - next if ($seq->{'num_assess'}<1); - my $seq_str = ''; - foreach my $res (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); - foreach my $part (@{$res->{'parts'}}) { - my $partdata = $res->{'partdata'}->{$part}; - if (! exists($partdata->{'option'}) || - $partdata->{'option'} == 0) { - next; - } - for (my $i=0;$i{'ResponseTypes'}});$i++){ - my $respid = $partdata->{'ResponseIds'}->[$i]; - my $resptype = $partdata->{'ResponseTypes'}->[$i]; - if ($resptype eq 'option') { - my $value = &Apache::lonnet::escape($res->{'symb'}.':'.$part.':'.$respid); - my $checked = ''; - if ($ENV{'form.problemchoice'} eq $value) { - $checked = 'checked '; - } - $seq_str .= '\n"; - } - } - } - } - if ($seq_str ne '') { - $Str .= ''. - "\n".$seq_str; - } - } - $Str .= "
'. - ''. - ''. - ''.$res->{'title'}.' '; - if ($partdata->{'option'} > 1) { - $seq_str .= &mt('response').' '.$respid; - } - $seq_str .= "
 '.$seq->{'title'}.'
\n"; return $Str; } ######################################################### ######################################################### ## -## Misc functions +## Misc Option Response functions ## ######################################################### ######################################################### -sub get_problem_symb { - my $problemstring = shift(); - my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/); - return ($symb,$partid,$resid); +sub get_time_from_row { + my ($row) = @_; + if (ref($row)) { + return $row->[&Apache::loncoursedata::RD_timestamp()]; + } + return undef; } -sub get_resource_from_symb { - my ($symb) = @_; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - foreach my $res (@{$seq->{'contents'}}) { - if ($res->{'symb'} eq $symb) { - return $res; - } - } +sub get_tries_from_row { + my ($row) = @_; + if (ref($row)) { + return $row->[&Apache::loncoursedata::RD_tries()]; } return undef; } -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 { - $value =~ s/^\s*//g; - $value =~ s/\s*$//g; - if ($key=~ /^foil\.text\.(.*)$/) { - my $foil = $1; - $Partdata{$part}->{'Foils'}->{$foil}->{'name'}=$foil; - $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value; - } elsif ($key =~ /^foil\.value\.(.*)$/) { - my $foil = $1; - $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value; - } - } +sub hashify_attempt { + my ($row) = @_; + my %attempt; + $attempt{'student'} = $row->[&Apache::loncoursedata::RD_sname()]; + $attempt{'tries'} = $row->[&Apache::loncoursedata::RD_tries()]; + $attempt{'submission'} = &Apache::lonnet::unescape($row->[&Apache::loncoursedata::RD_submission()]); + $attempt{'award'} = $row->[&Apache::loncoursedata::RD_awarddetail()]; + $attempt{'timestamp'} = $row->[&Apache::loncoursedata::RD_timestamp()]; + return %attempt; +} + +sub Process_OR_Row { + my ($row) = @_; + my %RowData; +# 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()]; + return undef if ($award eq 'MISSING_ANSWER'); + if ($award =~ /(APPROX_ANS|EXACT_ANS)/) { + $RowData{'_correct'} = 1; + } + $RowData{'_total'} = 1; + my @Foilgrades = split('&',$grading); + my @Foilsubs = split('&',$submission); + for (my $j=0;$j<=$#Foilgrades;$j++) { + my ($foilid,$correct) = split('=',$Foilgrades[$j]); + $foilid = &Apache::lonnet::unescape($foilid); + my (undef,$submission) = split('=',$Foilsubs[$j]); + if ($correct) { + $RowData{$foilid}->{'_correct'}++; + } else { + $submission = &Apache::lonnet::unescape($submission); + $RowData{$foilid}->{$submission}++; } + $RowData{$foilid}->{'_total'}++; } - return %Partdata; + return %RowData; } 1;