--- loncom/interface/lonnavmaps.pm	2011/01/24 16:18:41	1.456
+++ loncom/interface/lonnavmaps.pm	2011/05/25 09:03:07	1.461
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.456 2011/01/24 16:18:41 www Exp $
+# $Id: lonnavmaps.pm,v 1.461 2011/05/25 09:03:07 foxr 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; }
@@ -945,10 +945,10 @@ sub render_resource {
     }
 
     if ($resource->randomout()) {
-        $nonLinkedText .= ' <i>('.&mt('hidden').')</i> ';
+        $nonLinkedText .= ' <span class="LC_warning">('.&mt('hidden').')</span> ';
     }
     if (!$resource->condval()) {
-        $nonLinkedText .= ' <i>('.&mt('conditionally hidden').')</i> ';
+        $nonLinkedText .= ' <span class="LC_info">('.&mt('conditionally hidden').')</span> ';
     }
     if (($resource->is_practice()) && ($resource->is_raw_problem())) {
         $nonLinkedText .=' <font color="green"><b>'.&mt('not graded').'</b></font>';
@@ -2399,7 +2399,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 +3743,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 +3928,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 +3991,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 +4092,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;
@@ -4968,7 +5030,7 @@ sub check_for_slot {
                 my $taskstatus = $self->taskstatus();
                 $is_correct = (($taskstatus eq 'pass') || 
                                ($self->solved() =~ /^correct_/));
-                $got_grade = ($self->solved() =~ /^(?:pass|fail)$/);
+                $got_grade = ($taskstatus =~ /^(?:pass|fail)$/);
             } else {
                 $got_grade = 1;
                 $is_correct = ($self->solved() =~ /^correct_/);