--- loncom/interface/lontrackstudent.pm 2006/12/06 22:22:37 1.21 +++ loncom/interface/lontrackstudent.pm 2009/03/26 16:30:58 1.27 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lontrackstudent.pm,v 1.21 2006/12/06 22:22:37 albertel Exp $ +# $Id: lontrackstudent.pm,v 1.27 2009/03/26 16:30:58 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; @@ -110,12 +111,22 @@ sub get_data { &Apache::lonhtmlcommon::Update_PrgWin ($r,$prog_state,&mt('Parsing results')); # - &output_results($r,$results_file,$navmap,$mode); + my $last = &output_results($r,$results_file,$navmap,$mode); my ($sname,$sdom) = ($mode=~/^student:(.*):(.*)$/); - $r->print(&Apache::loncommon::track_student_link( - 'View more activity by this student', - $sname,$sdom,undef, - ($env{'form.start'}+$num_records))); + + my ($text,$inc); + if ( $last > 0 && (($last+1) >= $env{'form.start'}+$num_records) ) { + $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) + )); + $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'})); &Apache::lonhtmlcommon::Update_PrgWin($r,$prog_state,&mt('Finished!')); return; @@ -239,7 +250,7 @@ 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').'

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

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

'. @@ -248,7 +259,7 @@ sub output_results { 'You should contact your system administrator '. 'to resolve this issue.'). '

'); - return; + return -2; } ## ## @@ -256,6 +267,7 @@ sub output_results { if ($mode eq 'full_class') { $tableheader = ''. + ''. ''. ''. ''. @@ -266,6 +278,7 @@ sub output_results { } elsif ($mode =~ /^student:(.*):(.*)$/) { $tableheader = '
 '.&mt('Resource').''.&mt('Time').''.&mt('Student').'
'. + ''. ''. ''. ''. @@ -277,6 +290,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); @@ -307,10 +331,11 @@ sub output_results { $title = $nav_res->compTitle(); $src = $nav_res->src(); } else { - if ($src =~ m|^/res|) { - $title = $src; - } elsif ($values =~ /^\s*$/ && - (! defined($src) || $src =~ /^\s*$/)) { + $src = $symb; + if ($src !~ m{/adm}) { + $title = &Apache::lonnet::gettitle($src); + } elsif ($values =~ /^\s*$/ && + (! defined($src) || $src =~ /^\s*$/)) { next; } elsif ($values =~ /^\s*$/) { $values = $src; @@ -350,14 +375,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.=''; } @@ -370,7 +398,31 @@ sub output_results { } $r->print('
 '.&mt('Resource').''.&mt('Time').''.&mt('Action').'
}.($count+1).qq{'.$title.''.$title.''. + ''. ''.$title.''. - ''.$timestamp.''.$timestamp.''.$student.'
'.$/);### if (! $count % 50); close(ACTIVITYDATA); - return; + 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; } ################################################################### @@ -388,8 +440,11 @@ sub display_values { } $result.=''; } elsif ($action eq 'POST') { - my %values= - map {split('=',&unescape($_),-1)} split(/\&/,$values); + my %values; + foreach my $pair (split(/\&/,$values)) { + my ($key,$value) = split('=',&unescape($pair),-1); + $values{$key} = $value; + } foreach my $key (sort(keys(%values))) { if ($key eq 'counter') { next; } $result.=''.$key.''. @@ -503,6 +558,11 @@ sub handler { # # 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', @@ -542,10 +602,11 @@ sub handler { $r->print('

'. &mt('Recent activity of [_1]:[_2]',$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 {