--- loncom/interface/statistics/lonproblemstatistics.pm 2008/10/30 17:45:25 1.115 +++ loncom/interface/statistics/lonproblemstatistics.pm 2014/02/28 19:20:17 1.126 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemstatistics.pm,v 1.115 2008/10/30 17:45:25 bisitz Exp $ +# $Id: lonproblemstatistics.pm,v 1.126 2014/02/28 19:20:17 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,6 +52,7 @@ package Apache::lonproblemstatistics; use strict; use Apache::lonnet; use Apache::loncommon(); +use Apache::lonquickgrades(); use Apache::lonhtmlcommon; use Apache::loncoursedata; use Apache::lonstatistics; @@ -73,6 +74,14 @@ my %SeqStat; # keys are symbs, values ## header for plots created with Graph.pm, both of which more than likely do ## not support localization. ## +## Additional Notes: +## Localization can be done and is done before passing the phrases +## to the output. +## This might conflict with special characters, e.g. German Umlaute or +## chinese characters. Do not use such characters in this case. +## If this failed, consider that the sequence and folder names +## are also passed to the output and would fail the same way. +## # # ## @@ -84,7 +93,7 @@ my %SeqStat; # keys are symbs, values ## title yes any scalar This is what the user sees to identify ## the field. Passed through &mt(). ## long_title yes any scalar Used as graph heading and in excel -## output. NOT translated +## output. Passed through &mt(). ## align no (left|right|center) HTML cell contents alignment ## color yes html color HTML cell background color ## used to visually group statistics @@ -123,11 +132,11 @@ my @Fields = ( align => 'left', color => '#FFFFE6', special => 'link', - sortable => 'yes', + sortable => 'yes', selectable => 'no', defaultselected => 'yes', }, - { name => 'part', + { name => 'part', title => 'Part', align => 'left', color => '#FFFFE6', @@ -174,7 +183,7 @@ my @Fields = ( format => '%d', sortable => 'yes', graphable => 'yes', - long_title => 'Minumum Number of Tries', + long_title => 'Minimum Number of Tries', selectable => 'yes', defaultselected => 'yes', }, @@ -274,7 +283,7 @@ my @Fields = ( sortable => 'yes', graphable => 'yes', long_title => 'Degree of Difficulty'. - '[ 1 - ((#YES+#yes) / Tries) ]', + ' ~[ 1 - ((#YES+#yes) / Tries) ~]', selectable => 'yes', defaultselected => 'yes', }, @@ -375,7 +384,7 @@ my @SeqFields = ( align => 'left', color => '#FFFFE6', special => 'no', - sortable => 'no', + sortable => 'no', selectable => 'yes', defaultselected => 'no', }, @@ -430,7 +439,7 @@ my @SeqFields = ( format => '%4.2f', sortable => 'no', graphable => 'no', - long_title => 'Minumum Sequence Score', + long_title => 'Minimum Sequence Score', selectable => 'yes', defaultselected => 'no', }, @@ -485,7 +494,7 @@ my @SeqFields = ( format => '%4.2f', sortable => 'no', graphable => 'no', - long_title => 'Minumum Number of Correct Problems', + long_title => 'Minimum Number of Correct Problems', selectable => 'yes', defaultselected => 'no', }, @@ -510,7 +519,7 @@ my @SeqFields = ( long_title => 'KR-21 reliability statistic', selectable => 'yes', defaultselected => 'no', - }, + }, ); my %SelectedFields; @@ -577,15 +586,15 @@ sub parse_field_selection { } sub field_selection_input { - my $Str = ''."\n"; + $Str .= ''."\n"; foreach my $field (@Fields) { next if ($field->{'selectable'} ne 'yes'); $Str .= ' '."\n"; + $Str .= '>'.&mt($field->{'title'}).''."\n"; } $Str .= "\n"; } @@ -610,9 +619,6 @@ sub CreateInterface { &parse_field_selection(); # my $Str = ''; - $Str .= &Apache::lonhtmlcommon::breadcrumbs('Overall Problem Statistics', - 'Statistics_Overall_Key'); - $Str .= '

'; $Str .= &Apache::loncommon::start_data_table(); $Str .= &Apache::loncommon::start_data_table_header_row(); $Str .= ''.&mt('Sections').''; @@ -638,20 +644,13 @@ sub CreateInterface { $Str .= &field_selection_input(); $Str .= ''; $Str .= &plot_dropdown(); - $Str .= ''."\n"; + $Str .= "\n"; $Str .= ''; $Str .= &Apache::lonstathelpers::limit_by_time_form(); $Str .= ''."\n"; $Str .= &Apache::loncommon::end_data_table_row(); $Str .= &Apache::loncommon::end_data_table(); # - $Str .= '

