--- loncom/interface/statistics/lonproblemanalysis.pm 2003/12/15 16:23:00 1.52 +++ loncom/interface/statistics/lonproblemanalysis.pm 2004/01/16 20:19:33 1.56 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.52 2003/12/15 16:23:00 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.56 2004/01/16 20:19:33 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,14 +42,19 @@ my $plotcolors = ['#33ff00', '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66', ]; -my @SubmitButtons = ({ name => 'ProblemAnalyis', +my @SubmitButtons = ({ name => 'PrevProblemAnalysis', + text => 'Previous Problem' }, + { name => 'ProblemAnalysis', text => 'Analyze Problem Again' }, + { name => 'NextProblemAnalysis', + text => 'Next Problem' }, + { name => 'break'}, { name => 'ClearCache', text => 'Clear Caches' }, { name => 'updatecaches', text => 'Update Student Data' }, { name => 'SelectAnother', - text => 'Choose a different resource' }, + text => 'Choose a different Problem' }, { name => 'ExcelOutput', text => 'Produce Excel Output' }); @@ -112,34 +117,54 @@ sub BuildProblemAnalysisPage { if (exists($ENV{'form.problemchoice'}) && ! exists($ENV{'form.SelectAnother'})) { foreach my $button (@SubmitButtons) { - $r->print(''); - $r->print(' 'x5); + if ($button->{'name'} eq 'break') { + $r->print("
\n"); + } else { + $r->print(''); + $r->print(' 'x5); + } } - $r->print(''); # $r->print('
'); - # - my ($symb,$part,$resid,$resptype) = &get_problem_symb( - &Apache::lonnet::unescape($ENV{'form.problemchoice'})); $r->rflush(); # - my $resource = &get_resource_from_symb($symb); - if (! defined($resource) || ! defined($resptype)) { + # Determine which problem we are to analyze + my $current_problem = &get_target_from_id($ENV{'form.problemchoice'}); + # + my ($prev,$curr,$next) = &get_prev_curr_next($current_problem); + 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'} = &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'}.'

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

This analysis is not supported

'); @@ -155,9 +180,6 @@ sub BuildProblemAnalysisPage { } } -=pod - -Removed code: ######################################################### ######################################################### @@ -167,7 +189,9 @@ Removed code: ######################################################### ######################################################### sub RadioResponseAnalysis { - my ($r,$resource,$part,$respid,$ProblemData,$Students) = @_; + my ($r,$problem,$ProblemData,$Students) = @_; + my ($resource,$respid) = ($problem->{'resource'}, + $problem->{'respid'}); my $analysis_html; my $PerformanceData = &Apache::loncoursedata::get_response_data @@ -181,14 +205,14 @@ sub RadioResponseAnalysis { return; } if (exists($ENV{'form.ExcelOutput'})) { - $analysis_html .= &RR_Excel_output($r,$resource,$PerformanceData, - $ProblemData); + $analysis_html .= &RR_Excel_output($r,$problem->{'resource'}, + $PerformanceData,$ProblemData); } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') { - $analysis_html .= &RR_Tries_Analysis($r,$resource,$PerformanceData, - $ProblemData); + $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'}, + $PerformanceData,$ProblemData); } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { - $analysis_html .= &RR_Time_Analysis($r,$resource,$PerformanceData, - $ProblemData); + $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'}, + $PerformanceData,$ProblemData); } else { $analysis_html .= '

'. &mt('The analysis you have selected is not supported at this time'). @@ -197,7 +221,6 @@ sub RadioResponseAnalysis { $r->print($analysis_html); } - sub RR_Excel_output { my ($r,$PerformanceData,$ProblemData) = @_; return '

No!

'; @@ -218,15 +241,15 @@ sub RR_Tries_Analysis { } $analysis_html .= $table; my @TryData = &RR_tries_data_analysis($r,$PerformanceData); - if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $analysis_html = &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, +# if ($ENV{'form.AnalyzeAs'} eq 'Foils') { + $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, \@TryData,$ProblemData); - } else { - $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries, - $Concepts, - \@TryData, - $ProblemData); - } +# } else { +# $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries, +# $Concepts, +# \@TryData, +# $ProblemData); +# } return $analysis_html; } @@ -256,8 +279,8 @@ sub RR_Tries_Foil_Analysis { my @PlotData_Correct; my @PlotData_Incorrect; next if ($try > scalar(@{$TryData})); - next if (! defined($TryData->[$try-1])); - my %DataSet = %{$TryData->[$try-1]}; + next if (! defined($TryData->[$try])); + my %DataSet = %{$TryData->[$try]}; my $total = 0; foreach my $foilid (@$Foils) { $total += $DataSet{$foilid}; @@ -288,7 +311,6 @@ sub RR_Tries_Foil_Analysis { \@PlotData_Correct, \@PlotData_Incorrect); } - &Apache::lonnet::logthis('plot = '.$html); return $html; } @@ -311,14 +333,12 @@ sub RR_Time_Concept_Analysis { } - 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; - &Apache::lonnet::logthis('url = '.$url); foreach my $part (@{$Answer{'parts'}}) { while (my($key,$value) = each(%Answer)) { # if (ref($value) eq 'ARRAY') { @@ -344,9 +364,6 @@ sub get_Radio_problem_data { return %Partdata; } -=cut - - ######################################################### ######################################################### ## @@ -355,10 +372,13 @@ sub get_Radio_problem_data { ######################################################### ######################################################### sub OptionResponseAnalysis { - my ($r,$resource,$resid,$ProblemData,$Students) = @_; + my ($r,$problem,$ProblemData,$Students) = @_; + my ($resource,$respid) = ($problem->{'resource'}, + $problem->{'respid'}); + # Note: part data is not needed. my $PerformanceData = &Apache::loncoursedata::get_response_data - ($Students,$resource->{'symb'},$resid); + ($Students,$resource->{'symb'},$respid); if (! defined($PerformanceData) || ref($PerformanceData) ne 'ARRAY' ) { $r->print('

'. @@ -1489,11 +1509,12 @@ sub ProblemSelector { for (my $i=0;$i{'ResponseTypes'}});$i++){ my $respid = $partdata->{'ResponseIds'}->[$i]; my $resptype = $partdata->{'ResponseTypes'}->[$i]; - if ($resptype eq 'option' ){ -# if ($resptype eq 'option' || $resptype eq 'radiobutton') { - my $value = - &Apache::lonnet::escape($res->{'symb'}.':'.$part. - ':'.$respid.':'.$resptype); +# if ($resptype eq 'option' ){ + if ($resptype eq 'option' || $resptype eq 'radiobutton') { + my $value = &make_target_id({symb=>$res->{'symb'}, + part=>$part, + respid=>$respid, + resptype=>$resptype}); my $checked = ''; if ($ENV{'form.problemchoice'} eq $value) { $checked = 'checked '; @@ -1504,7 +1525,8 @@ sub ProblemSelector { } $seq_str .= ''. ''. - ''. + ''. +#.$resptype.''. ''.$title.' '; # ''.$resptype.' '.$res->{'title'}.' '; if ($partdata->{'option'} > 1) { @@ -1533,9 +1555,11 @@ sub ProblemSelector { ######################################################### sub get_problem_symb { my $problemstring = shift(); - my ($symb,$partid,$resid,$resptype) = - ($problemstring=~ /^(.*):([^:]*):([^:]*):([^:]*)$/); - return ($symb,$partid,$resid,$resptype); + my ($symb,$partid,$respid,$resptype) = split(':',$problemstring); + return ({ symb => $symb, + part => $partid, + respid => $respid, + type => $resptype } ); } sub get_resource_from_symb { @@ -1550,6 +1574,87 @@ sub get_resource_from_symb { return undef; } +sub get_prev_curr_next { + my ($target) = @_; + # + # Build an array with the data we need to search through + my @Resource; + foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + foreach my $res (@{$seq->{'contents'}}) { + next if ($res->{'type'} ne 'assessment'); + foreach my $part (@{$res->{'parts'}}) { + my $partdata = $res->{'partdata'}->{$part}; + for (my $i=0;$i{'ResponseTypes'}});$i++){ + my $respid = $partdata->{'ResponseIds'}->[$i]; + my $resptype = $partdata->{'ResponseTypes'}->[$i]; + next if ($resptype ne 'option' && + $resptype ne 'radiobutton'); + push (@Resource, + { symb => $res->{symb}, + part => $part, + respid => $partdata->{'ResponseIds'}->[$i], + resource => $res, + resptype => $resptype + } ); + } + } + } + } + # + # + # Get the index of the current situation + my $curr_idx; + for ($curr_idx=0;$curr_idx<$#Resource;$curr_idx++) { + my $curr_item = $Resource[$curr_idx]; + last if ($curr_item->{'symb'} eq $target->{'symb'} && + $curr_item->{'part'} eq $target->{'part'} && + $curr_item->{'respid'} eq $target->{'respid'} && + $curr_item->{'resptype'} eq $target->{'resptype'}); + } + my $curr_item = $Resource[$curr_idx]; + if ($curr_item->{'symb'} ne $target->{'symb'} || + $curr_item->{'part'} ne $target->{'part'} || + $curr_item->{'respid'} ne $target->{'respid'} || + $curr_item->{'resptype'} ne $target->{'resptype'}){ + # bogus symb - return nothing + return (undef,undef,undef); + } + # + # Now just pick up the data we need + my ($prev,$curr,$next); + if ($curr_idx == 0) { + $prev = undef; + $curr = $Resource[$curr_idx ]; + $next = $Resource[$curr_idx+1]; + } elsif ($curr_idx == $#Resource) { + $prev = $Resource[$curr_idx-1]; + $curr = $Resource[$curr_idx ]; + $next = undef; + } else { + $prev = $Resource[$curr_idx-1]; + $curr = $Resource[$curr_idx ]; + $next = $Resource[$curr_idx+1]; + } + return ($prev,$curr,$next); +} + +sub make_target_id { + my ($target) = @_; + my $id = &Apache::lonnet::escape($target->{'symb'}).':'. + &Apache::lonnet::escape($target->{'part'}).':'. + &Apache::lonnet::escape($target->{'respid'}).':'. + &Apache::lonnet::escape($target->{'resptype'}); + return $id; +} + +sub get_target_from_id { + my ($id) = @_; + my ($symb,$part,$respid,$resptype) = split(':',$id); + return ({ symb =>&Apache::lonnet::unescape($symb), + part =>&Apache::lonnet::unescape($part), + respid =>&Apache::lonnet::unescape($respid), + resptype =>&Apache::lonnet::unescape($resptype)}); +} ######################################################### #########################################################