--- loncom/interface/lontrackstudent.pm 2004/08/25 15:53:34 1.5 +++ loncom/interface/lontrackstudent.pm 2005/02/17 08:29:43 1.14 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lontrackstudent.pm,v 1.5 2004/08/25 15:53:34 matthew Exp $ +# $Id: lontrackstudent.pm,v 1.14 2005/02/17 08:29:43 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,6 +44,7 @@ package Apache::lontrackstudent; use strict; use Apache::Constants qw(:common :http); +use Apache::lonmysql; use Apache::lonnet(); use Apache::lonlocal; use Time::HiRes; @@ -55,8 +56,20 @@ sub get_data { &Apache::lonhtmlcommon::Update_PrgWin ($r,$prog_state,&mt('Composing Query')); # + # Allow the other server to begin processing the data before we ask for it. + sleep(5); + # + my $max_time = &get_max_time_in_db($r,$prog_state); + if (defined($max_time)) { + $r->print('

'.&mt('Activity data goes to [_1]', + &Apache::lonlocal::locallocaltime($max_time)). + '

'); + $r->rflush(); + } else { + $r->print('

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

'); + return; + } my $query = &build_query($mode); - &Apache::lonnet::logthis('sending query '.$query); ## ## Send it along my $home = $ENV{'course.'.$ENV{'request.course.id'}.'.home'}; @@ -88,19 +101,86 @@ sub get_data { $r->print(&mt('Please try again in a few minutes.')); return; } - $r->print('

'.&mt('Elapsed Time = [_1] seconds', - time-$starttime).'

'); $r->rflush(); + # &Apache::lonhtmlcommon::Update_PrgWin ($r,$prog_state,&mt('Parsing results')); - $r->print('

'. - &mt('Reloading this page may result in newer data'). - '

'); + # &output_results($r,$results_file,$navmap,$mode); &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 $prefix = $course.'_'.$domain.'_'; + # + my %tables = + ( 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; +} + +sub get_max_time_in_db { + my ($r,$prog_state) = @_; + my %table = &table_names(); + my $query = qq{SELECT MAX(time) FROM $table{'activity'} }; + # + 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; + } + my $results_file = $r->dir_config('lonDaemons').'/tmp/'.$reply->{$home}; + my $endfile = $results_file.'.end'; + ## + ## Check for the results + &Apache::lonhtmlcommon::Update_PrgWin + ($r,$prog_state,&mt('Waiting for results')); + my $maxtime = 500; + my $starttime = time; + while (! -e $endfile && (time-$starttime < $maxtime)) { + &Apache::lonhtmlcommon::Update_PrgWin + ($r,$prog_state,&mt('Waiting up to [_1] seconds for results', + $starttime+$maxtime-time)); + sleep(1); + } + if (! -e $endfile) { + $r->print('

'. + &mt('Unable to retrieve data.').'

