[LON-CAPA-cvs] cvs: loncom /homework lonhomework.pm

[albertel]

albertel		Tue Nov 15 16:39:34 2005 EDT

  Modified files:              
    /loncom/homework	lonhomework.pm 
  Log:
  - need to handle CANNOT_ANSWER better (are they in a slot?)
  
  
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.224 loncom/homework/lonhomework.pm:1.225
--- loncom/homework/lonhomework.pm:1.224	Tue Nov 15 13:38:47 2005
+++ loncom/homework/lonhomework.pm	Tue Nov 15 16:39:33 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.224 2005/11/15 18:38:47 albertel Exp $
+# $Id: lonhomework.pm,v 1.225 2005/11/15 21:39:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -236,7 +236,6 @@
     my ($status,$datemsg)=&check_access;
     if ($status eq 'SHOW_ANSWER' ||
 	$status eq 'CLOSED' ||
-	$status eq 'CANNOT_ANSWER' ||
 	$status eq 'INVALID_ACCESS' ||
 	$status eq 'UNAVAILABLE') {
 	return ($status,$datemsg);
@@ -286,6 +285,11 @@
 	    return ('WAITING_FOR_GRADE');
 	}
     }
+    if ( $status eq 'CANNOT_ANSWER' && 
+	 ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {
+	return ($status,$datemsg);
+    }
+
     return ($slotstatus,$datemsg,$slot_name,$returned_slot);
 }