--- loncom/interface/statistics/lonproblemanalysis.pm 2003/10/20 20:42:39 1.43 +++ 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.43 2003/10/20 20:42:39 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.56 2004/01/16 20:19:33 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -24,7 +24,6 @@ # # http://www.lon-capa.org/ # - package Apache::lonproblemanalysis; use strict; @@ -43,13 +42,65 @@ my $plotcolors = ['#33ff00', '#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 => 'ClearCache', + text => 'Clear Caches' }, + { name => 'updatecaches', + text => 'Update Student Data' }, + { name => 'SelectAnother', + text => 'Choose a different Problem' }, + { name => 'ExcelOutput', + text => 'Produce Excel Output' }); + +sub render_resource { + my ($resource) = @_; + ## + ## 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; + return '
'. + ''. + $rendered_problem. + '
'; +} + sub BuildProblemAnalysisPage { my ($r,$c)=@_; + # + my %Saveable_Parameters = ('Status' => 'scalar', + 'Section' => 'array', + 'NumPlots' => 'scalar', + 'AnalyzeAs' => '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('

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

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

There are no students in the sections selected

'); + } + # + &Apache::loncoursedata::clear_internal_caches(); if (exists($ENV{'form.ClearCache'}) || exists($ENV{'form.updatecaches'}) || (exists($ENV{'form.firstanalysis'}) && @@ -62,89 +113,62 @@ sub BuildProblemAnalysisPage { $r->print(''); } $r->rflush(); + # 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); - $r->print(''); - $r->print(' 'x5); + foreach my $button (@SubmitButtons) { + if ($button->{'name'} eq 'break') { + $r->print("
\n"); + } else { + $r->print(''); + $r->print(' 'x5); + } + } # $r->print('
'); - # - my ($symb,$part,$resid) = &get_problem_symb( - &Apache::lonnet::unescape($ENV{'form.problemchoice'}) - ); $r->rflush(); # - my $resource = &get_resource_from_symb($symb); - if (defined($resource)) { + # 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'}.'

'); - my %Data = &get_problem_data($resource->{'src'}); - my $PerformanceData = - &Apache::loncoursedata::get_optionresponse_data - (\@Students,$symb,$resid); - my $ORdata = $Data{$part.'.'.$resid}; - if (exists($ENV{'form.ExcelOutput'}) && - defined($PerformanceData)) { - my $result = &prepare_excel_sheet($r,$resource, - $PerformanceData,$ORdata); - $r->print($result); - $r->rflush(); - } - ## - ## 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. - '
'); + $r->print(&render_resource($resource)); $r->rflush(); - ## - ## Analyze the problem - if (defined($PerformanceData) && - ref($PerformanceData) eq 'ARRAY') { - if ($ENV{'form.AnalyzeOver'} eq 'Tries') { - my $analysis_html = &tries_analysis($r,$PerformanceData, - $ORdata); - $r->print($analysis_html); - $r->rflush(); - } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { - my $analysis_html = &time_analysis($PerformanceData, - $ORdata); - $r->print($analysis_html); - $r->rflush(); - } else { - $r->print('

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

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

'. - &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 { @@ -152,155 +176,249 @@ sub BuildProblemAnalysisPage { &mt('Analyze Problem').'" />'); $r->print(' 'x5); $r->print('

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

'); - $r->print(&OptionResponseProblemSelector()); + $r->print(&ProblemSelector()); } } + ######################################################### ######################################################### ## -## Misc interface routines use by analysis code +## Radio Response Routines ## ######################################################### ######################################################### -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); +sub RadioResponseAnalysis { + my ($r,$problem,$ProblemData,$Students) = @_; + my ($resource,$respid) = ($problem->{'resource'}, + $problem->{'respid'}); + my $analysis_html; + my $PerformanceData = + &Apache::loncoursedata::get_response_data + ($Students,$resource->{'symb'},$respid); + if (! defined($PerformanceData) || + ref($PerformanceData) ne 'ARRAY' ) { + $analysis_html = '

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

