--- loncom/interface/statistics/lonproblemanalysis.pm 2003/10/30 16:24:36 1.47 +++ loncom/interface/statistics/lonproblemanalysis.pm 2004/02/16 19:59:49 1.67 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.47 2003/10/30 16:24:36 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.67 2004/02/16 19:59:49 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -24,7 +24,6 @@ # # http://www.lon-capa.org/ # - package Apache::lonproblemanalysis; use strict; @@ -34,6 +33,7 @@ use Apache::lonhtmlcommon(); use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonlocal; +use Apache::lonstathelpers; use HTML::Entities(); use Time::Local(); use Spreadsheet::WriteExcel(); @@ -43,37 +43,40 @@ 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' }); -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)=@_; - $r->print('

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

'); + # + 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('Detailed Problem Analysis').'

'); $r->print(&CreateInterface()); # my @Students = @Apache::lonstatistics::Students; @@ -96,41 +99,68 @@ sub BuildProblemAnalysisPage { } $r->rflush(); # + my $problem_types = '(option|radiobutton|numerical)'; 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 = &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'}.'

'); - $r->print(&render_resource($resource)); + $r->print(&Apache::lonstathelpers::render_resource($resource)); $r->rflush(); - if ($resptype eq 'option') { - my %Data = &get_OR_problem_data($resource->{'src'}); - my $ProblemData = $Data{$part.'.'.$resid}; - &OptionResponseAnalysis($r,$resource,$resid,$ProblemData, + 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 ($resptype eq 'radiobutton') { - $r->print('

This analysis is not supported

'); - my %Data = &get_Radio_problem_data($resource->{'src'}); - my $ProblemData = $Data{$part.'.'.$resid}; - &RadioResponseAnalysis($r,$resource,$resid,$ProblemData, + } elsif ($current_problem->{'resptype'} eq 'radiobutton') { + &RadioResponseAnalysis($r,$current_problem, + $ProblemData, \@Students); + } elsif ($current_problem->{'resptype'} eq 'numerical') { + &NumericalResponseAnalysis($r,$current_problem, + $ProblemData,\@Students); } else { $r->print('

This analysis is not supported

'); } @@ -141,10 +171,72 @@ sub BuildProblemAnalysisPage { &mt('Analyze Problem').'" />'); $r->print(' 'x5); $r->print('

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

'); - $r->print(&ProblemSelector()); + $r->print(&Apache::lonstathelpers::ProblemSelector + ($problem_types)); } } +######################################################### +######################################################### +## +## Numerical Response Routines +## +######################################################### +######################################################### +sub NumericalResponseAnalysis { + 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; + } + my $Answers = &GetStudentAnswers($r,$problem,$Students); + + $r->print('

This analysis is not yet supported

'); +} + +sub GetStudentAnswers { + my ($r,$problem,$Students) = @_; + my %Answers; + my ($resource,$partid,$respid) = ($problem->{'resource'}, + $problem->{'part'}, + $problem->{'respid'}); + # Open progress window + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin + ($r,'Student Answer Compilation Status', + 'Student Answer Compilation Progress', scalar(@$Students)); + $r->print("\n"); + $r->rflush(); + foreach my $student (@$Students) { + my $sname = $student->{'username'}; + my $sdom = $student->{'domain'}; + my $answer = analyze_problem_as_student($resource, + $sname,$sdom, + $partid,$respid); + $r->print(''. + ''. + ''. + ''. + ''."\n"); + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, + &mt('last student')); + $Answers{$sname.':'.$sdom}=$answer; + } + $r->print("
'.$sname.''.$sdom.''.$answer.'
\n"); + $r->rflush(); + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + # close progress window + return \%Answers; +} ######################################################### ######################################################### @@ -154,19 +246,183 @@ sub BuildProblemAnalysisPage { ######################################################### ######################################################### sub RadioResponseAnalysis { - my ($r,$resource,$resid,$ProblemData,$Students) = @_; + 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'},$resid); - if (! ref($PerformanceData)) { - $r->print('

There is no submission data for this resource

'); + ($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; } -# foreach my $row (@$PerformanceData) { -# &Apache::lonnet::logthis('row = '.join(',',@$row)); + 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'). + '

'; + } + $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 ((! defined($Concepts)) || ((@$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; + 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; + # + # 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 ($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)); + } + } + } + my $title='Attempt '.$try; + my $xlabel = $total.' Submissions'; + $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,$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; + } + } + } + return %Partdata; } + ######################################################### ######################################################### ## @@ -175,10 +431,13 @@ sub RadioResponseAnalysis { ######################################################### ######################################################### 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('

