--- loncom/interface/lonstatistics.pm 2004/06/15 14:22:45 1.104 +++ loncom/interface/lonstatistics.pm 2004/09/22 15:39:14 1.110 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.104 2004/06/15 14:22:45 matthew Exp $ +# $Id: lonstatistics.pm,v 1.110 2004/09/22 15:39:14 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,43 +941,68 @@ sub Gather_Full_Student_Data { ################################################## sub DisplayClasslist { my ($r)=@_; + &Apache::lonhtmlcommon::add_breadcrumb + ({text=>'Select One Student'}); # - my @Fields = ('fullname','username','domain','id','section'); + # Output some of the standard interface components + my $Str; + $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Select One Student'); + $Str .= '

'."\n"; + $Str .= ''; + $Str .= ''; + $Str .= ''; + $Str .= ''.$/; + $Str .= ''; + $Str .= ''; + $Str .= ''; + + $Str .= ''.$/; + $Str .= '
'.&mt('Sections').''.&mt('Enrollment Status').'
'. + &Apache::lonstatistics::SectionSelect('Section','multiple',5). + ''. + &Apache::lonhtmlcommon::StatusOptions(undef,undef,5). + '

'; + $Str .= ''; + $r->print($Str); + $r->rflush(); # - my $Str=''; + my @Fields = ('fullname','username','domain','id','section','status'); + # + $Str = ''; if (! @Students) { if ($SelectedSections[0] eq 'all') { if (lc($ENV{'form.Status'}) eq 'any') { - $Str .= '

There are no students in the course.

'; + $Str .= '

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

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

There are no currently enrolled students in '. - 'the course.

'; + $Str .= '

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

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

There are no previously enrolled '. - 'students in the course.

'; + $Str .= '

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

'; } } 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 .= '

There are no students in '.$sections.'.

'; + $Str .= '

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

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

There are no currently enrolled students '. - 'in '.$sections.'.

'; + $Str .= '

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

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

There are no previously enrolled students '. - 'in '.$sections.'.

'; + $Str .= '

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

'; } } $Str.= ''. - 'Return to the chart.'; + &mt('Click here to return to the chart').''; $r->print($Str); $r->rflush(); return; @@ -991,7 +1016,7 @@ sub DisplayClasslist { $Str .= ''.$field. + 'sort='.$field.'">'.&mt($field). ''; } $Str .= ''."\n"; @@ -1016,6 +1041,8 @@ sub DisplayClasslist { $Str .= &Apache::lonnet::escape($sname).'">'; $Str .= $student->{$field}.' '; $Str .= ''; + } elsif ($field eq 'status') { + $Str .= &mt($student->{$field}); } else { $Str .= $student->{$field}; } @@ -1128,9 +1155,18 @@ sub handler { 'SelectedStudent']); # # Give the LON-CAPA page header + my $style = < + ul.sub_studentans { list-style-type: none } + ul.sub_correctans { list-style-type: none } + tr.even { background-color: \#CCCCCC } + td.essay { border: 1px solid gray; } + +ENDSTYLE $r->print(''. &mt('Course Statistics and Charts'). - "\n". + ''.$style. + "\n". &Apache::loncommon::bodytag('Course Statistics and Charts')); $r->rflush(); #