--- loncom/interface/statistics/lonproblemstatistics.pm 2012/03/15 20:53:18 1.121 +++ loncom/interface/statistics/lonproblemstatistics.pm 2018/03/07 12:24:27 1.128 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemstatistics.pm,v 1.121 2012/03/15 20:53:18 www Exp $ +# $Id: lonproblemstatistics.pm,v 1.128 2018/03/07 12:24:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -74,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. +## # # ## @@ -85,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 @@ -175,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', }, @@ -275,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', }, @@ -431,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', }, @@ -486,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', }, @@ -579,14 +587,14 @@ sub parse_field_selection { sub field_selection_input { my $Str = '<select name="fieldselections" multiple="multiple" size="5">'."\n"; - $Str .= '<option value="all">all</option>'."\n"; + $Str .= '<option value="all">'.&mt('all').'</option>'."\n"; foreach my $field (@Fields) { next if ($field->{'selectable'} ne 'yes'); $Str .= ' <option value="'.$field->{'name'}.'" '; if ($field->{'selected'} eq 'yes') { - $Str .= 'selected '; + $Str .= 'selected="selected" '; } - $Str .= '>'.$field->{'title'}.'</option>'."\n"; + $Str .= '>'.&mt($field->{'title'}).'</option>'."\n"; } $Str .= "</select>\n"; } @@ -611,7 +619,6 @@ sub CreateInterface { &parse_field_selection(); # my $Str = ''; - $Str .= '<p>'; $Str .= &Apache::loncommon::start_data_table(); $Str .= &Apache::loncommon::start_data_table_header_row(); $Str .= '<th>'.&mt('Sections').'</th>'; @@ -637,14 +644,13 @@ sub CreateInterface { $Str .= &field_selection_input(); $Str .= '</td><td align="center" valign="top">'; $Str .= &plot_dropdown(); - $Str .= '</td>'."\n"; + $Str .= "\n"; $Str .= '</td><td align="center" valign="top">'; $Str .= &Apache::lonstathelpers::limit_by_time_form(); $Str .= '</td>'."\n"; $Str .= &Apache::loncommon::end_data_table_row(); $Str .= &Apache::loncommon::end_data_table(); # - $Str .= '</p>'; $Str .= '<input type="submit" name="GenerateStatistics" value="'. &mt('Generate Statistics').'" />'; $Str .= (' 'x10); @@ -741,29 +747,30 @@ sub BuildProblemStatisticsPage { return; } if (exists($env{'form.Excel'})) { - $r->print('<h4>'. + $r->print('<p>'. &Apache::lonstatistics::section_and_enrollment_description(). - '</h4>'); + '</p>'); &Excel_output($r); } else { $r->print('<input type="submit" name="Excel" value="'. &mt('Produce Excel Output').'" />'.' 'x5); $r->rflush(); - $r->print('<h4>'. + $r->print('<p>'. &Apache::lonstatistics::section_and_enrollment_description(). - '</h4>'); + '</p>'); my $count = 0; + my $include_tools = 1; foreach my $seq (@sequences) { my @resources = - &Apache::lonstathelpers::get_resources($navmap,$seq); + &Apache::lonstathelpers::get_resources($navmap,$seq,$include_tools); $count += scalar(@resources); } if ($count > 10) { - $r->print('<h2>'. - &mt('Compiling statistics for [_1] problems',$count). - '</h2>'); + $r->print('<p>'. + &mt('Compiling statistics for [quant,_1,problem]',$count). + '</p>'); if ($count > 30) { - $r->print('<h3>'.&mt('This will take some time.').'</h3>'); + $r->print('<p class="LC_info">'.&mt('This will take some time.').'</p>'); } $r->rflush(); } @@ -795,17 +802,14 @@ sub output_sequence_statistics { $r->print('<h2>'.&mt('Sequence Statistics'). &Apache::loncommon::help_open_topic('Statistics_Sequence'). '</h2>'); - $r->print('<table border="0"><tr><td bgcolor="#777777">'."\n". - '<table border="0" cellpadding="3">'."\n". - '<tr bgcolor="#FFFFE6">'); + $r->print(&Apache::loncommon::start_data_table()); $r->print(&sequence_html_header()); foreach my $seq (@sequences) { last if ($c->aborted); &compute_sequence_statistics($seq); $r->print(&sequence_html_output($seq)); } - $r->print('</table>'); - $r->print('</table>'); + $r->print(&Apache::loncommon::end_data_table()); $r->rflush(); return; } @@ -821,22 +825,22 @@ sub output_sequence_statistics { sub output_html_by_sequence { my ($r) = @_; my $c = $r->connection(); - $r->print(&html_preamble()); + $r->print('<br />'.&html_preamble()); # foreach my $seq (@sequences) { last if ($c->aborted); $r->print("<h3>".$seq->compTitle."</h3>". - '<table border="0"><tr><td bgcolor="#777777">'."\n". - '<table border="0" cellpadding="3">'."\n". - '<tr bgcolor="#FFFFE6">'. - &statistics_table_header('no container')."</tr>\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('<tr>'.&statistics_html_table_data($data, - 'no container'). - "</tr>\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('</table>'."\n".'</table>'."\n"); + $r->print(&Apache::loncommon::end_data_table()."\n"); $r->rflush(); } return; @@ -851,17 +855,17 @@ sub output_html_stats { my $count=0; foreach my $data (@StatsArray) { if ($count++ % 50 == 0) { - $r->print("</table>\n</table>\n"); - $r->print('<table border="0"><tr><td bgcolor="#777777">'."\n". - '<table border="0" cellpadding="3">'."\n". - '<tr bgcolor="#FFFFE6">'. - '<tr bgcolor="#FFFFE6">'. - &statistics_table_header(). - "</tr>\n"); - } - $r->print('<tr>'.&statistics_html_table_data($data)."</tr>\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("</table>\n</table>\n"); + $r->print(&Apache::loncommon::end_data_table_row()); return; } @@ -878,8 +882,8 @@ sub html_preamble { &Apache::lonlocal::locallocaltime($endtime) ).'</h3>'; } - $Str .= "<h3>".&mt('Compiled on [_1]', - &Apache::lonlocal::locallocaltime(time))."</h3>"; + $Str .= "<p>".&mt('Compiled on [_1]', + &Apache::lonlocal::locallocaltime(time))."</p>"; return $Str; } @@ -897,7 +901,7 @@ sub statistics_html_table_data { foreach my $field (@Fields) { next if ($options =~ /no $field->{'name'}/); next if ($field->{'selected'} ne 'yes'); - $row .= '<td bgcolor="'.$field->{'color'}.'"'; + $row .= '<td style="background-color:'.$field->{'color'}.'"'; if (exists($field->{'align'})) { $row .= ' align="'.$field->{'align'}.'"'; } @@ -925,14 +929,16 @@ sub statistics_table_header { next if ($options =~ /no $field->{'name'}/); next if ($field->{'selected'} ne 'yes'); $header_row .= '<th>'; + my $header_row_text = &mt($field->{'title'}); if (exists($field->{'sortable'}) && $field->{'sortable'} eq 'yes') { - $header_row .= '<a href="javascript:'. + $header_row .= + '<a href="javascript:'. 'document.Statistics.sortby.value='."'".$field->{'name'}."'". - ';document.Statistics.submit();">'; - } - $header_row .= &mt($field->{'title'}); - if ($options =~ /sortable/) { - $header_row.= '</a>'; + ';document.Statistics.submit();">'. + $header_row_text. + '</a>'; + } else { + $header_row .= $header_row_text; } if ($options !~ /no plots/ && exists($field->{'graphable'}) && @@ -949,13 +955,13 @@ sub statistics_table_header { } sub sequence_html_header { - my $Str .= '<tr>'; + my $Str .= &Apache::loncommon::start_data_table_header_row(); foreach my $field (@SeqFields) { # next if ($field->{'selected'} ne 'yes'); $Str .= '<th bgcolor="'.$field->{'color'}.'"'; - $Str .= '>'.$field->{'title'}.'</th>'; + $Str .= '>'.&mt($field->{'title'}).'</th>'; } - $Str .= '</tr>'; + $Str .= &Apache::loncommon::end_data_table_header_row(); return $Str; } @@ -963,7 +969,7 @@ sub sequence_html_header { sub sequence_html_output { my ($seq) = @_; my $data = $SeqStat{$seq->symb}; - my $row = '<tr>'; + my $row = &Apache::loncommon::start_data_table_row(); foreach my $field (@SeqFields) { next if ($field->{'selected'} ne 'yes'); $row .= '<td bgcolor="'.$field->{'color'}.'"'; @@ -978,7 +984,7 @@ sub sequence_html_output { } $row .= '</td>'; } - $row .= '</tr>'."\n"; + $row .= &Apache::loncommon::end_data_table_row()."\n"; return $row; } @@ -1009,15 +1015,15 @@ sub make_single_stat_plot { my $title; my $yaxis; foreach my $field (@Fields) { next if ($field->{'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('<h3>'. + $r->print('<p class="LC_warning">'. &mt('Unable to plot the requested statistic.'). - '</h3>'); + '</p>'); return; } # @@ -1044,7 +1050,7 @@ sub make_single_stat_plot { } # $r->print("<p>".&Apache::loncommon::DrawBarGraph($title, - 'Problem Number', + &mt('Problem Number'), $yaxis, $max, undef, # colors @@ -1109,10 +1115,14 @@ sub degrees_plot { my $diffdata .= '<data>'.join(',',@Labels).'</data>'.$/. '<data>'.join(',',@Diff).'</data>'.$/; # - 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"; <gnuplot @@ -1124,7 +1134,7 @@ sub degrees_plot { align="center" border="on" transparent="on" - alttag="Degree of Discrimination and Degree of Difficulty Plot" + alttag="$lt{'alttag'}" samples="100" bgcolor="xffffff" height="$height" @@ -1135,7 +1145,7 @@ sub degrees_plot { box="off" /> <title>$title</title> <axis xmin="0" ymin="$ymin" xmax="$xmax" ymax="$ymax" color="x000000" /> - <xlabel>Problem Number</xlabel> + <xlabel>$lt{'xlabel'}</xlabel> <curve linestyle="linespoints" name="DoDisc" @@ -1197,11 +1207,16 @@ sub tries_data_plot { '<data>'.join(',',@Mean).'</data>'.$/. '<data>'.join(',',@STD).'</data>'.$/; # - 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"; <gnuplot texfont="10" @@ -1212,15 +1227,15 @@ sub tries_data_plot { align="center" border="on" transparent="on" - alttag="Mean and S.D of Tries Plot" + alttag="$lt{'alttag'}" samples="100" bgcolor="xffffff" height="$height" width="$width"> <title>$title</title> <axis xmin="0" ymin="0" xmax="$xmax" ymax="$ymax" color="x000000" /> - <xlabel>Problem Number</xlabel> - <ylabel>Number of Tries</ylabel> + <xlabel>$lt{'xlabel'}</xlabel> + <ylabel>$lt{'ylabel'}</ylabel> <curve linestyle="yerrorbars" name="S.D. Tries" @@ -1245,6 +1260,7 @@ END sub plot_dropdown { my $current = ''; + my $title; # if (defined($env{'form.plot'})) { $current = $env{'form.plot'}; @@ -1260,7 +1276,7 @@ sub plot_dropdown { # my $Str= "\n".'<select name="plot" size="1">'; $Str .= '<option name="none"></option>'."\n"; - $Str .= '<option name="none2">none</option>'."\n"; + $Str .= '<option name="none2">'.&mt('none').'</option>'."\n"; foreach my $field (@Additional_Plots,@Fields) { if (! exists($field->{'graphable'}) || $field->{'graphable'} ne 'yes') { @@ -1268,9 +1284,11 @@ sub plot_dropdown { } $Str .= '<option value="'.$field->{'name'}.'"'; if ($field->{'name'} eq $current) { - $Str .= ' selected '; + $Str .= ' selected="selected"'; } - $Str.= '>'.&mt($field->{'title'}).'</option>'."\n"; + $title = &mt($field->{'long_title'}); + $title = &mt($field->{'title'}) if (!$title); + $Str.= '>'.$title.'</option>'."\n"; } $Str .= '</select>'."\n"; return $Str; @@ -1328,16 +1346,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); @@ -1346,7 +1365,7 @@ 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++; $cols_output=0; @@ -1451,8 +1470,9 @@ sub write_headers { ################################################## sub compute_statistics_on_sequence { my ($seq) = @_; + my $include_tools = 1; my @Data; - foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) { + foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq,$include_tools)) { foreach my $part (@{$res->parts}) { next if (($res->is_survey($part)) || ($res->is_anonsurvey($part))) ; # @@ -1630,9 +1650,10 @@ Returns: integer between -1 and 1 ############################################### sub compute_discrimination_factor { my ($resource,$part,$seq) = @_; + my $include_tools = 1; my $symb = $resource->symb; my @Resources; - foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)){ + foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq,$include_tools)){ next if ($res->symb eq $symb); push (@Resources,$res->symb); } @@ -1651,11 +1672,11 @@ sub compute_discrimination_factor { my $number_to_grab = int(scalar(@{$ranking})/4); my $num_students = scalar(@{$ranking}); my @BottomSet = map { $_->[&Apache::loncoursedata::RNK_student()]; - } @{$ranking}[0..$number_to_grab]; + } @{$ranking}[0..$number_to_grab-1]; my @TopSet = map { $_->[&Apache::loncoursedata::RNK_student()]; - } @{$ranking}[-$number_to_grab..0]; + } @{$ranking}[-$number_to_grab..-1]; if (! @BottomSet || (@BottomSet == 1 && $BottomSet[0] eq '') || ! @TopSet || (@TopSet == 1 && $TopSet[0] eq '')) { return 'nan'; @@ -1696,10 +1717,11 @@ sub compute_discrimination_factor { ############################################### sub compute_sequence_statistics { my ($seq) = @_; + my $include_tools = 1; my $symb = $seq->symb; my @Resources; my $part_count; - foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) { + foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq,$include_tools)) { push (@Resources,$res->symb); $part_count += scalar(@{$res->parts}); }