--- loncom/interface/lonnavmaps.pm	2001/01/30 19:31:32	1.10
+++ loncom/interface/lonnavmaps.pm	2002/01/01 16:02:28	1.21
@@ -1,6 +1,30 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
+# $Id: lonnavmaps.pm,v 1.21 2002/01/01 16:02:28 www Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # (Page Handler
 #
 # (TeX Content Handler
@@ -9,13 +33,17 @@
 # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
 # 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer)
 #
-# 3/1/1,6/1,17/1,29/1,30/1 Gerd Kortemeyer
+# 3/1/1,6/1,17/1,29/1,30/1,2/8,9/21,9/24,9/25 Gerd Kortemeyer
+# YEAR=2002
+# 1/1 Gerd Kortemeyer
+#
 
 package Apache::lonnavmaps;
 
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet();
+use Apache::loncommon();
 use HTML::TokeParser;
 use GDBM_File;
 
@@ -39,7 +67,6 @@ my %courseopt;
 my %useropt;
 my %parmhash;
 
-
 # ------------------------------------------------------------------ Euclid gcd
 
 sub euclid {
@@ -153,56 +180,78 @@ sub astatus {
     $rid=~/(\d+)\.(\d+)/;
     my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.
 	     &Apache::lonnet::declutter($hash{'src_'.$rid});
-    my $duedate=&parmval('0.duedate',$symb);
-    if ($duedate) {
-       $ctext.='Due: '.localtime($duedate);
-    }
-    my $answer=&Apache::lonnet::reply(
-              "restore:$ENV{'user.domain'}:$ENV{'user.name'}:".
-              $ENV{'request.course.id'}.':'.
-              &Apache::lonnet::escape($symb),
-              "$ENV{'user.home'}");
-    my %returnhash=();
+
+    my %duedate=();
+    my %opendate=();
+    my %answerdate=();
     map {
-	my ($name,$value)=split(/\=/,$_);
-        $returnhash{&Apache::lonnet::unescape($name)}=
-                    &Apache::lonnet::unescape($value);
-    } split(/\&/,$answer);
-    if ($returnhash{'version'}) {
-       my $version;
-       for ($version=1;$version<=$returnhash{'version'};$version++) {
-          map {
-             $returnhash{$_}=$returnhash{$version.':'.$_};
-          } split(/\:/,$returnhash{$version.':keys'});
+        if ($_=~/^parameter\_(.*)\_opendate$/) {
+	    my $part=$1;
+            $duedate{$part}=&parmval($part.'.duedate',$symb);
+            $opendate{$part}=&parmval($part.'.opendate',$symb);
+            $answerdate{$part}=&parmval($part.'.answerdate',$symb);
+        }
+    } sort split(/\,/,&Apache::lonnet::metadata($hash{'src_'.$rid},'keys'));
+
+    my $now=time;
+    my $tcode=0;
+
+    my %returnhash=&Apache::lonnet::restore($symb);
+
+  map {
+
+   my $duedate=$duedate{$_};
+   my $opendate=$opendate{$_};
+   my $answerdate=$answerdate{$_};
+   my $preface='';
+   unless ($_ eq '0') { $preface=' Part: '.$_.' '; }
+   if ($opendate) {
+    if ($now<$duedate) {
+        unless ($tcode==4) { $tcode=2; } 
+        $ctext.=$preface.'Due: '.localtime($duedate);
+        if ($now<$opendate) { 
+          unless ($tcode) { $tcode=1; } 
+          $ctext.=$preface.'Open: '.localtime($opendate);
+        }
+        if ($duedate-$now<86400) {
+	   $tcode=4;
+           $ctext.=$preface.'Due: '.localtime($duedate);
+        }
+     } else {
+	 unless (($tcode==4) || ($tcode eq 2)) { $tcode=3; }
+       if ($now<$answerdate) {  
+          $ctext.='Answer: '.localtime($duedate);
        }
-       map {
-           if (($_=~/\.(\w+)\.solved$/) && ($_!~/^\d+\:/)) {
-               my $part=$1;
-               if ($ctext) { $ctext.=', '; }
-               if ($part) {
-		   $ctext.='Part '.$part.': ';
-               }
-	       if ($returnhash{$_} eq 'correct_by_student') {
+    }
+   } else {
+       unless (($tcode==2) || ($tcode==4)) { $tcode=1; }
+   }
+
+    my $status=$returnhash{'resource.'.$_.'.solved'};
+
+	       if ($status eq 'correct_by_student') {
                    unless ($code==2) { $code=3; }
-                   $ctext.='solved';
-               } elsif ($returnhash{$_} eq 'correct_by_override') {
+                   $ctext.=' solved';
+               } elsif ($status eq 'correct_by_override') {
                    unless ($code==2) { $code=3; }
-                   $ctext.='override';
-               } elsif ($returnhash{$_} eq 'incorrect_attempted') {
+                   $ctext.=' override';
+               } elsif ($status eq 'incorrect_attempted') {
                    $code=2;
-                   $ctext.=
-                     $returnhash{'resource.'.$part.'.tries'}.' attempt(s)';
-               } elsif ($returnhash{$_} eq 'incorrect_by_override') {
+                   $ctext.=' ('.
+                     ($returnhash{'resource.'.$_.'.tries'}?
+                      $returnhash{'resource.'.$_.'.tries'}:'0').'/'.
+                     &parmval($_.'.maxtries',$symb).' tries)';
+               } elsif ($status eq 'incorrect_by_override') {
                    $code=2;
-                   $ctext.='override';
-               } elsif ($returnhash{$_} eq 'excused') {
+                   $ctext.=' override';
+               } elsif ($status eq 'excused') {
                    unless ($code==2) { $code=3; }
-                   $ctext.='excused';
+                   $ctext.=' excused';
                }
-           }
-       } keys %returnhash;
-    }
-    return 'p'.$code.'"'.$ctext.'"';
+
+   } sort keys %opendate;
+
+    return 'p'.$code.$tcode.'"'.$ctext.'"';
 }
 
 # ------------------------------------------------------------ Build page table
@@ -414,20 +463,66 @@ sub handler {
 
 # ------------------------------------------------------------------ Build page
 
+		      my $currenturl=$ENV{'form.postdata'};
+                      $currenturl=~s/^http\:\/\///;
+                      $currenturl=~s/^[^\/]+//;
+
 # ---------------------------------------------------------------- Send headers
 
                           $r->content_type('text/html');
+                          &Apache::loncommon::no_cache($r);
                           $r->send_http_header;
-                          $r->print(
-                   '<html><head><title>Navigate LON-CAPA Maps</title></head>');
 
-			  $r->print('<body bgcolor="#FFFFFF">'.
-                                    '<script>window.focus();</script>'.
+		          my $date=localtime;
+		          my $now=time;
+# ----------------------------------------- Get email status and discussiontime
+
+		      my %emailstatus=&Apache::lonnet::dump('email_status');
+                      my $logouttime=$emailstatus{'logout'};
+                      my $courseleave=
+                         $emailstatus{'logout_'.$ENV{'request.course.id'}};
+                      my $lastcheck=
+                         ($courseleave>$logouttime?$courseleave:$logouttime);
+
+                      my %discussiontimes=&Apache::lonnet::dump(
+                         'discussiontimes',
+                         $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ 		         $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+                     
+                          $r->print(
+		   '<html><head><title>Navigate LON-CAPA Maps</title></head>');
+			  $r->print('<body bgcolor="#FFFFFF"');
+                          if (($currenturl=~/^\/res/) &&
+                              ($currenturl!~/^\/res\/adm/)) {
+                             $r->print(' onLoad="window.location.hash='.
+				       "'curloc'".'"');
+			  }
+                          $r->print('><script>window.focus();</script>'.
                            '<img align=right src=/adm/lonIcons/lonlogos.gif>'.
-                                    '<h1>Navigate Course Map</h1>');
-                          $r->rflush();
+                                    '<h1>Navigate Course Map</h1>'.
+                                    "<h3>$date</h3>");
+		      $r->rflush();
+                      if (($currenturl=~/^\/res/) &&
+                          ($currenturl!~/^\/res\/adm/)) {
+		       $r->print('<a href="#curloc">Current Location</a><p>');
+                      }
+# ----------------------------------------------------- The little content list
+                      for ($i=0;$i<=$#rows;$i++) {
+			if ($rows[$i]) {
+                          my @colcont=split(/\&/,$rows[$i]);
+                          my $avespan=$lcm/($#colcont+1);
+                          for ($j=0;$j<=$#colcont;$j++) {
+                              my $rid=$colcont[$j];
+                              if ($rid=~/^h(.+)/) {
+				  $rid=$1;
+                                  $r->print(
+     '&nbsp;&nbsp;&nbsp;<a href="#'.$rid.'">'.$hash{'title_'.$rid}.'</a><br>');
+                              }
+                          }
+		        }
+                      }
 # ----------------------------------------------------------------- Start table
-                      $r->print('<table cols="'.$lcm.'" border="0">');
+                      $r->print('<hr><table cols="'.$lcm.'" border="0">');
                       for ($i=0;$i<=$#rows;$i++) {
 			if ($rows[$i]) {
                           $r->print("\n<tr>");
@@ -441,13 +536,30 @@ sub handler {
                               my $hwke='</font>';
                               if ($rid=~/^h(.+)/) {
 				  $rid=$1;
-                                  $add='<th bgcolor="#AAFF55">';
+                                  $add=
+                                   '<th bgcolor="#AAFF55"><a name="'.$rid.'">';
                                   $adde='</th>';
                               }
-                              if ($rid=~/^p(\d)\"([\w\: \(\)\,]*)\"(.+)/) {
+                            if ($rid=~/^p(\d)(\d)\"([\w\: \(\)\/\,]*)\"(.+)/) {
                                   my $code=$1;
-                                  my $ctext=$2;
-                                  $rid=$3;
+                                  my $tcode=$2;
+                                  my $ctext=$3;
+                                  $rid=$4;
+                                  if ($tcode eq '1') {
+                                     $add='<td bgcolor="#AAAAAA">';
+                                  }
+                                  if ($code eq '3') {
+                                     $add='<td bgcolor="#AAFFAA">';
+				  } else {
+                                      $add='<td bgcolor="#FFAAAA">';
+				      if ($tcode eq '2') {
+                                         $add='<td bgcolor="#FFFFAA">';
+                                      }
+                                      if ($tcode eq '4') {
+                                         $add='<td bgcolor="#FFFF33"><blink>';
+                                         $adde='</blink></td>';
+                                      }
+                                  }
                                   $hwk='<font color="#888811"><b>';
                                   $hwke='</b></font>';
                                   if ($code eq '1') {
@@ -462,6 +574,20 @@ sub handler {
                                      $hwke='</b> ('.$ctext.')</font>';
                                   }
                               }
+			      if ($hash{'src_'.$rid} eq $currenturl) {
+                                  $add=$add.'<a name="curloc"></a>'.
+			  '<font color=red size=+2><b>&gt; </b></font>';
+                                  $adde=
+                          '<font color=red size=+2><b> &lt;</b></font>'.$adde;
+                              }
+                              $rid=~/^(\d+)\.(\d+)$/;
+    my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.
+	     &Apache::lonnet::declutter($hash{'src_'.$rid});
+                              if ($discussiontimes{$symb}>$lastcheck) {
+                                 $adde=
+                                 '<img border=0 src="/adm/lonMisc/chat.gif">'.
+				     $adde;
+                              }
                               $r->print($add.'<a href="'.$hash{'src_'.$rid}.
                                 '">'.$hwk.
                                 $hash{'title_'.$rid}.$hwke.'</a>'.$adde);
@@ -470,7 +596,6 @@ sub handler {
 		        }
                       }
                       $r->print("\n</table>");
-
                       $r->print('</body></html>');
 # -------------------------------------------------------------------- End page
                   }