--- loncom/interface/lonstatistics.pm 2011/01/17 00:19:38 1.154 +++ loncom/interface/lonstatistics.pm 2013/03/18 01:28:27 1.156.2.2 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.154 2011/01/17 00:19:38 www Exp $ +# $Id: lonstatistics.pm,v 1.156.2.2 2013/03/18 01:28:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -413,7 +413,7 @@ sub StudentDataSelect { last; } } - $Str .= ">all\n"; + $Str .= '>'.&mt('all')."\n"; # # Loop through the student data fields foreach my $item (@StudentDataOrder) { @@ -424,7 +424,7 @@ sub StudentDataSelect { last; } } - $Str .= '>'.$item."\n"; + $Str .= '>'.&mt($item)."\n"; } $Str .= "\n"; return $Str; @@ -691,7 +691,7 @@ sub DisplayClasslist { } $Str .= '

'.&mt('Select One Student').'

' - .'

'.&mt("Click on a student's name or username to view their chart").'

' + .'

'.&mt("Click on a student's name or username to view their chart.").'

' .&Apache::loncommon::start_data_table() .&Apache::loncommon::start_data_table_header_row(); foreach my $field (@Fields) { @@ -715,11 +715,16 @@ sub DisplayClasslist { $Str .= '&sort='.&escape($env{'form.sort'}); $Str .= '&SelectedStudent='; $Str .= &escape($sname).'">'; - $Str .= $student->{$field}.' '; + $Str .= $student->{$field}; $Str .= ''; } elsif ($field eq 'status') { $Str .= &mt($student->{$field}); } else { + if ($student->{$field} eq 'none') { + $Str .= &mt('none') + } else { + $Str .= $student->{$field}; + } $Str .= $student->{$field}; } $Str .= ''; @@ -839,16 +844,15 @@ ENDSTYLE bug=>'Statistics and Charts'}); if (! exists($env{'form.reportSelected'}) || $env{'form.reportSelected'} eq '') { - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Statistics Main Page')); - &Apache::lonquickgrades::startGradeScreen($r,'statistics'); - $r->print(&CreateMainMenu()); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Statistics Main Page'). + &CreateMainMenu()); } else { # if (! &Apache::lonmysql::verify_sql_connection()) { my $serveradmin = $r->dir_config('lonAdmEMail'); - $r->print('

'. + $r->print('

'. &mt('Unable to connect to database!'). - '

'); + '

'); $r->print('

' .&mt('Please notify the server administrator [_1]', ,''.$serveradmin.'') @@ -928,7 +932,6 @@ ENDSTYLE # $r->print("\n"); } - &Apache::lonquickgrades::endGradeScreen($r); $r->print(&Apache::loncommon::end_page()); $r->rflush(); #