--- loncom/interface/lontrackstudent.pm 2004/12/16 22:04:41 1.10 +++ loncom/interface/lontrackstudent.pm 2009/01/02 23:07:55 1.26 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lontrackstudent.pm,v 1.10 2004/12/16 22:04:41 matthew Exp $ +# $Id: lontrackstudent.pm,v 1.26 2009/01/02 23:07:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,10 +44,15 @@ package Apache::lontrackstudent; use strict; use Apache::Constants qw(:common :http); -use Apache::lonnet(); +use Apache::lonmysql; +use Apache::lonnet; use Apache::lonlocal; use Time::HiRes; -use Time::Local; +use DateTime(); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + +my $num_records=500; sub get_data { my ($r,$prog_state,$navmap,$mode) = @_; @@ -61,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.').'

'); @@ -72,7 +77,7 @@ sub get_data { my $query = &build_query($mode); ## ## Send it along - my $home = $ENV{'course.'.$ENV{'request.course.id'}.'.home'}; + my $home = $env{'course.'.$env{'request.course.id'}.'.home'}; my $reply=&Apache::lonnet::metadata_query($query,undef,undef,[$home]); if (ref($reply) ne 'HASH') { $r->print('

'. @@ -106,23 +111,38 @@ 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:(.*):(.*)$/); + + 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('
'); + } + $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; } sub table_names { - my $cid = $ENV{'request.course.id'}; - my $domain = $ENV{'course.'.$cid.'.domain'}; - my $home = $ENV{'course.'.$cid.'.home'}; - my $course = $ENV{'course.'.$cid.'.num'}; + my $cid = $env{'request.course.id'}; + my $domain = $env{'course.'.$cid.'.domain'}; + my $home = $env{'course.'.$cid.'.home'}; + my $course = $env{'course.'.$cid.'.num'}; my $prefix = $course.'_'.$domain.'_'; # my %tables = - ( student => $prefix.'students', - res => $prefix.'resource', - machine => $prefix.'machine_table', - activity=> $prefix.'activity', + ( student =>&Apache::lonmysql::fix_table_name($prefix.'students'), + res =>&Apache::lonmysql::fix_table_name($prefix.'resource'), + machine =>&Apache::lonmysql::fix_table_name($prefix.'machine_table'), + activity=>&Apache::lonmysql::fix_table_name($prefix.'activity'), ); return %tables; } @@ -132,7 +152,7 @@ sub get_max_time_in_db { my %table = &table_names(); my $query = qq{SELECT MAX(time) FROM $table{'activity'} }; # - my $home = $ENV{'course.'.$ENV{'request.course.id'}.'.home'}; + my $home = $env{'course.'.$env{'request.course.id'}.'.home'}; my $reply=&Apache::lonnet::metadata_query($query,undef,undef,[$home]); if (ref($reply) ne 'HASH') { return undef; @@ -175,26 +195,20 @@ sub get_max_time_in_db { my $timestr = ''; while (my $line = ) { chomp($line); - $timestr = &Apache::lonnet::unescape($line); + $timestr = &unescape($line); } close(TIMEDATA); - my ($year,$month,$day,$hour,$min,$sec) = - ($timestr =~ /^(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)/); - $month -= 1; # Good old timelocal - my $max_time = undef; - if (eval("&timelocal($sec,$min,$hour,$day,$month,$year)")) { - $max_time = &timelocal($sec,$min,$hour,$day,$month,$year); - } - return $max_time; + return &Apache::lonmysql::unsqltime($timestr); } sub build_query { my ($mode) = @_; - my $cid = $ENV{'request.course.id'}; - my $domain = $ENV{'course.'.$cid.'.domain'}; - my $home = $ENV{'course.'.$cid.'.home'}; - my $course = $ENV{'course.'.$cid.'.num'}; + my $cid = $env{'request.course.id'}; + my $domain = $env{'course.'.$cid.'.domain'}; + my $home = $env{'course.'.$cid.'.home'}; + my $course = $env{'course.'.$cid.'.num'}; my $prefix = $course.'_'.$domain.'_'; + my $start = ($env{'form.start'}+0); # my %table = &table_names(); # @@ -207,7 +221,7 @@ sub build_query { LEFT JOIN $table{'student'} AS C ON C.student_id=A.student_id LEFT JOIN $table{'machine'} AS E ON E.machine_id=A.machine_id ORDER BY A.time DESC - LIMIT 500 + LIMIT $start, $num_records }; } elsif ($mode =~ /^student:(.*):(.*)$/) { my $student = $1.':'.$2; @@ -219,7 +233,7 @@ sub build_query { LEFT JOIN $table{'machine'} AS E ON E.machine_id=A.machine_id WHERE C.student='$student' ORDER BY A.time DESC - LIMIT 500 + LIMIT $start, $num_records }; } $query =~ s|$/||g; @@ -232,6 +246,11 @@ sub output_results { my ($r,$results_file,$navmap,$mode) = @_; ## ## + 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 -1; + } if (! open(ACTIVITYDATA,$results_file)) { $r->print('

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

'. '

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

'); - return; + return -2; } ## ## @@ -247,6 +266,7 @@ sub output_results { if ($mode eq 'full_class') { $tableheader = ''. + ''. ''. ''. ''. @@ -257,6 +277,7 @@ sub output_results { } elsif ($mode =~ /^student:(.*):(.*)$/) { $tableheader = '
 '.&mt('Resource').''.&mt('Time').''.&mt('Student').'