'); + $r->print(&mt('Please try again in a few minutes.')); + return undef; + } + $r->rflush(); + # + &Apache::lonhtmlcommon::Update_PrgWin + ($r,$prog_state,&mt('Parsing results')); + # + if (! open(TIMEDATA,$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; + } + # + my $timestr = ''; + while (my $line = ) { + chomp($line); + $timestr = &Apache::lonnet::unescape($line); + } + close(TIMEDATA); + return &Apache::lonmysql::unsqltime($timestr); +} + sub build_query { my ($mode) = @_; my $cid = $ENV{'request.course.id'}; @@ -109,36 +189,31 @@ sub build_query { my $course = $ENV{'course.'.$cid.'.num'}; my $prefix = $course.'_'.$domain.'_'; # - my $student_table = $prefix.'students'; - my $res_table = $prefix.'resource'; - my $action_table = $prefix.'actions'; - my $machine_table = $prefix.'machine_table'; - my $activity_table = $prefix.'activity'; + my %table = &table_names(); # my $query; if ($mode eq 'full_class') { $query = qq{ SELECT B.resource,A.time,C.student,A.action,E.machine,A.action_values - FROM $activity_table AS A - LEFT JOIN $res_table AS B ON B.res_id=A.res_id - LEFT JOIN $student_table AS C ON C.student_id=A.student_id - LEFT JOIN $machine_table AS E ON E.machine_id=A.machine_id - WHERE A.student_id>10 + FROM $table{'activity'} AS A + LEFT JOIN $table{'res'} AS B ON B.res_id=A.res_id + 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 5000 + LIMIT 500 }; } elsif ($mode =~ /^student:(.*):(.*)$/) { my $student = $1.':'.$2; $query = qq{ - SELECT B.resource,A.time,A.action,E.machine,A.action_values - FROM $activity_table AS A - LEFT JOIN $res_table AS B ON B.res_id=A.res_id - LEFT JOIN $student_table AS C ON C.student_id=A.student_id - LEFT JOIN $machine_table AS E ON E.machine_id=A.machine_id - WHERE C.student='$student' - ORDER BY A.time DESC - LIMIT 5000 - }; + SELECT B.resource,A.time,A.action,E.machine,A.action_values + FROM $table{'activity'} AS A + LEFT JOIN $table{'res'} AS B ON B.res_id=A.res_id + 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 + WHERE C.student='$student' + ORDER BY A.time DESC + LIMIT 500 + }; } $query =~ s|$/||g; return $query; @@ -148,6 +223,13 @@ sub build_query { ################################################################### 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('No data was returned for your request').'

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

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

'. '

'. @@ -157,30 +239,36 @@ sub output_results { '