'; + $r->print($analysis_html); + return; + } + if (exists($ENV{'form.ExcelOutput'})) { + $analysis_html .= &RR_Excel_output($r,$problem->{'resource'}, + $PerformanceData,$ProblemData); + } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') { + $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'}, + $PerformanceData,$ProblemData); + } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { + $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'}, + $PerformanceData,$ProblemData); + } else { + $analysis_html .= '

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

'; } - 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{$a})) { - $a1 = $Numbers{$a}; - } - if (exists($Numbers{$b})) { - $b1 = $Numbers{$b}; - } - $a1 cmp $b1; - }; - my @Concepts; - foreach my $concept (sort $sortfunction (keys(%Concepts))) { - push(@Concepts,{ name => $concept, - foils => [@{$Concepts{$concept}}]}); - push(@Foils,(@{$Concepts{$concept}})); + $r->print($analysis_html); +} + +sub RR_Excel_output { + my ($r,$PerformanceData,$ProblemData) = @_; + return '

No!

'; +} + +sub RR_Tries_Analysis { + my ($r,$resource,$PerformanceData,$ProblemData) = @_; + my $analysis_html; + my $mintries = 1; + my $maxtries = $ENV{'form.NumPlots'}; + my ($table,$Foils,$Concepts) = &build_foil_index($ProblemData); + if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) { + $table = '

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

'.$table; + $ENV{'form.AnalyzeAs'} = 'Foils'; } + $analysis_html .= $table; + my @TryData = &RR_tries_data_analysis($r,$PerformanceData); +# if ($ENV{'form.AnalyzeAs'} eq 'Foils') { + $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, + \@TryData,$ProblemData); +# } else { +# $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries, +# $Concepts, +# \@TryData, +# $ProblemData); +# } + return $analysis_html; +} + +sub RR_tries_data_analysis { + my ($r,$Attempt_data) = @_; + my @TryData; + foreach my $attempt (@$Attempt_data) { + my %Attempt = &hashify_attempt($attempt); + my ($answer,undef) = split('=',$Attempt{'submission'}); + $TryData[$Attempt{'tries'}]->{$answer}++; + } + return @TryData; +} + +sub RR_Time_Analysis { + my ($r,$PerformanceData,$ProblemData) = @_; + my $html; + return $html; +} + +sub RR_Tries_Foil_Analysis { + my ($min,$max,$Foils,$TryData,$ProblemData) = @_; + my $html; # - # Build up the table of row labels. - my $table = ''."\n"; - if (@Concepts > 1) { - $table .= ''. - ''. - ''. - ''. - ''. - ''. - ''. - "\n"; - } else { - $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"; + # 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 (@FoilsInConcept) { - if (@Concepts > 1) { - $table .= ''. - ''. - ''. - ''. - ''. - ''. - ''. - "\n"; + foreach my $foilid (@$Foils) { + if ($total == 0) { + push (@PlotData_Correct,0); + push (@PlotData_Incorrect,0); } else { - $table .= ''. - ''. - ''. - ''. - ''. - "\n"; - } - } continue { - $foilindex++; + if ($ProblemData->{'_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)); + } + } } - } continue { - $conceptindex++; + my $title='Attempt '.$try; + my $xlabel = $total.' Submissions'; + $html.= &Apache::loncommon::DrawBarGraph($title, + $xlabel, + 'Percent Choosing', + 100, + ['#33ff00','#ff3300'], + \@PlotData_Correct, + \@PlotData_Incorrect); } - $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.''.$concept->{'name'}.''.$foilindex++.''.$Foildata{$firstfoil}->{'name'}.''.$Foildata{$firstfoil}->{'text'}.''.$Foildata{$firstfoil}->{'value'}.'
'.$foilindex++.''.$Foildata{$firstfoil}->{'name'}.''.$Foildata{$firstfoil}->{'text'}.''.$Foildata{$firstfoil}->{'value'}.'
'.$foilindex.''.$Foildata{$foilid}->{'name'}.''.$Foildata{$foilid}->{'text'}.''.$Foildata{$foilid}->{'value'}.'
'.$foilindex.''.$Foildata{$foilid}->{'name'}.''.$Foildata{$foilid}->{'text'}.''.$Foildata{$foilid}->{'value'}.'
\n"; - # - # Build option index with color stuff - return ($table,\@Foils,\@Concepts); + return $html; } -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"); +sub RR_Tries_Concept_Analysis { + my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_; + my $html; + return $html; +} + +sub RR_Time_Foil_Analysis { + my ($min,$max,$Foils,$ResponseData,$ProblemData) = @_; + my $html; + return $html; +} + +sub RR_Time_Concept_Analysis { + my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_; + my $html; + return $html; +} + + +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; + } + } } - shift(@Rows); # Throw away 'correct option chosen' color - $table .= join('',reverse(@Rows)); - $table .= "
'. - (' 'x4).''.$option.'
\n"; + return %Partdata; } ######################################################### ######################################################### ## -## Tries Analysis +## Option Response Routines ## ######################################################### ######################################################### +sub OptionResponseAnalysis { + 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'},$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 = &prepare_optionresponse_excel_sheet($r,$resource, + $PerformanceData, + $ProblemData); + $r->print($result); + $r->rflush(); + } else { + if ($ENV{'form.AnalyzeOver'} eq 'Tries') { + my $analysis_html = &tries_analysis($r, + $PerformanceData, + $ProblemData); + $r->print($analysis_html); + $r->rflush(); + } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { + my $analysis_html = &time_analysis($PerformanceData, + $ProblemData); + $r->print($analysis_html); + $r->rflush(); + } else { + $r->print('

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