' - .&mt('Status: [_1]', - '') - .'

'; - # - $Str .= '

'; $Str .= ''; $Str .= (' 'x10); @@ -704,12 +703,16 @@ sub BuildProblemStatisticsPage { undef(%SeqStat); # # Finally let the user know we are here + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Overall Problem Statistics', + 'Statistics_Overall_Key')); + &Apache::lonquickgrades::startGradeScreen($r,'statistics'); + my $interface = &CreateInterface($r); $r->print($interface); $r->print(''); # - my @CacheButtonHTML = + my @CacheButtonHTML = &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status'); my $Str; foreach my $html (@CacheButtonHTML) { @@ -718,11 +721,12 @@ sub BuildProblemStatisticsPage { # $r->print($Str); if (! exists($env{'form.firstrun'})) { - $r->print('

'. + $r->print('

'. &mt('Press "Generate Statistics" when you are ready.'). - '

'. + '

'. + '

'. &mt('It may take some time to update the student data '. - 'for the first analysis. Future analysis this session '. + 'for the first analysis. Future analysis this session '. 'will not have this delay.'). '

'); &clean_up(); @@ -734,7 +738,7 @@ sub BuildProblemStatisticsPage { # it does not slow things down noticably. &Apache::loncoursedata::populate_weight_table(); # - ($navmap,@sequences) = + ($navmap,@sequences) = &Apache::lonstatistics::selected_sequences_with_assessments(); if (! ref($navmap)) { $r->print('
'.&mt('A course-wide error occurred.').'
'. @@ -743,29 +747,29 @@ sub BuildProblemStatisticsPage { return; } if (exists($env{'form.Excel'})) { - $r->print('

'. + $r->print('

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

'); + '

'); &Excel_output($r); - } else { + } else { $r->print(''.' 'x5); $r->rflush(); - $r->print('

'. + $r->print('

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

'); + '

'); my $count = 0; foreach my $seq (@sequences) { - my @resources = + my @resources = &Apache::lonstathelpers::get_resources($navmap,$seq); $count += scalar(@resources); } if ($count > 10) { - $r->print('

'. - &mt('Compiling statistics for [_1] problems',$count). - '

'); + $r->print('

'. + &mt('Compiling statistics for [quant,_1,problem]',$count). + '

'); if ($count > 30) { - $r->print('

'.&mt('This will take some time.').'

'); + $r->print('

'.&mt('This will take some time.').'

'); } $r->rflush(); } @@ -797,17 +801,14 @@ sub output_sequence_statistics { $r->print('

'.&mt('Sequence Statistics'). &Apache::loncommon::help_open_topic('Statistics_Sequence'). '

'); - $r->print('
'."\n". - ''."\n". - ''); + $r->print(&Apache::loncommon::start_data_table()); $r->print(&sequence_html_header()); - foreach my $seq (@sequences) { + foreach my $seq (@sequences) { last if ($c->aborted); &compute_sequence_statistics($seq); $r->print(&sequence_html_output($seq)); } - $r->print('
'); - $r->print('
'); + $r->print(&Apache::loncommon::end_data_table()); $r->rflush(); return; } @@ -823,22 +824,22 @@ sub output_sequence_statistics { sub output_html_by_sequence { my ($r) = @_; my $c = $r->connection(); - $r->print(&html_preamble()); + $r->print('
'.&html_preamble()); # foreach my $seq (@sequences) { last if ($c->aborted); $r->print("

".$seq->compTitle."