'); return; } + ## + ## my $tableheader; if ($mode eq 'full_class') { $tableheader = ''. - ''. ''. ''. ''. ''. - ''. - ''. + # ''. + ''. + ''.$/; + } elsif ($mode =~ /^student:(.*):(.*)$/) { + $tableheader = + '
count'.&mt('Resource').''.&mt('Time').''.&mt('Student').''.&mt('Action').''.&mt('Originating Server').''.&mt('Data').''.&mt('Originating Server').''.&mt('Data').'
'. + ''. + ''. + ''. + # ''. + ''. ''.$/; - } elsif ($mode =~ /^student:/) { - '
'.&mt('Resource').''.&mt('Time').''.&mt('Action').''.&mt('Originating Server').''.&mt('Data').'
'. - ''. - ''. - ''. - ''. - ''. - ''.$/; } my $count = -1; $r->rflush(); + ## + ## while (my $line = ) { + # FIXME: does not pass symbs along :( + chomp($line); $line = &Apache::lonnet::unescape($line); if (++$count % 50 == 0) { if ($count != 0) { @@ -191,12 +279,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) { + $_=&Apache::lonnet::unescape($_); + } my ($title,$src); if ($symb =~ m:^/adm/:) { $title = $symb; @@ -204,14 +293,28 @@ 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 { - $title = 'unable to retrieve title'; - $src = '/dev/null'; + if ($src =~ m|^/res|) { + $title = $src; + } elsif ($values =~ /^\s*$/ && + (! defined($src) || $src =~ /^\s*$/)) { + next; + } elsif ($values =~ /^\s*$/) { + $values = $src; + } else { + $title = 'unable to retrieve title'; + $src = '/dev/null'; + } } } - my $class = ''; + my %classes; + my $class_count=0; + if (! exists($classes{$symb})) { + $classes{$symb} = $class_count++; + } + my $class = 'a';#.$classes{$symb}; # if ($symb eq '/prtspool/') { $class = 'print'; @@ -229,26 +332,30 @@ sub output_results { $title = 'untitled'; $class = 'warning'; } - if ($values =~ /^counter=\d+$/) { - $values = ''; + # Clean up the values + $values = &display_values($action,$values); + # + # Build the row for output + my $tablerow = qq{}; + if ($src =~ m|^/adm/|) { + $tablerow .= + ''; + } else { + $tablerow .= + ''; } + $tablerow .= ''; if ($mode eq 'full_class') { - $r->print(''. - ''. - ''. - ''. - ''. - ''. - ''. - ''.''.$/); - } elsif ($mode =~ /^student:/) { - $r->print(''. - ''. - ''. - ''. - ''. - ''.''.$/); + $tablerow.=''; } + $tablerow .= + ''. +# ''. + ''. + ''; + $r->print($tablerow.$/); } $r->print('
'.&mt('Resource').''.&mt('Time').''.&mt('Action').''.&mt('Originating Server').''.&mt('Data').'
'.$title.''. + ''.$title.''. + ''.$timestamp.'
'.$count.''.$title.''.''.$timestamp.''.$student.''.$action.''.$machine.''.$values.'
'.$title.''.''.$timestamp.''.$action.''.$machine.''.$values.'
'.$student.''.$action.''.$machine.''.$values.'
'.$/) if (! $count % 50); close(ACTIVITYDATA); @@ -257,13 +364,41 @@ sub output_results { ################################################################### ################################################################### +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.='
'. + &Apache::lonnet::unescape($key). + '='. + &Apache::lonnet::unescape($values{$key}).'
'; + } elsif ($action eq 'POST') { + my %values= + map {split('=',&Apache::lonnet::unescape($_),-1)} split(/\&/,$values); + foreach my $key (sort(keys(%values))) { + if ($key eq 'counter') { next; } + $result.=''.$key.''. + '='.$values{$key}.''; + } + $result.=''; + } else { + $result=&Apache::lonnet::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'}; - &Apache::lonnet::logthis($command.' '.$course.' '.$domain.' '.$home); +# &Apache::lonnet::logthis($command.' '.$course.' '.$domain.' '.$home); my $result = &Apache::lonnet::metadata_query($command,$course,$domain, [$home]); return $result; @@ -282,15 +417,36 @@ sub pick_student { sub styles { return < + tr.warning { background-color: \#CCCCCC; } + tr.chat { background-color: \#CCCCCC; } + tr.chatfetch { background-color: \#CCCCCC; } + tr.navmaps { background-color: \#CCCCCC; } + tr.roles { background-color: \#CCCCCC; } + tr.flip { background-color: \#CCCCCC; } + tr.adm { background-color: \#CCCCCC; } + tr.print { background-color: \#CCCCCC; } + tr.printout { background-color: \#CCCCCC; } + tr.parmset { background-color: \#CCCCCC; } + tr.grades { background-color: \#CCCCCC; } + +END +} + +sub developer_centric_styles { + return < tr.warning { background-color: red; } tr.chat { background-color: yellow; } tr.chatfetch { background-color: yellow; } + tr.evaluate { background-color: red; } tr.navmaps { background-color: \#777777; } tr.roles { background-color: \#999999; } tr.flip { background-color: \#BBBBBB; } tr.adm { background-color: green; } tr.print { background-color: blue; } + tr.parmset { background-color: \#000088; } tr.printout { background-color: blue; } + tr.grades { background-color: \#CCCCCC; } END } @@ -345,7 +501,8 @@ sub handler { bug=>'instructor interface'}); # # Give the LON-CAPA page header - $r->print(''.&styles.''. + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'<head>'.&styles().'<title>'. &mt('Student Activity'). "\n". &Apache::loncommon::bodytag('Student Activity'). @@ -368,20 +525,25 @@ 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)); - } - &Apache::lonnet::logthis('result from request_data_update: '.$result); # 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'}); - $r->print('

'. - &mt('Recent activity of [_1]@[_2]',$sname,$sdom). - '

'); - &get_data($r,\%prog_state,$navmap, - 'student:'.$ENV{'form.selected_student'}); + if ($sname =~ /^\w*$/ && $sdom =~ /^\w*$/) { + $r->print('

'. + &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. +END + &get_data($r,\%prog_state,$navmap, + 'student:'.$ENV{'form.selected_student'}); + } else { + $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 &get_data($r,\%prog_state,$navmap,'full_class');