--- loncom/interface/lonnavmaps.pm 2014/05/30 13:48:39 1.501 +++ loncom/interface/lonnavmaps.pm 2014/11/18 03:33:53 1.503 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.501 2014/05/30 13:48:39 raeburn Exp $ +# $Id: lonnavmaps.pm,v 1.503 2014/11/18 03:33:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees @@ -1140,12 +1140,17 @@ sub render_long_status { my $info = ''; if ($resource->is_problem() || $resource->is_practice()) { $color = $colormap{$resource->status}; - - if (dueInLessThan24Hours($resource, $part) || - lastTry($resource, $part)) { + + if (dueInLessThan24Hours($resource, $part)) { $color = $hurryUpColor; $info = ' title="'.&mt('Due in less than 24 hours!').'"'; - } + } elsif (lastTry($resource, $part)) { + unless (($resource->problemstatus($part) eq 'no') || + ($resource->problemstatus($part) eq 'no_feedback_ever')) { + $color = $hurryUpColor; + $info = ' title="'.&mt('One try remaining!').'"'; + } + } } if ($resource->kind() eq "res" && @@ -5397,7 +5402,7 @@ sub check_for_slot { } else { if ($ip ne '') { if (!&Apache::loncommon::check_ip_acc($ip)) { - return (RESERVED_LOCATION,$ip,$slot_name); + return (RESERVED_LOCATION,$end,$slot_name); } } my @proctors;