'. @@ -187,20 +446,20 @@ sub OptionResponseAnalysis { } else { $r->rflush(); if (exists($ENV{'form.ExcelOutput'})) { - my $result = &prepare_optionresponse_excel_sheet($r,$resource, - $PerformanceData, - $ProblemData); + my $result = &OR_excel_sheet($r,$resource, + $PerformanceData, + $ProblemData); $r->print($result); $r->rflush(); } else { if ($ENV{'form.AnalyzeOver'} eq 'Tries') { - my $analysis_html = &tries_analysis($r, + my $analysis_html = &OR_tries_analysis($r, $PerformanceData, $ProblemData); $r->print($analysis_html); $r->rflush(); } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { - my $analysis_html = &time_analysis($PerformanceData, + my $analysis_html = &OR_time_analysis($PerformanceData, $ProblemData); $r->print($analysis_html); $r->rflush(); @@ -219,7 +478,7 @@ sub OptionResponseAnalysis { # Option Response: Tries Analysis # ######################################################### -sub tries_analysis { +sub OR_tries_analysis { my ($r,$PerformanceData,$ORdata) = @_; my $mintries = 1; my $maxtries = $ENV{'form.NumPlots'}; @@ -231,21 +490,21 @@ sub tries_analysis { '

'.$table; $ENV{'form.AnalyzeAs'} = 'Foils'; } - my %ResponseData = &analyze_option_data_by_tries($r,$PerformanceData, + my %ResponseData = &OR_analyze_by_tries($r,$PerformanceData, $mintries,$maxtries); my $analysis = ''; if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $analysis = &Tries_Foil_Analysis($mintries,$maxtries,$Foils, + $analysis = &OR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, \%ResponseData,$ORdata); } else { - $analysis = &Tries_Concept_Analysis($mintries,$maxtries, + $analysis = &OR_Tries_Concept_Analysis($mintries,$maxtries, $Concepts,\%ResponseData,$ORdata); } $table .= $analysis; return $table; } -sub Tries_Foil_Analysis { +sub OR_Tries_Foil_Analysis { my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_; my %ResponseData = %$respdat; # @@ -260,7 +519,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) { @@ -294,16 +553,17 @@ 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::DrawBarGraph ($title,'Foil Number','Percent Correct', - 100,$plotcolors,$Datasets[0]); + 100,$plotcolors,undef,$Datasets[0]); $analysis_html.= ''.$correctgraph.''; ## ## + next if (! defined($Datasets[0])); for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) { $Datasets[0]->[$i]=0; } @@ -318,7 +578,7 @@ sub Tries_Foil_Analysis { $title = 'Attempt '.$i.', '.$count; my $incorrectgraph = &Apache::loncommon::DrawBarGraph ($title,'Foil Number','% Option Chosen Incorrectly', - 100,$plotcolors,@Datasets); + 100,$plotcolors,undef,@Datasets); $analysis_html.= ''.$incorrectgraph.''; $analysis_html.= ''.$foilkey."\n"; } @@ -326,7 +586,7 @@ sub Tries_Foil_Analysis { return $analysis_html; } -sub Tries_Concept_Analysis { +sub OR_Tries_Concept_Analysis { my ($mintries,$maxtries,$Concepts,$respdat,$ORdata) = @_; my %ResponseData = %$respdat; my $analysis_html = "\n"; @@ -385,14 +645,14 @@ sub Tries_Concept_Analysis { $title = 'Attempt '.$i.', '.$count; my $graphlink = &Apache::loncommon::DrawBarGraph ($title,'Concept Number','Percent Correct', - 100,$plotcolors,$PlotData[$i]->{'_correct'}); + 100,$plotcolors,undef,$PlotData[$i]->{'_correct'}); $analysis_html.= '\n"; } $analysis_html .= "
'.$graphlink."
\n"; return $analysis_html; } -sub analyze_option_data_by_tries { +sub OR_analyze_by_tries { my ($r,$PerformanceData,$mintries,$maxtries) = @_; my %Trydata; $mintries = 1 if (! defined($mintries) || $mintries < 1); @@ -420,7 +680,7 @@ sub analyze_option_data_by_tries { # Option Response: Time Analysis # ######################################################### -sub time_analysis { +sub OR_time_analysis { my ($PerformanceData,$ORdata) = @_; my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) { @@ -478,10 +738,10 @@ sub time_analysis { enddateform => $enddateform, }; if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $table .= &Foil_Time_Analysis($PerformanceData,$ORdata,$Foils, + $table .= &OR_Foil_Time_Analysis($PerformanceData,$ORdata,$Foils, $interval); } else { - $table .= &Concept_Time_Analysis($PerformanceData,$ORdata, + $table .= &OR_Concept_Time_Analysis($PerformanceData,$ORdata, $Concepts,$interval); } } @@ -489,7 +749,7 @@ sub time_analysis { return $table; } -sub Foil_Time_Analysis { +sub OR_Foil_Time_Analysis { my ($PerformanceData,$ORdata,$Foils,$interval) = @_; my $analysis_html; my $foilkey = &build_option_index($ORdata); @@ -523,7 +783,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 { @@ -550,6 +810,7 @@ sub Foil_Time_Analysis { 'Percent Correct', 100, $plotcolors, + undef, $Plotdata[0]); for (my $j=0; $j< scalar(@{$Plotdata[0]});$j++) { $Plotdata[0]->[$j]=0; @@ -567,6 +828,7 @@ sub Foil_Time_Analysis { 'Incorrect Option Choice', 100, $plotcolors, + undef, @Plotdata); $analysis_html.=''. ''.$correctplot.''. @@ -584,7 +846,7 @@ sub Foil_Time_Analysis { return $analysis_html; } -sub Concept_Time_Analysis { +sub OR_Concept_Time_Analysis { my ($PerformanceData,$ORdata,$Concepts,$interval) = @_; my $analysis_html; ## @@ -631,6 +893,7 @@ sub Concept_Time_Analysis { 'Percent Correct', 100, $plotcolors, + undef, \@Plotdata); $analysis_html.=''. ''.$correctplot.''. @@ -652,7 +915,7 @@ sub Concept_Time_Analysis { ## ######################################################### ######################################################### -sub prepare_optionresponse_excel_sheet { +sub OR_excel_sheet { my ($r,$resource,$PerformanceData,$ORdata) = @_; my $response = ''; my (undef,$Foils,$Concepts) = &build_foil_index($ORdata); @@ -696,16 +959,16 @@ sub prepare_optionresponse_excel_sheet { } # my $result; - $result = &build_problem_data_worksheet($problem_data_sheet,$format, + $result = &OR_build_problem_data_worksheet($problem_data_sheet,$format, $Concepts,$ORdata); if ($result ne 'okay') { # Do something useful } - $result = &build_student_data_worksheet($student_data_sheet,$format); + $result = &OR_build_student_data_worksheet($student_data_sheet,$format); if ($result ne 'okay') { # Do something useful } - $result = &build_response_data_worksheet($response_data_sheet,$format, + $result = &OR_build_response_data_worksheet($response_data_sheet,$format, $PerformanceData,$Foils, $ORdata); if ($result ne 'okay') { @@ -724,7 +987,7 @@ sub prepare_optionresponse_excel_sheet { return $result; } -sub build_problem_data_worksheet { +sub OR_build_problem_data_worksheet { my ($worksheet,$format,$Concepts,$ORdata) = @_; my $rows_output = 3; my $cols_output = 0; @@ -739,7 +1002,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) { @@ -787,13 +1050,13 @@ 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'; } -sub build_student_data_worksheet { +sub OR_build_student_data_worksheet { my ($worksheet,$format) = @_; my $rows_output = 3; my $cols_output = 0; @@ -819,7 +1082,7 @@ sub build_student_data_worksheet { return; } -sub build_response_data_worksheet { +sub OR_build_response_data_worksheet { my ($worksheet,$format,$PerformanceData,$Foils,$ORdata)=@_; my $rows_output = 3; my $cols_output = 0; @@ -1044,12 +1307,12 @@ sub _adjustment { sub build_foil_index { my ($ORdata) = @_; - return if (! exists($ORdata->{'Foils'})); - my %Foildata = %{$ORdata->{'Foils'}}; + 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'}}}, + push(@{$Concepts{$Foildata{$foilid}->{'_Concept'}}}, $foilid); } undef(@Foils); @@ -1069,16 +1332,24 @@ sub build_foil_index { ten => 10,); my $a1 = lc($a); my $b1 = lc($b); - if (exists($Numbers{$a})) { - $a1 = $Numbers{$a}; + if (exists($Numbers{$a1})) { + $a1 = $Numbers{$a1}; } - if (exists($Numbers{$b})) { - $b1 = $Numbers{$b}; + if (exists($Numbers{$b1})) { + $b1 = $Numbers{$b1}; + } + if (($a1 =~/^\d+$/) && ($b1 =~/^\d+$/)) { + return $a1 <=> $b1; + } else { + return $a1 cmp $b1; } - $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}})); @@ -1111,18 +1382,18 @@ sub build_foil_index { if (@Concepts > 1) { $table .= ''. ''.$conceptindex.''. - ''.$concept->{'name'}.''. + ''.&HTML::Entities::encode($concept->{'name'}).''. ''.$foilindex++.''. - ''.$Foildata{$firstfoil}->{'name'}.''. + ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).''. ''.$Foildata{$firstfoil}->{'text'}.''. - ''.$Foildata{$firstfoil}->{'value'}.''. + ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).''. "\n"; } else { $table .= ''. ''.$foilindex++.''. - ''.$Foildata{$firstfoil}->{'name'}.''. + ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).''. ''.$Foildata{$firstfoil}->{'text'}.''. - ''.$Foildata{$firstfoil}->{'value'}.''. + ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).''. "\n"; } foreach my $foilid (@FoilsInConcept) { @@ -1131,16 +1402,16 @@ sub build_foil_index { ''. ''. ''.$foilindex.''. - ''.$Foildata{$foilid}->{'name'}.''. + ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).''. ''.$Foildata{$foilid}->{'text'}.''. - ''.$Foildata{$foilid}->{'value'}.''. + ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).''. "\n"; } else { $table .= ''. ''.$foilindex.''. - ''.$Foildata{$foilid}->{'name'}.''. + ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).''. ''.$Foildata{$foilid}->{'text'}.''. - ''.$Foildata{$foilid}->{'value'}.''. + ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).''. "\n"; } } continue { @@ -1160,12 +1431,12 @@ sub build_option_index { my $table = "\n"; my $optionindex = 0; my @Rows; - foreach my $option (&mt('correct option chosen'),@{$ORdata->{'Options'}}) { + foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) { push (@Rows, ''. ''. - ''. + ''. "\n"); } shift(@Rows); # Throw away 'correct option chosen' color @@ -1223,6 +1494,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 .='\n"; - } - } - } - } - if ($seq_str ne '') { - $Str .= ''. - "\n".$seq_str; - } - } - $Str .= "
'. (' 'x4).''.$option.''.&HTML::Entities::encode($option).'
'. - ''. - ''. - ''.$resptype.' '.$res->{'title'}.' '; - if ($partdata->{'option'} > 1) { - $seq_str .= &mt('response').' '.$respid; - } - $seq_str .= "
 '.$seq->{'title'}.'
