--- loncom/interface/lontrackstudent.pm 2009/01/02 23:07:55 1.26 +++ loncom/interface/lontrackstudent.pm 2010/01/06 18:23:27 1.30.2.1 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lontrackstudent.pm,v 1.26 2009/01/02 23:07:55 raeburn Exp $ +# $Id: lontrackstudent.pm,v 1.30.2.1 2010/01/06 18:23:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -119,13 +119,16 @@ sub get_data { $text = 'View more activity by this student'; $inc = $num_records; $r->print(&Apache::loncommon::track_student_link($text,$sname,$sdom,undef, - ($env{'form.start'}+$inc) + ($env{'form.start'}+$inc), + $env{'form.only_body'} )); $r->print('
'); } + $r->print('
'); $text = 'Resubmit last request to check for newer data'; $r->print(&Apache::loncommon::track_student_link($text,$sname,$sdom,undef, - $env{'form.start'})); + $env{'form.start'}, + $env{'form.only_body'})); &Apache::lonhtmlcommon::Update_PrgWin($r,$prog_state,&mt('Finished!')); return; @@ -550,10 +553,20 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; if ($r->header_only) { return OK; } + + if (&Apache::loncommon::needs_gci_custom()) { + $r->print(&Apache::loncommon::start_page("Student Activity")); + $r->print('

'. + &mt('No student activity display available for Concept Tests') . + '

'); + $r->print(&Apache::loncommon::end_page()); + return OK; + } + # # Extract form elements from query string &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['selected_student','start']); + ['selected_student','start','only_body']); # # We will almost always need this... my $navmap = Apache::lonnavmaps::navmap->new(); @@ -571,7 +584,11 @@ sub handler { bug=>'instructor interface'}); # # Give the LON-CAPA page header - $r->print(&Apache::loncommon::start_page('Student Activity',&styles()). + my $args; + if ($env{'form.only_body'}) { + $args = { only_body => 1, }; + } + $r->print(&Apache::loncommon::start_page('Student Activity',&styles(),$args). &Apache::lonhtmlcommon::breadcrumbs('Student Activity')); $r->rflush(); # @@ -579,8 +596,8 @@ sub handler { $r->print('
'); $r->print('
'); $r->print('
'. - &mt('Status:[_1]', - ''). + &mt('Status: [_1]', + ''). '
'); $r->rflush(); my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin @@ -599,12 +616,13 @@ sub handler { if ($sname =~ /^$LONCAPA::username_re$/ && $sdom =~ /^$LONCAPA::domain_re$/) { $r->print('

'. - &mt('Recent activity of [_1]:[_2]',$sname,$sdom). + &mt('Recent activity of [_1]',$sname.':'.$sdom). '

'); - $r->print('

'.&mt(<'); -Compiling student activity data can take a long time. -Your request continues to be processed while results are displayed. -END + $r->print('

' + .&mt('Compiling student activity data can take a long time.' + .' Your request continues to be processed while results are displayed.') + .'

' + ); &get_data($r,\%prog_state,$navmap, 'student:'.$env{'form.selected_student'}); } else {