--- loncom/interface/statistics/lonproblemanalysis.pm 2004/02/18 19:16:55 1.70 +++ loncom/interface/statistics/lonproblemanalysis.pm 2004/06/24 18:47:36 1.87 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.70 2004/02/18 19:16:55 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.87 2004/06/24 18:47:36 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,7 +33,8 @@ use Apache::lonhtmlcommon(); use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonlocal; -use Apache::lonstathelpers; +use Apache::lonstathelpers(); +use Apache::lonstudentsubmissions(); use HTML::Entities(); use Time::Local(); use Spreadsheet::WriteExcel(); @@ -50,10 +51,6 @@ my @SubmitButtons = ({ name => 'PrevProb { name => 'NextProblemAnalysis', text => 'Next Problem' }, { name => 'break'}, - { name => 'ClearCache', - text => 'Clear Caches' }, - { name => 'updatecaches', - text => 'Update Student Data' }, { name => 'SelectAnother', text => 'Choose a different Problem' }, { name => 'ExcelOutput', @@ -76,30 +73,22 @@ sub BuildProblemAnalysisPage { # &Apache::lonstatistics::PrepareClasslist(); # - $r->print('

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

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

There are no students in the sections selected

'); } # - &Apache::loncoursedata::clear_internal_caches(); - if (exists($ENV{'form.ClearCache'}) || - exists($ENV{'form.updatecaches'}) || - (exists($ENV{'form.firstanalysis'}) && - $ENV{'form.firstanalysis'} ne 'no')) { - &Apache::lonstatistics::Gather_Full_Student_Data($r); - } - if (! exists($ENV{'form.firstanalysis'})) { - $r->print(''); - } else { - $r->print(''); - } + my @CacheButtonHTML = + &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status'); $r->rflush(); # - my $problem_types = '(option|radiobutton|numerical)'; + # Support for numerical and radio response isn't complete enough to + # include in 1.2 release. + # my $problem_types = '(option|radiobutton|numerical)'; + my $problem_types = '(option)'; if (exists($ENV{'form.problemchoice'}) && ! exists($ENV{'form.SelectAnother'})) { foreach my $button (@SubmitButtons) { @@ -111,6 +100,9 @@ sub BuildProblemAnalysisPage { $r->print(' 'x5); } } + foreach my $html (@CacheButtonHTML) { + $r->print($html.(' 'x5)); + } # $r->print('
'); $r->rflush(); @@ -146,7 +138,8 @@ sub BuildProblemAnalysisPage { $r->print('

'.$resource->{'src'}.'

'); $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'}}; @@ -159,13 +152,17 @@ sub BuildProblemAnalysisPage { $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); -# } + ## + ## analyze all responses of a problem at once + my $res = $current_problem->{'resource'}; + foreach my $partid (@{$res->{'parts'}}) { + $current_problem->{'part'} = $partid; + foreach my $respid (@{$res->{'partdata'}->{$partid}->{'ResponseIds'}}) { + $current_problem->{'respid'}=$respid; + &NumericalResponseAnalysis($r,$current_problem, + $ProblemData,\@Students); + } + } } else { $r->print('

This analysis is not supported

'); } @@ -185,149 +182,36 @@ sub BuildProblemAnalysisPage { ######################################################### ######################################################### ## -## Excel output of student answers and correct answers +## Numerical Response Routines ## ######################################################### ######################################################### -sub prepare_excel_output { +sub NumericalResponseAnalysis { my ($r,$problem,$ProblemData,$Students) = @_; - my ($resource,$respid,$partid) = ($problem->{'resource'}, - $problem->{'respid'}, - $problem->{'part'}); - $r->print('

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

