--- loncom/interface/statistics/lonproblemanalysis.pm 2005/02/28 23:07:32 1.116 +++ loncom/interface/statistics/lonproblemanalysis.pm 2008/12/11 14:55:27 1.133 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.116 2005/02/28 23:07:32 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.133 2008/12/11 14:55:27 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,7 +27,7 @@ package Apache::lonproblemanalysis; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::loncoursedata(); @@ -38,6 +38,9 @@ use Apache::lonstudentsubmissions(); use HTML::Entities(); use Time::Local(); use capa; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + my $plotcolors = ['#33ff00', '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933', @@ -59,6 +62,7 @@ sub BuildProblemAnalysisPage { # my %Saveable_Parameters = ('Status' => 'scalar', 'Section' => 'array', + 'Groups' => 'array', 'NumPlots' => 'scalar', 'AnalyzeOver' => 'scalar', ); @@ -73,8 +77,11 @@ sub BuildProblemAnalysisPage { # my @Students = @Apache::lonstatistics::Students; # - if (@Students < 1 && exists($ENV{'form.firstrun'})) { - $r->print('

There are no students in the sections selected

'); + if (@Students < 1 && exists($env{'form.firstrun'})) { + $r->print('
' + .&mt('There are no students in the sections/groups selected.') + .'
' + ); } # my @CacheButtonHTML = @@ -82,8 +89,8 @@ sub BuildProblemAnalysisPage { $r->rflush(); # my $problem_types = '(option|radiobutton|numerical)'; - if (exists($ENV{'form.problemchoice'}) && - ! exists($ENV{'form.SelectAnother'})) { + if (exists($env{'form.problemchoice'}) && + ! exists($env{'form.SelectAnother'})) { foreach my $button (@SubmitButtons) { if ($button->{'name'} eq 'break') { $r->print("
\n"); @@ -97,34 +104,37 @@ sub BuildProblemAnalysisPage { $r->print($html.(' 'x5)); } # - $r->print(&Apache::lonstathelpers::submission_report_form - ('problem_analysis')); + + # This is commented out pending actual implementation of + # CSV and Excel output. + #$r->print(&Apache::lonstathelpers::submission_report_form + # ('problem_analysis')); # $r->print('
'); $r->rflush(); # # Determine which problem we are to analyze my $current_problem = &Apache::lonstathelpers::get_target_from_id - ($ENV{'form.problemchoice'}); + ($env{'form.problemchoice'}); # my ($navmap,$prev,$curr,$next) = &Apache::lonstathelpers::get_prev_curr_next($current_problem, $problem_types, 'response', ); - if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) { + if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) { $current_problem = $prev; - } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) { + } 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'} = + $env{'form.problemchoice'} = &Apache::lonstathelpers::make_target_id($current_problem); $r->print(''); + $env{'form.problemchoice'}.'" />'); # if (! defined($current_problem->{'resource'})) { $r->print('resource is undefined'); @@ -132,37 +142,50 @@ sub BuildProblemAnalysisPage { my $resource = $current_problem->{'resource'}; $r->print('

'.$resource->compTitle.'

'); $r->print('

'.$resource->src.'

'); - if ($ENV{'form.show_prob'} eq 'true') { - $r->print(&Apache::lonstathelpers::render_resource($resource)); + $r->print('

'.&Apache::lonstatistics::section_and_enrollment_description().'

'); + if ($env{'form.show_prob'} eq 'true') { + $r->print('
' + .&Apache::lonstathelpers::render_resource($resource) + .'
' + ); } $r->rflush(); - my %Data = &Apache::lonstathelpers::get_problem_data - ($resource->src); - my $problem_data = $Data{$current_problem->{'part'}. - '.'. - $current_problem->{'respid'}}; - if ($current_problem->{'resptype'} eq 'option') { - &OptionResponseAnalysis($r,$current_problem, - $problem_data, - \@Students); - } elsif ($current_problem->{'resptype'} eq 'radiobutton') { - &radio_response_analysis($r,$current_problem, - $problem_data, - \@Students); - } elsif ($current_problem->{'resptype'} eq 'numerical') { - &numerical_response_analysis($r,$current_problem, - $problem_data,\@Students); - } else { - $r->print('

Analysis of '.$current_problem->{'resptype'}.' is not supported

