--- loncom/interface/lontrackstudent.pm 2005/06/30 17:56:28 1.16 +++ loncom/interface/lontrackstudent.pm 2012/10/12 16:27:19 1.35 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lontrackstudent.pm,v 1.16 2005/06/30 17:56:28 albertel Exp $ +# $Id: lontrackstudent.pm,v 1.35 2012/10/12 16:27:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,6 +48,9 @@ use Apache::lonmysql; use Apache::lonnet; use Apache::lonlocal; use Time::HiRes; +use DateTime(); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; my $num_records=500; @@ -63,9 +66,9 @@ sub get_data { # my $max_time = &get_max_time_in_db($r,$prog_state); if (defined($max_time)) { - $r->print('

'.&mt('Activity data goes to [_1]', + $r->print('

'.&mt('Activity data compiled up to [_1]', &Apache::lonlocal::locallocaltime($max_time)). - '

'); + ''.&mt('While data is processed, periodically reload this page for more recent activity').'
'); $r->rflush(); } else { $r->print('

'.&mt('Unable to retrieve any data. Please reload this page and try again.').'

'); @@ -108,12 +111,24 @@ 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), + $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.only_body'})); &Apache::lonhtmlcommon::Update_PrgWin($r,$prog_state,&mt('Finished!')); return; @@ -183,7 +198,7 @@ sub get_max_time_in_db { my $timestr = ''; while (my $line = ) { chomp($line); - $timestr = &Apache::lonnet::unescape($line); + $timestr = &unescape($line); } close(TIMEDATA); return &Apache::lonmysql::unsqltime($timestr); @@ -236,17 +251,17 @@ sub output_results { ## if (! -s $results_file) { # results file is empty, just let them know there is no data - $r->print('

'.&mt('No data was returned for your request').'

'); - return; + $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 '. 'to resolve this issue.'). '

'); - return; + return -2; } ## ## @@ -254,6 +269,7 @@ sub output_results { if ($mode eq 'full_class') { $tableheader = ''. + ''. ''. ''. ''. @@ -264,6 +280,7 @@ sub output_results { } elsif ($mode =~ /^student:(.*):(.*)$/) { $tableheader = '
 '.&mt('Resource').''.&mt('Time').''.&mt('Student').'
'. + ''. ''. ''. ''. @@ -275,10 +292,21 @@ 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); - $line = &Apache::lonnet::unescape($line); + $line = &unescape($line); if (++$count % 50 == 0) { if ($count != 0) { $r->print('
 '.&mt('Resource').''.&mt('Time').''.&mt('Action').'
'.$/); @@ -293,7 +321,7 @@ sub output_results { ($symb,$timestamp,$action,$machine,$values) = split(',',$line,5); } foreach ($symb,$timestamp,$student,$action,$machine) { - $_=&Apache::lonnet::unescape($_); + $_=&unescape($_); } my ($title,$src); if ($symb =~ m:^/adm/:) { @@ -305,10 +333,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; @@ -348,14 +377,17 @@ sub output_results { my $tablerow = qq{}.($count+1).qq{}; if ($src =~ m|^/adm/|) { $tablerow .= - ''.$title.''; + ''.$title.''; } else { $tablerow .= - ''. + ''. ''.$title.''. - ''; + ''; + } + if ($server_timezone ne '') { + $timestamp = &convert_timezone($server_timezone,$timestamp); } - $tablerow .= ''.$timestamp.''; + $tablerow .= ''.$timestamp.''; if ($mode eq 'full_class') { $tablerow.=''.$student.''; } @@ -368,7 +400,31 @@ sub output_results { } $r->print(''.$/);### 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; } ################################################################### @@ -377,17 +433,31 @@ sub display_values { my ($action,$values)=@_; my $result=''; 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.=''; + &unescape($values{$key}).''; } $result.='
'. - &Apache::lonnet::unescape($key). + $unesc_key. '='. - &Apache::lonnet::unescape($values{$key}).'
'; + if ($is_anon) { + $result = ''.&mt('Anonymous Survey Submission: details not shown').''; + } } elsif ($action eq 'POST') { - my %values= - map {split('=',&Apache::lonnet::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.''. @@ -395,7 +465,7 @@ sub display_values { } $result.=''; } else { - $result=&Apache::lonnet::unescape($values) + $result=&unescape($values) } return $result; } @@ -466,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'}= @@ -497,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', @@ -510,26 +576,18 @@ sub handler { bug=>'instructor interface'}); # # Give the LON-CAPA page header - my $html=&Apache::lonxml::xmlbegin(); - $r->print($html.''.&styles().''. - &mt('Student Activity'). - "\n". - &Apache::loncommon::bodytag('Student Activity'). - &Apache::lonhtmlcommon::breadcrumbs(undef,'Student Activity')); + 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(); # # Begin form output $r->print('
'); - $r->print('
'); - $r->print('
'. - &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')); # @@ -539,19 +597,24 @@ sub handler { # For now, just show all the data, in the future allow selection of # a student my ($sname,$sdom) = split(':',$env{'form.selected_student'}); - if ($sname =~ /^\w*$/ && $sdom =~ /^\w*$/) { + 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. -It may be necessary to reload this page to get the most current information. -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 @@ -562,7 +625,7 @@ END &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); # $r->print("
\n"); - $r->print("\n\n"); + $r->print(&Apache::loncommon::end_page()); $r->rflush(); # return OK;