--- loncom/homework/inputtags.pm 2011/10/08 19:19:58 1.295 +++ loncom/homework/inputtags.pm 2011/12/20 22:47:27 1.300 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.295 2011/10/08 19:19:58 raeburn Exp $ +# $Id: inputtags.pm,v 1.300 2011/12/20 22:47:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -911,7 +911,13 @@ sub decideoutput { } } } - if ($awarded==1) { $button=0; } else { $button=1; } + if ($awarded >= 1) { + $button=0; + } elsif (&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/i) { + $button=0; + } else { + $button=1; + } $previousmsg=''; } elsif ($solved =~ /^excused/) { if ($target eq 'tex') { @@ -1488,7 +1494,10 @@ sub gradestatus { && $status ne 'UNAVAILABLE' && $status ne 'INVALID_ACCESS' && $status ne 'NEEDS_CHECKIN' - && $status ne 'NOT_IN_A_SLOT') { + && $status ne 'NOT_IN_A_SLOT' + && $status ne 'RESERVABLE' + && $status ne 'RESERVABLE_LATER' + && $status ne 'NOTRESERVABLE') { ($previousmsg,$latemessage,$message,$trystr) = &get_grade_messages($id,"resource.$id",$target,$status, @@ -1622,31 +1631,13 @@ sub previous_tries { '