'. + ''. ''. ''. ''. @@ -264,14 +285,25 @@ sub output_results { ''. ''.$/; } - my $count = -1; + my $count = $env{'form.start'}-1; $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').''.&mt('Data').'
'.$/); @@ -281,12 +313,13 @@ sub output_results { } my ($symb,$timestamp,$student,$action,$machine,$values); if ($mode eq 'full_class') { - ($symb,$timestamp,$student,$action,$machine,$values) = - map { &Apache::lonnet::unescape($_); } split(',',$line,6); + ($symb,$timestamp,$student,$action,$machine,$values) = split(',',$line,6); } else { - ($symb,$timestamp,$action,$machine,$values) = - map { &Apache::lonnet::unescape($_); } split(',',$line,5); + ($symb,$timestamp,$action,$machine,$values) = split(',',$line,5); } + foreach ($symb,$timestamp,$student,$action,$machine) { + $_=&unescape($_); + } my ($title,$src); if ($symb =~ m:^/adm/:) { $title = $symb; @@ -294,13 +327,14 @@ sub output_results { } else { my $nav_res = $navmap->getBySymb($symb); if (defined($nav_res)) { - $title = $nav_res->title(); + $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; @@ -334,43 +368,101 @@ sub output_results { $class = 'warning'; } # Clean up the values - $values =~ s/counter=\d+$//; + $values = &display_values($action,$values); # # Build the row for output - my $tablerow = qq{}; + my $tablerow = qq{}.($count+1).qq{}; if ($src =~ m|^/adm/|) { $tablerow .= - ''.$title.''; + ''.$title.''; } else { $tablerow .= - ''. + ''. ''.$title.''. - ''; + ''; } - $tablerow .= ''.$timestamp.''; + if ($server_timezone ne '') { + $timestamp = &convert_timezone($server_timezone,$timestamp); + } + $tablerow .= ''.$timestamp.''; if ($mode eq 'full_class') { - $tablerow.=''.$student.''; + $tablerow.=''.$student.''; } $tablerow .= - ''.$action.''. + ''.$action.''. # ''.$machine.''. - ''.$values.''. + ''.$values.''. ''; $r->print($tablerow.$/); } - $r->print(''.$/) if (! $count % 50); + $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; } ################################################################### ################################################################### +sub display_values { + my ($action,$values)=@_; + my $result=''; + if ($action eq 'CSTORE') { + my %values=map {split('=',$_,-1)} split(/\&/,$values); + foreach my $key (sort(keys(%values))) { + $result.=''; + } + $result.='
'. + &unescape($key). + '='. + &unescape($values{$key}).'
'; + } elsif ($action eq 'POST') { + 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.''. + '='.$values{$key}.''; + } + $result.=''; + } else { + $result=&unescape($values) + } + return $result; +} +################################################################### +################################################################### sub request_data_update { my $command = 'prepare activity log'; - my $cid = $ENV{'request.course.id'}; - my $domain = $ENV{'course.'.$cid.'.domain'}; - my $home = $ENV{'course.'.$cid.'.home'}; - my $course = $ENV{'course.'.$cid.'.num'}; + my $cid = $env{'request.course.id'}; + my $domain = $env{'course.'.$cid.'.domain'}; + my $home = $env{'course.'.$cid.'.home'}; + my $course = $env{'course.'.$cid.'.num'}; # &Apache::lonnet::logthis($command.' '.$course.' '.$domain.' '.$home); my $result = &Apache::lonnet::metadata_query($command,$course,$domain, [$home]); @@ -436,18 +528,18 @@ sub handler { $loaderror= &Apache::lonnet::overloaderror ($r, - $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); + $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'}= + if (! &Apache::lonnet::allowed('vsa',$env{'request.course.id'})) { + $env{'user.error.msg'}= $r->uri.":vsa:0:0:Cannot student activity for complete course"; if (! &Apache::lonnet::allowed('vsa', - $ENV{'request.course.id'}.'/'. - $ENV{'request.course.sec'})) { - $ENV{'user.error.msg'}= + $env{'request.course.id'}.'/'. + $env{'request.course.sec'})) { + $env{'user.error.msg'}= $r->uri.":vsa:0:0:Cannot view student activity with given role"; return HTTP_NOT_ACCEPTABLE; } @@ -461,10 +553,15 @@ sub handler { # # Extract form elements from query string &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['selected_student']); + ['selected_student','start']); # # 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', @@ -474,11 +571,8 @@ sub handler { bug=>'instructor interface'}); # # Give the LON-CAPA page header - $r->print(''.&styles.''. - &mt('Student Activity'). - "\n". - &Apache::loncommon::bodytag('Student Activity'). - &Apache::lonhtmlcommon::breadcrumbs(undef,'Student Activity')); + $r->print(&Apache::loncommon::start_page('Student Activity',&styles()). + &Apache::lonhtmlcommon::breadcrumbs('Student Activity')); $r->rflush(); # # Begin form output @@ -497,26 +591,24 @@ sub handler { ($r,\%prog_state,&mt('Contacting course home server')); # my $result = &request_data_update(); - if (ref($result) eq 'HASH') { - $result = join(' ',map { $_.'=>'.$result->{$_}; } keys(%$result)); - } # - if (exists($ENV{'form.selected_student'})) { + if (exists($env{'form.selected_student'})) { # 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*$/) { + my ($sname,$sdom) = split(':',$env{'form.selected_student'}); + if ($sname =~ /^$LONCAPA::username_re$/ + && $sdom =~ /^$LONCAPA::domain_re$/) { $r->print('

'. - &mt('Recent activity of [_1]@[_2]',$sname,$sdom). + &mt('Recent activity of [_1]:[_2]',$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. +Your request continues to be processed while results are displayed. END &get_data($r,\%prog_state,$navmap, - 'student:'.$ENV{'form.selected_student'}); + 'student:'.$env{'form.selected_student'}); } else { - $r->print('

'.&mt('Unable to process for [_1]@[_2]', + $r->print('

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

'); } } else { @@ -528,7 +620,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;