'); - } + if (@Students) { + my %Data = &Apache::lonstathelpers::get_problem_data + ($resource->src); + my $problem_data = $Data{$current_problem->{'part'}. + '.'. + $current_problem->{'respid'}}; + if ($current_problem->{'resptype'} eq 'option') { + &OptionResponseAnalysis($r,$current_problem, + $problem_data, + \@Students); + } elsif ($current_problem->{'resptype'} eq 'radiobutton') { + &radio_response_analysis($r,$current_problem, + $problem_data, + \@Students); + } elsif ($current_problem->{'resptype'} eq 'numerical') { + &numerical_response_analysis($r,$current_problem, + $problem_data,\@Students); + } else { + $r->print('
' + .&mt('Analysis of [_1] is not supported.' + ,$current_problem->{'resptype'}) + .'
' + ); + } + } } $r->print('
'); } else { - $r->print(''); + my $submit_button = ''; + $r->print($submit_button); $r->print(' 'x5); $r->print('

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

'); - $r->print(&Apache::lonstathelpers::problem_selector($problem_types)); + $r->print(&Apache::lonstathelpers::problem_selector($problem_types, + $submit_button)); } } @@ -177,7 +200,7 @@ sub numerical_response_analysis { my ($r,$problem,$problem_analysis,$students) = @_; my $c = $r->connection(); # - if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) { + if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) { $r->print('Bad request'); } # @@ -186,7 +209,8 @@ sub numerical_response_analysis { $problem->{'respid'}); # Gather student data my $response_data = &Apache::loncoursedata::get_response_data - (\@Apache::lonstatistics::SelectedSections, + ([&Apache::lonstatistics::get_selected_sections()], + [&Apache::lonstatistics::get_selected_groups()], $Apache::lonstatistics::enrollment_status, $resource->symb,$respid); # @@ -200,26 +224,27 @@ sub numerical_response_analysis { } # if (ref($response_data) ne 'ARRAY') { - $r->print('

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

