--- loncom/interface/lonstatistics.pm 2012/05/03 11:21:27 1.156 +++ loncom/interface/lonstatistics.pm 2013/05/11 21:48:06 1.156.2.3 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.156 2012/05/03 11:21:27 goltermann Exp $ +# $Id: lonstatistics.pm,v 1.156.2.3 2013/05/11 21:48:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -615,7 +615,7 @@ sub DisplayClasslist { # Output some of the standard interface components my $Str; $Str .= &Apache::lonhtmlcommon::breadcrumbs('Select One Student'); - $Str .= '

'."\n"; + $Str .= '
'."\n"; $Str .= ''; $Str .= ''; $Str .= ''; @@ -633,7 +633,7 @@ sub DisplayClasslist { ''; $Str .= ''.$/; - $Str .= '
'.&mt('Sections').''.&mt('Groups').'

'; + $Str .= ''; $Str .= ''; $r->print($Str); @@ -691,13 +691,13 @@ 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) { $Str .= ''.&mt($field). ''; } @@ -712,15 +712,19 @@ sub DisplayClasslist { if ($field eq 'fullname' || $field eq 'username') { $Str .= ''; - $Str .= $student->{$field}.' '; + $Str .= $student->{$field}; $Str .= ''; } elsif ($field eq 'status') { $Str .= &mt($student->{$field}); } else { - $Str .= $student->{$field}; + if ($student->{$field} eq 'none') { + $Str .= &mt('none') + } else { + $Str .= $student->{$field}; + } } $Str .= ''; } @@ -839,9 +843,8 @@ 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()) { @@ -928,7 +931,6 @@ ENDSTYLE # $r->print("\n"); } - &Apache::lonquickgrades::endGradeScreen($r); $r->print(&Apache::loncommon::end_page()); $r->rflush(); #