--- loncom/homework/lonhomework.pm	2003/04/30 21:27:57	1.120
+++ loncom/homework/lonhomework.pm	2003/05/14 17:16:20	1.127
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.120 2003/04/30 21:27:57 albertel Exp $
+# $Id: lonhomework.pm,v 1.127 2003/05/14 17:16:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,6 +50,7 @@ use Apache::essayresponse();
 use Apache::externalresponse();
 use Apache::rankresponse();
 use Apache::matchresponse();
+#use Apache::chemresponse();
 use Apache::Constants qw(:common);
 use HTML::Entities();
 use Apache::loncommon();
@@ -60,7 +61,8 @@ BEGIN {
 }
 
 sub get_target {
-  if ( $ENV{'request.state'} eq "published") {
+  if (($ENV{'request.state'} eq "published") ||
+      ($ENV{'request.state'} eq "uploaded")) {
     if ( defined($ENV{'form.grade_target'}  ) 
 	 && ($ENV{'form.grade_target'} eq 'tex')) {
       return ($ENV{'form.grade_target'});
@@ -207,12 +209,16 @@ sub check_access {
     $datemsg = "was due on $lastdate, and answers will be available on $date";
   }
   if ($status eq 'CAN_ANSWER') {
-    #check #tries
+    #check #tries, and if correct.
     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'; } 
+    if($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
+      && lc($Apache::lonhomework::problemstatus) ne 'no') {
+	$status = 'CANNOT_ANSWER';
+    }
   }
 
   if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
@@ -280,7 +286,14 @@ sub showhashsubset {
 
 sub setuppermissions {
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
-  $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+  my $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+  if (! $viewgrades && 
+      exists($ENV{'request.course.sec'}) && 
+      $ENV{'request.course.sec'} !~ /^\s*$/) {
+      $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.
+                                               '/'.$ENV{'request.course.sec'});
+  }
+  $Apache::lonhomework::viewgrades = $viewgrades;
   return ''
 }