\n"; - return $Str; -} - -######################################################### -######################################################### -## -## Misc functions -## -######################################################### -######################################################### -sub get_problem_symb { - my $problemstring = shift(); - my ($symb,$partid,$resid,$resptype) = - ($problemstring=~ /^(.*):([^:]*):([^:]*):([^:]*)$/); - return ($symb,$partid,$resid,$resptype); -} - -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; - } - } - } - return undef; -} - - ######################################################### ######################################################### ## @@ -1379,6 +1576,16 @@ sub get_tries_from_row { return undef; } +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; @@ -1397,6 +1604,7 @@ sub Process_OR_Row { 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'}++; @@ -1409,12 +1617,33 @@ sub Process_OR_Row { return %RowData; } + +sub analyze_problem_as_student { + my ($resource,$sname,$sdom,$partid,$respid) = @_; + my $url = $resource->{'src'}; + my $symb = $resource->{'symb'}; + my $courseid = $ENV{'request.course.id'}; + my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze', + 'grade_domain' => $sdom, + 'grade_username' => $sname, + 'grade_symb' => $symb, + 'grade_courseid' => $courseid)); + (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2); + my %Answer=&Apache::lonnet::str2hash($Answ); + my $key = $partid.'.'.$respid.'.answer'; + my $student_answer = $Answer{$key}->[0]; + if (! defined($student_answer)) { + $student_answer = $Answer{$key}->[1]; + } + return ($student_answer); +} + ## ## 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_OR_problem_data { +sub get_problem_data { my ($url) = @_; my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze')); (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2); @@ -1423,77 +1652,46 @@ sub get_OR_problem_data { my %Partdata; foreach my $part (@{$Answer{'parts'}}) { while (my($key,$value) = each(%Answer)) { + # + # Logging code: + if (0) { + &Apache::lonnet::logthis($part.' got key "'.$key.'"'); + if (ref($value) eq 'ARRAY') { + &Apache::lonnet::logthis(' '.join(',',@$value)); + } else { + &Apache::lonnet::logthis(' '.$value); + } + } + # End of logging code next if ($key !~ /^$part/); $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; } + } elsif ($key =~ /^(incorrect|answer|ans_low|ans_high)$/) { + $Partdata{$part}->{$key}=$value; } } 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; } } } } - return %Partdata; -} - -######################################################### -######################################################### -## -## Misc Radio Response functions -## -######################################################### -######################################################### -sub get_Radio_problem_student_data { - my ($row) = @_; -} - -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; - %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') { - &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; }