'); + $r->print('
' + .&mt('There is no submission data for this resource.') + .'
' + ); return; } my $analysis_html = ''; - for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) { + for (my $plot_num = 1;$plot_num<=$env{'form.NumPlots'};$plot_num++) { my $restriction_function; my $header_message; my $stats_message; my $post_message; # passed through &mt sooner rather than later my $no_data_message; my @extra_data; - if ($ENV{'form.AnalyzeOver'} eq 'tries') { + if ($env{'form.AnalyzeOver'} eq 'tries') { $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)}; $header_message = 'Attempt [_1]'; $stats_message = '[_1] submissions, [_2] correct, [_3] incorrect'; $post_message = ''; - $no_data_message = 'No data exists for attempt [_1]'; + $no_data_message = 'No data exists for attempt [_1].'; } else { my $starttime = &Apache::lonhtmlcommon::get_date_from_form ('startdate_'.$plot_num); @@ -267,9 +292,9 @@ sub numerical_response_analysis { $restriction_function); if ($stats->{'submission_count'} == 0) { $analysis_html.= - ''; + ''; } else { $analysis_html.= '
'. + '
'. &mt($no_data_message,$plot_num,@extra_data). - '
'. @@ -315,11 +340,14 @@ sub numerical_plot_percent { last; } } + $percent_spread = $highest_percent - $lowest_percent; my $bin_size = 1; foreach (qw/0.01 0.05 0.1 0.5 1 2 5 10 20 25 50 100/) { if ($lowest_percent/2 < $_){ $bin_size = $_; - last; + if ( ($percent_spread/$bin_size) < $max_bins ) { + last; + } } } my @bins; @@ -337,7 +365,9 @@ sub numerical_plot_percent { while (my ($ans,$submissions) = each(%$responses)) { while (my ($submission,$counts) = each(%$submissions)) { my ($correct_count,$incorrect_count) = @$counts; - my $scaled_value = 100*($submission-$ans)/abs($ans); + my $scaled_value = + ($ans) ? 100*($submission-$ans)/abs($ans) + : 0; if ($scaled_value < $bins[0]) { $bins[0]=$scaled_value -1; } @@ -392,7 +422,12 @@ sub numerical_plot_differences { } elsif ($low_bin < 0 && $high_bin < -$low_bin) { $high_bin = -$low_bin; } - if (($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) { + if ($high_bin == $low_bin) { + $high_bin+=1; + $low_bin-=1; + } + if (!$min_bin_size || + ($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) { $min_bin_size = abs($high_bin - $low_bin) / $max_bins * 2; } my @bins; @@ -481,8 +516,12 @@ sub numerical_classify_responses { if ($stats{'max_abs'} < $abs_high) { $stats{'max_abs'} = $abs_high; } - my $low_percent = 100 * abs($abs_low / $subm{'correct'}); - my $high_percent = 100 * abs($abs_high / $subm{'correct'}); + my $low_percent; + my $high_percent; + if (defined($subm{'correct'}) && $subm{'correct'} != 0) { + $low_percent = 100 * abs($abs_low / $subm{'correct'}); + $high_percent = 100 * abs($abs_high / $subm{'correct'}); + } if (! defined($stats{'min_percent'}) || $stats{'min_percent'} > $low_percent) { $stats{'min_percent'} = $low_percent; @@ -530,6 +569,8 @@ sub numerical_classify_responses { } } } + $stats{'correct_count'} |= 0; + $stats{'incorrect_count'} |= 0; $stats{'students'}=scalar(keys(%students)); return (\%submission_data,\%stats); } @@ -606,11 +647,21 @@ sub numerical_determine_answers { $sdom); # make the key my $key = $partid.'.'.$respid; + # pick one of the possible answers + my $which = 'INTERNAL'; + if (!exists($analysis->{$key}{$which})) { + $which = (sort(keys(%{ $analysis->{$key} })))[0]; + } foreach my $item ('answer','unit','ans_high','ans_low') { - $correct->{$sname.':'.$sdom}->{$item} = - $analysis->{$key.'.'.$item}->[0]; + if (ref($analysis->{$key.'.'.$item}) eq 'ARRAY') { + $correct->{$sname.':'.$sdom}->{$item} = + $analysis->{$key.'.'.$item}[0]; + } else { + $correct->{$sname.':'.$sdom}->{$item} = + $analysis->{$key.'.'.$item}{$which}[0][0]; + } } - $answers{$analysis->{$key.'.answer'}->[0]}++; + $answers{$correct->{$sname.':'.$sdom}{'answer'}}++; &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, &mt('last student')); } @@ -736,7 +787,7 @@ sub circle { sub radio_response_analysis { my ($r,$problem,$problem_analysis,$students) = @_; # - if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) { + if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) { $r->print('Bad request'); } # @@ -765,7 +816,8 @@ sub radio_response_analysis { $analysis_html .= $table; # Gather student data my $response_data = &Apache::loncoursedata::get_response_data - (\@Apache::lonstatistics::SelectedSections, + ([&Apache::lonstatistics::get_selected_sections()], + [&Apache::lonstatistics::get_selected_groups()], $Apache::lonstatistics::enrollment_status, $resource->symb,$respid); my $correct; # either a hash reference or a scalar @@ -778,7 +830,7 @@ sub radio_response_analysis { my ($idx,@remainder) = split('&',$student->{'answer'}); my ($answer) = ($remainder[$idx]=~/^(.*)=([^=]*)$/); $correct->{$student->{'username'}.':'.$student->{'domain'}}= - &Apache::lonnet::unescape($answer); + &unescape($answer); } } else { foreach my $foil (keys(%$foildata)) { @@ -789,21 +841,21 @@ sub radio_response_analysis { } # if (! defined($response_data) || ref($response_data) ne 'ARRAY' ) { - $analysis_html = '

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

