version 1.5, 2004/08/25 15:53:34
|
version 1.6, 2004/08/29 19:58:32
|
Line 88 sub get_data {
|
Line 88 sub get_data {
|
$r->print(&mt('Please try again in a few minutes.')); |
$r->print(&mt('Please try again in a few minutes.')); |
return; |
return; |
} |
} |
$r->print('<h2>'.&mt('Elapsed Time = [_1] seconds', |
# $r->print('<h2>'.&mt('Elapsed Time = [_1] seconds', |
time-$starttime).'</h2>'); |
# time-$starttime).'</h2>'); |
$r->rflush(); |
$r->rflush(); |
&Apache::lonhtmlcommon::Update_PrgWin |
&Apache::lonhtmlcommon::Update_PrgWin |
($r,$prog_state,&mt('Parsing results')); |
($r,$prog_state,&mt('Parsing results')); |
$r->print('<h2>'. |
# $r->print('<h2>'. |
&mt('Reloading this page may result in newer data'). |
# &mt('Reloading this page may result in newer data'). |
'</h2>'); |
# '</h2>'); |
&output_results($r,$results_file,$navmap,$mode); |
&output_results($r,$results_file,$navmap,$mode); |
&Apache::lonhtmlcommon::Update_PrgWin($r,$prog_state,&mt('Finished!')); |
&Apache::lonhtmlcommon::Update_PrgWin($r,$prog_state,&mt('Finished!')); |
return; |
return; |
Line 125 sub build_query {
|
Line 125 sub build_query {
|
LEFT JOIN $machine_table AS E ON E.machine_id=A.machine_id |
LEFT JOIN $machine_table AS E ON E.machine_id=A.machine_id |
WHERE A.student_id>10 |
WHERE A.student_id>10 |
ORDER BY A.time DESC |
ORDER BY A.time DESC |
LIMIT 5000 |
LIMIT 500 |
}; |
}; |
} elsif ($mode =~ /^student:(.*):(.*)$/) { |
} elsif ($mode =~ /^student:(.*):(.*)$/) { |
my $student = $1.':'.$2; |
my $student = $1.':'.$2; |
$query = qq{ |
$query = qq{ |
SELECT B.resource,A.time,A.action,E.machine,A.action_values |
SELECT B.resource,A.time,A.action,E.machine,A.action_values |
FROM $activity_table AS A |
FROM $activity_table AS A |
LEFT JOIN $res_table AS B ON B.res_id=A.res_id |
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 $student_table AS C ON C.student_id=A.student_id |
LEFT JOIN $machine_table AS E ON E.machine_id=A.machine_id |
LEFT JOIN $machine_table AS E ON E.machine_id=A.machine_id |
WHERE C.student='$student' |
WHERE C.student='$student' |
ORDER BY A.time DESC |
ORDER BY A.time DESC |
LIMIT 5000 |
LIMIT 500 |
}; |
}; |
} |
} |
$query =~ s|$/||g; |
$query =~ s|$/||g; |
return $query; |
return $query; |
Line 148 sub build_query {
|
Line 148 sub build_query {
|
################################################################### |
################################################################### |
sub output_results { |
sub output_results { |
my ($r,$results_file,$navmap,$mode) = @_; |
my ($r,$results_file,$navmap,$mode) = @_; |
|
## |
|
## |
if (! open(ACTIVITYDATA,$results_file)) { |
if (! open(ACTIVITYDATA,$results_file)) { |
$r->print('<h2>'.&mt('Unable to read results file.').'</h2>'. |
$r->print('<h2>'.&mt('Unable to read results file.').'</h2>'. |
'<p>'. |
'<p>'. |
Line 157 sub output_results {
|
Line 159 sub output_results {
|
'</p>'); |
'</p>'); |
return; |
return; |
} |
} |
|
## |
|
## |
my $tableheader; |
my $tableheader; |
if ($mode eq 'full_class') { |
if ($mode eq 'full_class') { |
$tableheader = |
$tableheader = |
'<table><tr>'. |
'<table><tr>'. |
'<th>count</th>'. |
|
'<th>'.&mt('Resource').'</th>'. |
'<th>'.&mt('Resource').'</th>'. |
'<th>'.&mt('Time').'</th>'. |
'<th>'.&mt('Time').'</th>'. |
'<th>'.&mt('Student').'</th>'. |
'<th>'.&mt('Student').'</th>'. |
'<th>'.&mt('Action').'</th>'. |
'<th>'.&mt('Action').'</th>'. |
'<th>'.&mt('Originating Server').'</th>'. |
# '<th>'.&mt('Originating Server').'</th>'. |
'<th>'.&mt('Data').'</th>'. |
'<th align="left">'.&mt('Data').'</th>'. |
|
'</tr>'.$/; |
|
} elsif ($mode =~ /^student:(.*):(.*)$/) { |
|
$tableheader = |
|
'<table><tr>'. |
|
'<th>'.&mt('Resource').'</th>'. |
|
'<th>'.&mt('Time').'</th>'. |
|
'<th>'.&mt('Action').'</th>'. |
|
# '<th>'.&mt('Originating Server').'</th>'. |
|
'<th align="left">'.&mt('Data').'</th>'. |
'</tr>'.$/; |
'</tr>'.$/; |
} elsif ($mode =~ /^student:/) { |
|
'<table><tr>'. |
|
'<th>'.&mt('Resource').'</th>'. |
|
'<th>'.&mt('Time').'</th>'. |
|
'<th>'.&mt('Action').'</th>'. |
|
'<th>'.&mt('Originating Server').'</th>'. |
|
'<th>'.&mt('Data').'</th>'. |
|
'</tr>'.$/; |
|
} |
} |
my $count = -1; |
my $count = -1; |
$r->rflush(); |
$r->rflush(); |
|
## |
|
## |
while (my $line = <ACTIVITYDATA>) { |
while (my $line = <ACTIVITYDATA>) { |
|
chomp($line); |
$line = &Apache::lonnet::unescape($line); |
$line = &Apache::lonnet::unescape($line); |
if (++$count % 50 == 0) { |
if (++$count % 50 == 0) { |
if ($count != 0) { |
if ($count != 0) { |
Line 207 sub output_results {
|
Line 214 sub output_results {
|
$title = $nav_res->title(); |
$title = $nav_res->title(); |
$src = $nav_res->src(); |
$src = $nav_res->src(); |
} else { |
} else { |
$title = 'unable to retrieve title'; |
if ($src =~ m|^/res|) { |
$src = '/dev/null'; |
$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/') { |
if ($symb eq '/prtspool/') { |
$class = 'print'; |
$class = 'print'; |
Line 229 sub output_results {
|
Line 250 sub output_results {
|
$title = 'untitled'; |
$title = 'untitled'; |
$class = 'warning'; |
$class = 'warning'; |
} |
} |
if ($values =~ /^counter=\d+$/) { |
# Clean up the values |
$values = ''; |
$values =~ s/counter=\d+$//; |
|
# |
|
# Build the row for output |
|
my $tablerow = qq{<tr class="$class">}; |
|
if ($src =~ m|^/adm/|) { |
|
$tablerow .= |
|
'<td><nobr>'.$title.'</td>'; |
|
} else { |
|
$tablerow .= |
|
'<td><nobr>'. |
|
'<a href="'.$src.'">'.$title.'</a>'. |
|
'</nobr></td>'; |
} |
} |
|
$tablerow .= '<td><nobr>'.$timestamp.'</nobr></td>'; |
if ($mode eq 'full_class') { |
if ($mode eq 'full_class') { |
$r->print('<tr class="'.$class.'">'. |
$tablerow.='<td>'.$student.'</td>'; |
'<td>'.$count.'</td>'. |
|
'<td><a href="'.$src.'">'.$title.'</a>'.'</td>'. |
|
'<td><nobr>'.$timestamp.'</nobr></td>'. |
|
'<td>'.$student.'</td>'. |
|
'<td>'.$action.'</td>'. |
|
'<td>'.$machine.'</td>'. |
|
'<td>'.$values.'</td>'.'</tr>'.$/); |
|
} elsif ($mode =~ /^student:/) { |
|
$r->print('<tr class="'.$class.'">'. |
|
'<td><a href="'.$src.'">'.$title.'</a>'.'</td>'. |
|
'<td><nobr>'.$timestamp.'</nobr></td>'. |
|
'<td>'.$action.'</td>'. |
|
'<td>'.$machine.'</td>'. |
|
'<td>'.$values.'</td>'.'</tr>'.$/); |
|
} |
} |
|
$tablerow .= |
|
'<td>'.$action.'</td>'. |
|
# '<td>'.$machine.'</td>'. |
|
'<td>'.$values.'</td>'. |
|
'</tr>'; |
|
$r->print($tablerow.$/); |
} |
} |
$r->print('</table>'.$/) if (! $count % 50); |
$r->print('</table>'.$/) if (! $count % 50); |
close(ACTIVITYDATA); |
close(ACTIVITYDATA); |
Line 263 sub request_data_update {
|
Line 288 sub request_data_update {
|
my $domain = $ENV{'course.'.$cid.'.domain'}; |
my $domain = $ENV{'course.'.$cid.'.domain'}; |
my $home = $ENV{'course.'.$cid.'.home'}; |
my $home = $ENV{'course.'.$cid.'.home'}; |
my $course = $ENV{'course.'.$cid.'.num'}; |
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, |
my $result = &Apache::lonnet::metadata_query($command,$course,$domain, |
[$home]); |
[$home]); |
return $result; |
return $result; |
Line 282 sub pick_student {
|
Line 307 sub pick_student {
|
sub styles { |
sub styles { |
return <<END; |
return <<END; |
<style type="text/css"> |
<style type="text/css"> |
|
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; } |
|
</style> |
|
END |
|
} |
|
|
|
sub developer_centric_styles { |
|
return <<END; |
|
<style type="text/css"> |
tr.warning { background-color: red; } |
tr.warning { background-color: red; } |
tr.chat { background-color: yellow; } |
tr.chat { background-color: yellow; } |
tr.chatfetch { background-color: yellow; } |
tr.chatfetch { background-color: yellow; } |
Line 290 sub styles {
|
Line 333 sub styles {
|
tr.flip { background-color: \#BBBBBB; } |
tr.flip { background-color: \#BBBBBB; } |
tr.adm { background-color: green; } |
tr.adm { background-color: green; } |
tr.print { background-color: blue; } |
tr.print { background-color: blue; } |
|
tr.parmset { background-color: \#000088; } |
tr.printout { background-color: blue; } |
tr.printout { background-color: blue; } |
|
tr.grades { background-color: \#CCCCCC; } |
</style> |
</style> |
END |
END |
} |
} |
Line 371 sub handler {
|
Line 416 sub handler {
|
if (ref($result) eq 'HASH') { |
if (ref($result) eq 'HASH') { |
$result = join(' ',map { $_.'=>'.$result->{$_}; } keys(%$result)); |
$result = join(' ',map { $_.'=>'.$result->{$_}; } keys(%$result)); |
} |
} |
&Apache::lonnet::logthis('result from request_data_update: '.$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 |
# For now, just show all the data, in the future allow selection of |
# a student |
# a student |
my ($sname,$sdom) = split(':',$ENV{'form.selected_student'}); |
my ($sname,$sdom) = split(':',$ENV{'form.selected_student'}); |
$r->print('<h2>'. |
if ($sname =~ /^\w*$/ && $sdom =~ /^\w*$/) { |
&mt('Recent activity of [_1]@[_2]',$sname,$sdom). |
$r->print('<h2>'. |
'</h2>'); |
&mt('Recent activity of [_1]@[_2]',$sname,$sdom). |
&get_data($r,\%prog_state,$navmap, |
'</h2>'); |
'student:'.$ENV{'form.selected_student'}); |
&get_data($r,\%prog_state,$navmap, |
|
'student:'.$ENV{'form.selected_student'}); |
|
} else { |
|
$r->print('<h2>'.&mt('Unable to process for [_1]@[_2]', |
|
$sname,$sdom).'</h2>'); |
|
} |
} else { |
} else { |
# For now, just show all the data instead of limiting it to one student |
# For now, just show all the data instead of limiting it to one student |
&get_data($r,\%prog_state,$navmap,'full_class'); |
&get_data($r,\%prog_state,$navmap,'full_class'); |