--- loncom/interface/lontrackstudent.pm 2005/04/07 06:56:23 1.15 +++ loncom/interface/lontrackstudent.pm 2006/05/30 12:46:09 1.20 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lontrackstudent.pm,v 1.15 2005/04/07 06:56:23 albertel Exp $ +# $Id: lontrackstudent.pm,v 1.20 2006/05/30 12:46:09 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,6 +48,10 @@ use Apache::lonmysql; use Apache::lonnet; use Apache::lonlocal; use Time::HiRes; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + +my $num_records=500; sub get_data { my ($r,$prog_state,$navmap,$mode) = @_; @@ -61,9 +65,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.').'

'); @@ -107,6 +111,12 @@ sub get_data { ($r,$prog_state,&mt('Parsing results')); # &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))); + &Apache::lonhtmlcommon::Update_PrgWin($r,$prog_state,&mt('Finished!')); return; } @@ -175,7 +185,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); @@ -188,6 +198,7 @@ sub build_query { 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(); # @@ -200,7 +211,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; @@ -212,7 +223,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; @@ -227,7 +238,7 @@ 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').'

'); + $r->print('

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

'); return; } if (! open(ACTIVITYDATA,$results_file)) { @@ -262,14 +273,14 @@ sub output_results { ''.&mt('Data').''. ''.$/; } - my $count = -1; + my $count = $env{'form.start'}-1; $r->rflush(); ## ## 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(''.$/); @@ -284,7 +295,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/:) { @@ -336,7 +347,7 @@ sub output_results { $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.''; @@ -357,7 +368,7 @@ sub output_results { ''; $r->print($tablerow.$/); } - $r->print(''.$/) if (! $count % 50); + $r->print(''.$/);### if (! $count % 50); close(ACTIVITYDATA); return; } @@ -371,14 +382,14 @@ sub display_values { my %values=map {split('=',$_,-1)} split(/\&/,$values); foreach my $key (sort(keys(%values))) { $result.=''. - &Apache::lonnet::unescape($key). + &unescape($key). '='. - &Apache::lonnet::unescape($values{$key}).''; + &unescape($values{$key}).''; } $result.=''; } elsif ($action eq 'POST') { my %values= - map {split('=',&Apache::lonnet::unescape($_),-1)} split(/\&/,$values); + map {split('=',&unescape($_),-1)} split(/\&/,$values); foreach my $key (sort(keys(%values))) { if ($key eq 'counter') { next; } $result.=''.$key.''. @@ -386,7 +397,7 @@ sub display_values { } $result.=''; } else { - $result=&Apache::lonnet::unescape($values) + $result=&unescape($values) } return $result; } @@ -488,7 +499,7 @@ 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(); @@ -501,12 +512,8 @@ 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')); + $r->print(&Apache::loncommon::start_page('Student Activity',&styles()). + &Apache::lonhtmlcommon::breadcrumbs('Student Activity')); $r->rflush(); # # Begin form output @@ -536,7 +543,7 @@ sub handler { ''); $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'}); @@ -553,7 +560,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;