--- loncom/interface/lontrackstudent.pm 2007/02/13 01:44:02 1.23 +++ loncom/interface/lontrackstudent.pm 2012/10/04 13:41:10 1.34 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lontrackstudent.pm,v 1.23 2007/02/13 01:44:02 albertel Exp $ +# $Id: lontrackstudent.pm,v 1.34 2012/10/04 13:41:10 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,6 +48,7 @@ use Apache::lonmysql; use Apache::lonnet; use Apache::lonlocal; use Time::HiRes; +use DateTime(); use lib '/home/httpd/lib/perl/'; use LONCAPA; @@ -118,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; @@ -247,11 +251,11 @@ sub output_results { ## if (! -s $results_file) { # results file is empty, just let them know there is no data - $r->print('

'.&mt('So far, no data has been returned for your request').'

'); + $r->print('

'.&mt('So far, no data has been returned for your request').'

'); return -1; } if (! open(ACTIVITYDATA,$results_file)) { - $r->print('

'.&mt('Unable to read results file.').'

'. + $r->print('

'.&mt('Unable to read results file.').'

'. '

'. &mt('This is a serious error and has been logged. '. 'You should contact your system administrator '. @@ -265,6 +269,7 @@ sub output_results { if ($mode eq 'full_class') { $tableheader = ''. + ''. ''. ''. ''. @@ -275,6 +280,7 @@ sub output_results { } elsif ($mode =~ /^student:(.*):(.*)$/) { $tableheader = '
 '.&mt('Resource').''.&mt('Time').''.&mt('Student').'
'. + ''. ''. ''. ''. @@ -286,6 +292,17 @@ sub output_results { $r->rflush(); ## ## + + my $cid = $env{'request.course.id'}; + my $cnum = $env{'course.'.$cid.'.num'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + my $server_timezone = &Apache::lonnet::get_server_timezone($cnum,$cdom); + if ($server_timezone ne '') { + if (&Apache::lonlocal::gettimezone($server_timezone) eq 'local') { + $server_timezone = ''; + } + } + while (my $line = ) { # FIXME: does not pass symbs along :( chomp($line); @@ -360,14 +377,17 @@ sub output_results { my $tablerow = qq{}; if ($src =~ m|^/adm/|) { $tablerow .= - ''; + ''; } else { $tablerow .= - ''; + ''; + } + if ($server_timezone ne '') { + $timestamp = &convert_timezone($server_timezone,$timestamp); } - $tablerow .= ''; + $tablerow .= ''; if ($mode eq 'full_class') { $tablerow.=''; } @@ -383,20 +403,55 @@ sub output_results { return $count; } +sub convert_timezone { + my ($server_timezone,$timestamp) = @_; + if ($server_timezone && $timestamp) { + my ($date,$time) = split(/\s+/,$timestamp); + my ($year,$month,$day) = split(/\-/,$date); + my ($hour,$minute,$sec) = split(/:/,$time); + foreach ($month,$day,$hour,$minute,$sec) { + return $timestamp if $_ eq ''; + $_ =~ s/^0//; + } + my $dt = DateTime->new(year => $year, + month => $month, + day => $day, + hour => $hour, + minute => $minute, + second => $sec, + time_zone => $server_timezone, + ); + my $unixtime = $dt->epoch; + $timestamp = &Apache::lonlocal::locallocaltime($unixtime); + } + return $timestamp; +} + ################################################################### ################################################################### sub display_values { my ($action,$values)=@_; my $result='
 '.&mt('Resource').''.&mt('Time').''.&mt('Action').'
}.($count+1).qq{'.$title.''.$title.''. + ''. ''.$title.''. - ''.$timestamp.''.$timestamp.''.$student.'
'; if ($action eq 'CSTORE') { + my $is_anon; my %values=map {split('=',$_,-1)} split(/\&/,$values); foreach my $key (sort(keys(%values))) { + my $unesc_key = &unescape($key); + if ($values{$key} eq 'anonsurvey' || $values{$key} eq 'anonsurveycred') { + if ($unesc_key =~ /^resource\..+\.type$/) { + $is_anon = 1; + last; + } + } $result.=''; } $result.='
'. - &unescape($key). + $unesc_key. '='. &unescape($values{$key}).'
'; + if ($is_anon) { + $result = ''.&mt('Anonymous Survey Submission: details not shown').''; + } } elsif ($action eq 'POST') { my %values; foreach my $pair (split(/\&/,$values)) { @@ -481,15 +536,6 @@ sub handler { my $r=shift; my $c = $r->connection(); # - # Check for overloading here and on the course home server - my $loaderror=&Apache::lonnet::overloaderror($r); - if ($loaderror) { return $loaderror; } - $loaderror= - &Apache::lonnet::overloaderror - ($r, - $env{'course.'.$env{'request.course.id'}.'.home'}); - if ($loaderror) { return $loaderror; } - # # Check for access if (! &Apache::lonnet::allowed('vsa',$env{'request.course.id'})) { $env{'user.error.msg'}= @@ -512,10 +558,15 @@ sub handler { # # 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(); + if (!defined($navmap)) { + my $requrl = $r->uri; + $env{'user.error.msg'} = "$requrl:bre:0:0:Navmap initialization failed."; + return HTTP_NOT_ACCEPTABLE; + } # &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/studentactivity', @@ -525,7 +576,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(); # @@ -533,14 +588,11 @@ sub handler { $r->print('

'); $r->print('
'); $r->print('
'. - &mt('Status:[_1]', - ''). + &mt('Status: [_1]', + ''). '
'); $r->rflush(); - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,&mt('Student Activity Retrieval'), - &mt('Student Activity Retrieval'),undef,'inline',undef, - 'trackstudent','status'); + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r); &Apache::lonhtmlcommon::Update_PrgWin ($r,\%prog_state,&mt('Contacting course home server')); # @@ -553,17 +605,21 @@ 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 { - $r->print('

'.&mt('Unable to process for [_1]:[_2]', - $sname,$sdom).'

'); + $r->print( + '

' + .&mt('Unable to process for [_1]:[_2]',$sname,$sdom) + .'

' + ); } } else { # For now, just show all the data instead of limiting it to one student