--- loncom/homework/lonhomework.pm 2001/01/06 16:23:45 1.26 +++ loncom/homework/lonhomework.pm 2001/01/11 15:20:58 1.31 @@ -12,6 +12,7 @@ use Apache::inputtags; use Apache::structuretags; use Apache::response; use Apache::hint; +use Apache::outputtags; use Apache::Constants qw(:common); sub get_target { @@ -29,7 +30,9 @@ sub get_target { return ('web'); } } else { - return ('edit'); + #return ('edit'); + #edit is currently broken + return ('web'); } } return (); @@ -72,6 +75,8 @@ sub check_date { &Apache::lonxml::debug("found :$date: for :$temp:"); if ($date eq '') { $date = "an unknown date"; $passed = 0; + } elsif ($date eq 'con_lost') { + $date = "an indeterminate date"; $passed = 0; } else { if (time < $date) { $passed = 0; } else { $passed = 1; } $date = localtime $date; @@ -92,6 +97,14 @@ sub check_date { $status='CLOSED'; $datemsg = "was due as $lastdate, and answers will be available at $date"; } + if ($status eq 'CAN_ANSWER') { + #check #tries + my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; + my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); + if ( $tries eq '' ) { $tries = '0'; } + if ( $maxtries eq '' ) { $maxtries = '2'; } + if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } + } &Apache::lonxml::debug("sending back :$status:$datemsg:"); if ($ENV{'request.state'} eq "construct") { &Apache::lonxml::debug("in construction ignoring dates"); @@ -151,11 +164,6 @@ sub handler { &Apache::lonxml::error("Unable to find default_homework.lcpm"); $default=''; } - if ( $target eq 'grade') { - $Apache::lonxml::textredirection = 0; - } else { - $Apache::lonxml::textredirection = 1; - } $result = &Apache::lonxml::xmlparse($target, $problem, $default.&setup_vars($target),%mystyle); @@ -163,6 +171,7 @@ sub handler { $request->print($result); #$request->print(":Result ends"); if ($target eq 'grade') { + my $resultkey; foreach $resultkey (sort keys %Apache::lonhomework::results) { &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");