--- loncom/interface/lontrackstudent.pm 2004/08/25 15:53:34 1.5 +++ loncom/interface/lontrackstudent.pm 2004/12/02 19:01:55 1.8 @@ -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.8 2004/12/02 19:01:55 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -88,14 +88,14 @@ sub get_data { $r->print(&mt('Please try again in a few minutes.')); return; } - $r->print('

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

'); +# $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'). - '

'); +# $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; @@ -125,20 +125,20 @@ sub build_query { LEFT JOIN $machine_table AS E ON E.machine_id=A.machine_id WHERE A.student_id>10 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 $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 500 + }; } $query =~ s|$/||g; return $query; @@ -148,6 +148,8 @@ sub build_query { ################################################################### sub output_results { my ($r,$results_file,$navmap,$mode) = @_; + ## + ## if (! open(ACTIVITYDATA,$results_file)) { $r->print('

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

'. '

'. @@ -157,30 +159,35 @@ 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 = ) { + chomp($line); $line = &Apache::lonnet::unescape($line); if (++$count % 50 == 0) { if ($count != 0) { @@ -207,11 +214,25 @@ sub output_results { $title = $nav_res->title(); $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 +250,30 @@ sub output_results { $title = 'untitled'; $class = 'warning'; } - if ($values =~ /^counter=\d+$/) { - $values = ''; + # Clean up the values + $values =~ s/counter=\d+$//; + # + # 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); @@ -263,7 +288,7 @@ sub request_data_update { 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 +307,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 } @@ -371,17 +417,25 @@ sub handler { 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');