--- loncom/interface/lonstatistics.pm 2007/06/06 17:30:40 1.138 +++ 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.138 2007/06/06 17:30:40 albertel Exp $ +# $Id: lonstatistics.pm,v 1.141 2008/09/16 15:40:15 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -707,8 +707,13 @@ sub selected_sequences_with_assessments # my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); },1,0,1); + my $toplevelseq = $navmap->getById('0.0'); + if (!grep(/^\Q$toplevelseq\E$/,@sequences)) { + unshift(@sequences,$toplevelseq); + } + my @sequences_with_assessments; - for my $sequence ($navmap->getById('0.0'), @sequences) { + foreach my $sequence (@sequences) { if ($navmap->hasResource($sequence,sub { shift->is_problem(); },0,1)){ push(@sequences_with_assessments,$sequence); } @@ -960,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 currently enrolled students in the course.'). - ''; + '
'; } elsif (lc($env{'form.Status'}) eq 'expired') { - $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 currently enrolled students in the selected sections.'). - ''; + '
'; } elsif (lc($env{'form.Status'}) eq 'expired') { - $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 .= ''."\n";
- $Str .= '
|
'. - &mt('Please notify the server administrator '). - ''.$serveradmin.'
'); + ''); + $r->print('' + .&mt('Please notify the server administrator [_1]', + ,''.$serveradmin.'') + .'
'); $r->print(''. &mt('Course Statistics and Charts cannot be '. 'retrieved until the database is restarted. '.