--- loncom/interface/lonstatistics.pm 2008/09/16 12:32:18 1.140 +++ loncom/interface/lonstatistics.pm 2008/09/16 15:40:15 1.141 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.140 2008/09/16 12:32:18 bisitz Exp $ +# $Id: lonstatistics.pm,v 1.141 2008/09/16 15:40:15 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -965,46 +965,55 @@ sub DisplayClasslist { my @selected_sections = &get_selected_sections(); if (! @Students) { if ($selected_sections[0] eq 'all') { - if (lc($env{'form.Status'}) eq 'any') { - $Str .= '

'. - &mt('There are no students in the course.'). - '

'; - } elsif (lc($env{'form.Status'}) eq 'active') { - $Str .= '

'. + if (lc($env{'form.Status'}) eq 'active') { + $Str .= '

'. &mt('There are no currently enrolled students in the course.'). - '

'; + '

'; } elsif (lc($env{'form.Status'}) eq 'expired') { - $Str .= '

'. + $Str .= '

'. &mt('There are no previously enrolled students in the course.'). - '

'; + '

'; + } elsif (lc($env{'form.Status'}) eq 'future') { + $Str .= '

'. + &mt('There are no students with future access in the course.'). + '

'; + } else { # 'any' and any others + $Str .= '

'. + &mt('There are no students in the course.'). + '

'; } } else { - my $sections; - if (lc($env{'form.Status'}) eq 'any') { - $Str .= '

'. - &mt('There are no students in the selected sections.'). - '

'; - } elsif (lc($env{'form.Status'}) eq 'active') { - $Str .= '

'. + if (lc($env{'form.Status'}) eq 'active') { + $Str .= '

'. &mt('There are no currently enrolled students in the selected sections.'). - '

'; + '

'; } elsif (lc($env{'form.Status'}) eq 'expired') { - $Str .= '

'. + $Str .= '

'. &mt('There are no previously enrolled students in the selected sections.'). - '

'; + '

'; + } elsif (lc($env{'form.Status'}) eq 'future') { + $Str .= '

'. + &mt('There are no students with future access in the selected sections.'). + '

'; + } else { # 'any' and any others + $Str .= '

'. + &mt('There are no students in the selected sections.'). + '

'; } } - $Str.= ''. - &mt('Click here to return to the chart').''; + $Str.= '

' + .'' + .&mt('Return to the chart').'' + .'

'; $r->print($Str); $r->rflush(); return; } - # "Click" is asinine but it is probably not my place to change the world. - $Str .= '

Click on a students name or username to view their chart

'; - $Str .= '
'."\n"; - $Str .= ''."\n"; + $Str .= '

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

' + .'

'.&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 .= ''; } - $Str .= ''."\n"; + $Str .= &Apache::loncommon::end_data_table_header_row(); # - my $alternate = 0; foreach my $student (@Students) { # @Students is a package variable my $sname = $student->{'username'}.':'.$student->{'domain'}; - if($alternate) { - $Str .= ''; - } else { - $Str .= ''; - } - $alternate = ($alternate + 1) % 2; + $Str .= &Apache::loncommon::start_data_table_row(); # foreach my $field (@Fields) { $Str .= ''; } - $Str .= "\n"; + $Str .= &Apache::loncommon::end_data_table_row(); } - $Str .= '
'.&mt($field). '
'; @@ -1041,9 +1044,9 @@ sub DisplayClasslist { } $Str .= '
'."\n"; + $Str .= &Apache::loncommon::end_data_table(); # $r->print($Str); $r->rflush();