--- loncom/interface/statistics/lonpercentage.pm 2009/05/16 23:21:07 1.12 +++ loncom/interface/statistics/lonpercentage.pm 2013/12/04 11:20:07 1.13 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonpercentage.pm,v 1.12 2009/05/16 23:21:07 bisitz Exp $ +# $Id: lonpercentage.pm,v 1.13 2013/12/04 11:20:07 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,7 +42,7 @@ sub BuildPercentageGraph { my %cache; unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { - $r->print('Unable to tie database.6'); + $r->print('

'.&mt('Unable to tie [_1]','database.6').'

'); return; } @@ -57,7 +57,7 @@ sub BuildPercentageGraph { } unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { - $r->print('Unable to tie database.6'); + $r->print('

'.&mt('Unable to tie [_1]','database.6').'

'); return; } @@ -76,7 +76,7 @@ sub CreateInterface { my $Ptr = ''; $Ptr .= ''; - $Ptr .= ''."\n"; + $Ptr .= ''."\n"; $Ptr .= ''."\n"; - $Ptr .= ''."\n"; $Ptr .= '' + .'' + .'' + .&Apache::loncommon::end_data_table_header_row(); - $Ptr .= '
Select Map
'.&mt('Select Map').''; $Ptr .= &Apache::lonhtmlcommon::MapOptions($cache, 'Statistics', 'Statistics'); @@ -107,7 +107,7 @@ sub CreateInterface { $Ptr .= '
Select Sections'; + $Ptr .= '
'.&mt('Select Sections').''; $Ptr .= ''."\n"; my @sections = split(':',$cache->{'sectionList'}); @@ -143,7 +143,7 @@ sub InitializeSelectedStudents { my %cache; unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { - $r->print('Unable to tie database1.1.'); + $r->print('

'.&mt('Unable to tie [_1]','database1.1.').'

'); return ('ERROR'); } @@ -290,7 +290,7 @@ sub GraphData { $Ptr .= ''."\n"; $Ptr .= ''; - $Ptr .= '
'."\n"; + $Ptr .= ''."\n"; return ($Ptr, \%percentages); } @@ -301,47 +301,36 @@ sub NumericSort { sub TableData { my($cache,$percentage)=@_; - my $Ptr; + my $Ptr = + &Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'
'&mt('% Correct').''&mt('Frequency').''&mt('Students').'
'."\n"; - $Ptr .= ''."\n"; - - $Ptr .= ''."\n"; - $Ptr .= ''. - ''. - ''; - $Ptr .= ''."\n"; - - my $alternate=0; foreach (sort NumericSort keys(%$percentage)) { my @temp = split(':::', $percentage->{$_}); my $count = scalar(@temp); - if($alternate) { - $Ptr .= ''; - } else { - $Ptr .= ''; + $Ptr .= + &Apache::loncommon::start_data_table_row() + .'' + .''; - $Ptr .= ''."\n"; + $Ptr .= ''.&Apache::loncommon::end_data_table_row(); } - - $Ptr .= ''."\n"; - $Ptr .= '
% CorrectFrequencyStudents
'.$_.''.$count.''; + + foreach my $name (sort(split(':::', $percentage->{$_}))) { + $Ptr .= + '' + .$cache->{$name.':fullname'} + .',  '; } - $alternate = ($alternate + 1) % 2; - - $Ptr .= ''.$_.''.$count.''; - - foreach my $name (sort(split(':::', $percentage->{$_}))) { - $Ptr .= ''; - $Ptr .= $cache->{$name.':fullname'}; - $Ptr .= ',  '; - } - - $Ptr .= '
'."\n"; + $Ptr .= &Apache::loncommon::end_data_table(); return $Ptr; }