". - '
'."\n". - ''."\n". - ''. - &statistics_table_header('no container')."\n"); + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + &statistics_table_header('no container'). + &Apache::loncommon::end_data_table_header_row()."\n"); my @Data = &compute_statistics_on_sequence($seq); foreach my $data (@Data) { - $r->print(''.&statistics_html_table_data($data, - 'no container'). - "\n"); + $r->print(&Apache::loncommon::start_data_table_row(). + &statistics_html_table_data($data,'no container'). + &Apache::loncommon::end_data_table_row()."\n"); } - $r->print('
'."\n".'
'."\n"); + $r->print(&Apache::loncommon::end_data_table()."\n"); $r->rflush(); } return; @@ -853,17 +854,17 @@ sub output_html_stats { my $count=0; foreach my $data (@StatsArray) { if ($count++ % 50 == 0) { - $r->print("\n\n"); - $r->print('
'."\n". - ''."\n". - ''. - ''. - &statistics_table_header(). - "\n"); - } - $r->print(''.&statistics_html_table_data($data)."\n"); + $r->print(&Apache::loncommon::end_data_table()); + $r->print(&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_row(). + &statistics_table_header(). + &Apache::loncommon::end_data_table_row()); + } + $r->print(&Apache::loncommon::start_data_table_row(). + &statistics_html_table_data($data). + &Apache::loncommon::end_data_table_row()); } - $r->print("
\n
\n"); + $r->print(&Apache::loncommon::end_data_table_row()); return; } @@ -880,8 +881,8 @@ sub html_preamble { &Apache::lonlocal::locallocaltime($endtime) ).''; } - $Str .= "

".&mt('Compiled on [_1]', - &Apache::lonlocal::locallocaltime(time))."

"; + $Str .= "

".&mt('Compiled on [_1]', + &Apache::lonlocal::locallocaltime(time))."

