--- loncom/interface/lonnavmaps.pm 2004/10/07 22:12:47 1.300 +++ loncom/interface/lonnavmaps.pm 2004/10/27 18:15:31 1.301 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.300 2004/10/07 22:12:47 albertel Exp $ +# $Id: lonnavmaps.pm,v 1.301 2004/10/27 18:15:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3496,6 +3496,16 @@ sub title { return $self->navHash("title_", 1); } # considered private and undocumented sub to { my $self=shift; return $self->navHash("to_", 1); } +sub condition { + my $self=shift; + my $undercond=$self->navHash("undercond_", 1); + if (!defined($undercond)) { return 1; }; + my $condid=$self->navHash("condid_$undercond"); + if (!defined($condid)) { return 1; }; + my $condition=&Apache::lonnet::directcondval($condid); + return $condition; +} + sub compTitle { my $self = shift; my $title = $self->title(); @@ -4669,6 +4679,7 @@ sub getNext { my $to = $self->to(); foreach my $branch ( split(/,/, $to) ) { my $choice = $self->{NAV_MAP}->getById($branch); + if (!$choice->condition()) { next; } my $next = $choice->goesto(); $next = $self->{NAV_MAP}->getById($next);