--- loncom/interface/statistics/lonproblemanalysis.pm 2004/01/16 20:19:33 1.56 +++ loncom/interface/statistics/lonproblemanalysis.pm 2004/03/12 20:29:48 1.78 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.56 2004/01/16 20:19:33 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.78 2004/03/12 20:29:48 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,8 @@ use Apache::lonhtmlcommon(); use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonlocal; +use Apache::lonstathelpers(); +use Apache::lonstudentsubmissions(); use HTML::Entities(); use Time::Local(); use Spreadsheet::WriteExcel(); @@ -58,22 +60,6 @@ my @SubmitButtons = ({ name => 'PrevProb { 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)=@_; @@ -91,7 +77,6 @@ sub BuildProblemAnalysisPage { # &Apache::lonstatistics::PrepareClasslist(); # - $r->print('

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

'); $r->print(&CreateInterface()); # my @Students = @Apache::lonstatistics::Students; @@ -114,6 +99,7 @@ sub BuildProblemAnalysisPage { } $r->rflush(); # + my $problem_types = '(option|radiobutton|numerical)'; if (exists($ENV{'form.problemchoice'}) && ! exists($ENV{'form.SelectAnother'})) { foreach my $button (@SubmitButtons) { @@ -130,9 +116,14 @@ sub BuildProblemAnalysisPage { $r->rflush(); # # Determine which problem we are to analyze - my $current_problem = &get_target_from_id($ENV{'form.problemchoice'}); + my $current_problem = &Apache::lonstathelpers::get_target_from_id + ($ENV{'form.problemchoice'}); # - my ($prev,$curr,$next) = &get_prev_curr_next($current_problem); + 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)) { @@ -142,7 +133,8 @@ sub BuildProblemAnalysisPage { } # # Store the current problem choice and send it out in the form - $ENV{'form.problemchoice'} = &make_target_id($current_problem); + $ENV{'form.problemchoice'} = + &Apache::lonstathelpers::make_target_id($current_problem); $r->print(''); # @@ -152,9 +144,10 @@ sub BuildProblemAnalysisPage { 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(); - my %Data = &get_problem_data($resource->{'src'}); + my %Data = &Apache::lonstathelpers::get_problem_data + ($resource->{'src'}); my $ProblemData = $Data{$current_problem->{'part'}. '.'. $current_problem->{'respid'}}; @@ -166,6 +159,14 @@ sub BuildProblemAnalysisPage { &RadioResponseAnalysis($r,$current_problem, $ProblemData, \@Students); + } elsif ($current_problem->{'resptype'} eq 'numerical') { +# if (exists($ENV{'form.ExcelOutput'})) { +# &Apache::lonstudentsubmissions::prepare_excel_output +# ($r,$current_problem,$ProblemData,\@Students); +# } else { + &NumericalResponseAnalysis($r,$current_problem, + $ProblemData,\@Students); +# } } else { $r->print('

This analysis is not supported

'); } @@ -176,10 +177,193 @@ 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; } + # + # This next call causes all the waiting around that people complain about + my ($max,$min) = &GetStudentAnswers($r,$problem,$Students); + # + # Collate the data + my %Data; + foreach my $student (@$Students) { + my $answer = $student->{'answer'}; + $Data{$answer}++; + } + my @Labels = sort {$a <=> $b } keys(%Data); + my @PlotData = @Data{@Labels}; + # + my $width = 500; + my $height = 100; + my $plot = &one_dimensional_plot($r,500,100,scalar(@$Students), + \@Labels,\@PlotData); + $r->print($plot); + return; } +sub one_dimensional_plot { + my ($r,$width,$height,$N,$Labels,$Data)=@_; + # + # Compute data -> image scaling factors + my $min = $Labels->[0]; + my $max = $Labels->[-1]; + my $h_scale = ($width-10)/($max-$min); + # + my $max_y = 0; + foreach (@$Data) { + $max_y = $_ if ($max_y < $_); + } + my $ticscale = 5; + if ($max_y * $ticscale > $height/2) { + $ticscale = int($height/2/$max_y); + $ticscale = 1 if ($ticscale < 1); + } + # + # Create the plot + my $plot = + qq{}; + for (my $idx=0;$idx[$idx] - $min); + my $top = $height/2-$Data->[$idx]*$ticscale; + my $bottom = $height/2+$Data->[$idx]*$ticscale; + $plot .= + &line($xloc,$top,$xloc,$bottom,'888888',1); + } + # + # Put the scale on last to ensure it is on top of the data. + if ($min < 0 && $max > 0) { + my $circle_x = 5+$h_scale*abs($min); # '0' in data coordinates + my $r = 4; + $plot .= &line(5,$height/2,$circle_x-$r,$height/2,'000000',1); + $plot .= &circle($circle_x,$height/2,$r+1,'000000'); + $plot .= &line($circle_x+$r,$height/2,$width-5,$height/2,'000000',1); + } else { + $plot .= &line(5,$height/2,$width-5,$height/2,'000000',1); + } + $plot .= ''; + my $plotresult = &Apache::lonxml::xmlparse($r,'web',$plot); + + my $title = 'Distribution of correct answers'; + my $result = ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + '
'. + ''.$title.' (N='.$N.')'. + ''. + '
'.$min.''.$plotresult.''.$max.'
'. + 'Maximum Number of Coinciding Values: '.$max_y. + '
'; + return $result; +} + +## +## Helper subroutines for . +## These should probably go somewhere more suitable soon. +sub line { + my ($x1,$y1,$x2,$y2,$color,$thickness) = @_; + return qq{$/}; +} + +sub rectangle { + my ($x1,$y1,$x2,$y2,$color,$thickness,$filled) = @_; + return qq{}; +} + +sub arc { + my ($x,$y,$width,$height,$start,$end,$color,$thickness,$filled)=@_; + return qq{}; +} + +sub circle { + my ($x,$y,$radius,$color,$thickness,$filled)=@_; + return &arc($x,$y,$radius,$radius,0,360,$color,$thickness,$filled); +} + +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 = &Apache::lonstathelpers::analyze_problem_as_student + ($resource,$sname,$sdom,$partid,$respid); + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, + &mt('last student')); + $student->{'answer'} = $answer; + } + $r->print("
\n"); + $r->rflush(); + # close progress window + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + return; +} + +sub build_student_data_worksheet { + my ($workbook,$format) = @_; + my $rows_output = 3; + my $cols_output = 0; + my $worksheet = $workbook->addworksheet('Student Data'); + $worksheet->write($rows_output++,0,'Student Data',$format->{'h3'}); + my @Headers = ('full name','username','domain','section', + "student\nnumber",'identifier'); + $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'}); + my @Students = @Apache::lonstatistics::Students; + my $studentrows = &Apache::loncoursedata::get_student_data(\@Students); + my %ids; + foreach my $row (@$studentrows) { + my ($mysqlid,$student) = @$row; + $ids{$student}=$mysqlid; + } + foreach my $student (@Students) { + my $name_domain = $student->{'username'}.':'.$student->{'domain'}; + $worksheet->write_row($rows_output++,0, + [$student->{'fullname'}, + $student->{'username'},$student->{'domain'}, + $student->{'section'},$student->{'id'}, + $ids{$name_domain}]); + } + return $worksheet; +} ######################################################### ######################################################### @@ -191,7 +375,7 @@ sub BuildProblemAnalysisPage { sub RadioResponseAnalysis { my ($r,$problem,$ProblemData,$Students) = @_; my ($resource,$respid) = ($problem->{'resource'}, - $problem->{'respid'}); + $problem->{'respid'}); my $analysis_html; my $PerformanceData = &Apache::loncoursedata::get_response_data @@ -232,7 +416,8 @@ sub RR_Tries_Analysis { my $mintries = 1; my $maxtries = $ENV{'form.NumPlots'}; my ($table,$Foils,$Concepts) = &build_foil_index($ProblemData); - if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) { + if ((! defined($Concepts)) || ((@$Concepts < 2) && + ($ENV{'form.AnalyzeAs'} ne 'Foils'))) { $table = '

'. &mt('Not enough data for concept analysis. '. 'Performing Foil Analysis'). @@ -308,6 +493,7 @@ sub RR_Tries_Foil_Analysis { 'Percent Choosing', 100, ['#33ff00','#ff3300'], + undef, \@PlotData_Correct, \@PlotData_Incorrect); } @@ -387,20 +573,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(); @@ -419,114 +605,134 @@ 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'}; my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); - if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) { + 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'; } - 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,$Concepts, \%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 { - my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_; +sub OR_Tries_Foil_Analysis { + my ($mintries,$maxtries,$Concepts,$respdat,$ORdata) = @_; my %ResponseData = %$respdat; # # Compute the data neccessary to make the plots my @PlotData; - foreach my $foilid (@$Foils) { - for (my $i=$mintries;$i<=$maxtries;$i++) { - if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) { - push(@{$PlotData[$i]->{'_correct'}},0); - } else { - push(@{$PlotData[$i]->{'_correct'}}, - 100*$ResponseData{$foilid}->[$i]->{'_correct'}/ - $ResponseData{$foilid}->[$i]->{'_total'}); - } - foreach my $option (@{$ORdata->{'_Options'}}) { - push(@{$PlotData[$i]->{'_total'}}, - $ResponseData{$foilid}->[$i]->{'_total'}); - if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) { - push (@{$PlotData[$i]->{$option}},0); + foreach my $concept (@$Concepts) { + foreach my $foilid (@{$concept->{'foils'}}) { + for (my $try=$mintries;$try<=$maxtries;$try++) { + if ($ResponseData{$foilid}->[$try]->{'_total'} == 0) { + push(@{$PlotData[$try]->{'_correct'}},0); } else { - if ($ResponseData{$foilid}->[$i]->{'_total'} == - $ResponseData{$foilid}->[$i]->{'_correct'}) { - push(@{$PlotData[$i]->{$option}},0); + push(@{$PlotData[$try]->{'_correct'}}, + 100*$ResponseData{$foilid}->[$try]->{'_correct'}/ + $ResponseData{$foilid}->[$try]->{'_total'}); + } + foreach my $option (@{$ORdata->{'_Options'}}) { + push(@{$PlotData[$try]->{'_total'}}, + $ResponseData{$foilid}->[$try]->{'_total'}); + if ($ResponseData{$foilid}->[$try]->{'_total'} == 0) { + push (@{$PlotData[$try]->{$option}},0); } else { - push (@{$PlotData[$i]->{$option}}, - 100 * $ResponseData{$foilid}->[$i]->{$option} / - ($ResponseData{$foilid}->[$i]->{'_total'} - - $ResponseData{$foilid}->[$i]->{'_correct'})); + if ($ResponseData{$foilid}->[$try]->{'_total'} == + $ResponseData{$foilid}->[$try]->{'_correct'}) { + push(@{$PlotData[$try]->{$option}},0); + } else { + push (@{$PlotData[$try]->{$option}}, + 100 * + $ResponseData{$foilid}->[$try]->{$option} / + ($ResponseData{$foilid}->[$try]->{'_total'} + - + $ResponseData{$foilid}->[$try]->{'_correct'} + )); + } } - } + } # End of foreach my $option } - } - } + } # End of foreach my $foilid + } # End of foreach my $concept # # Build a table for the plots my $analysis_html = "\n"; - my $foilkey = &build_option_index($ORdata); - for (my $i=$mintries;$i<=$maxtries;$i++) { - my $count = $ResponseData{'_total'}->[$i]; - if ($count == 0) { - $count = 'no submissions'; - } elsif ($count == 1) { - $count = '1 submission'; - } else { - $count = $count.' submissions'; - } - my $title = 'Attempt '.$i.', '.$count; + my $optionkey = &build_option_index($ORdata); + for (my $try=$mintries;$try<=$maxtries;$try++) { + my $count = $ResponseData{'_total'}->[$try]; + my $title = 'Submission '.$try.' (N='.$count.')'; my @Datasets; foreach my $option ('_correct',@{$ORdata->{'_Options'}}) { - next if (! exists($PlotData[$i]->{$option})); - push(@Datasets,$PlotData[$i]->{$option}); + next if (! exists($PlotData[$try]->{$option})); + push(@Datasets,$PlotData[$try]->{$option}); + } + # + # Put a blank in the data set between concepts + for (my $set =0;$set<=$#Datasets;$set++) { + my @Data = @{$Datasets[$set]}; + my $idx = 0; + foreach my $concept (@{$Concepts}) { + foreach my $foilid (@{$concept->{'foils'}}) { + $Datasets[$set]->[$idx++]=shift(@Data); + } + if ($concept->{'name'} ne $Concepts->[-1]->{'name'}) { + $Datasets[$set]->[$idx++] = 0; + } + } } + # + # Set up the labels needed for the bar graph + my @Labels; + my $idx = 1; + foreach my $concept (@{$Concepts}) { + foreach my $foilid (@{$concept->{'foils'}}) { + push(@Labels,$idx++); + } + push(@Labels,''); + } + # my $correctgraph = &Apache::loncommon::DrawBarGraph ($title,'Foil Number','Percent Correct', - 100,$plotcolors,$Datasets[0]); + 100,$plotcolors,\@Labels,$Datasets[0]); $analysis_html.= ''; - ## - ## + + # + # + next if (! defined($Datasets[0])); for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) { $Datasets[0]->[$i]=0; } - $count = $ResponseData{'_total'}->[$i]-$ResponseData{'_correct'}->[$i]; - if ($count == 0) { - $count = 'no submissions'; - } elsif ($count == 1) { - $count = '1 submission'; - } else { - $count = $count.' submissions'; - } - $title = 'Attempt '.$i.', '.$count; + $count = $ResponseData{'_total'}->[$try] - + $ResponseData{'_correct'}->[$try]; + $title = 'Submission '.$try.' (N='.$count.')'; my $incorrectgraph = &Apache::loncommon::DrawBarGraph ($title,'Foil Number','% Option Chosen Incorrectly', - 100,$plotcolors,@Datasets); + 100,$plotcolors,\@Labels,@Datasets); $analysis_html.= ''; - $analysis_html.= '\n"; + $analysis_html.= '\n"; } $analysis_html .= "
'.$correctgraph.''.$incorrectgraph.''.$foilkey."
'.$optionkey."
\n"; 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"; @@ -585,14 +791,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); @@ -620,7 +826,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')) { @@ -678,10 +884,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); } } @@ -689,7 +895,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); @@ -750,6 +956,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; @@ -767,6 +974,7 @@ sub Foil_Time_Analysis { 'Incorrect Option Choice', 100, $plotcolors, + undef, @Plotdata); $analysis_html.=''. ''.$correctplot.''. @@ -784,7 +992,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; ## @@ -831,6 +1039,7 @@ sub Concept_Time_Analysis { 'Percent Correct', 100, $plotcolors, + undef, \@Plotdata); $analysis_html.=''. ''.$correctplot.''. @@ -852,7 +1061,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); @@ -872,22 +1081,11 @@ sub prepare_optionresponse_excel_sheet { } # $workbook->set_tempdir('/home/httpd/perl/tmp'); - # - # Define some potentially useful formats - my $format; - $format->{'header'} = $workbook->add_format(bold => 1, - bottom => 1, - align => 'center'); - $format->{'bold'} = $workbook->add_format(bold=>1); - $format->{'h1'} = $workbook->add_format(bold=>1, size=>18); - $format->{'h2'} = $workbook->add_format(bold=>1, size=>16); - $format->{'h3'} = $workbook->add_format(bold=>1, size=>14); - $format->{'date'} = $workbook->add_format(num_format=> - 'mmm d yyyy hh:mm AM/PM'); + my $format = &Apache::loncommon::define_excel_formats($workbook); # # Create and populate main worksheets my $problem_data_sheet = $workbook->addworksheet('Problem Data'); - my $student_data_sheet = $workbook->addworksheet('Student Data'); + my $student_data_sheet = &build_student_data_worksheet($workbook,$format); my $response_data_sheet = $workbook->addworksheet('Response Data'); foreach my $sheet ($problem_data_sheet,$student_data_sheet, $response_data_sheet) { @@ -896,16 +1094,12 @@ 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); - 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') { @@ -924,7 +1118,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; @@ -993,33 +1187,7 @@ sub build_problem_data_worksheet { return 'okay'; } -sub build_student_data_worksheet { - my ($worksheet,$format) = @_; - my $rows_output = 3; - my $cols_output = 0; - $worksheet->write($rows_output++,0,'Student Data',$format->{'h3'}); - my @Headers = ('full name','username','domain','section', - "student\nnumber",'identifier'); - $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'}); - my @Students = @Apache::lonstatistics::Students; - my $studentrows = &Apache::loncoursedata::get_student_data(\@Students); - my %ids; - foreach my $row (@$studentrows) { - my ($mysqlid,$student) = @$row; - $ids{$student}=$mysqlid; - } - foreach my $student (@Students) { - my $name_domain = $student->{'username'}.':'.$student->{'domain'}; - $worksheet->write_row($rows_output++,0, - [$student->{'fullname'}, - $student->{'username'},$student->{'domain'}, - $student->{'section'},$student->{'id'}, - $ids{$name_domain}]); - } - 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; @@ -1048,7 +1216,7 @@ sub build_response_data_worksheet { } $worksheet->write($rows_output,$cols_output++,$student); $worksheet->write($rows_output,$cols_output++, - &calc_serial($time),$format->{'date'}); + &Apache::lonstathelpers::calc_serial($time),$format->{'date'}); $worksheet->write($rows_output,$cols_output++,$award); $worksheet->write($rows_output,$cols_output++,$tries); foreach my $foilid (@$Foils) { @@ -1063,185 +1231,6 @@ sub build_response_data_worksheet { return; } - -## -## The following is copied from datecalc1.pl, part of the -## Spreadsheet::WriteExcel CPAN module. -## -## -###################################################################### -# -# Demonstration of writing date/time cells to Excel spreadsheets, -# using UNIX/Perl time as source of date/time. -# -# Copyright 2000, Andrew Benham, adsb@bigfoot.com -# -###################################################################### -# -# UNIX/Perl time is the time since the Epoch (00:00:00 GMT, 1 Jan 1970) -# measured in seconds. -# -# An Excel file can use exactly one of two different date/time systems. -# In these systems, a floating point number represents the number of days -# (and fractional parts of the day) since a start point. The floating point -# number is referred to as a 'serial'. -# The two systems ('1900' and '1904') use different starting points: -# '1900'; '1.00' is 1 Jan 1900 BUT 1900 is erroneously regarded as -# a leap year - see: -# http://support.microsoft.com/support/kb/articles/Q181/3/70.asp -# for the excuse^H^H^H^H^H^Hreason. -# '1904'; '1.00' is 2 Jan 1904. -# -# The '1904' system is the default for Apple Macs. Windows versions of -# Excel have the option to use the '1904' system. -# -# Note that Visual Basic's "DateSerial" function does NOT erroneously -# regard 1900 as a leap year, and thus its serials do not agree with -# the 1900 serials of Excel for dates before 1 Mar 1900. -# -# Note that StarOffice (at least at version 5.2) does NOT erroneously -# regard 1900 as a leap year, and thus its serials do not agree with -# the 1900 serials of Excel for dates before 1 Mar 1900. -# -###################################################################### -# -# Calculation description -# ======================= -# -# 1900 system -# ----------- -# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 70 years after 1 Jan 1900. -# Of those 70 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68) -# were leap years with an extra day. -# Thus there were 17 + 70*365 days = 25567 days between 1 Jan 1900 and -# 1 Jan 1970. -# In the 1900 system, '1' is 1 Jan 1900, but as 1900 was not a leap year -# 1 Jan 1900 should really be '2', so 1 Jan 1970 is '25569'. -# -# 1904 system -# ----------- -# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 66 years after 1 Jan 1904. -# Of those 66 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68) -# were leap years with an extra day. -# Thus there were 17 + 66*365 days = 24107 days between 1 Jan 1904 and -# 1 Jan 1970. -# In the 1904 system, 2 Jan 1904 being '1', 1 Jan 1970 is '24107'. -# -###################################################################### -# -# Copyright (c) 2000, Andrew Benham. -# This program is free software. It may be used, redistributed and/or -# modified under the same terms as Perl itself. -# -# Andrew Benham, adsb@bigfoot.com -# London, United Kingdom -# 11 Nov 2000 -# -###################################################################### - -# Use 1900 date system on all platforms other than Apple Mac (for which -# use 1904 date system). -my $DATE_SYSTEM = ($^O eq 'MacOS') ? 1 : 0; - -#----------------------------------------------------------- -# calc_serial() -# -# Called with (up to) 2 parameters. -# 1. Unix timestamp. If omitted, uses current time. -# 2. GMT flag. Set to '1' to return serial in GMT. -# If omitted, returns serial in appropriate timezone. -# -# Returns date/time serial according to $DATE_SYSTEM selected -#----------------------------------------------------------- -sub calc_serial { - my $time = (defined $_[0]) ? $_[0] : time(); - my $gmtflag = (defined $_[1]) ? $_[1] : 0; - - # Divide timestamp by number of seconds in a day. - # This gives a date serial with '0' on 1 Jan 1970. - my $serial = $time / 86400; - - # Adjust the date serial by the offset appropriate to the - # currently selected system (1900/1904). - if ($DATE_SYSTEM == 0) { # use 1900 system - $serial += 25569; - } else { # use 1904 system - $serial += 24107; - } - - unless ($gmtflag) { - # Now have a 'raw' serial with the right offset. But this - # gives a serial in GMT, which is false unless the timezone - # is GMT. We need to adjust the serial by the appropriate - # timezone offset. - # Calculate the appropriate timezone offset by seeing what - # the differences between localtime and gmtime for the given - # time are. - - my @gmtime = gmtime($time); - my @ltime = localtime($time); - - # For the first 7 elements of the two arrays, adjust the - # date serial where the elements differ. - for (0 .. 6) { - my $diff = $ltime[$_] - $gmtime[$_]; - if ($diff) { - $serial += _adjustment($diff,$_); - } - } - } - - # Perpetuate the error that 1900 was a leap year by decrementing - # the serial if we're using the 1900 system and the date is prior to - # 1 Mar 1900. This has the effect of making serial value '60' - # 29 Feb 1900. - - # This fix only has any effect if UNIX/Perl time on the platform - # can represent 1900. Many can't. - - unless ($DATE_SYSTEM) { - $serial-- if ($serial < 61); # '61' is 1 Mar 1900 - } - return $serial; -} - -sub _adjustment { - # Based on the difference in the localtime/gmtime array elements - # number, return the adjustment required to the serial. - - # We only look at some elements of the localtime/gmtime arrays: - # seconds unlikely to be different as all known timezones - # have an offset of integral multiples of 15 minutes, - # but it's easy to do. - # minutes will be different for timezone offsets which are - # not an exact number of hours. - # hours very likely to be different. - # weekday will differ when localtime/gmtime difference - # straddles midnight. - # - # Assume that difference between localtime and gmtime is less than - # 5 days, then don't have to do maths for day of month, month number, - # year number, etc... - - my ($delta,$element) = @_; - my $adjust = 0; - - if ($element == 0) { # Seconds - $adjust = $delta/86400; # 60 * 60 * 24 - } elsif ($element == 1) { # Minutes - $adjust = $delta/1440; # 60 * 24 - } elsif ($element == 2) { # Hours - $adjust = $delta/24; # 24 - } elsif ($element == 6) { # Day of week number - # Catch difference straddling Sat/Sun in either direction - $delta += 7 if ($delta < -4); - $delta -= 7 if ($delta > 4); - - $adjust = $delta; - } - return $adjust; -} - sub build_foil_index { my ($ORdata) = @_; return if (! exists($ORdata->{'_Foils'})); @@ -1269,16 +1258,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{$b1})) { + $b1 = $Numbers{$b1}; } - if (exists($Numbers{$b})) { - $b1 = $Numbers{$b}; + 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}})); @@ -1311,18 +1308,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) { @@ -1331,16 +1328,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 { @@ -1365,7 +1362,7 @@ sub build_option_index { ''. ''. (' 'x4).''. - ''.$option.''. + ''.&HTML::Entities::encode($option).''. "\n"); } shift(@Rows); # Throw away 'correct option chosen' color @@ -1389,6 +1386,8 @@ sub CreateInterface { ## ## Build the menu my $Str = ''; + $Str .= &Apache::lonhtmlcommon::breadcrumbs + (undef,'Detailed Problem Analysis'); $Str .= ''."\n"; $Str .= ''; $Str .= ''; @@ -1482,180 +1481,6 @@ sub CreateInterface { return $Str; } -sub ProblemSelector { - my $Str; - $Str = "\n
'.&mt('Sections').'
\n"; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - next if ($seq->{'num_assess'}<1); - my $seq_str = ''; - foreach my $res (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); - foreach my $part (@{$res->{'parts'}}) { - my $partdata = $res->{'partdata'}->{$part}; -# &Apache::lonnet::logthis('----------------'); -# while (my ($k,$v)=each(%$partdata)) { -# if (ref($v) eq 'ARRAY') { -# &Apache::lonnet::logthis($k.' = '.join(',',@$v)); -# } else { -# &Apache::lonnet::logthis($k.' = '.$v); -# } -# } - if ((! exists($partdata->{'option'}) || - $partdata->{'option'} == 0 ) && - (! exists($partdata->{'radiobutton'}) || - $partdata->{'radiobutton'} == 0)) { - next; - } - 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 = &make_target_id({symb=>$res->{'symb'}, - part=>$part, - respid=>$respid, - resptype=>$resptype}); - my $checked = ''; - if ($ENV{'form.problemchoice'} eq $value) { - $checked = 'checked '; - } - my $title = $res->{'title'}; - if (! defined($title) || $title eq '') { - ($title) = ($res->{'src'} =~ m:/([^/]*)$:); - } - $seq_str .= '\n"; - } - } - } - } - if ($seq_str ne '') { - $Str .= ''. - "\n".$seq_str; - } - } - $Str .= "
'. - ''. - ''. -#.$resptype.''. - ''.$title.' '; -# ''.$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,$respid,$resptype) = split(':',$problemstring); - return ({ symb => $symb, - part => $partid, - respid => $respid, - type => $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; -} - -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)}); -} - ######################################################### ######################################################### ## @@ -1707,6 +1532,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'}++; @@ -1719,58 +1545,6 @@ sub Process_OR_Row { return %RowData; } -## -## get problem data and put it into a useful data structure. -## note: we must force each foil and option to not begin or end with -## spaces as they are stored without such data. -## -sub get_problem_data { - my ($url) = @_; - my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze')); - (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2); - my %Answer; - %Answer=&Apache::lonnet::str2hash($Answ); - my %Partdata; - foreach my $part (@{$Answer{'parts'}}) { - while (my($key,$value) = each(%Answer)) { - next if ($key !~ /^$part/); - $key =~ s/^$part\.//; - if (ref($value) eq 'ARRAY') { - if ($key eq 'options') { - $Partdata{$part}->{'_Options'}=$value; - } elsif ($key eq 'concepts') { - $Partdata{$part}->{'_Concepts'}=$value; - } elsif ($key =~ /^concept\.(.*)$/) { - my $concept = $1; - foreach my $foil (@$value) { - $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}= - $concept; - } - } - } else { - if ($key=~ /^foil\.text\.(.*)$/) { - my $foil = $1; - $Partdata{$part}->{'_Foils'}->{$foil}->{'name'}=$foil; - $value =~ s/(\s*$|^\s*)//g; - $Partdata{$part}->{'_Foils'}->{$foil}->{'text'}=$value; - } elsif ($key =~ /^foil\.value\.(.*)$/) { - my $foil = $1; - $Partdata{$part}->{'_Foils'}->{$foil}->{'value'}=$value; - } - } - } - } - return %Partdata; -} - 1; __END__ - -##### -# partdata{part}->{_Foils}->{foilid}->{'name'} = $ -# ->{'text'} = $ -# ->{'value'} = $ -# ->{'_Concept'} = $ -# partdata{part}->{_Options} = @ -# partdata{part}->{_Concepts} = @