'); - # - &GetStudentAnswers($r,$problem,$Students); - # - my @Columns = ( 'username','domain','attempt','time', - 'submission','correct', 'grading','awarded','weight', - 'score'); - my $awarded_col = 7; - my $weight_col = 8; - # - # 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'); - # - # Make sure we get new weight data instead of data on a 10 minute delay - &Apache::lonnet::clear_EXT_cache_status(); - # - # 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'}); + my $c = $r->connection(); + my ($resource,$partid,$respid) = ($problem->{'resource'}, + $problem->{'part'}, + $problem->{'respid'}); # - # Populate the worksheet with the student data - foreach my $student (@$Students) { - my $results = &Apache::loncoursedata::get_response_data_by_student - ($student,$resource->{'symb'},$respid); - my %row; - $row{'username'} = $student->{'username'}; - $row{'domain'} = $student->{'domain'}; - $row{'correct'} = $student->{'answer'}; - $row{'weight'} = &Apache::lonnet::EXT - ('resource.'.$partid.'.weight',$resource->{'symb'}, - undef,undef,undef); - if (! defined($results) || ref($results) ne 'ARRAY') { - $row{'score'} = '='. - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$awarded_col) - .'*'. - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$weight_col); - 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) { - delete($row{'time'}); - delete($row{'attempt'}); - delete($row{'submission'}); - delete($row{'awarded'}); - delete($row{'grading'}); - delete($row{'score'}); - my %row_format; - # - # Time is handled differently - $row{'time'} = &calc_serial( - $response->[&Apache::loncoursedata::RDs_timestamp()]); - $row_format{'time'}=$format->{'date'}; - # - $row{'attempt'} = $response->[ - &Apache::loncoursedata::RDs_tries()]; - $row{'submission'} = $response->[ - &Apache::loncoursedata::RDs_submission()]; - $row{'grading'} = $response->[ - &Apache::loncoursedata::RDs_awarddetail()]; - $row{'awarded'} = $response->[ - &Apache::loncoursedata::RDs_awarded()]; - $row{'score'} = '='. - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$awarded_col) - .'*'. - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$weight_col); - 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) .... + if (scalar(@{$resource->{'parts'}})>1) { + if (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) { + $r->print('

'. + &mt('Part [_1], response [_2].',$partid,$respid). + '

'); + } else { + $r->print('

'. + &mt('Part [_1]',$partid,$respid). + '

'); + } + } elsif (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) { + $r->print('

'.&mt('Response [_1]',$respid).'

'); } # - # 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); + my $PerformanceData = &Apache::loncoursedata::get_response_data + (\@Apache::lonstatistics::SelectedSections, + $Apache::lonstatistics::enrollment_status, + $resource->{'symb'},$respid); if (! defined($PerformanceData) || ref($PerformanceData) ne 'ARRAY' ) { $analysis_html = '

'. @@ -336,67 +220,126 @@ sub NumericalResponseAnalysis { $r->print($analysis_html); return; } - my ($max,$min) = &GetStudentAnswers($r,$problem,$Students); - $r->print('Maximum = '.$max.' Minimum = '.$min); - my $max_students = 0; + # + # This next call causes all the waiting around that people complain about + my ($max,$min) = + &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students, + 'Statistics', + 'stats_status'); + return if ($c->aborted()); + # + # Collate the data 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); + # + my $width = 500; + my $height = 100; + my $plot = &one_dimensional_plot($r,500,100,scalar(@$Students), + \@Labels,\@PlotData); + $r->print($plot); return; } -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; +sub one_dimensional_plot { + my ($r,$width,$height,$N,$Labels,$Data)=@_; + # + # Compute data -> image scaling factors + my $min = $Labels->[0]; + my $max = $Labels->[-1]; + if ($max == $min) { + $max =$min+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); } - $r->print("
\n"); - $r->rflush(); - # close progress window - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - return; + # + # 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 text { + my ($x,$y,$color,$text,$font,$direction) = @_; + if (! defined($font) || $font !~ /^(tiny|small|medium|large|giant)$/) { + $font = 'medium'; + } + if (! defined($direction) || $direction ne 'vertical') { + $direction = ''; + } + return qq{$text}; +} + +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 build_student_data_worksheet { @@ -438,9 +381,10 @@ sub RadioResponseAnalysis { my ($resource,$respid) = ($problem->{'resource'}, $problem->{'respid'}); my $analysis_html; - my $PerformanceData = - &Apache::loncoursedata::get_response_data - ($Students,$resource->{'symb'},$respid); + my $PerformanceData = &Apache::loncoursedata::get_response_data + (\@Apache::lonstatistics::SelectedSections, + $Apache::lonstatistics::enrollment_status, + $resource->{'symb'},$respid); if (! defined($PerformanceData) || ref($PerformanceData) ne 'ARRAY' ) { $analysis_html = '

