--- loncom/interface/lonstatistics.pm 2004/06/24 19:17:49 1.105 +++ loncom/interface/lonstatistics.pm 2004/07/15 21:08:45 1.108 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.105 2004/06/24 19:17:49 matthew Exp $ +# $Id: lonstatistics.pm,v 1.108 2004/07/15 21:08:45 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -229,10 +229,10 @@ sub PrepareClasslist { } # # Set up %StudentData - @StudentDataOrder = qw/fullname username domain id section status/; + @StudentDataOrder = qw/fullname username domain id section status comments/; foreach my $field (@StudentDataOrder) { - $StudentData{$field}->{'title'} = $field; - $StudentData{$field}->{'base_width'} = length($field); + $StudentData{$field}->{'title'} = &mt($field); + $StudentData{$field}->{'base_width'} = length(&mt($field)); $StudentData{$field}->{'width'} = $StudentData{$field}->{'base_width'}; } @@ -941,9 +941,12 @@ sub Gather_Full_Student_Data { ################################################## sub DisplayClasslist { my ($r)=@_; + &Apache::lonhtmlcommon::add_breadcrumb + ({text=>'Select One Student'}); # # Output some of the standard interface components my $Str; + $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Select One Student'); $Str .= '<p><table cellspacing="5">'."\n"; $Str .= '<tr>'; $Str .= '<th align="center"><b>'.&mt('Sections').'</b></th>'; @@ -970,36 +973,36 @@ sub DisplayClasslist { if (! @Students) { if ($SelectedSections[0] eq 'all') { if (lc($ENV{'form.Status'}) eq 'any') { - $Str .= '<h2>There are no students in the course.</h2>'; + $Str .= '<h2>'. + &mt('There are no students in the course.'). + '</h2>'; } elsif (lc($ENV{'form.Status'}) eq 'active') { - $Str .= '<h2>There are no currently enrolled students in '. - 'the course.</h2>'; + $Str .= '<h2>'. + &mt('There are no currently enrolled students in the course.'). + '</h2>'; } elsif (lc($ENV{'form.Status'}) eq 'expired') { - $Str .= '<h2>There are no previously enrolled '. - 'students in the course.</h2>'; + $Str .= '<h2>'. + &mt('There are no previously enrolled students in the course.'). + '</h2>'; } } else { my $sections; - if (@SelectedSections == 1) { - $sections = 'section '.$SelectedSections[0]; - } elsif (@SelectedSections > 2) { - $sections = 'sections '.join(', ',@SelectedSections); - $sections =~ s/, ([^,])*$/, and $1/; - } else { - $sections = 'sections '.join(' and ',@SelectedSections); - } if (lc($ENV{'form.Status'}) eq 'any') { - $Str .= '<h2>There are no students in '.$sections.'.</h2>'; + $Str .= '<h2>'. + &mt('There are no students in the selected sections.'). + '</h2>'; } elsif (lc($ENV{'form.Status'}) eq 'active') { - $Str .= '<h2>There are no currently enrolled students '. - 'in '.$sections.'.</h2>'; + $Str .= '<h2>'. + &mt('There are no currently enrolled students in the selected sections.'). + '</h2>'; } elsif (lc($ENV{'form.Status'}) eq 'expired') { - $Str .= '<h2>There are no previously enrolled students '. - 'in '.$sections.'.</h2>'; + $Str .= '<h2>'. + &mt('There are no previously enrolled students in the selected sections.'). + '</h2>'; } } $Str.= '<a href="/adm/statistics?reportSelected=student_assessment">'. - 'Return to the chart.</a>'; + &mt('Click here to return to the chart').'</a>'; $r->print($Str); $r->rflush(); return; @@ -1013,7 +1016,7 @@ sub DisplayClasslist { $Str .= '<th><a href="/adm/statistics?'. 'reportSelected=student_assessment&'. 'selectstudent=1&'. - 'sort='.$field.'">'.$field. + 'sort='.$field.'">'.&mt($field). '</a></th>'; } $Str .= '</tr>'."\n"; @@ -1038,6 +1041,8 @@ sub DisplayClasslist { $Str .= &Apache::lonnet::escape($sname).'">'; $Str .= $student->{$field}.' '; $Str .= '</a>'; + } elsif ($field eq 'status') { + $Str .= &mt($student->{$field}); } else { $Str .= $student->{$field}; }