--- loncom/interface/lonstatistics.pm 2006/08/18 15:15:38 1.137 +++ loncom/interface/lonstatistics.pm 2008/10/22 10:53:21 1.142 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.137 2006/08/18 15:15:38 raeburn Exp $ +# $Id: lonstatistics.pm,v 1.142 2008/10/22 10:53:21 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -76,7 +76,6 @@ use Apache::lonpercentage; use Apache::lonstudentsubmissions(); use Apache::lonsurveyreports(); use Apache::longradinganalysis(); -use lib '/home/httpd/lib/perl/'; use LONCAPA; ####################################################### @@ -313,7 +312,11 @@ sub PrepareClasslist { if ($env{'request.course.sec'} !~ /^\s*$/) { @Sections = ($env{'request.course.sec'}); } else { - @Sections = sort {$a cmp $b} keys(%Sections); + @Sections = sort { + if ($a == $a && $b == $b ) { return $a <=> $b; } + return $a cmp $b; + } keys(%Sections); + unshift(@Sections,'all'); # Put 'all' at the front of the list } # Sort the groups @@ -459,7 +462,7 @@ sub section_and_enrollment_description { $description = §ion_or_group_text($mode,'section',@sections). ' '.§ion_or_group_text($mode,'group',@groups); if ($mode eq 'localized') { - $description .= &mt(' [_1] access status.',$env{'form.Status'}); + $description .= ' '.&mt($env{'form.Status'}.' access status.'); } elsif ($mode eq 'plaintext') { $description .= ' '.$env{'form.Status'}.' access status.'; } @@ -485,21 +488,21 @@ sub section_or_group_text { ); if (scalar(@items) == 1 && $items[0] ne 'all') { if ($mode eq 'localized') { - $text = &mt('[_1] [_2].',$phrases{$type}{single},$items[0]); + $text = &mt($phrases{$type}{single}.' [_1].',$items[0]); } elsif ($mode eq 'plaintext') { $text = $phrases{$type}{single}.' '.$items[0].'.'; } } elsif (scalar(@items) && $items[0] eq 'all') { if ($mode eq 'localized') { - $text = &mt('[_1].',$phrases{$type}{all}); + $text = &mt($phrases{$type}{all}.'.'); } elsif ($mode eq 'plaintext') { $text = $phrases{$type}{all}.'.'; } } elsif (scalar(@items)) { my $lastitem = pop(@items); if ($mode eq 'localized') { - $text = &mt('[_1] [_2] and [_3].',$phrases{$type}{plural}, + $text = &mt($phrases{$type}{plural}.' [_1] and [_2].', join(', ',@items),$lastitem); } elsif ($mode eq 'plaintext') { $text = $phrases{$type}{plural}.' '.join(', ',@items).' and '. @@ -704,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); } @@ -957,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. '.