Diff for /loncom/homework/lonhomework.pm between versions 1.233 and 1.233.2.1

version 1.233, 2006/02/10 18:36:37 version 1.233.2.1, 2006/02/16 01:25:33
Line 297  sub check_slot_access { Line 297  sub check_slot_access {
  $slotstatus='CAN_ANSWER';   $slotstatus='CAN_ANSWER';
     }      }
   
     my ($got_grade,$checkedin);      my ($is_correct,$got_grade,$checkedin);
     if ($type eq 'Task') {      if ($type eq 'Task') {
  my $version=$Apache::lonhomework::history{'resource.0.version'};   my $version=$Apache::lonhomework::history{'resource.0.version'};
  $got_grade =    $got_grade = 
     ($Apache::lonhomework::history{"resource.$version.0.status"}       ($Apache::lonhomework::history{"resource.$version.0.status"} 
      =~ /^(?:pass|fail)$/);       =~ /^(?:pass|fail)$/);
    $is_correct =  
       ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass'
        || $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ );
  $checkedin =   $checkedin =
     $Apache::lonhomework::history{"resource.$version.0.checkedin"};      $Apache::lonhomework::history{"resource.$version.0.checkedin"};
     } elsif ($type eq 'problem') {      } elsif ($type eq 'problem') {
Line 310  sub check_slot_access { Line 313  sub check_slot_access {
  $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"};   $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'       if ($slotstatus eq 'NOT_IN_A_SLOT' 
  && $checkedin ) {   && $checkedin ) {
   
Line 320  sub check_slot_access { Line 325  sub check_slot_access {
  }   }
   
     }      }
       if ( $is_correct) {
    return ('SHOW_ANSWER');
       }
     if ( $status eq 'CANNOT_ANSWER' &&       if ( $status eq 'CANNOT_ANSWER' && 
  ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {   ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {
  return ($status,$datemsg);   return ($status,$datemsg);

Removed from v.1.233  
changed lines
  Added in v.1.233.2.1


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>