'; + $analysis_html = '
' + .&mt('There is no submission data for this resource.') + .'
'; $r->print($analysis_html); return; } # $analysis_html.=''; - for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) { + for (my $plot_num = 1;$plot_num<=$env{'form.NumPlots'};$plot_num++) { # classify data ->correct foil -> selected foil my ($restriction_function, $correct_foil_title,$incorrect_foil_title, $pre_graph_text,$post_graph_text, $no_data_text,@extra_data); - if ($ENV{'form.AnalyzeOver'} eq 'tries') { + if ($env{'form.AnalyzeOver'} eq 'tries') { $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)}; $correct_foil_title = 'Attempt '.$plot_num; $incorrect_foil_title = 'Attempt '.$plot_num; @@ -811,7 +863,7 @@ sub radio_response_analysis { 'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect'; $post_graph_text = ''; $no_data_text = 'No data exists for attempt [_1]'; - } elsif ($ENV{'form.AnalyzeOver'} eq 'time') { + } elsif ($env{'form.AnalyzeOver'} eq 'time') { my $starttime = &Apache::lonhtmlcommon::get_date_from_form ('startdate_'.$plot_num); my $endtime = &Apache::lonhtmlcommon::get_date_from_form @@ -822,7 +874,9 @@ sub radio_response_analysis { &get_time_from_row($response_data->[-1]), $plot_num); $pre_graph_text = - 'Data from [_6] to [_7]
[_2] submissions from [_5] students, [_3] correct, [_4] incorrect'; + 'Data from [_6] to [_7]' + .'
' + .'[_2] submissions from [_5] students, [_3] correct, [_4] incorrect'; $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime); $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime); # @@ -881,16 +935,14 @@ sub radio_response_analysis { $choice_plot ne '' || $stacked_plot ne '') { my $correct = $foil_choice_data->{'_correct'}; - if (! defined($correct) || $correct eq '') { - $correct = 0; - } - my $incorrect = + $correct |= 0; + my $incorrect = $foil_choice_data->{'_count'}-$correct; $analysis_html.= ''.$/; @@ -912,11 +964,13 @@ sub radio_response_analysis { } } elsif ($no_data_text ne '') { $analysis_html.=''; + $analysis_html.= ''; } else { - $analysis_html.= ''; + $analysis_html.= ''; } last; } @@ -1307,18 +1366,16 @@ sub OR_tries_analysis { ('Correct Concepts','Concept Number','Percent Correct', 100,$plotcolors,undef,\@concept_plot_data,{xskip=>1}); } - &Apache::lonnet::logthis('got here a_0'); # # Create Foil Plots my $data_count = $response_data{'_total'}->[$try]; my $correct = $response_data{'_correct'}->[$try]; + $correct |= 0; my @Datasets; foreach my $option ('_correct',@{$ORdata->{'_Options'}}) { - &Apache::lonnet::logthis('checking option '.$option); next if (! exists($foil_plot[$try]->{$option})); push(@Datasets,$foil_plot[$try]->{$option}); } - &Apache::lonnet::logthis('got here a'); # # Put a blank in the data set between concepts for (my $set =0;$set<=$#Datasets;$set++) { @@ -1335,7 +1392,6 @@ sub OR_tries_analysis { } # # Set up the labels needed for the bar graph - &Apache::lonnet::logthis('got here b'); my @Labels; my $idx = 1; foreach my $concept (@{$Concepts}) { @@ -1351,9 +1407,7 @@ sub OR_tries_analysis { # # - &Apache::lonnet::logthis('got here c'); next if (! defined($Datasets[0])); - &Apache::lonnet::logthis('got here d'); for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) { $Datasets[0]->[$i]=0; } @@ -1362,7 +1416,6 @@ sub OR_tries_analysis { my $incorrect_graph = &Apache::loncommon::DrawBarGraph ('Incorrect Statements','Statement','% Chosen Incorrectly', 100,$plotcolors,\@Labels,@Datasets,{xskip=>1}); - &Apache::lonnet::logthis('incorrect graph = '.$incorrect_graph); $analysis_html.= '
'. ''. &mt($pre_graph_text, $plot_num,$foil_choice_data->{'_count'}, $correct, - $foil_choice_data->{'_count'}-$correct, + $incorrect, $foil_choice_data->{'_students'}, @extra_data). '
'. + '
'. &mt($no_data_text, $plot_num,$foil_choice_data->{'_count'}, $correct, $foil_choice_data->{'_count'}-$correct, - @extra_data); + @extra_data). + '
'; if (defined($post_graph_text)) { $analysis_html.='
'.$post_graph_text; } @@ -935,7 +989,7 @@ sub ensure_start_end_times { (localtime($last - $sec_in_day*($plot_num-1)))[3..5]; $start = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear); $end = $start + $sec_in_day; - if ($plot_num == $ENV{'form.NumPlots'}) { + if ($plot_num == $env{'form.NumPlots'}) { $start = $first; } } @@ -1170,35 +1224,36 @@ sub OptionResponseAnalysis { my ($r,$problem,$problem_data,$Students) = @_; my ($resource,$respid) = ($problem->{'resource'}, $problem->{'respid'}); - &Apache::lonnet::logthis('option response analysis on '.$resource->symb); # Note: part data is not needed. my $PerformanceData = &Apache::loncoursedata::get_response_data - (\@Apache::lonstatistics::SelectedSections, + ([&Apache::lonstatistics::get_selected_sections()], + [&Apache::lonstatistics::get_selected_groups()], $Apache::lonstatistics::enrollment_status, $resource->symb,$respid); if (! defined($PerformanceData) || ref($PerformanceData) ne 'ARRAY' ) { - $r->print('

'. - &mt('There is no student data for this problem.'). - '

