--- loncom/interface/lontrackstudent.pm	2004/08/19 21:07:35	1.3
+++ loncom/interface/lontrackstudent.pm	2004/08/25 15:53:34	1.5
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lontrackstudent.pm,v 1.3 2004/08/19 21:07:35 matthew Exp $
+# $Id: lontrackstudent.pm,v 1.5 2004/08/25 15:53:34 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,41 +48,18 @@ use Apache::lonnet();
 use Apache::lonlocal;
 use Time::HiRes;
 
-###################################################################
-###################################################################
-sub get_all_data {
-    my ($r,$prog_state,$navmap) = @_;
+sub get_data {
+    my ($r,$prog_state,$navmap,$mode) = @_;
     ##
     ## Compose the query
     &Apache::lonhtmlcommon::Update_PrgWin
         ($r,$prog_state,&mt('Composing Query'));
     #
-    my $query;
-    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 $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';
-    #
-    $query = qq{
-        select B.resource,A.time,C.student,D.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 $action_table   AS D ON D.action_id=A.action_id 
-            LEFT JOIN $machine_table  AS E ON E.machine_id=A.machine_id
-            LIMIT 500
-    };
-    $query =~ s|$/||g;
-    # &Apache::lonnet::logthis($query);
+    my $query = &build_query($mode);
+    &Apache::lonnet::logthis('sending query '.$query);
     ##
     ## Send it along
+    my $home = $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
     my $reply=&Apache::lonnet::metadata_query($query,undef,undef,[$home]);
     if (ref($reply) ne 'HASH') {
         $r->print('<h2>'.
@@ -100,9 +77,10 @@ sub get_all_data {
     my $maxtime = 500;
     my $starttime = time;
     while (! -e $endfile && (time-$starttime < $maxtime)) {
-        sleep(1);
         &Apache::lonhtmlcommon::Update_PrgWin
-            ($r,$prog_state,&mt('Waiting for results'));
+            ($r,$prog_state,&mt('Waiting up to [_1] seconds for results',
+                                $starttime+$maxtime-time));
+        sleep(1);
     }
     if (! -e $endfile) {
         $r->print('<h2>'.
@@ -110,71 +88,175 @@ sub get_all_data {
         $r->print(&mt('Please try again in a few minutes.'));
         return;
     }
+    $r->print('<h2>'.&mt('Elapsed Time = [_1] seconds',
+                         time-$starttime).'</h2>');
+    $r->rflush();
     &Apache::lonhtmlcommon::Update_PrgWin
         ($r,$prog_state,&mt('Parsing results'));
+    $r->print('<h2>'.
+              &mt('Reloading this page may result in newer data').
+              '</h2>');
+    &output_results($r,$results_file,$navmap,$mode);
+    &Apache::lonhtmlcommon::Update_PrgWin($r,$prog_state,&mt('Finished!'));
+    return;
+}
+
+sub build_query {
+    my ($mode) = @_;
+    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 $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 $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
+            ORDER BY A.time DESC
+            LIMIT 5000
+        };
+    } 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
+        };
+    }
+    $query =~ s|$/||g;
+    return $query;
+}
+
+###################################################################
+###################################################################
+sub output_results {
+    my ($r,$results_file,$navmap,$mode) = @_;
     if (! open(ACTIVITYDATA,$results_file)) {
-        $r->print('<h2>'.
-                  &mt('Unable to read results file.  This is a serious error and has been logged.  You should contact your system administrator to resolve this issue.  If you are the system administrator, I feel sorry for you.').
-                  '</h2>');
+        $r->print('<h2>'.&mt('Unable to read results file.').'</h2>'.
+                  '<p>'.
+                  &mt('This is a serious error and has been logged.  '.
+                      'You should contact your system administrator '.
+                      'to resolve this issue.').
+                  '</p>');
         return;
     }
-    my $tableheader = 
+    my $tableheader;
+    if ($mode eq 'full_class') { 
+        $tableheader = 
+            '<table><tr>'.
+            '<th>count</th>'.
+            '<th>'.&mt('Resource').'</th>'.
+            '<th>'.&mt('Time').'</th>'.
+            '<th>'.&mt('Student').'</th>'.
+            '<th>'.&mt('Action').'</th>'.
+            '<th>'.&mt('Originating Server').'</th>'.
+            '<th>'.&mt('Data').'</th>'.
+            '</tr>'.$/;
+    } elsif ($mode =~ /^student:/) {
         '<table><tr>'.
         '<th>'.&mt('Resource').'</th>'.
         '<th>'.&mt('Time').'</th>'.
-        '<th>'.&mt('Student').'</th>'.
         '<th>'.&mt('Action').'</th>'.
         '<th>'.&mt('Originating Server').'</th>'.
         '<th>'.&mt('Data').'</th>'.
         '</tr>'.$/;
-    my $count =0;
-    $r->print($tableheader);
+    }
+    my $count = -1;
     $r->rflush();
     while (my $line = <ACTIVITYDATA>) {
         $line = &Apache::lonnet::unescape($line);
         if (++$count % 50 == 0) {
-            $r->print('</table>'.$/);
-            $r->rflush();
+            if ($count != 0) { 
+                $r->print('</table>'.$/);
+                $r->rflush();
+            }
             $r->print($tableheader);
         }
-        my ($symb,$timestamp,$student,$action,$machine,$values) =
-            map { &Apache::lonnet::unescape($_); } split(',',$line,6);
+        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);
+        } else {
+            ($symb,$timestamp,$action,$machine,$values) =
+                map { &Apache::lonnet::unescape($_); } split(',',$line,5);
+        }
         my ($title,$src);
-        if ($symb =~ m:^/(res|adm)/:) {
+        if ($symb =~ m:^/adm/:) {
             $title = $symb;
             $src = $symb;
         } else {
-            # We may need to add 'uploaded/' to the symb
-            # 
-            # Hey, guess what - navmaps->getBySymb 
-            # does not work with uploaded resources/new style courses/something
-            # The fact that our symbs do not have uploaded/ prepended to them
-            # then they (most often but not always) should, is likely to be
-            # a puzzle too.
-            #&Apache::lonnet::logthis('trackstudent:symb = '.$symb);
-            # my $nav_res = $navmap->getBySymb($symb);
-            $title = 'resource title goes here'; # $nav_res->title();
-            $src   = '/dev/null'; # $nav_res->src();
+            my $nav_res = $navmap->getBySymb($symb);
+            if (defined($nav_res)) {
+                $title = $nav_res->title();
+                $src   = $nav_res->src();
+            } else {
+                $title = 'unable to retrieve title';
+                $src   = '/dev/null';
+            }
+        }
+        my $class = '';
+        #
+        if ($symb eq '/prtspool/') {
+            $class = 'print';
+            $title = 'retrieve printout';
+        } elsif ($symb =~ m|^/adm/([^/]+)|) {
+            $class = $1;
+        } elsif ($symb =~ m|^/adm/|) {
+            $class = 'adm';
+        }
+        if ($title eq 'unable to retrieve title') {
+            $title =~ s/ /\&nbsp;/g;
+            $class = 'warning';
+        }
+        if (! defined($title) || $title eq '') {
+            $title = 'untitled';
+            $class = 'warning';
+        }
+        if ($values =~ /^counter=\d+$/) {
+            $values = '';
+        }
+        if ($mode eq 'full_class') {
+            $r->print('<tr class="'.$class.'">'.
+                      '<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>'.$/);
         }
-        $r->print('<tr>'.
-                  '<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>'.$/);
     }
-    $r->print('</table>'.$/);
+    $r->print('</table>'.$/) if (! $count % 50);
     close(ACTIVITYDATA);
-    &Apache::lonhtmlcommon::Update_PrgWin
-        ($r,$prog_state,&mt('Finished!'));
     return;
 }
 
-sub get_student_data {}
-sub html_output_student_data {}
-sub html_output_class_data {}
-
+###################################################################
+###################################################################
 sub request_data_update {
     my $command = 'prepare activity log';
     my $cid = $ENV{'request.course.id'};
@@ -189,7 +271,29 @@ sub request_data_update {
 
 ###################################################################
 ###################################################################
+sub pick_student {
+    my ($r) = @_;
+    $r->print("Sorry, cannot display classlist at this time.  Come back another time.");
+    return;
+}
 
+###################################################################
+###################################################################
+sub styles {
+    return <<END;
+<style type="text/css">
+    tr.warning   { background-color: red; }
+    tr.chat      { background-color: yellow; }
+    tr.chatfetch { background-color: yellow; }
+    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.printout  { background-color: blue; }
+</style>
+END
+}
 
 ###################################################################
 ###################################################################
@@ -241,7 +345,7 @@ sub handler {
                                             bug=>'instructor interface'});
     #
     # Give the LON-CAPA page header
-    $r->print('<html><head><title>'.
+    $r->print('<html><head>'.&styles.'<title>'.
               &mt('Student Activity').
               "</title></head>\n".
               &Apache::loncommon::bodytag('Student Activity').
@@ -267,21 +371,24 @@ sub handler {
     if (ref($result) eq 'HASH') {
         $result = join(' ',map { $_.'=>'.$result->{$_}; } keys(%$result));
     }
-    $r->print('<h2>'.$result.'</h2>');
+    &Apache::lonnet::logthis('result from request_data_update: '.$result);
     #
-    if (! exists($ENV{'form.selected_student'})) {
-        # Choose a student
-        $r->print('If you worked here you would be done by now');
+    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('<h2>'.
+                  &mt('Recent activity of [_1]@[_2]',$sname,$sdom).
+                  '</h2>');
+        &get_data($r,\%prog_state,$navmap,
+                  'student:'.$ENV{'form.selected_student'});
     } else {
-        # Show a students activity
-        $r->print('I would like to have something to show you but I do not.');
+        # For now, just show all the data instead of limiting it to one student
+        &get_data($r,\%prog_state,$navmap,'full_class');
     }
     #
-    &get_all_data($r,\%prog_state,$navmap);
-
-#    &Apache::lonhtmlcommon::Update_PrgWin
-#        ($r,\%prog_state,&mt('Done'));
-
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Done'));
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     #
     $r->print("</form>\n");
     $r->print("</body>\n</html>\n");