--- loncom/homework/lonhomework.pm 2006/02/10 23:44:53 1.234 +++ loncom/homework/lonhomework.pm 2006/02/16 01:24:39 1.235 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.234 2006/02/10 23:44:53 albertel Exp $ +# $Id: lonhomework.pm,v 1.235 2006/02/16 01:24:39 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -297,12 +297,15 @@ sub check_slot_access { $slotstatus='CAN_ANSWER'; } - my ($got_grade,$checkedin); + my ($is_correct,$got_grade,$checkedin); if ($type eq 'Task') { my $version=$Apache::lonhomework::history{'resource.0.version'}; $got_grade = ($Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(?:pass|fail)$/); + $is_correct = + ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' + || $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ ); $checkedin = $Apache::lonhomework::history{"resource.$version.0.checkedin"}; } elsif ($type eq 'problem') { @@ -310,6 +313,8 @@ sub check_slot_access { $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; } + &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)"); + if ($slotstatus eq 'NOT_IN_A_SLOT' && $checkedin ) { @@ -320,6 +325,9 @@ sub check_slot_access { } } + if ( $is_correct) { + return ('SHOW_ANSWER'); + } if ( $status eq 'CANNOT_ANSWER' && ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) { return ($status,$datemsg);