'); + } + } + } +} + +######################################################### +# +# Option Response: Tries Analysis +# +######################################################### sub tries_analysis { my ($r,$PerformanceData,$ORdata) = @_; my $mintries = 1; @@ -342,7 +460,7 @@ sub Tries_Foil_Analysis { 100*$ResponseData{$foilid}->[$i]->{'_correct'}/ $ResponseData{$foilid}->[$i]->{'_total'}); } - foreach my $option (@{$ORdata->{'Options'}}) { + foreach my $option (@{$ORdata->{'_Options'}}) { push(@{$PlotData[$i]->{'_total'}}, $ResponseData{$foilid}->[$i]->{'_total'}); if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) { @@ -376,11 +494,11 @@ sub Tries_Foil_Analysis { } my $title = 'Attempt '.$i.', '.$count; my @Datasets; - foreach my $option ('_correct',@{$ORdata->{'Options'}}) { + foreach my $option ('_correct',@{$ORdata->{'_Options'}}) { next if (! exists($PlotData[$i]->{$option})); push(@Datasets,$PlotData[$i]->{$option}); } - my $correctgraph = &Apache::loncommon::DrawGraph + my $correctgraph = &Apache::loncommon::DrawBarGraph ($title,'Foil Number','Percent Correct', 100,$plotcolors,$Datasets[0]); $analysis_html.= ''.$correctgraph.''; @@ -398,7 +516,7 @@ sub Tries_Foil_Analysis { $count = $count.' submissions'; } $title = 'Attempt '.$i.', '.$count; - my $incorrectgraph = &Apache::loncommon::DrawGraph + my $incorrectgraph = &Apache::loncommon::DrawBarGraph ($title,'Foil Number','% Option Chosen Incorrectly', 100,$plotcolors,@Datasets); $analysis_html.= ''.$incorrectgraph.''; @@ -465,7 +583,7 @@ sub Tries_Concept_Analysis { $count = $count.' submissions'; } $title = 'Attempt '.$i.', '.$count; - my $graphlink = &Apache::loncommon::DrawGraph + my $graphlink = &Apache::loncommon::DrawBarGraph ($title,'Concept Number','Percent Correct', 100,$plotcolors,$PlotData[$i]->{'_correct'}); $analysis_html.= ''.$graphlink."\n"; @@ -482,7 +600,7 @@ sub analyze_option_data_by_tries { foreach my $row (@$PerformanceData) { next if (! defined($row)); my $tries = &get_tries_from_row($row); - my %Row = &Process_Row($row); + my %Row = &Process_OR_Row($row); next if (! %Row); while (my ($foilid,$href) = each(%Row)) { if (! ref($href)) { @@ -498,11 +616,9 @@ sub analyze_option_data_by_tries { } ######################################################### -######################################################### -## -## Time Analysis -## -######################################################### +# +# Option Response: Time Analysis +# ######################################################### sub time_analysis { my ($PerformanceData,$ORdata) = @_; @@ -546,7 +662,8 @@ sub time_analysis { my $end_index; my $j; while (++$j < scalar(@$PerformanceData)) { - last if (&get_time_from_row($PerformanceData->[$j]) > $starttime); + last if (&get_time_from_row($PerformanceData->[$j]) + > $starttime); } $begin_index = $j; while (++$j < scalar(@$PerformanceData)) { @@ -584,7 +701,7 @@ sub Foil_Time_Analysis { for (my $j=$begin_index;$j<=$end_index;$j++) { my $row = $PerformanceData->[$j]; next if (! defined($row)); - my %Row = &Process_Row($row); + my %Row = &Process_OR_Row($row); while (my ($foilid,$href) = each(%Row)) { if (! ref($href)) { $TimeData{$foilid} += $href; @@ -606,7 +723,7 @@ sub Foil_Time_Analysis { } my $total_incorrect = $total - $TimeData{$foil}->{'_correct'}; my $optionidx = 1; - foreach my $option (@{$ORdata->{'Options'}}) { + foreach my $option (@{$ORdata->{'_Options'}}) { if ($total_incorrect == 0) { push(@{$Plotdata[$optionidx]},0); } else { @@ -628,12 +745,12 @@ sub Foil_Time_Analysis { } else { $title = $count.' submissions'; } - my $correctplot = &Apache::loncommon::DrawGraph($title, - 'Foil Number', - 'Percent Correct', - 100, - $plotcolors, - $Plotdata[0]); + my $correctplot = &Apache::loncommon::DrawBarGraph($title, + 'Foil Number', + 'Percent Correct', + 100, + $plotcolors, + $Plotdata[0]); for (my $j=0; $j< scalar(@{$Plotdata[0]});$j++) { $Plotdata[0]->[$j]=0; } @@ -645,7 +762,7 @@ sub Foil_Time_Analysis { } else { $title = $count.' submissions'; } - my $incorrectplot = &Apache::loncommon::DrawGraph($title, + my $incorrectplot = &Apache::loncommon::DrawBarGraph($title, 'Foil Number', 'Incorrect Option Choice', 100, @@ -680,7 +797,7 @@ sub Concept_Time_Analysis { for (my $j=$begin_index;$j<=$end_index;$j++) { my $row = $PerformanceData->[$j]; next if (! defined($row)); - my %Row = &Process_Row($row); + my %Row = &Process_OR_Row($row); while (my ($foilid,$href) = each(%Row)) { if (! ref($href)) { $TimeData{$foilid} += $href; @@ -709,7 +826,7 @@ sub Concept_Time_Analysis { # # Create the plot my $title = ($end_index - $begin_index).' submissions'; - my $correctplot = &Apache::loncommon::DrawGraph($title, + my $correctplot = &Apache::loncommon::DrawBarGraph($title, 'Concept Number', 'Percent Correct', 100, @@ -735,10 +852,9 @@ sub Concept_Time_Analysis { ## ######################################################### ######################################################### - -sub prepare_excel_sheet { +sub prepare_optionresponse_excel_sheet { my ($r,$resource,$PerformanceData,$ORdata) = @_; - my $response = '

