--- loncom/interface/lontrackstudent.pm 2008/12/11 14:55:15 1.24
+++ loncom/interface/lontrackstudent.pm 2014/04/15 12:05:41 1.37
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lontrackstudent.pm,v 1.24 2008/12/11 14:55:15 bisitz Exp $
+# $Id: lontrackstudent.pm,v 1.37 2014/04/15 12:05:41 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -48,6 +48,7 @@ use Apache::lonmysql;
use Apache::lonnet;
use Apache::lonlocal;
use Time::HiRes;
+use DateTime();
use lib '/home/httpd/lib/perl/';
use LONCAPA;
@@ -118,13 +119,16 @@ sub get_data {
$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)
+ ($env{'form.start'}+$inc),
+ $env{'form.only_body'}
));
$r->print('<br />');
}
+ $r->print('<hr />');
$text = 'Resubmit last request to check for newer data';
$r->print(&Apache::loncommon::track_student_link($text,$sname,$sdom,undef,
- $env{'form.start'}));
+ $env{'form.start'},
+ $env{'form.only_body'}));
&Apache::lonhtmlcommon::Update_PrgWin($r,$prog_state,&mt('Finished!'));
return;
@@ -182,11 +186,11 @@ sub get_max_time_in_db {
($r,$prog_state,&mt('Parsing results'));
#
if (! open(TIMEDATA,$results_file)) {
- $r->print('<h2>'.&mt('Unable to read results file.').'</h2>'.
+ $r->print('<p class="LC_error">'.&mt('Unable to read results file.').'</p>'.
'<p>'.
- &mt('This is a serious error and has been logged. '.
- 'You should contact your system administrator '.
- 'to resolve this issue.').
+ &mt('This is a serious error and has been logged.').
+ '<br />'.
+ &mt('Please alert your LON-CAPA administrator.').
'</p>');
return;
}
@@ -247,15 +251,15 @@ sub output_results {
##
if (! -s $results_file) {
# results file is empty, just let them know there is no data
- $r->print('<h2>'.&mt('So far, no data has been returned for your request').'</h2>');
+ $r->print('<p class="LC_info">'.&mt('So far, no data has been returned for your request').'</p>');
return -1;
}
if (! open(ACTIVITYDATA,$results_file)) {
- $r->print('<h2>'.&mt('Unable to read results file.').'</h2>'.
+ $r->print('<p class="LC_error">'.&mt('Unable to read results file.').'</p>'.
'<p>'.
- &mt('This is a serious error and has been logged. '.
- 'You should contact your system administrator '.
- 'to resolve this issue.').
+ &mt('This is a serious error and has been logged.').
+ '<br />'.
+ &mt('Please alert your LON-CAPA administrator.').
'</p>');
return -2;
}
@@ -265,6 +269,7 @@ sub output_results {
if ($mode eq 'full_class') {
$tableheader =
'<table><tr>'.
+ '<th> </th>'.
'<th>'.&mt('Resource').'</th>'.
'<th>'.&mt('Time').'</th>'.
'<th>'.&mt('Student').'</th>'.
@@ -275,6 +280,7 @@ sub output_results {
} elsif ($mode =~ /^student:(.*):(.*)$/) {
$tableheader =
'<table><tr>'.
+ '<th> </th>'.
'<th>'.&mt('Resource').'</th>'.
'<th>'.&mt('Time').'</th>'.
'<th>'.&mt('Action').'</th>'.
@@ -286,6 +292,17 @@ sub output_results {
$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 = <ACTIVITYDATA>) {
# FIXME: does not pass symbs along :(
chomp($line);
@@ -367,6 +384,9 @@ sub output_results {
'<a href="'.$src.'">'.$title.'</a>'.
'</span></td>';
}
+ if ($server_timezone ne '') {
+ $timestamp = &convert_timezone($server_timezone,$timestamp);
+ }
$tablerow .= '<td valign="top"><span class="LC_nobreak">'.$timestamp.'</span></td>';
if ($mode eq 'full_class') {
$tablerow.='<td valign="top">'.$student.'</td>';
@@ -383,20 +403,55 @@ sub output_results {
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='<table>';
if ($action eq 'CSTORE') {
+ my $is_anon;
my %values=map {split('=',$_,-1)} split(/\&/,$values);
foreach my $key (sort(keys(%values))) {
+ my $unesc_key = &unescape($key);
+ if ($values{$key} eq 'anonsurvey' || $values{$key} eq 'anonsurveycred') {
+ if ($unesc_key =~ /^resource\..+\.type$/) {
+ $is_anon = 1;
+ last;
+ }
+ }
$result.='<tr><td align="right">'.
- &unescape($key).
+ $unesc_key.
'</td><td>=</td><td align="left">'.
&unescape($values{$key}).'</td></tr>';
}
$result.='</table>';
+ if ($is_anon) {
+ $result = '<span class="LC_warning">'.&mt('Anonymous Survey Submission: details not shown').'</span>';
+ }
} elsif ($action eq 'POST') {
my %values;
foreach my $pair (split(/\&/,$values)) {
@@ -481,15 +536,6 @@ sub handler {
my $r=shift;
my $c = $r->connection();
#
- # Check for overloading here and on the course home server
- my $loaderror=&Apache::lonnet::overloaderror($r);
- if ($loaderror) { return $loaderror; }
- $loaderror=
- &Apache::lonnet::overloaderror
- ($r,
- $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'}=
@@ -512,35 +558,37 @@ sub handler {
#
# Extract form elements from query string
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['selected_student','start']);
+ ['selected_student','start','only_body']);
#
# 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',
title=>'Student Activity',
text =>'Student Activity',
faq=>139,
- bug=>'instructor interface'});
+ bug=>'instructor interface',
+ help=>'View_recent_activity'});
#
# Give the LON-CAPA page header
- $r->print(&Apache::loncommon::start_page('Student Activity',&styles()).
+ my $args;
+ if ($env{'form.only_body'}) {
+ $args = { only_body => 1, };
+ }
+ $r->print(&Apache::loncommon::start_page('Student Activity',&styles(),$args).
&Apache::lonhtmlcommon::breadcrumbs('Student Activity'));
$r->rflush();
#
# Begin form output
$r->print('<form name="trackstudent" method="post" action="/adm/trackstudent">');
- $r->print('<br />');
- $r->print('<div name="statusline">'.
- &mt('Status:[_1]',
- '<input type="text" name="status" size="60" value="" />').
- '</div>');
$r->rflush();
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,&mt('Student Activity Retrieval'),
- &mt('Student Activity Retrieval'),undef,'inline',undef,
- 'trackstudent','status');
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r);
&Apache::lonhtmlcommon::Update_PrgWin
($r,\%prog_state,&mt('Contacting course home server'));
#
@@ -553,17 +601,21 @@ sub handler {
if ($sname =~ /^$LONCAPA::username_re$/
&& $sdom =~ /^$LONCAPA::domain_re$/) {
$r->print('<h2>'.
- &mt('Recent activity of [_1]:[_2]',$sname,$sdom).
+ &mt('Recent activity of [_1]',$sname.':'.$sdom).
'</h2>');
- $r->print('<p>'.&mt(<<END).'</p>');
-Compiling student activity data can take a long time.
-Your request continues to be processed while results are displayed.
-END
+ $r->print('<p class="LC_info">'
+ .&mt('Compiling student activity data can take a long time.'
+ .' Your request continues to be processed while results are displayed.')
+ .'</p>'
+ );
&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>');
+ $r->print(
+ '<p class="LC_error">'
+ .&mt('Unable to process for [_1]:[_2]',$sname,$sdom)
+ .'</p>'
+ );
}
} else {
# For now, just show all the data instead of limiting it to one student