'. @@ -623,9 +567,10 @@ sub OptionResponseAnalysis { my ($resource,$respid) = ($problem->{'resource'}, $problem->{'respid'}); # Note: part data is not needed. - my $PerformanceData = - &Apache::loncoursedata::get_response_data - ($Students,$resource->{'symb'},$respid); + my $PerformanceData = &Apache::loncoursedata::get_response_data + (\@Apache::lonstatistics::SelectedSections, + $Apache::lonstatistics::enrollment_status, + $resource->{'symb'},$respid); if (! defined($PerformanceData) || ref($PerformanceData) ne 'ARRAY' ) { $r->print('

'. @@ -671,7 +616,8 @@ sub OR_tries_analysis { 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'). @@ -682,7 +628,7 @@ sub OR_tries_analysis { $mintries,$maxtries); my $analysis = ''; if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $analysis = &OR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, + $analysis = &OR_Tries_Foil_Analysis($mintries,$maxtries,$Concepts, \%ResponseData,$ORdata); } else { $analysis = &OR_Tries_Concept_Analysis($mintries,$maxtries, @@ -693,82 +639,100 @@ sub OR_tries_analysis { } sub OR_Tries_Foil_Analysis { - my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_; + 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,undef,$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,undef,@Datasets); + 100,$plotcolors,\@Labels,@Datasets); $analysis_html.= ''; - $analysis_html.= '\n"; + $analysis_html.= '\n"; } $analysis_html .= "
'.$correctgraph.''.$incorrectgraph.''.$foilkey."
'.$optionkey."
\n"; return $analysis_html; @@ -1258,7 +1222,7 @@ sub OR_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) { @@ -1273,185 +1237,6 @@ sub OR_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'})); @@ -1529,18 +1314,18 @@ sub build_foil_index { if (@Concepts > 1) { $table .= ''. ''.$conceptindex.''. - ''.&HTML::Entities::encode($concept->{'name'}).''. + ''.&HTML::Entities::encode($concept->{'name'},'<>&"').''. ''.$foilindex++.''. - ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).''. + ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').''. ''.$Foildata{$firstfoil}->{'text'}.''. - ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).''. + ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').''. "\n"; } else { $table .= ''. ''.$foilindex++.''. - ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).''. + ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').''. ''.$Foildata{$firstfoil}->{'text'}.''. - ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).''. + ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').''. "\n"; } foreach my $foilid (@FoilsInConcept) { @@ -1549,16 +1334,16 @@ sub build_foil_index { ''. ''. ''.$foilindex.''. - ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).''. + ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').''. ''.$Foildata{$foilid}->{'text'}.''. - ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).''. + ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').''. "\n"; } else { $table .= ''. ''.$foilindex.''. - ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).''. + ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').''. ''.$Foildata{$foilid}->{'text'}.''. - ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).''. + ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').''. "\n"; } } continue { @@ -1583,7 +1368,7 @@ sub build_option_index { ''. ''. (' 'x4).''. - ''.&HTML::Entities::encode($option).''. + ''.&HTML::Entities::encode($option,'<>&"').''. "\n"); } shift(@Rows); # Throw away 'correct option chosen' color @@ -1607,6 +1392,8 @@ sub CreateInterface { ## ## Build the menu my $Str = ''; + $Str .= &Apache::lonhtmlcommon::breadcrumbs + (undef,'Detailed Problem Analysis'); $Str .= ''."\n"; $Str .= ''; $Str .= ''; @@ -1675,7 +1462,7 @@ sub CreateInterface { $Str .= '
'; } { - $Str .= '
'.&mt('Number of Plots:'); + $Str .= ''.&mt('Number of Plots:'); $Str .= &Apache::loncommon::help_open_topic ('Analysis_num_plots'); $Str .= ''; + $Str .= '
'; + } + { + $Str .= ''.&mt('Status: [_1]', + '' + ). + '
'; } } $Str .= ''; @@ -1764,84 +1558,6 @@ 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_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)) { - # - # 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; - } elsif ($key eq 'concepts') { - $Partdata{$part}->{'_Concepts'}=$value; - } elsif ($key =~ /^concept\.(.*)$/) { - my $concept = $1; - foreach my $foil (@$value) { - $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; - $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__
'.&mt('Sections').'