'.&mt('Excel Spreadsheet Creation').'

'; + my $response = ''; my (undef,$Foils,$Concepts) = &build_foil_index($ORdata); # # Create excel worksheet @@ -761,7 +877,6 @@ sub prepare_excel_sheet { my $format; $format->{'header'} = $workbook->add_format(bold => 1, bottom => 1, -# text_wrap => 1, align => 'center'); $format->{'bold'} = $workbook->add_format(bold=>1); $format->{'h1'} = $workbook->add_format(bold=>1, size=>18); @@ -796,14 +911,16 @@ sub prepare_excel_sheet { if ($result ne 'okay') { # Do something useful } - $response_data_sheet->activate(); + $response_data_sheet->activate(); # # Close the excel file $workbook->close(); # # Write a link to allow them to download it - $result .= '
'. - 'Your Excel spreadsheet.'."\n"; + $result .= '

'.&mt('Excel Raw Data Output').'

'. + '

'. + &mt('Your Excel spreadsheet.'). + '

'."\n"; return $result; } @@ -822,7 +939,7 @@ sub build_problem_data_worksheet { @Headers = ('Foil Number','FoilName','Foil Text','Correct value'); } $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'}); - my %Foildata = %{$ORdata->{'Foils'}}; + my %Foildata = %{$ORdata->{'_Foils'}}; my $conceptindex = 1; my $foilindex = 1; foreach my $concept (@$Concepts) { @@ -870,7 +987,7 @@ sub build_problem_data_worksheet { ## ## Option data output $worksheet->write($rows_output++,0,'Options',$format->{'header'}); - foreach my $string (@{$ORdata->{'Options'}}) { + foreach my $string (@{$ORdata->{'_Options'}}) { $worksheet->write($rows_output++,0,$string); } return 'okay'; @@ -1125,10 +1242,141 @@ sub _adjustment { return $adjust; } +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{$a})) { + $a1 = $Numbers{$a}; + } + if (exists($Numbers{$b})) { + $b1 = $Numbers{$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 = ''."\n"; + if (@Concepts > 1) { + $table .= ''. + ''. + ''. + ''. + ''. + ''. + ''. + "\n"; + } else { + $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++; + } + $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.''.$concept->{'name'}.''.$foilindex++.''.$Foildata{$firstfoil}->{'name'}.''.$Foildata{$firstfoil}->{'text'}.''.$Foildata{$firstfoil}->{'value'}.'
'.$foilindex++.''.$Foildata{$firstfoil}->{'name'}.''.$Foildata{$firstfoil}->{'text'}.''.$Foildata{$firstfoil}->{'value'}.'
'.$foilindex.''.$Foildata{$foilid}->{'name'}.''.$Foildata{$foilid}->{'text'}.''.$Foildata{$foilid}->{'value'}.'
'.$foilindex.''.$Foildata{$foilid}->{'name'}.''.$Foildata{$foilid}->{'text'}.''.$Foildata{$foilid}->{'value'}.'
\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"; +} + ######################################################### ######################################################### ## -## Interface +## Generic Interface Routines ## ######################################################### ######################################################### @@ -1175,6 +1423,8 @@ sub CreateInterface { { # These braces are here to organize the code, not scope it. { $Str .= ''.&mt('Analyze Over '); + $Str .= &Apache::loncommon::help_open_topic + ('Analysis_Analyze_Over'); $Str .='
'; + $Str .= ''; + $Str .= '
'; } { $Str .= ''.&mt('Analyze as '); + $Str .= &Apache::loncommon::help_open_topic + ('Analysis_Analyze_as'); $Str .=''. - ''. - ''.$res->{'title'}.' '; + ''. +#.$resptype.''. + ''.$title.' '; +# ''.$resptype.' '.$res->{'title'}.' '; if ($partdata->{'option'} > 1) { $seq_str .= &mt('response').' '.$respid; } @@ -1280,8 +1555,11 @@ sub OptionResponseProblemSelector { ######################################################### sub get_problem_symb { my $problemstring = shift(); - my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/); - return ($symb,$partid,$resid); + my ($symb,$partid,$respid,$resptype) = split(':',$problemstring); + return ({ symb => $symb, + part => $partid, + respid => $respid, + type => $resptype } ); } sub get_resource_from_symb { @@ -1296,10 +1574,99 @@ 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)}); +} + +######################################################### +######################################################### +## +## Misc Option Response functions +## +######################################################### +######################################################### sub get_time_from_row { my ($row) = @_; if (ref($row)) { - return $row->[3]; + return $row->[&Apache::loncoursedata::RD_timestamp()]; } return undef; } @@ -1307,15 +1674,30 @@ sub get_time_from_row { sub get_tries_from_row { my ($row) = @_; if (ref($row)) { - return $row->[5]; + return $row->[&Apache::loncoursedata::RD_tries()]; } return undef; } -sub Process_Row { +sub hashify_attempt { + my ($row) = @_; + my %attempt; + $attempt{'tries'} = $row->[&Apache::loncoursedata::RD_tries()]; + $attempt{'submission'} = $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,$award,$grading,$submission,$time,$tries) = @$row; + 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; @@ -1355,25 +1737,25 @@ sub get_problem_data { $key =~ s/^$part\.//; if (ref($value) eq 'ARRAY') { if ($key eq 'options') { - $Partdata{$part}->{'Options'}=$value; + $Partdata{$part}->{'_Options'}=$value; } elsif ($key eq 'concepts') { - $Partdata{$part}->{'Concepts'}=$value; + $Partdata{$part}->{'_Concepts'}=$value; } elsif ($key =~ /^concept\.(.*)$/) { my $concept = $1; foreach my $foil (@$value) { - $Partdata{$part}->{'Foils'}->{$foil}->{'Concept'}= + $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}= $concept; } } } else { if ($key=~ /^foil\.text\.(.*)$/) { my $foil = $1; - $Partdata{$part}->{'Foils'}->{$foil}->{'name'}=$foil; + $Partdata{$part}->{'_Foils'}->{$foil}->{'name'}=$foil; $value =~ s/(\s*$|^\s*)//g; - $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value; + $Partdata{$part}->{'_Foils'}->{$foil}->{'text'}=$value; } elsif ($key =~ /^foil\.value\.(.*)$/) { my $foil = $1; - $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value; + $Partdata{$part}->{'_Foils'}->{$foil}->{'value'}=$value; } } } @@ -1384,3 +1766,11 @@ sub get_problem_data { 1; __END__ + +##### +# partdata{part}->{_Foils}->{foilid}->{'name'} = $ +# ->{'text'} = $ +# ->{'value'} = $ +# ->{'_Concept'} = $ +# partdata{part}->{_Options} = @ +# partdata{part}->{_Concepts} = @