--- loncom/interface/statistics/lonproblemanalysis.pm 2003/10/14 14:23:14 1.35 +++ loncom/interface/statistics/lonproblemanalysis.pm 2003/10/16 15:24:49 1.41 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.35 2003/10/14 14:23:14 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.41 2003/10/16 15:24:49 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,6 +35,12 @@ use Apache::lonhtmlcommon(); use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonlocal; +use HTML::Entities(); + +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('<input type="hidden" name="firstanalysis" value="no" />'); } + $r->rflush(); if (exists($ENV{'form.problemchoice'}) && ! exists($ENV{'form.SelectAnother'})) { $r->print('<input type="submit" name="ProblemAnalysis" value="'. @@ -78,6 +86,7 @@ sub BuildProblemAnalysisPage { # my $resource = &get_resource_from_symb($symb); if (defined($resource)) { + $r->print('<h3>'.$resource->{'src'}.'</h3>'); my %Data = &get_problem_data($resource->{'src'}); my $ORdata = $Data{$part.'.'.$resid}; ## @@ -100,11 +109,11 @@ sub BuildProblemAnalysisPage { (\@Students,$symb,$resid); if (defined($PerformanceData) && ref($PerformanceData) eq 'ARRAY') { - if ($ENV{'form.AnalyzeBy'} eq 'Tries') { + if ($ENV{'form.AnalyzeOver'} eq 'Tries') { my $analysis_html = &tries_analysis($PerformanceData, $ORdata); $r->print($analysis_html); - } elsif ($ENV{'form.AnalyzeBy'} eq 'Time') { + } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { my $analysis_html = &time_analysis($PerformanceData, $ORdata); $r->print($analysis_html); @@ -142,26 +151,132 @@ sub BuildProblemAnalysisPage { ######################################################### sub build_foil_index { my ($ORdata) = @_; - my @Foils = sort(keys(%{$ORdata->{'Foiltext'}})); - my %Row_Label; + return if (! exists($ORdata->{'Foils'})); + my %Foildata = %{$ORdata->{'Foils'}}; + my @Foils = sort(keys(%Foildata)); + my %Concepts; foreach my $foilid (@Foils) { - my $value = $ORdata->{'Foiltext'}->{$foilid}; - $Row_Label{$foilid} = $ORdata->{'Foiltext'}->{$foilid}; + 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 = $a; + my $b1 = $b; + if (exists($Numbers{lc($a)})) { + $a1 = $Numbers{lc($a)}; + } + if (exists($Numbers{lc($b)})) { + $b1 = $Numbers{lc($b)}; + } + $a1 cmp $b1; + }; + my @Concepts; + foreach my $concept (sort $sortfunction (keys(%Concepts))) { + push(@Concepts,{ name => $concept, + foils => [@{$Concepts{$concept}}]}); + push(@Foils,(@{$Concepts{$concept}})); } # # Build up the table of row labels. my $table = '<table border="1" >'."\n"; - $table .= '<tr><th>'.&mt('Foil Number').'</th>'. - '<th>'.&mt('Foil Text')."</th></tr>\n"; - my $index = 1; - foreach my $foilid (@Foils) { - $table .= '<tr><td>'.$index.'</td>'. - '<td>'.$Row_Label{$foilid}."</td></tr>\n"; + if (@Concepts > 1) { + $table .= '<tr>'. + '<th>'.&mt('Concept Number').'</th>'. + '<th>'.&mt('Concept').'</th>'. + '<th>'.&mt('Foil Number').'</th>'. + '<th>'.&mt('Foil Name').'</th>'. + '<th>'.&mt('Foil Text').'</th>'. + '<th>'.&mt('Correct Value').'</th>'. + "</tr>\n"; + } else { + $table .= '<tr>'. + '<th>'.&mt('Foil Number').'</th>'. + '<th>'.&mt('Foil Name').'</th>'. + '<th>'.&mt('Foil Text').'</th>'. + '<th>'.&mt('Correct Value').'</th>'. + "</tr>\n"; + } + my $conceptindex = 1; + my $foilindex = 1; + foreach my $concept (@Concepts) { + my @FoilsInConcept = @{$concept->{'foils'}}; + my $firstfoil = shift(@FoilsInConcept); + if (@Concepts > 1) { + $table .= '<tr>'. + '<td>'.$conceptindex.'</td>'. + '<td>'.$concept->{'name'}.'</td>'. + '<td>'.$foilindex++.'</td>'. + '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'. + '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'. + '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'. + "</tr>\n"; + } else { + $table .= '<tr>'. + '<td>'.$foilindex++.'</td>'. + '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'. + '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'. + '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'. + "</tr>\n"; + } + foreach my $foilid (@FoilsInConcept) { + if (@Concepts > 1) { + $table .= '<tr>'. + '<td></td>'. + '<td></td>'. + '<td>'.$foilindex.'</td>'. + '<td>'.$Foildata{$foilid}->{'name'}.'</td>'. + '<td>'.$Foildata{$foilid}->{'text'}.'</td>'. + '<td>'.$Foildata{$foilid}->{'value'}.'</td>'. + "</tr>\n"; + } else { + $table .= '<tr>'. + '<td>'.$foilindex.'</td>'. + '<td>'.$Foildata{$foilid}->{'name'}.'</td>'. + '<td>'.$Foildata{$foilid}->{'text'}.'</td>'. + '<td>'.$Foildata{$foilid}->{'value'}.'</td>'. + "</tr>\n"; + } + } continue { + $foilindex++; + } } continue { - $index++; + $conceptindex++; + } + $table .= "</table>\n"; + # + # Build option index with color stuff + return ($table,\@Foils,\@Concepts); +} + +sub build_option_index { + my ($ORdata)= @_; + my $table = "<table>\n"; + my $optionindex = 0; + my @Rows; + foreach my $option (&mt('correct option chosen'),@{$ORdata->{'Options'}}) { + push (@Rows, + '<tr>'. + '<td bgcolor="'.$plotcolors->[$optionindex++].'">'. + (' 'x4).'</td>'. + '<td>'.$option.'</td>'. + "</tr>\n"); } + $table .= join('',reverse(@Rows)); $table .= "</table>\n"; - return ($table,@Foils); } ######################################################### @@ -175,76 +290,113 @@ 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 = '<h3>'. + &mt('Not enough data for concept analysis. '. + 'Performing Foil Analysis'). + '</h3>'.$table; + $ENV{'form.AnalyzeAs'} = 'Foils'; + } my %ResponseData = &analyze_option_data_by_tries($PerformanceData, - $mintries,$maxtries); - my ($table,@Foils) = &build_foil_index($ORdata); + $mintries,$maxtries); # # Compute the data neccessary to make the plots - my @PlotData; - my @CumulativePlotData; - 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'}); + my @PlotData; # Array which holds the data for each plot + # @{$PlotData[$try]->{'datasetname'}} holds the data for + # try $try with respect to 'datasetname'. The array is + # filled either with per-foil or per-concept data. + my ($extrakey,$xlabel,$ylabel); + if ($ENV{'form.AnalyzeAs'} eq 'Foils') { + $extrakey = &build_option_index($ORdata); + $xlabel = 'Foil Number'; + $ylabel = 'Percent Choosing Option'; + foreach my $foilid (@$Foils) { + for (my $i=$mintries;$i<=$maxtries;$i++) { + foreach my $option ('_correct',@{$ORdata->{'Options'}}) { + push(@{$PlotData[$i]->{'_total'}}, + $ResponseData{$foilid}->[$i]->{'_total'}); + if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) { + push (@{$PlotData[$i]->{$option}},0); + } else { + push (@{$PlotData[$i]->{$option}}, + 100 * $ResponseData{$foilid}->[$i]->{$option} / + $ResponseData{$foilid}->[$i]->{'_total'}); + } + } + } } - } + } else { + # 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. + $extrakey = ''; + $xlabel = 'Concept Number'; + $ylabel = 'Percent Correct'; + 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 { + push (@{$PlotData[$i]->{'_correct'}}, + 100*$cdata->{'_correct'}/$cdata->{'_total'}); + } + } + } + } # End of work to fill @PlotData # # Build a table for the plots $table .= "<table>\n"; my @Plots; 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'}; + 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 < $ResponseData{$foilid}->[$i]->{'total'}) { - $maxstu = $ResponseData{$foilid}->[$i]->{'total'}; + if ($maxstu < $count) { + $maxstu = $count; } } - $maxstu = 0 if (! $maxstu); - $minstu = 0 if (! $minstu); + $maxstu = 0 if (! defined($maxstu)); + $minstu = 0 if (! defined($minstu)); my $title; if ($maxstu == $minstu) { $title = 'Attempt '.$i.', '.$maxstu.' students'; } else { $title = 'Attempt '.$i.', '.$minstu.'-'.$maxstu.' students'; } + my @Datasets; + foreach my $option ('_correct',@{$ORdata->{'Options'}}) { + next if (! exists($PlotData[$i]->{$option})); + push(@Datasets,$PlotData[$i]->{$option}); + } my $graphlink = &Apache::loncommon::DrawGraph($title, - 'Foil Number', - 'Percent Correct', + $xlabel, + $ylabel, 100, - $PlotData[$i]->{'good'}, - $PlotData[$i]->{'bad'}); + $plotcolors, + @Datasets); 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 .= '<tr><td>'.$plotlink.'</td>'; - for (my $i=1;$i<$plots_per_row;$i++) { - if ($plotlink = shift(@Plots)) { - $table .= '<td>'.$plotlink.'</td>'; - } else { - $table .= '<td></td>'; - } - } - $table .= "</tr>\n"; + $table .= '<tr><td>'.$plotlink.'</td><td>'.$extrakey."</td></tr>\n"; } $table .= "</table>\n"; return ($table); @@ -258,35 +410,25 @@ sub analyze_option_data_by_tries { foreach my $row (@$PerformanceData) { next if (! defined($row)); my ($grading,$submission,$time,$tries) = @$row; + next if ($grading eq 'MISSING_ANSWER'); 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); + for (my $i=0;$i<=$#Foilgrades;$i++) { + my ($foilid,$correct) = split('=',$Foilgrades[$i]); + my (undef,$submission) = split('=',$Foilsubs[$i]); + $submission = &Apache::lonnet::unescape($submission); if ($correct) { - $Trydata{$foilid}->[$numtries]->{'correct'}++; + $Trydata{$foilid}->[$numtries]->{'_correct'}++; } else { - $Trydata{$foilid}->[$numtries]->{'incorrect'}++; + $Trydata{$foilid}->[$numtries]->{$submission}++; } + $Trydata{$foilid}->[$numtries]->{'_total'}++; } } } } - 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; } @@ -300,9 +442,14 @@ sub analyze_option_data_by_tries { sub time_analysis { my ($PerformanceData,$ORdata) = @_; my $num_plots = $ENV{'form.NumPlots'}; - my ($table,@Foils) = &build_foil_index($ORdata); + my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); my $num_data = scalar(@$PerformanceData)-1; my $percent = sprintf('%2f',100/$num_plots); + my $extratable = ''; + if ($ENV{'form.AnalyzeAs'} eq 'Foils') { + $extratable = &build_option_index($ORdata); + } + $table .= "<table>\n"; for (my $i=0;$i<$num_plots;$i++) { my $starttime = &Apache::lonhtmlcommon::get_date_from_form ('startdate_'.$i); @@ -327,28 +474,32 @@ sub time_analysis { last if ($PerformanceData->[$j]->[2] > $endtime); } $end_index = $j; - $plottitle = 'Tries plot '.($i+1); + $plottitle = $ENV{'form.plottitle_'.$i}; } - ($plothtml,$starttime,$endtime,$data) = &analyze_option_data_by_time($PerformanceData, $begin_index,$end_index, - $plottitle, - @Foils); + $plottitle,$Foils, + $Concepts,$ORdata); my $startdateform = &Apache::lonhtmlcommon::date_setter ('Statistics','startdate_'.$i,$starttime); my $enddateform = &Apache::lonhtmlcommon::date_setter ('Statistics','enddate_'.$i,$endtime); - $plothtml.= "<br />\n". - "<b>Start Time</b>: "." ".$startdateform."<br />\n". - "<b>End Time</b> : "." ".$enddateform."<br />\n"; - $table.=$plothtml; + $table.="<tr><td>".$plothtml.'</td><td align="left" valign="top">'. + "<b>Start Time</b>: ".$startdateform."<br />". + "<b>End Time</b> : "." ".$enddateform."<br />". + '<b>Plot Title</b> :'.(" "x3). + '<input type="text" size="30" name="plottitle_'.$i.'" value="'. + &HTML::Entities::encode($plottitle).'" /><br />'.$extratable. + "</td></tr>\n"; } + $table .="</table>\n"; return $table; } sub analyze_option_data_by_time { - my ($PerformanceData,$begin_index,$end_index,$description,@Foils) = @_; + my ($PerformanceData,$begin_index, + $end_index,$description,$Foils,$Concepts,$ORdata) = @_; my %TimeData; # # Get the start and end times for this segment of the plot @@ -360,51 +511,73 @@ sub analyze_option_data_by_time { my $row = $PerformanceData->[$i]; next if (! defined($row)); my ($grading,$submission,$time,$tries) = @$row; + next if ($grading eq 'MISSING_ANSWER'); my @Foilgrades = split('&',$grading); my @Foilsubs = split('&',$submission); - foreach my $foilgrade (@Foilgrades) { - my ($foilid,$correct) = split('=',$foilgrade); + for (my $j=0;$j<=$#Foilgrades;$j++) { + my ($foilid,$correct) = split('=',$Foilgrades[$j]); + my (undef,$submission) = split('=',$Foilsubs[$j]); if ($correct) { - $TimeData{$foilid}->{'correct'}++; + $TimeData{$foilid}->{'_correct'}++; } else { - $TimeData{$foilid}->{'incorrect'}++; + $submission = &HTML::Entities::decode($submission); + $submission =~ s/\%20/ /g; + $TimeData{$foilid}->{$submission}++; } + $TimeData{$foilid}->{'_total'}++; } } # # Compute the total and percent correct - my @Plotdata1; - my @Plotdata2; - foreach my $foilid (@Foils) { - if (! exists($TimeData{$foilid}->{'correct'})) { - $TimeData{$foilid}->{'correct'} = 0; + my @Plotdata; + my ($xlabel,$ylabel); + if ($ENV{'form.AnalyzeAs'} eq 'Foils') { + $xlabel = 'Foil Number'; + $ylabel = 'Option Chosen'; + foreach my $foil (@$Foils) { + my $total = $TimeData{$foil}->{'_total'}; + my $optionidx = 0; + foreach my $option ('_correct',@{$ORdata->{'Options'}}) { + if ($total > 0) { + push(@{$Plotdata[$optionidx]}, + 100 * $TimeData{$foil}->{$option} / $total); + } else { + push(@{$Plotdata[$optionidx]},0); + } + } continue { + $optionidx++; + } } - if (! exists($TimeData{$foilid}->{'incorrect'})) { - $TimeData{$foilid}->{'incorrect'} = 0; + } else { + $xlabel = 'Concept Number'; + $ylabel = 'Percent Correct'; + foreach my $concept (@$Concepts) { + my $correct; + my $total; + foreach my $foil (@{$concept->{'foils'}}) { + $correct+=$TimeData{$foil}->{'_correct'}; + $total +=$TimeData{$foil}->{'_total'}; + } + if ($total > 0) { + push(@{$Plotdata[0]},100 * $correct / $total); + } else { + push(@{$Plotdata[0]},0); + } } - $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', + $xlabel, + $ylabel, 100, - \@Plotdata1,\@Plotdata2); + $plotcolors, + @Plotdata); # return ($graphlink,$starttime,$endtime,\%TimeData); } - - - ######################################################### ######################################################### ## @@ -415,8 +588,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 @@ -449,39 +622,59 @@ sub CreateInterface { }; &Apache::lonstatistics::MapSelect('Maps','multiple,all',5, $only_seq_with_assessments); -# $Str .= '</td>'; - # + ## + ## $Str .= '<td>'; - $Str .= '<nobr>'.&mt('Analyze By '); - $Str .='<select name="AnalyzeBy" >'; - # - $Str .= '<option value="Tries" '; - if (! exists($ENV{'form.AnalyzeBy'}) || $ENV{'form.AnalyzeBy'} eq 'Tries'){ - # Default to Tries - $Str .= ' selected '; - } - $Str .= '>'.&mt('Tries').'</option>'; - # - $Str .= '<option value="Time" '; - $Str .= ' selected ' if ($ENV{'form.AnalyzeBy'} eq 'Time'); - $Str .= '>'.&mt('Time').'</option>'; - $Str .= '</select></nobr><br />'; - # - $Str .= '<br /><nobr>'.&mt('Number of Plots:'); - $Str .= '<select name="NumPlots">'; - if (! exists($ENV{'form.NumPlots'}) - || $ENV{'form.NumPlots'} < 1 - || $ENV{'form.NumPlots'} > 20) { - $ENV{'form.NumPlots'} = 5; - } - foreach my $i (1,2,3,4,5,6,7,8,10,15,20) { - $Str .= '<option value="'.$i.'" '; - if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; } - $Str .= '>'.$i.'</option>'; + { # These braces are here to organize the code, not scope it. + { + $Str .= '<nobr>'.&mt('Analyze Over '); + $Str .='<select name="AnalyzeOver" >'; + $Str .= '<option value="Tries" '; + if (! exists($ENV{'form.AnalyzeOver'}) || + $ENV{'form.AnalyzeOver'} eq 'Tries'){ + # Default to Tries + $Str .= ' selected '; + } + $Str .= '>'.&mt('Tries').'</option>'; + $Str .= '<option value="Time" '; + $Str .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time'); + $Str .= '>'.&mt('Time').'</option>'; + $Str .= '</select></nobr><br />'; + } + { + $Str .= '<nobr>'.&mt('Analyze as '); + $Str .='<select name="AnalyzeAs" >'; + $Str .= '<option value="Concepts" '; + if (! exists($ENV{'form.AnalyzeAs'}) || + $ENV{'form.AnalyzeAs'} eq 'Concepts'){ + # Default to Concepts + $Str .= ' selected '; + } + $Str .= '>'.&mt('Concepts').'</option>'; + $Str .= '<option value="Foils" '; + $Str .= ' selected ' if ($ENV{'form.AnalyzeAs'} eq 'Foils'); + $Str .= '>'.&mt('Foils').'</option>'; + $Str .= '</select></nobr><br />'; + } + { + $Str .= '<br /><nobr>'.&mt('Number of Plots:'); + $Str .= '<select name="NumPlots">'; + if (! exists($ENV{'form.NumPlots'}) + || $ENV{'form.NumPlots'} < 1 + || $ENV{'form.NumPlots'} > 20) { + $ENV{'form.NumPlots'} = 5; + } + foreach my $i (1,2,3,4,5,6,7,8,10,15,20) { + $Str .= '<option value="'.$i.'" '; + if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; } + $Str .= '>'.$i.'</option>'; + } + $Str .= '</select></nobr>'; + } } - $Str .= '</select></nobr>'; $Str .= '</td>'; - # + ## + ## $Str .= '</tr>'."\n"; $Str .= '</table>'."\n"; return ($Str); @@ -494,7 +687,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}; @@ -557,20 +749,17 @@ sub get_resource_from_symb { return undef; } +## +## 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)) { @@ -584,45 +773,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; }