--- loncom/homework/inputtags.pm 2003/10/08 18:25:18 1.120 +++ loncom/homework/inputtags.pm 2003/11/16 03:23:17 1.123 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.120 2003/10/08 18:25:18 albertel Exp $ +# $Id: inputtags.pm,v 1.123 2003/11/16 03:23:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -145,8 +145,7 @@ sub start_textfield { } else { $result=$token->[4]; } - my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser); - $result.=&Apache::edit::modifiedfield(); + $result.=&Apache::edit::modifiedfield("/textfield",$parser); } elsif ($target eq 'tex') { my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval); my $width_of_box = &Apache::lonxml::get_param('cols',$parstack,$safeeval); @@ -621,7 +620,8 @@ sub gradestatus { my $status = $Apache::inputtags::status['-1']; &Apache::lonxml::debug("gradestatus has :$status:"); - if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE') { + if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' && + $status ne 'INVALID_ACCESS') { my $award = $Apache::lonhomework::history{"resource.$id.award"}; my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; @@ -642,6 +642,8 @@ sub gradestatus { my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); &Apache::lonxml::debug("got maxtries of :$maxtries:"); + #if tries are set to negative turn off the Tries/Button and messages + if (defined($maxtries) && $maxtries < 0) { return ''; } if ( $tries eq '' ) { $tries = '0'; } if ( $maxtries eq '' ) { $maxtries = '2'; } if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }