--- loncom/interface/lonnavmaps.pm	2011/03/14 15:48:00	1.458
+++ loncom/interface/lonnavmaps.pm	2011/09/15 01:06:41	1.463
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.458 2011/03/14 15:48:00 bisitz Exp $
+# $Id: lonnavmaps.pm,v 1.463 2011/09/15 01:06:41 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -483,7 +483,7 @@ use POSIX qw (floor strftime);
 use Time::HiRes qw( gettimeofday tv_interval );
 use LONCAPA;
 use DateTime();
-
+use Data::Dumper;
 # symbolic constants
 sub SYMB { return 1; }
 sub URL { return 2; }
@@ -509,7 +509,7 @@ my %statusIconMap =
 my %iconAltTags =   #texthash does not work here
     ( 'navmap.correct.gif'  => 'Correct',
       'navmap.wrong.gif'    => 'Incorrect',
-      'navmap.open.gif'     => 'Open',
+      'navmap.open.gif'     => 'Is Open',
       'navmap.partial.gif'  => 'Partially Correct',
       'navmap.ellipsis.gif' => 'Attempted',
      );
@@ -612,7 +612,7 @@ sub getDescription {
         return &Apache::lonhtmlcommon::direct_parm_link(&mt("Not currently assigned.",$res->symb(),'opendate'),$part);
     }
     if ($status == $res->OPEN_LATER) {
-        return &mt("Open ") .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($open,'start'),$res->symb(),'opendate',$part);
+        return &mt("Open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($open,'start')),$res->symb(),'opendate',$part);
     }
     if ($res->simpleStatus($part) == $res->OPEN) {
         unless (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
@@ -646,22 +646,22 @@ sub getDescription {
     if ($status == $res->OPEN) {
         if ($due) {
 	    if ($res->is_practice()) {
-		return &mt("Closes ")."  " .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'duedate',$part);
+		return &mt("Closes [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start')),$res->symb(),'duedate',$part);
 	    } else {
-		return &mt("Due")."  " .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part);
+		return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end')),$res->symb(),'duedate',$part);
 	    }
         } else {
             return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part);
         }
     }
     if ($status == $res->PAST_DUE_ANSWER_LATER) {
-        return &mt("Answer open")." " .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start'),$res->symb(),'answerdate',$part);
+        return &mt("Answer open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start')),$res->symb(),'answerdate',$part);
     }
     if ($status == $res->PAST_DUE_NO_ANSWER) {
 	if ($res->is_practice()) {
-	    return &mt("Closed")." " . &Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'answerdate,duedate',$part);
+	    return &mt("Closed [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start')),$res->symb(),'answerdate,duedate',$part);
 	} else {
-	    return &mt("Was due")." " .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'answerdate,duedate',$part);
+	    return &mt("Was due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end')),$res->symb(),'answerdate,duedate',$part);
 	}
     }
     if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
@@ -694,7 +694,7 @@ sub getDescription {
             }
         }
         if ($due) {
-            return &mt("Due")." " . &Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part) .
+            return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end')),$res->symb(),'duedate',$part) .
                 " $triesString";
         } else {
             return &Apache::lonhtmlcommon::direct_parm_link(&mt("No due date"),$res->symb(),'duedate',$part)." $triesString";
@@ -1090,10 +1090,9 @@ sub render_long_status {
         }
     }
     
-    if (($resource->kind() eq "res" &&
-        ($resource->is_problem() || $resource->is_practice()) &&
-        !$firstDisplayed) &&
-        $resource->is_raw_problem()) {
+    if ($resource->kind() eq "res" &&
+        $resource->is_raw_problem() &&
+        !$firstDisplayed) {
         if ($color) {$result .= "<font color=\"$color\"><b>"; }
         $result .= getDescription($resource, $part);
         if ($color) {$result .= "</b></font>"; }
@@ -2399,7 +2398,7 @@ sub parmval {
     my $self = shift;
     my ($what,$symb,$recurse)=@_;
     my $hashkey = $what."|||".$symb;
-
+    my $cache = $self->{PARM_CACHE};
     if (defined($self->{PARM_CACHE}->{$hashkey})) {
         if (ref($self->{PARM_CACHE}->{$hashkey}) eq 'ARRAY') { 
             if (defined($self->{PARM_CACHE}->{$hashkey}->[0])) {
@@ -3743,9 +3742,7 @@ my %incomplete_hash =
 sub is_incomplete {
     my $self = shift;
     if ($self->is_problem()) {
-	&Apache::lonnet::logthis('is problem');
 	foreach my $part (@{$self->parts()}) {
-	    &Apache::lonnet::logthis("$part status ".$self->status($part));
 	    if (exists($incomplete_hash{$self->status($part)})) {
 		return 1;
 	    }
@@ -3930,7 +3927,17 @@ their code.)
 
 =over 4
 
-=item * B<acc>:
+=item * B<printable>
+
+returns true if the current date is such that the 
+specified resource part is printable.
+
+=item * B<resprintable>
+
+Returns true if all parts in the resource are printable making the
+entire resource printable.
+
+=item * B<acc>
 
 Get the Client IP/Name Access Control information.
 
@@ -3983,6 +3990,55 @@ Get the weight for the problem.
 
 =cut
 
+sub printable {
+
+    my ($self, $part) = @_;
+
+    # Get the print open/close dates for the resource.
+
+    my $start = $self->parmval("prinstartdate", $part);
+    my $end   = $self->parmval("printenddate", $part);
+
+    #  The following cases apply:
+    #  - No dates set: Printable.
+    #  - Start date set but no end date: Printable if now >= start date.
+    #  - End date set but no start date: Printable if now <= end date.
+    #  - both defined: printable if start <= now <= end
+    #
+    my $now  = time();
+
+    my $startok = 1;
+    my $endok   = 1;
+
+    if ((defined $start) && ($start ne '')) {
+	$startok = $start <= $now;
+    }
+    if ((defined $end) && ($end != '')) {
+	$endok = $end >= $now;
+    }
+    return $startok && $endok;
+}
+
+sub resprintable {
+    my $self = shift;
+
+    # get parts...or realize there are no parts.
+
+    my $partsref = $self->parts();
+    my @parts    = @$partsref;
+
+    if ((!defined(@parts)) || (scalar(@parts) == 0)) {
+	return $self->printable(0);
+    } else {
+	foreach my $part  (@parts) {
+	    if (!$self->printable($part)) { 
+		return 0; 
+	    }
+	}
+	return 1;
+    }
+}
+
 sub acc {
     (my $self, my $part) = @_;
     my $acc = $self->parmval("acc", $part);
@@ -4035,6 +4091,11 @@ sub checkedin {
     }
 }
 # this should work exactly like the copy in lonhomework.pm
+# Why is there a copy in lonhomework?  Why not centralized?
+#
+#  TODO: Centralize duedate.
+#
+
 sub duedate {
     (my $self, my $part) = @_;
     my $date;