--- loncom/homework/lonhomework.pm	2005/04/07 06:56:21	1.204
+++ loncom/homework/lonhomework.pm	2005/05/10 20:58:38	1.208
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.204 2005/04/07 06:56:21 albertel Exp $
+# $Id: lonhomework.pm,v 1.208 2005/05/10 20:58:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -87,7 +87,10 @@ sub get_target {
 		  && ($Apache::lonhomework::viewgrades eq 'F' )) {
 	    return ($env{'form.grade_target'});
 	}
-
+	if ($env{'form.webgrade'} &&
+	    $Apache::lonhomework::modifygrades eq 'F') {
+	    return ('grade','webgrade');
+	}
 	if ( defined($env{'form.submitted'}) &&
 	     ( !defined($env{'form.resetdata'})) &&
 	     ( !defined($env{'form.newrandomization'}))) {
@@ -163,10 +166,14 @@ sub send_footer {
 }
 
 sub proctor_checked_in {
-    my ($slot)=@_;
+    my ($slot_name,$slot)=@_;
     my @allowed=split(",",$slot->{'proctor'});
+    my $version=$Apache::lonhomework::history{'resource.version'};
     foreach my $possible (@allowed) { 
-	if ($Apache::lonhomework::history{'resource.checkedin'} eq $possible) {
+	if ($Apache::lonhomework::history{"resource.$version.checkedin"} eq
+	    $possible &&
+	    $Apache::lonhomework::history{"resource.$version.checkedin.slot"}
+	       eq $slot_name) {
 	    return 1;
 	}
     }
@@ -221,7 +228,8 @@ sub check_ip_acc {
 }
 
 sub check_task_access {
-    #does it pass normal muster
+    # does it pass normal muster
+    # yes we really do want the default args passing
     my ($status,$datemsg)=&check_access;
     if ($status eq 'SHOW_ANSWER' ||
 	$status eq 'CLOSED' ||
@@ -233,15 +241,21 @@ sub check_task_access {
     if ($env{'request.state'} eq "construct") {
 	return ($status,$datemsg);
     }
-    
+    my $version=$Apache::lonhomework::history{'resource.version'};
+    if ($Apache::lonhomework::history{"resource.$version.checkedin"}) {
+	if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
+	    $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+	    return ('SHOW_ANSWER');
+	}
+    }
     my ($id)=@_;
     my @slots=split(':',&Apache::lonnet::EXT("resource.$id.available"));
 #    if (!@slots) {
 #	return ($status,$datemsg);
 #    }
     my $slotstatus='NOT_IN_A_SLOT';
-    my $returned_slot;
-    foreach my $slot (@slots) {
+    my ($returned_slot,$slot_name);
+    foreach my $slot (sort(@slots)) {
 	&Apache::lonxml::debug("getting $slot");
 	my %slot=&Apache::lonnet::get_slot($slot);
 	&Apache::lonhomework::showhash(%slot);
@@ -251,15 +265,20 @@ sub check_task_access {
 	    &Apache::lonxml::debug("$slot is good");
 	    $slotstatus='NEEDS_CHECKIN';
 	    $returned_slot=\%slot;
+	    $slot_name=$slot;
 	    last;
 	}
     }
     if ($slotstatus eq 'NEEDS_CHECKIN' &&
-	&proctor_checked_in($returned_slot)) {
+	&proctor_checked_in($slot_name,$returned_slot)) {
 	&Apache::lonxml::debug("protoctor checked in");
 	$slotstatus='CAN_ANSWER';
     }
-    return ($slotstatus,$datemsg,$returned_slot);
+    if ( ($slotstatus eq 'NOT_IN_A_SLOT' || $slotstatus eq 'NEEDS_CHECKIN') && 
+	$Apache::lonhomework::history{"resource.$version.checkedin"}) {
+	return ('WAITING_FOR_GRADE');
+    }
+    return ($slotstatus,$datemsg,$slot_name,$returned_slot);
 }
 
 # JB, 9/24/2002: Any changes in this function may require a change
@@ -479,7 +498,16 @@ sub setuppermissions {
 	&Apache::lonnet::devalidatecourseresdata($env{"course.$courseid.num"},
 					      $env{"course.$courseid.domain"});
     }
-    return ''
+    my $modifygrades = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+    if (! $modifygrades && 
+	exists($env{'request.course.sec'}) && 
+	$env{'request.course.sec'} !~ /^\s*$/) {
+	$modifygrades = 
+	    &Apache::lonnet::allowed('mgr',$env{'request.course.id'}.
+				     '/'.$env{'request.course.sec'});
+    }
+    $Apache::lonhomework::modifygrades = $modifygrades;
+    return '';
 }
 
 sub setupheader {