--- loncom/interface/statistics/lonproblemanalysis.pm 2004/01/08 19:20:12 1.53 +++ loncom/interface/statistics/lonproblemanalysis.pm 2004/02/18 17:33:12 1.69 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.53 2004/01/08 19:20:12 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.69 2004/02/18 17:33:12 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,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(); @@ -42,8 +43,13 @@ 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', @@ -53,22 +59,6 @@ my @SubmitButtons = ({ name => 'ProblemA { 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)=@_; @@ -86,7 +76,7 @@ sub BuildProblemAnalysisPage { # &Apache::lonstatistics::PrepareClasslist(); # - $r->print('

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

'); + $r->print('

'.&mt('Detailed Problem Analysis').'

'); $r->print(&CreateInterface()); # my @Students = @Apache::lonstatistics::Students; @@ -109,38 +99,73 @@ 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(); my %Data = &get_problem_data($resource->{'src'}); - my $ProblemData = $Data{$part.'.'.$resid}; - if ($resptype eq 'option') { - &OptionResponseAnalysis($r,$resource,$resid,$ProblemData, + my $ProblemData = $Data{$current_problem->{'part'}. + '.'. + $current_problem->{'respid'}}; + if ($current_problem->{'resptype'} eq 'option') { + &OptionResponseAnalysis($r,$current_problem, + $ProblemData, \@Students); - } elsif ($resptype eq 'radiobutton') { - &RadioResponseAnalysis($r,$resource,$part,$resid,$ProblemData, + } elsif ($current_problem->{'resptype'} eq 'radiobutton') { + &RadioResponseAnalysis($r,$current_problem, + $ProblemData, \@Students); + } elsif ($current_problem->{'resptype'} eq 'numerical') { +# if (exists($ENV{'form.ExcelOutput'})) { + &prepare_excel_output($r,$current_problem, + $ProblemData,\@Students); +# } else { +# &NumericalResponseAnalysis($r,$current_problem, +# $ProblemData,\@Students); +# } } else { $r->print('

This analysis is not supported

'); } @@ -151,13 +176,232 @@ 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)); + } +} + + +######################################################### +######################################################### +## +## Excel output of student answers and correct answers +## +######################################################### +######################################################### +sub prepare_excel_output { + my ($r,$problem,$ProblemData,$Students) = @_; + my ($resource,$respid) = ($problem->{'resource'}, + $problem->{'respid'}); + $r->print('

'. + &mt('Preparing Excel spreadsheet of student responses'). + '

'); + # + &GetStudentAnswers($r,$problem,$Students); + # + my @Columns = ( 'username','domain','attempt','time', + 'submission','correct', 'grading'); + # + # Create excel worksheet + my $filename = '/prtspool/'. + $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. + time.'_'.rand(1000000000).'.xls'; + my $workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename); + if (! defined($workbook)) { + $r->log_error("Error creating excel spreadsheet $filename: $!"); + $r->print('

'.&mt("Unable to create new Excel file. ". + "This error has been logged. ". + "Please alert your LON-CAPA administrator"). + '

'); + return undef; + } + # + $workbook->set_tempdir('/home/httpd/perl/tmp'); + # + my $format = &Apache::loncommon::define_excel_formats($workbook); + my $worksheet = $workbook->addworksheet('Student Submission Data'); + # + # Put on the standard headers and whatnot + my $rows_output=0; + $worksheet->write($rows_output++,0,$resource->{'title'},$format->{'h1'}); + $worksheet->write($rows_output++,0,$resource->{'src'},$format->{'h3'}); + $rows_output++; + $worksheet->write_row($rows_output++,0,\@Columns,$format->{'bold'}); + # + # Populate the worksheet with the student data + foreach my $student (@$Students) { + # For each attempt + # write the username, domain, attempt number, timestamp, + # submission, correct answer, grading + my $results = &Apache::loncoursedata::get_response_data_by_student + ($student,$resource->{'symb'},$respid); + if (! defined($results) || ref($results) ne 'ARRAY') { + my %row; + $row{'username'} = $student->{'username'}; + $row{'domain'} = $student->{'domain'}; + $row{'correct'} = $student->{'answer'}; + my $cols_output = 0; + foreach my $col (@Columns) { + if (! exists($row{$col})) { + $cols_output++; + next; + } + $worksheet->write($rows_output,$cols_output++,$row{$col}); + } + $rows_output++; + } else { + foreach my $response (@$results) { + my %row_format; + my %row; + # + # Time is handled differently + $row{'time'} = &calc_serial( + $response->[&Apache::loncoursedata::RDs_timestamp()]); + $row_format{'time'}=$format->{'date'}; + # + $row{'username'} = $student->{'username'}; + $row{'domain'} = $student->{'domain'}; + $row{'attempt'} = $response->[ + &Apache::loncoursedata::RDs_tries()]; + $row{'submission'} = $response->[ + &Apache::loncoursedata::RDs_submission()]; + $row{'correct'} = $student->{'answer'}; + $row{'grading'} = $response->[ + &Apache::loncoursedata::RDs_awarddetail()]; + my $cols_output = 0; + foreach my $col (@Columns) { + $worksheet->write($rows_output,$cols_output++,$row{$col}, + $row_format{$col}); + } + $rows_output++; + } + } # End of else clause on if (! defined($results) .... + } + # + # Close the excel file + $workbook->close(); + # + # Write a link to allow them to download it + $r->print('

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

'."\n"); + +} + + +######################################################### +######################################################### +## +## Numerical Response Routines +## +######################################################### +######################################################### +sub NumericalResponseAnalysis { + my ($r,$problem,$ProblemData,$Students) = @_; + $r->print('

This analysis is not yet supported

'); + 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 ($max,$min) = &GetStudentAnswers($r,$problem,$Students); + $r->print('Maximum = '.$max.' Minimum = '.$min); + my $max_students = 0; + my %Data; + foreach my $student (@$Students) { + my $answer = $student->{'answer'}; + $Data{$answer}++; + if ($max_students < $Data{$answer}) { + $max_students = $Data{$answer}; + } + } + foreach (5,10,20,25,50,75,100,150,200,250,500,1000,1500,2000,2500,5000) { + if ($max_students < $_) { + $max_students = $_; + last; + } + } + my @Labels = sort {$a <=> $b } keys(%Data); + $r->print('number of labels = '.scalar(@Labels)); + my @PlotData = @Data{@Labels}; + $r->print('number of PlotData = '.scalar(@PlotData)); + my $graph = + &Apache::loncommon::DrawXYGraph('Correct Answer Distribution', + 'Correct Answer', + 'Number of students', + $max_students, + undef, + \@Labels, + [\@PlotData], + (xskip=>10)); + $r->print($graph); + return; } -=pod +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); + &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; +} -Removed code: +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; +} ######################################################### ######################################################### @@ -167,7 +411,9 @@ Removed code: ######################################################### ######################################################### sub RadioResponseAnalysis { - my ($r,$resource,$part,$respid,$ProblemData,$Students) = @_; + my ($r,$problem,$ProblemData,$Students) = @_; + my ($resource,$respid) = ($problem->{'resource'}, + $problem->{'respid'}); my $analysis_html; my $PerformanceData = &Apache::loncoursedata::get_response_data @@ -181,14 +427,14 @@ sub RadioResponseAnalysis { return; } if (exists($ENV{'form.ExcelOutput'})) { - $analysis_html .= &RR_Excel_output($r,$resource,$PerformanceData, - $ProblemData); + $analysis_html .= &RR_Excel_output($r,$problem->{'resource'}, + $PerformanceData,$ProblemData); } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') { - $analysis_html .= &RR_Tries_Analysis($r,$resource,$PerformanceData, - $ProblemData); + $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'}, + $PerformanceData,$ProblemData); } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { - $analysis_html .= &RR_Time_Analysis($r,$resource,$PerformanceData, - $ProblemData); + $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'}, + $PerformanceData,$ProblemData); } else { $analysis_html .= '

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

No!

'; @@ -209,7 +454,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'). @@ -218,15 +464,15 @@ sub RR_Tries_Analysis { } $analysis_html .= $table; my @TryData = &RR_tries_data_analysis($r,$PerformanceData); - if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $analysis_html = &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, +# if ($ENV{'form.AnalyzeAs'} eq 'Foils') { + $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, \@TryData,$ProblemData); - } else { - $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries, - $Concepts, - \@TryData, - $ProblemData); - } +# } else { +# $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries, +# $Concepts, +# \@TryData, +# $ProblemData); +# } return $analysis_html; } @@ -256,8 +502,8 @@ sub RR_Tries_Foil_Analysis { my @PlotData_Correct; my @PlotData_Incorrect; next if ($try > scalar(@{$TryData})); - next if (! defined($TryData->[$try-1])); - my %DataSet = %{$TryData->[$try-1]}; + next if (! defined($TryData->[$try])); + my %DataSet = %{$TryData->[$try]}; my $total = 0; foreach my $foilid (@$Foils) { $total += $DataSet{$foilid}; @@ -285,10 +531,10 @@ sub RR_Tries_Foil_Analysis { 'Percent Choosing', 100, ['#33ff00','#ff3300'], + undef, \@PlotData_Correct, \@PlotData_Incorrect); } - &Apache::lonnet::logthis('plot = '.$html); return $html; } @@ -311,14 +557,12 @@ sub RR_Time_Concept_Analysis { } - sub get_Radio_problem_data { my ($url) = @_; my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze')); (my $garbage,$Answ)=split('_HASH_REF__',$Answ,2); my %Answer = &Apache::lonnet::str2hash($Answ); my %Partdata; - &Apache::lonnet::logthis('url = '.$url); foreach my $part (@{$Answer{'parts'}}) { while (my($key,$value) = each(%Answer)) { # if (ref($value) eq 'ARRAY') { @@ -344,9 +588,6 @@ sub get_Radio_problem_data { return %Partdata; } -=cut - - ######################################################### ######################################################### ## @@ -355,10 +596,13 @@ sub get_Radio_problem_data { ######################################################### ######################################################### sub OptionResponseAnalysis { - my ($r,$resource,$resid,$ProblemData,$Students) = @_; + my ($r,$problem,$ProblemData,$Students) = @_; + my ($resource,$respid) = ($problem->{'resource'}, + $problem->{'respid'}); + # Note: part data is not needed. my $PerformanceData = &Apache::loncoursedata::get_response_data - ($Students,$resource->{'symb'},$resid); + ($Students,$resource->{'symb'},$respid); if (! defined($PerformanceData) || ref($PerformanceData) ne 'ARRAY' ) { $r->print('