"; return $Str; } @@ -899,7 +900,7 @@ sub statistics_html_table_data { foreach my $field (@Fields) { next if ($options =~ /no $field->{'name'}/); next if ($field->{'selected'} ne 'yes'); - $row .= '{'color'}.'"'; if (exists($field->{'align'})) { $row .= ' align="'.$field->{'align'}.'"'; } @@ -927,14 +928,16 @@ sub statistics_table_header { next if ($options =~ /no $field->{'name'}/); next if ($field->{'selected'} ne 'yes'); $header_row .= ''; + my $header_row_text = &mt($field->{'title'}); if (exists($field->{'sortable'}) && $field->{'sortable'} eq 'yes') { - $header_row .= '{'name'}."'". - ';document.Statistics.submit();">'; - } - $header_row .= &mt($field->{'title'}); - if ($options =~ /sortable/) { - $header_row.= ''; + ';document.Statistics.submit();">'. + $header_row_text. + ''; + } else { + $header_row .= $header_row_text; } if ($options !~ /no plots/ && exists($field->{'graphable'}) && @@ -951,13 +954,13 @@ sub statistics_table_header { } sub sequence_html_header { - my $Str .= ''; + my $Str .= &Apache::loncommon::start_data_table_header_row(); foreach my $field (@SeqFields) { # next if ($field->{'selected'} ne 'yes'); $Str .= '{'title'}.''; + $Str .= '>'.&mt($field->{'title'}).''; } - $Str .= ''; + $Str .= &Apache::loncommon::end_data_table_header_row(); return $Str; } @@ -965,7 +968,7 @@ sub sequence_html_header { sub sequence_html_output { my ($seq) = @_; my $data = $SeqStat{$seq->symb}; - my $row = ''; + my $row = &Apache::loncommon::start_data_table_row(); foreach my $field (@SeqFields) { next if ($field->{'selected'} ne 'yes'); $row .= '{'name'} ne $datafield); - $title = $field->{'long_title'}; - $yaxis = $field->{'title'}; + $title = &mt($field->{'long_title'}); + $yaxis = &mt($field->{'title'}); last; } if ($title eq '' || $yaxis eq '') { # datafield is something we do not know enough about to plot - $r->print('

'. + $r->print('

'. &mt('Unable to plot the requested statistic.'). - '

'); + '

'); return; } # # Build up the data sets to plot - my @Labels; + my @Labels; my @Data; my $max = 1; foreach my $data (@StatsArray) { @@ -1046,7 +1049,7 @@ sub make_single_stat_plot { } # $r->print("

".&Apache::loncommon::DrawBarGraph($title, - 'Problem Number', + &mt('Problem Number'), $yaxis, $max, undef, # colors @@ -1064,7 +1067,7 @@ sub degrees_plot { my $plot = ''; my $ymax = 0; my $ymin = 0; - my @Disc; my @Diff; my @Labels; + my @Disc; my @Diff; my @Labels; foreach my $data (@StatsArray) { push(@Labels,$data->{'problem_num'}); my $disc = $data->{'deg_of_disc'}; @@ -1111,10 +1114,14 @@ sub degrees_plot { my $diffdata .= ''.join(',',@Labels).''.$/. ''.join(',',@Diff).''.$/; # - my $title = 'Degree of Discrimination\nand Degree of Difficulty'; + my $title = &mt('Degree of Discrimination[_1]and Degree of Difficulty','\n'); if ($xmax > 50) { - $title = 'Degree of Discrimination and Degree of Difficulty'; + $title = &mt('Degree of Discrimination and Degree of Difficulty'); } + my %lt = &Apache::lonlocal::texthash( + 'alttag' => 'Degree of Discrimination and Degree of Difficulty Plot', + 'xlabel' => 'Problem Number', + ); # $plot=<<"END"; $title - Problem Number + $lt{'xlabel'} END - my $plotresult = + my $plotresult = '

'.&Apache::lonxml::xmlparse($r,'web',$plot).'

'.$/; $r->print($plotresult); return; @@ -1199,11 +1206,16 @@ sub tries_data_plot { ''.join(',',@Mean).''.$/. ''.join(',',@STD).''.$/; # - my $title = 'Mean and S.D. of Tries'; - if ($xmax > 25) { - $title = 'Mean and Standard Deviation of Tries'; + my $title = &mt('Mean and S.D. of Tries'); + if ($xmax > 30) { + $title = &mt('Mean and Standard Deviation of Tries'); } # + my %lt = &Apache::lonlocal::texthash( + 'alttag' => 'Mean and S.D of Tries Plot', + 'xlabel' => 'Problem Number', + 'ylabel' => 'Number of Tries', + ); $plot=<<"END"; $title - Problem Number - Number of Tries + $lt{'xlabel'} + $lt{'ylabel'} END - my $plotresult = + my $plotresult = '

'.&Apache::lonxml::xmlparse($r,'web',$plot).'

'.$/; $r->print($plotresult); return; @@ -1247,6 +1259,7 @@ END sub plot_dropdown { my $current = ''; + my $title; # if (defined($env{'form.plot'})) { $current = $env{'form.plot'}; @@ -1262,7 +1275,7 @@ sub plot_dropdown { # my $Str= "\n".''."\n"; return $Str; @@ -1330,16 +1345,17 @@ sub Excel_output { # Time restrictions my $time_string; if (defined($starttime)) { - # call localtime but not lonlocal:locallocaltime because excel probably - # cannot handle localized text. Probably. - $time_string .= 'Data collected from '.localtime($time_string); if (defined($endtime)) { - $time_string .= ' to '.localtime($endtime); + $time_string .= &mt('Data collected from [_1] to [_2]', + &Apache::lonlocal::locallocaltime($starttime), + &Apache::lonlocal::locallocaltime($endtime)); + } else { + $time_string .= &mt('Data collected from [_1]', + &Apache::lonlocal::locallocaltime($starttime)); } - $time_string .= '.'; } elsif (defined($endtime)) { - # See note above about lonlocal:locallocaltime - $time_string .= 'Data collected before '.localtime($endtime).'.'; + $time_string .= &mt('Data collected before [_1]', + &Apache::lonlocal::locallocaltime($endtime)); } if (defined($time_string)) { $excel_sheet->write($rows_output,$cols_output++,$time_string); @@ -1348,13 +1364,13 @@ sub Excel_output { # # Put the date in there too $excel_sheet->write($rows_output,$cols_output++, - 'Compiled on '.localtime(time)); + &mt('Compiled on [_1]',&Apache::lonlocal::locallocaltime(time))); # - $rows_output++; + $rows_output++; $cols_output=0; ## ## Sequence Statistics - ## + ## &write_headers($excel_sheet,$format,\$rows_output,\$cols_output, \@SeqFields); foreach my $seq (@sequences) { @@ -1432,7 +1448,7 @@ sub write_headers { foreach my $field (@{$Fields}) { next if ($field->{'selected'} ne 'yes'); next if ($field->{'name'} eq 'problem_num'); - # Use english for excel as I am not sure how well excel handles + # Use english for excel as I am not sure how well excel handles # other character sets.... $excel_sheet->write($$rows_output,$$cols_output, $field->{'title'}, @@ -1456,7 +1472,7 @@ sub compute_statistics_on_sequence { my @Data; foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) { foreach my $part (@{$res->parts}) { - next if ($res->is_survey($part)); + next if (($res->is_survey($part)) || ($res->is_anonsurvey($part))) ; # # This is where all the work happens my $data = &get_statistics($seq,$res,$part,scalar(@StatsArray)+1); @@ -1545,13 +1561,13 @@ sub sort_data { =item &get_statistics() -Wrapper routine from the call to loncoursedata::get_problem_statistics. +Wrapper routine from the call to loncoursedata::get_problem_statistics. Calls lonstathelpers::get_time_limits() to limit the data set by time and &compute_discrimination_factor Inputs: $sequence, $resource, $part, $problem_num -Returns: Hash reference with statistics data from +Returns: Hash reference with statistics data from loncoursedata::get_problem_statistics. =cut @@ -1579,7 +1595,7 @@ sub get_statistics { &escape($resource->symb); # if ($SelectedFields{'deg_of_disc'}) { - $data->{'deg_of_disc'} = + $data->{'deg_of_disc'} = &compute_discrimination_factor($resource,$part,$sequence); } # @@ -1591,10 +1607,9 @@ sub get_statistics { $data->{'sections'}=$sections; $data->{'course'} = $env{'request.course.id'}; my $urlres=(&Apache::lonnet::decode_symb($resource->symb))[2]; - $data->{'urlres'}=$urlres; - my %storestats = + my %storestats = &LONCAPA::lonmetadata::dynamic_metadata_storage($data); - my ($dom,$user) = ($urlres=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)}); + my ($dom,$user) = ($urlres=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)}); &Apache::lonnet::put('nohist_resevaldata',\%storestats,$dom,$user); } # @@ -1608,7 +1623,7 @@ sub get_statistics { # my $hinttries = &Apache::lonnet::EXT('resource.'.$part.'.hinttries',$symb); my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',$symb); $data->{'weight'} = $weight; -# $data->{'duedate'} = $duedate; +# $data->{'duedate'} = $duedate; # $data->{'opendate'} = $opendate; # $data->{'maxtries'} = $maxtries; # $data->{'hinttries'} = $hinttries; @@ -1642,7 +1657,7 @@ sub compute_discrimination_factor { # # rank my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits(); - my $ranking = + my $ranking = &Apache::loncoursedata::rank_students_by_scores_on_resources (\@Resources, [&Apache::lonstatistics::get_selected_sections()], @@ -1653,20 +1668,20 @@ sub compute_discrimination_factor { # compute their percent scores on the problems in the sequence, my $number_to_grab = int(scalar(@{$ranking})/4); my $num_students = scalar(@{$ranking}); - my @BottomSet = map { $_->[&Apache::loncoursedata::RNK_student()]; + my @BottomSet = map { $_->[&Apache::loncoursedata::RNK_student()]; } @{$ranking}[0..$number_to_grab]; - my @TopSet = - map { - $_->[&Apache::loncoursedata::RNK_student()]; + my @TopSet = + map { + $_->[&Apache::loncoursedata::RNK_student()]; } @{$ranking}[-$number_to_grab..0]; if (! @BottomSet || (@BottomSet == 1 && $BottomSet[0] eq '') || ! @TopSet || (@TopSet == 1 && $TopSet[0] eq '')) { return 'nan'; } - my ($bottom_sum,$bottom_max) = + my ($bottom_sum,$bottom_max) = &Apache::loncoursedata::get_sum_of_scores($symb,$part,\@BottomSet, undef,$starttime,$endtime); - my ($top_sum,$top_max) = + my ($top_sum,$top_max) = &Apache::loncoursedata::get_sum_of_scores($symb,$part,\@TopSet, undef,$starttime,$endtime); my $deg_of_disc; @@ -1689,10 +1704,10 @@ sub compute_discrimination_factor { ## ## K=the number of items in your test ## M=the mean score on the test -## s=the standard deviation of the scores on your test +## s=the standard deviation of the scores on your test ## ## then: -## +## ## KR-21 rk= [K/(K-1)] * [1- (M*(K-M))/(K*s^2))] ## ############################################### @@ -1709,7 +1724,7 @@ sub compute_sequence_statistics { my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits(); # # First compute statistics based on student scores - my ($smin,$smax,$sMean,$sSTD,$scount,$sMAX) = + my ($smin,$smax,$sMean,$sSTD,$scount,$sMAX) = &Apache::loncoursedata::score_stats ([&Apache::lonstatistics::get_selected_sections()], [&Apache::lonstatistics::get_selected_groups()], @@ -1724,7 +1739,7 @@ sub compute_sequence_statistics { $SeqStat{$symb}->{'max_possible'} = $sMAX; # # Compute statistics based on the number of correct problems - # 'correct' is taken to mean + # 'correct' is taken to mean my ($cmin,$cmax,$cMean,$cSTD,$ccount)= &Apache::loncoursedata::count_stats ([&Apache::lonstatistics::get_selected_sections()],