'); + $r->print('
' + .&mt('There is no student data for this problem.') + .'
' + ); } else { $r->rflush(); - if ($ENV{'form.AnalyzeOver'} eq 'tries') { + if ($env{'form.AnalyzeOver'} eq 'tries') { my $analysis_html = &OR_tries_analysis($r, $PerformanceData, $problem_data); $r->print($analysis_html); $r->rflush(); - } elsif ($ENV{'form.AnalyzeOver'} eq 'time') { + } elsif ($env{'form.AnalyzeOver'} eq 'time') { my $analysis_html = &OR_time_analysis($PerformanceData, $problem_data); $r->print($analysis_html); $r->rflush(); } else { - $r->print('

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

'); + $r->print('div class="LC_warning"' + .&mt('The analysis you have selected is not supported at this time.') + .'' + ); } } } @@ -1211,12 +1266,11 @@ sub OptionResponseAnalysis { sub OR_tries_analysis { my ($r,$PerformanceData,$ORdata) = @_; my $mintries = 1; - my $maxtries = $ENV{'form.NumPlots'}; + my $maxtries = $env{'form.NumPlots'}; my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); if (! defined($Concepts)) { $Concepts = []; } - &Apache::lonnet::logthis('got '.scalar(@$PerformanceData).' data points'); my %response_data = &OR_analyze_by_tries($r,$PerformanceData, $mintries,$maxtries); my $analysis = ''; @@ -1273,16 +1327,21 @@ sub OR_tries_analysis { if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); } # for (my $try=$mintries;$try<=$maxtries;$try++) { - &Apache::lonnet::logthis('try = '.$try); if (! defined($response_data{'_total'}->[$try]) || $response_data{'_total'}->[$try] == 0) { if ($try > 1) { - $analysis_html.= '
'. - &mt('None of the selected students attempted the problem more than [_1] times.',$try-1). - '
' + .'
' + .&mt('None of the selected students attempted the problem more than [_1] times.' + ,$try-1) + .'
' + .'
'. - &mt('None of the selected students have attempted the problem').'
' + .'
' + .&mt('None of the selected students have attempted the problem.') + .'
' + .'
'. ''. @@ -1429,7 +1482,7 @@ sub OR_time_analysis { ''.$table; } # - my $num_plots = $ENV{'form.NumPlots'}; + my $num_plots = $env{'form.NumPlots'}; my $num_data = scalar(@$performance_data)-1; # my $current_index; @@ -1480,6 +1533,7 @@ sub OR_time_analysis { ## my ($processed_time_data,$correct,$data_count,$student_count) = &OR_time_process_data($performance_data,$begin_index,$end_index); + $correct |= 0; ## $table .= '
'. &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect', @@ -1515,7 +1569,11 @@ sub OR_Foil_Time_Analysis { my ($processed_time_data,$correct,$data_count,$student_count, $ORdata,$Foils,$Concepts) = @_; if ($data_count <= 0) { - return ('

'.&mt('There is no data to plot').'

',''); + return ('
' + .&mt('There is no data to plot.') + .'
' + ,'' + ); } my $analysis_html; my @plotdata; @@ -1691,23 +1749,23 @@ sub build_foil_index { } # # Build up the table of row labels. - my $table = ''."\n"; + my $table = &Apache::loncommon::start_data_table(); if (@Concepts > 1) { - $table .= ''. + $table .= &Apache::loncommon::start_data_table_header_row(). ''. ''. ''. ''. ''. ''. - "\n"; + &Apache::loncommon::end_data_table_header_row(); } else { - $table .= ''. + $table .= &Apache::loncommon::start_data_table_header_row(). ''. ''. ''. ''. - "\n"; + &Apache::loncommon::end_data_table_header_row(); } my $conceptindex = 1; my $foilindex = 1; @@ -1715,39 +1773,39 @@ sub build_foil_index { my @FoilsInConcept = @{$concept->{'foils'}}; my $firstfoil = shift(@FoilsInConcept); if (@Concepts > 1) { - $table .= ''. + $table .= &Apache::loncommon::start_data_table_row(). ''. ''. ''. ''. ''. ''. - "\n"; + &Apache::loncommon::end_data_table_row(); } else { - $table .= ''. + $table .= &Apache::loncommon::start_data_table_row(). ''. ''. ''. ''. - "\n"; + &Apache::loncommon::end_data_table_row(); } foreach my $foilid (@FoilsInConcept) { if (@Concepts > 1) { - $table .= ''. + $table .= &Apache::loncommon::start_data_table_row(). ''. ''. ''. ''. ''. ''. - "\n"; + &Apache::loncommon::end_data_table_row(); } else { - $table .= ''. + $table .= &Apache::loncommon::start_data_table_row(). ''. ''. ''. ''. - "\n"; + &Apache::loncommon::end_data_table_row(); } } continue { $foilindex++; @@ -1755,7 +1813,7 @@ sub build_foil_index { } continue { $conceptindex++; } - $table .= "
'.&mt('Concept Number').''.&mt('Concept').''.&mt('Foil Number').''.&mt('Foil Name').''.&mt('Foil Text').''.&mt('Correct Value').'
'.&mt('Foil Number').''.&mt('Foil Name').''.&mt('Foil Text').''.&mt('Correct Value').'
'.$conceptindex.''.&HTML::Entities::encode($concept->{'name'},'<>&"').''.$foilindex++.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').''.$Foildata{$firstfoil}->{'text'}.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'
'.$foilindex++.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').''.$Foildata{$firstfoil}->{'text'}.''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'
'.$foilindex.''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').''.$Foildata{$foilid}->{'text'}.''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'
'.$foilindex.''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').''.$Foildata{$foilid}->{'text'}.''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'
\n"; + $table .= &Apache::loncommon::end_data_table(); # # Build option index with color stuff return ($table,\@Foils,\@Concepts); @@ -1811,87 +1869,94 @@ sub build_foil_key { sub CreateInterface { ## ## Environment variable initialization - if (! exists$ENV{'form.AnalyzeOver'}) { - $ENV{'form.AnalyzeOver'} = 'tries'; + if (! exists($env{'form.AnalyzeOver'})) { + $env{'form.AnalyzeOver'} = 'tries'; } ## ## Build the menu my $Str = ''; - $Str .= &Apache::lonhtmlcommon::breadcrumbs - (undef,'Detailed Problem Analysis'); - $Str .= ''."\n"; - $Str .= ''; - $Str .= ''; - $Str .= ''; - $Str .= ''; - $Str .= ''."\n"; + $Str .= &Apache::lonhtmlcommon::breadcrumbs('Detailed Problem Analysis'); + $Str .= '