'. @@ -367,20 +611,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(); @@ -399,7 +643,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'}; @@ -411,21 +655,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; # @@ -480,10 +724,11 @@ sub Tries_Foil_Analysis { } 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; } @@ -498,7 +743,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"; } @@ -506,7 +751,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"; @@ -565,14 +810,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); @@ -600,7 +845,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')) { @@ -658,10 +903,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); } } @@ -669,7 +914,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); @@ -730,6 +975,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; @@ -747,6 +993,7 @@ sub Foil_Time_Analysis { 'Incorrect Option Choice', 100, $plotcolors, + undef, @Plotdata); $analysis_html.=''. ''.$correctplot.''. @@ -764,7 +1011,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; ## @@ -811,6 +1058,7 @@ sub Concept_Time_Analysis { 'Percent Correct', 100, $plotcolors, + undef, \@Plotdata); $analysis_html.=''. ''.$correctplot.''. @@ -832,7 +1080,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); @@ -852,22 +1100,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) { @@ -876,16 +1113,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') { @@ -904,7 +1137,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; @@ -973,33 +1206,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; @@ -1249,16 +1456,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}})); @@ -1291,18 +1506,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) { @@ -1311,16 +1526,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 { @@ -1345,7 +1560,7 @@ sub build_option_index { ''. ''. (' 'x4).''. - ''.$option.''. + ''.&HTML::Entities::encode($option).''. "\n"); } shift(@Rows); # Throw away 'correct option chosen' color @@ -1462,95 +1677,6 @@ sub CreateInterface { return $Str; } -sub ProblemSelector { - my $Str; - $Str = "\n\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 = - &Apache::lonnet::escape($res->{'symb'}.':'.$part. - ':'.$respid.':'.$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 .= "
'. - ''. - ''. - ''.$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,$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; -} - - ######################################################### ######################################################### ## @@ -1602,6 +1728,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'}++; @@ -1614,6 +1741,27 @@ 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 @@ -1628,6 +1776,17 @@ sub get_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') { @@ -1641,6 +1800,8 @@ sub get_problem_data { $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}= $concept; } + } elsif ($key =~ /^(incorrect|answer|ans_low|ans_high)$/) { + $Partdata{$part}->{$key}=$value; } } else { if ($key=~ /^foil\.text\.(.*)$/) { @@ -1661,11 +1822,3 @@ sub get_problem_data { 1; __END__ - -##### -# partdata{part}->{_Foils}->{foilid}->{'name'} = $ -# ->{'text'} = $ -# ->{'value'} = $ -# ->{'_Concept'} = $ -# partdata{part}->{_Options} = @ -# partdata{part}->{_Concepts} = @