--- loncom/interface/lontrackstudent.pm	2008/12/11 14:55:15	1.24
+++ loncom/interface/lontrackstudent.pm	2009/03/26 17:36:39	1.28
@@ -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.28 2009/03/26 17:36:39 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;
 
@@ -122,6 +123,7 @@ sub get_data {
 							 ));
 	$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'}));
@@ -265,6 +267,7 @@ sub output_results {
     if ($mode eq 'full_class') { 
         $tableheader = 
             '<table><tr>'.
+            '<th>&nbsp;</th>'.
             '<th>'.&mt('Resource').'</th>'.
             '<th>'.&mt('Time').'</th>'.
             '<th>'.&mt('Student').'</th>'.
@@ -275,6 +278,7 @@ sub output_results {
     } elsif ($mode =~ /^student:(.*):(.*)$/) {
         $tableheader = 
             '<table><tr>'.
+            '<th>&nbsp;</th>'.
             '<th>'.&mt('Resource').'</th>'.
             '<th>'.&mt('Time').'</th>'.
             '<th>'.&mt('Action').'</th>'.
@@ -286,6 +290,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 +382,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,6 +401,30 @@ 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 {
@@ -516,6 +558,11 @@ sub handler {
     #
     # 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',
@@ -533,8 +580,8 @@ sub handler {
     $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="" />').
+              &mt('Status: [_1]',
+                  '<input type="text" name="status" size="60" value="" readonly="readonly" />').
               '</div>');
     $r->rflush();
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
@@ -555,10 +602,11 @@ sub handler {
             $r->print('<h2>'.
                       &mt('Recent activity of [_1]:[_2]',$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 {