--- loncom/interface/statistics/lonproblemanalysis.pm 2003/10/13 19:17:42 1.33 +++ loncom/interface/statistics/lonproblemanalysis.pm 2003/10/17 22:05:45 1.42 @@ -1,7 +1,6 @@ # The LearningOnline Network with CAPA # - -# $Id: lonproblemanalysis.pm,v 1.33 2003/10/13 19:17:42 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.42 2003/10/17 22:05:45 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,6 +34,13 @@ use Apache::lonhtmlcommon(); use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonlocal; +use HTML::Entities(); +use Time::Local(); + +my $plotcolors = ['#33ff00', + '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933', + '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66', + ]; sub BuildProblemAnalysisPage { my ($r,$c)=@_; @@ -43,7 +49,8 @@ sub BuildProblemAnalysisPage { # my @Students = @Apache::lonstatistics::Students; # - if (exists($ENV{'form.updatecaches'}) || + 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); @@ -53,6 +60,7 @@ sub BuildProblemAnalysisPage { } else { $r->print(''); } + $r->rflush(); if (exists($ENV{'form.problemchoice'}) && ! exists($ENV{'form.SelectAnother'})) { $r->print(''."\n"; - $table .= ''.&mt('Foil Number').''. - ''.&mt('Foil Text')."\n"; - my $index = 1; - foreach my $foilid (@Foils) { - $table .= ''.$index.''. - ''.$Row_Label{$foilid}."\n"; + if (@Concepts > 1) { + $table .= ''. + ''.&mt('Concept Number').''. + ''.&mt('Concept').''. + ''.&mt('Foil Number').''. + ''.&mt('Foil Name').''. + ''.&mt('Foil Text').''. + ''.&mt('Correct Value').''. + "\n"; + } else { + $table .= ''. + ''.&mt('Foil Number').''. + ''.&mt('Foil Name').''. + ''.&mt('Foil Text').''. + ''.&mt('Correct Value').''. + "\n"; + } + my $conceptindex = 1; + my $foilindex = 1; + foreach my $concept (@Concepts) { + my @FoilsInConcept = @{$concept->{'foils'}}; + my $firstfoil = shift(@FoilsInConcept); + if (@Concepts > 1) { + $table .= ''. + ''.$conceptindex.''. + ''.$concept->{'name'}.''. + ''.$foilindex++.''. + ''.$Foildata{$firstfoil}->{'name'}.''. + ''.$Foildata{$firstfoil}->{'text'}.''. + ''.$Foildata{$firstfoil}->{'value'}.''. + "\n"; + } else { + $table .= ''. + ''.$foilindex++.''. + ''.$Foildata{$firstfoil}->{'name'}.''. + ''.$Foildata{$firstfoil}->{'text'}.''. + ''.$Foildata{$firstfoil}->{'value'}.''. + "\n"; + } + foreach my $foilid (@FoilsInConcept) { + if (@Concepts > 1) { + $table .= ''. + ''. + ''. + ''.$foilindex.''. + ''.$Foildata{$foilid}->{'name'}.''. + ''.$Foildata{$foilid}->{'text'}.''. + ''.$Foildata{$foilid}->{'value'}.''. + "\n"; + } else { + $table .= ''. + ''.$foilindex.''. + ''.$Foildata{$foilid}->{'name'}.''. + ''.$Foildata{$foilid}->{'text'}.''. + ''.$Foildata{$foilid}->{'value'}.''. + "\n"; + } + } continue { + $foilindex++; + } } continue { - $index++; + $conceptindex++; + } + $table .= "\n"; + # + # 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'}}) { + push (@Rows, + ''. + ''. + ''. + "\n"); } + shift(@Rows); # Throw away 'correct option chosen' color + $table .= join('',reverse(@Rows)); $table .= "
'. + (' 'x4).''.$option.'
\n"; - return ($table,@Foils); } ######################################################### @@ -175,86 +290,173 @@ sub tries_analysis { my ($PerformanceData,$ORdata) = @_; my $mintries = 1; 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'; + } my %ResponseData = &analyze_option_data_by_tries($PerformanceData, - $mintries,$maxtries); - my ($table,@Foils) = &build_foil_index($ORdata); + $mintries,$maxtries); + my $analysis = ''; + if ($ENV{'form.AnalyzeAs'} eq 'Foils') { + $analysis = &Tries_Foil_Analysis($mintries,$maxtries,$Foils, + \%ResponseData,$ORdata); + } else { + $analysis = &Tries_Concept_Analysis($mintries,$maxtries, + $Concepts,\%ResponseData,$ORdata); + } + $table .= $analysis; + return $table; +} + +sub Tries_Foil_Analysis { + my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_; + my %ResponseData = %$respdat; # # Compute the data neccessary to make the plots - my @PlotData; - my @CumulativePlotData; - foreach my $foilid (@Foils) { + my @PlotData; + foreach my $foilid (@$Foils) { for (my $i=$mintries;$i<=$maxtries;$i++) { - # - # Gather the per-attempt data - push (@{$PlotData[$i]->{'good'}}, - $ResponseData{$foilid}->[$i]->{'percent_corr'}); - push (@{$PlotData[$i]->{'bad'}}, - 100-$ResponseData{$foilid}->[$i]->{'percent_corr'}); - # - # Someday we may need the cumulative data and I think - # this is a neat way of computing it as we go along. - push (@{$CumulativePlotData[$i]->{'good'}}, - $CumulativePlotData[-1]->{'good'}+ - $ResponseData{$foilid}->[$i]->{'correct'}); - push (@{$CumulativePlotData[$i]->{'bad'}}, - $CumulativePlotData[-1]->{'bad'}+ - $ResponseData{$foilid}->[$i]->{'incorrect'}); + 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); + } else { + if ($ResponseData{$foilid}->[$i]->{'_total'} == + $ResponseData{$foilid}->[$i]->{'_correct'}) { + push(@{$PlotData[$i]->{$option}},0); + } else { + push (@{$PlotData[$i]->{$option}}, + 100 * $ResponseData{$foilid}->[$i]->{$option} / + ($ResponseData{$foilid}->[$i]->{'_total'} - + $ResponseData{$foilid}->[$i]->{'_correct'})); + } + } + } } } # # Build a table for the plots - $table .= "\n"; - my @Plots; + my $analysis_html = "
\n"; + my $foilkey = &build_option_index($ORdata); for (my $i=$mintries;$i<=$maxtries;$i++) { - my $minstu = $ResponseData{$Foils[0]}->[$i]->{'total'}; - my $maxstu = $ResponseData{$Foils[0]}->[$i]->{'total'}; - foreach my $foilid (@Foils) { - if ($minstu > $ResponseData{$foilid}->[$i]->{'total'}) { - $minstu = $ResponseData{$foilid}->[$i]->{'total'}; - } - if ($maxstu < $ResponseData{$foilid}->[$i]->{'total'}) { - $maxstu = $ResponseData{$foilid}->[$i]->{'total'}; - } - } - $maxstu = 0 if (! $maxstu); - $minstu = 0 if (! $minstu); - my $graphlink; - if ($maxstu == $minstu) { - $graphlink = &Apache::loncommon::DrawGraph - ('Attempt '.$i.', '.$maxstu.' students', - 'Foil Number', - 'Percent Correct', - 100, - $PlotData[$i]->{'good'}, - $PlotData[$i]->{'bad'}); + my $count = $ResponseData{'_total'}->[$i]; + if ($count == 0) { + $count = 'no submissions'; + } elsif ($count == 1) { + $count = '1 submission'; } else { - $graphlink = &Apache::loncommon::DrawGraph - ('Attempt '.$i.', '.$minstu.'-'.$maxstu. - ' students', - 'Foil Number', - '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 .= ''; + $count = $count.' submissions'; + } + my $title = 'Attempt '.$i.', '.$count; + my @Datasets; + foreach my $option ('_correct',@{$ORdata->{'Options'}}) { + next if (! exists($PlotData[$i]->{$option})); + push(@Datasets,$PlotData[$i]->{$option}); + } + my $correctgraph = &Apache::loncommon::DrawGraph + ($title,'Foil Number','Percent Correct', + 100,$plotcolors,$Datasets[0]); + $analysis_html.= ''; + ## + ## + 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'; + } + $title = 'Attempt '.$i.', '.$count; + my $incorrectgraph = &Apache::loncommon::DrawGraph + ($title,'Foil Number','% Option Chosen Incorrectly', + 100,$plotcolors,@Datasets); + $analysis_html.= ''; + $analysis_html.= '\n"; + } + $analysis_html .= "
'.$plotlink.''.$plotlink.'
'.$correctgraph.''.$incorrectgraph.''.$foilkey."
\n"; + return $analysis_html; +} + +sub 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]; + 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 { - $table .= ''; + push (@{$PlotData[$i]->{'_correct'}}, + 100*$cdata->{'_correct'}/$cdata->{'_total'}); + } + } + } + # 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; } } - $table .= "\n"; + $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'; + } + $title = 'Attempt '.$i.', '.$count; + my $graphlink = &Apache::loncommon::DrawGraph + ($title,'Concept Number','Percent Correct', + 100,$plotcolors,$PlotData[$i]->{'_correct'}); + $analysis_html.= '\n"; } - $table .= "
'.$graphlink."
\n"; - return ($table); + $analysis_html .= "\n"; + return $analysis_html; } sub analyze_option_data_by_tries { @@ -264,34 +466,16 @@ sub analyze_option_data_by_tries { $maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries); 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_Row($row); + 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'}; - $tryhash->{'percent_corr'} = 100 * - ($tryhash->{'correct'} / - ($tryhash->{'correct'} + $tryhash->{'incorrect'}) - ); } } return %Trydata; @@ -306,88 +490,243 @@ sub analyze_option_data_by_tries { ######################################################### sub time_analysis { my ($PerformanceData,$ORdata) = @_; + 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'; + } my $num_plots = $ENV{'form.NumPlots'}; - my ($table,@Foils) = &build_foil_index($ORdata); - my ($begin_index,$end_index); my $num_data = scalar(@$PerformanceData)-1; my $percent = sprintf('%2f',100/$num_plots); + # + $table .= "\n"; for (my $i=0;$i<$num_plots;$i++) { - $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)$//; - my ($plothtml,$starttime,$endtime,$data) = - &analyze_option_data_by_time($PerformanceData, - $begin_index,$end_index, - $lownum.'% to '.$highnum.'% of submissions', - @Foils); - $table.=$plothtml; + ## + my $starttime = &Apache::lonhtmlcommon::get_date_from_form + ('startdate_'.$i); + my $endtime = &Apache::lonhtmlcommon::get_date_from_form + ('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); + $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]); + } + } + my $startdateform = &Apache::lonhtmlcommon::date_setter + ('Statistics','startdate_'.$i,$starttime); + my $enddateform = &Apache::lonhtmlcommon::date_setter + ('Statistics','enddate_'.$i,$endtime); + # + my $begin_index; + my $end_index; + my $j; + while (++$j < scalar(@$PerformanceData)) { + last if (&get_time_from_row($PerformanceData->[$j]) > $starttime); + } + $begin_index = $j; + while (++$j < scalar(@$PerformanceData)) { + last if (&get_time_from_row($PerformanceData->[$j]) > $endtime); + } + $end_index = $j; + ## + my $interval = { + begin_index => $begin_index, + end_index => $end_index, + startdateform => $startdateform, + enddateform => $enddateform, + }; + if ($ENV{'form.AnalyzeAs'} eq 'Foils') { + $table .= &Foil_Time_Analysis($PerformanceData,$ORdata,$Foils, + $interval); + } else { + $table .= &Concept_Time_Analysis($PerformanceData,$ORdata, + $Concepts,$interval); + } } + # return $table; } -sub analyze_option_data_by_time { - my ($PerformanceData,$begin_index,$end_index,$description,@Foils) = @_; +sub Foil_Time_Analysis { + my ($PerformanceData,$ORdata,$Foils,$interval) = @_; + my $analysis_html; + my $foilkey = &build_option_index($ORdata); + my ($begin_index,$end_index) = ($interval->{'begin_index'}, + $interval->{'end_index'}); 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]; + for (my $j=$begin_index;$j<=$end_index;$j++) { + my $row = $PerformanceData->[$j]; 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'}++; + my %Row = &Process_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 @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 { - $TimeData{$foilid}->{'incorrect'}++; + push(@{$Plotdata[$optionidx]}, + 100 * $TimeData{$foil}->{$option} / $total_incorrect); } + } continue { + $optionidx++; } } # - # Compute the total and percent correct - my @Plotdata1; - my @Plotdata2; - foreach my $foilid (@Foils) { - if (! exists($TimeData{$foilid}->{'correct'})) { - $TimeData{$foilid}->{'correct'} = 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::DrawGraph($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::DrawGraph($title, + 'Foil Number', + 'Incorrect Option Choice', + 100, + $plotcolors, + @Plotdata); + $analysis_html.=''. + ''. + ''. + ''."\n"; + $analysis_html.= ''.''. + "\n"; + return $analysis_html; +} + +sub 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_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; + } } - if (! exists($TimeData{$foilid}->{'incorrect'})) { - $TimeData{$foilid}->{'incorrect'} = 0; + } + # + # Put the data in plottable form + my @Plotdata; + foreach my $concept (@$Concepts) { + my ($total,$correct); + foreach my $foil (@{$concept->{'foils'}}) { + $total += $TimeData{$foil}->{'_total'}; + $correct += $TimeData{$foil}->{'_correct'}; + } + if ($total == 0) { + push(@Plotdata,0); + } else { + push(@Plotdata,100 * $correct / $total); } - $TimeData{$foilid}->{'total'} = $TimeData{$foilid}->{'correct'} + - $TimeData{$foilid}->{'incorrect'}; - $TimeData{$foilid}->{'percent_corr'} = 100 * - $TimeData{$foilid}->{'correct'} / - $TimeData{$foilid}->{'total'}; - push (@Plotdata1, $TimeData{$foilid}->{'percent_corr'}); - push (@Plotdata2,100-$TimeData{$foilid}->{'percent_corr'}); } # # Create the plot - my $graphlink = &Apache::loncommon::DrawGraph - ($description,#'Time Interval Analysis', - 'Foil Number', - 'Percent Correct / Incorrect', - 100, - \@Plotdata1,\@Plotdata2); - $graphlink .= "
\n". - "Start Time: ".localtime($starttime)."
\n". - "End Time: ".localtime($endtime)."
\n"; - # - return ($graphlink,$starttime,$endtime,\%TimeData); + my $title = ($end_index - $begin_index).' submissions'; + my $correctplot = &Apache::loncommon::DrawGraph($title, + 'Concept Number', + 'Percent Correct', + 100, + $plotcolors, + \@Plotdata); + $analysis_html.=''. + ''. + ''. + "\n"; + return $analysis_html; } +######################################################### +######################################################### +## +## Excel output +## +######################################################### +######################################################### +sub prepare_excel_sheet { + my ($PerformanceData,$ORdata) = @_; + my (undef,$Foils,$Concepts) = &build_foil_index($ORdata); +} - +sub process_data_for_excel_sheet { + my ($PerformanceData,$Foils,$Concepts,$ORdata)=@_; +} ######################################################### ######################################################### @@ -399,8 +738,8 @@ sub analyze_option_data_by_time { sub CreateInterface { ## ## Environment variable initialization - if (! exists$ENV{'form.AnalyzeBy'}) { - $ENV{'form.AnalyzeBy'} = 'Tries'; + if (! exists$ENV{'form.AnalyzeOver'}) { + $ENV{'form.AnalyzeOver'} = 'Tries'; } ## ## Build the menu @@ -433,42 +772,62 @@ sub CreateInterface { }; &Apache::lonstatistics::MapSelect('Maps','multiple,all',5, $only_seq_with_assessments); -# $Str .= ''; - # + ## + ## $Str .= ''; - # + ## + ## $Str .= ''."\n"; $Str .= '
'.$correctplot.''.$incorrectplot.''.$foilkey.'
'. + 'Start Time:'. + '  '.$interval->{'startdateform'}.'
'. + 'End Time  : '. + ' '.$interval->{'enddateform'}.'
'. +# 'Plot Title  :'. +# (" "x3).$interval->{'titleform'}. + '
'.$correctplot.''. + 'Start Time:  '.$interval->{'startdateform'}.'
'. + 'End Time  : '. + ' '.$interval->{'enddateform'}.'
'. +# 'Plot Title  :'.(" "x3). +# $interval->{'titleform'}. + '
'; - $Str .= ''.&mt('Analyze By '); - $Str .='
'; - # - $Str .= '
'.&mt('Number of Plots:'); - $Str .= ''; + $Str .= '
'; + } + { + $Str .= ''.&mt('Analyze as '); + $Str .='
'; + } + { + $Str .= '
'.&mt('Number of Plots:'); + $Str .= ''; + } } - $Str .= ''; $Str .= '
'."\n"; - return ($Str); + return $Str; } sub OptionResponseProblemSelector { @@ -478,7 +837,6 @@ sub OptionResponseProblemSelector { next if ($seq->{'num_assess'}<1); my $seq_str = ''; foreach my $res (@{$seq->{'contents'}}) { -# &Apache::lonnet::logthis('checking '.$res->{'title'}); next if ($res->{'type'} ne 'assessment'); foreach my $part (@{$res->{'parts'}}) { my $partdata = $res->{'partdata'}->{$part}; @@ -541,20 +899,59 @@ sub get_resource_from_symb { return undef; } +sub get_time_from_row { + my ($row) = @_; + if (ref($row)) { + return $row->[3]; + } + return undef; +} + +sub get_tries_from_row { + my ($row) = @_; + if (ref($row)) { + return $row->[4]; + } + return undef; +} + +sub Process_Row { + my ($row) = @_; + my %RowData; + my ($award,$grading,$submission,$time,$tries) = @$row; + next 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]); + my (undef,$submission) = split('=',$Foilsubs[$j]); + if ($correct) { + $RowData{$foilid}->{'_correct'}++; + } else { + $submission = &Apache::lonnet::unescape($submission); + $submission =~ s/\%20/ /g; + $RowData{$foilid}->{$submission}++; + } + $RowData{$foilid}->{'_total'}++; + } + 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($URI,('grade_target' => 'analyze', -# 'grade_username' => $sname, -# 'grade_domain' => $sdom, -# 'grade_courseid' => $cid, -# 'grade_symb' => $symb)); my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze')); (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2); my %Answer; %Answer=&Apache::lonnet::str2hash($Answ); -# &Apache::lonnet::logthis('keys of %Answer = '.join(', ',(keys(%Answer)))); -# &Apache::lonnet::logthis('$Answer{parts} = '. -# join(', ',@{$Answer{'parts'}})); my %Partdata; foreach my $part (@{$Answer{'parts'}}) { while (my($key,$value) = each(%Answer)) { @@ -568,45 +965,22 @@ sub get_problem_data { } elsif ($key =~ /^concept\.(.*)$/) { my $concept = $1; foreach my $foil (@$value) { - $Partdata{$part}->{$foil}->{'Concept'}=$concept; + $Partdata{$part}->{'Foils'}->{$foil}->{'Concept'}= + $concept; } } - # &Apache::lonnet::logthis($part.' '.$key.' (array) = '. - # join(', ',@$value)); } else { - $value =~ s/^\s*//g; - $value =~ s/\s*$//g; if ($key=~ /^foil\.text\.(.*)$/) { my $foil = $1; - $Partdata{$part}->{'Foiltext'}->{$foil}=$value; + $Partdata{$part}->{'Foils'}->{$foil}->{'name'}=$foil; + $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value; } elsif ($key =~ /^foil\.value\.(.*)$/) { my $foil = $1; - $Partdata{$part}->{'FoilValues'}->{$foil}=$value; + $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value; } -# &Apache::lonnet::logthis($part.' '.$key.' = '.$value); } } } - -# my $parts=''; -# foreach my $elm (@{$Answer{"parts"}}) { -# $parts.="$elm,"; -# } -# chop($parts); -# my $conc=''; -# foreach my $elm (@{$Answer{"$parts.concepts"}}) { -# $conc.="$elm@"; -# } -# chop($conc); -# -# @Concepts=split(/\@/,$conc); -# foreach my $concept (@{$Answer{"$parts.concepts"}}) { -# foreach my $foil (@{$Answer{"$parts.concept.$concept"}}) { -# $foil_to_concept{$foil} = $concept; -# #$ConceptData{$foil} = $Answer{"$parts.foil.value.$foil"}; -# } -# } -# return $symb; return %Partdata; }