--- loncom/interface/lonnavmaps.pm 2011/03/14 15:48:00 1.458 +++ loncom/interface/lonnavmaps.pm 2011/05/18 11:26:44 1.459 @@ -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.459 2011/05/18 11:26:44 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; } @@ -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])) { @@ -2414,6 +2414,7 @@ sub parmval { } } my $result = $self->parmval_real($what, $symb, $recurse); + my $dumper = Data::Dumper->new([$result]); $self->{PARM_CACHE}->{$hashkey} = $result; if (wantarray) { return @{$result}; @@ -3743,9 +3744,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 +3929,17 @@ their code.) =over 4 -=item * B: +=item * B + +returns true if the current date is such that the +specified resource part is printable. + +=item * B + +Returns true if all parts in the resource are printable making the +entire resource printable. + +=item * B Get the Client IP/Name Access Control information. @@ -3983,6 +3992,54 @@ Get the weight for the problem. =cut +sub printable { + + &Apache::lonnet::logthis("Printable"); + my ($self, $part) = @_; + + # Get the print open/close dates for the resource. + + my $start = $self->parmval("printopendate", $part); + my $end = $self->parmval("printclosedate", $part); + my $dumper = Data::Dumper->new([$self, $part, $start, $end]); + &Apache::lonnet::logthis("Start for " . $dumper->Dump); + + # 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 ($start ne '') { + $startok = $start <= $now; + } + if ($end ne '') { + $endok = $end >= $now; + } + return $startok && $endok; +} + +sub resprintable { + my $self = shift; + + # get parts...or realize there are no parts. + + my $parts = $self->parts(); + if ($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;