'; + $Str .= &Apache::loncommon::start_data_table(); + $Str .= &Apache::loncommon::start_data_table_header_row(); + $Str .= '

'; + $Str .= ''; + $Str .= ''; + $Str .= ''; + $Str .= &Apache::loncommon::end_data_table_header_row(); ## ## - $Str .= ''; # + $Str .= ''; + # $Str .= ''; # ## ## - $Str .= ''; ## ## - $Str .= ''."\n"; - $Str .= '
'.&mt('Sections').''.&mt('Enrollment Status').' 
'.&mt('Sections').''.&mt('Groups').''.&mt('Access Status').''.&mt('Options').'
'."\n"; + $Str .= &Apache::loncommon::start_data_table_row(); + $Str .= ''."\n"; $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5); $Str .= ''."\n"; + $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5); + $Str .= ''; $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); $Str .= ''; + $Str .= ''; ## my $showprob_checkbox = '
'; + '
'; ## my $analyze_selector = ''; - $Str .= '
'.$/; + '
'.$/; ## my $numplots_selector = '
'; - $Str .= ''; + $numplots_selector .= '
'; + $Str .= ''; ## - $Str .= ''; $Str .= '
'."\n"; + $Str .= &Apache::loncommon::end_data_table_row(); + $Str .= &Apache::loncommon::end_data_table(); + $Str .= '

'; + $Str .= '

'; return $Str; } @@ -1923,7 +1988,7 @@ sub hashify_attempt { my %attempt; $attempt{'student'} = $row->[&Apache::loncoursedata::RD_sname()]; $attempt{'tries'} = $row->[&Apache::loncoursedata::RD_tries()]; - $attempt{'submission'} = &Apache::lonnet::unescape($row->[&Apache::loncoursedata::RD_submission()]); + $attempt{'submission'} = &unescape($row->[&Apache::loncoursedata::RD_submission()]); $attempt{'award'} = $row->[&Apache::loncoursedata::RD_awarddetail()]; $attempt{'timestamp'} = $row->[&Apache::loncoursedata::RD_timestamp()]; return %attempt; @@ -1947,12 +2012,12 @@ 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); + $foilid = &unescape($foilid); my (undef,$submission) = split('=',$Foilsubs[$j]); if ($correct) { $RowData{$foilid}->{'_correct'}++; } else { - $submission = &Apache::lonnet::unescape($submission); + $submission = &unescape($submission); $RowData{$foilid}->{$submission}++; } $RowData{$foilid}->{'_total'}++;