--- loncom/homework/lonhomework.pm	2006/04/21 15:26:25	1.241
+++ loncom/homework/lonhomework.pm	2006/05/12 03:46:54	1.246
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.241 2006/04/21 15:26:25 albertel Exp $
+# $Id: lonhomework.pm,v 1.246 2006/05/12 03:46:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,9 +86,13 @@ sub get_target {
 	} elsif ( defined($env{'form.grade_target'}  ) 
 		  && ($Apache::lonhomework::viewgrades eq 'F' )) {
 	    return ($env{'form.grade_target'});
+	} elsif ( $env{'form.grade_target'} eq 'webgrade'
+		  && ($Apache::lonhomework::queuegrade eq 'F' )) {
+	    return ($env{'form.grade_target'});
 	}
 	if ($env{'form.webgrade'} &&
-	    $Apache::lonhomework::modifygrades eq 'F') {
+	    ($Apache::lonhomework::modifygrades eq 'F'
+	     || $Apache::lonhomework::queuegrade eq 'F' )) {
 	    return ('grade','webgrade');
 	}
 	if ( defined($env{'form.submitted'}) &&
@@ -234,7 +238,7 @@ sub check_slot_access {
     my ($status,$datemsg)=&check_access($id);
     
     my $useslots = &Apache::lonnet::EXT("resource.$id.useslots");
-    if ($useslots ne 'resource') {
+    if ($useslots ne 'resource' && $useslots ne 'map') {
 	return ($status,$datemsg);
     }
 
@@ -304,9 +308,10 @@ sub check_slot_access {
     
     &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");
     
-    # has a current checked in recrd, but hasn't got a grade, must be awaiting
-    # a grade
-    if ($checkedin 
+    # no slot is currently open, and has been checked in for this version
+    # but hasn't got a grade, therefore must be awaiting a grade
+    if (!defined($slot_name)
+	&& $checkedin 
 	&& !$got_grade) {
 	return ('WAITING_FOR_GRADE');
     }
@@ -474,6 +479,20 @@ sub check_access {
     return ($status,$datemsg);
 }
 
+sub due_date {
+    my ($part_id,$symb)=@_;
+    my $date;
+    my $interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb);
+    if ($interval) {
+	my $first_access=&Apache::lonnet::get_first_access('map',$symb);
+	if ($first_access) { $date = $first_access+$interval; }
+    }
+    if (!defined($date)) {
+	$date = &Apache::lonnet::EXT("resource.$part_id.duedate",$symb);
+    }
+    return $date
+}
+
 sub seconds_to_human_length {
     my ($length)=@_;
 
@@ -545,13 +564,15 @@ sub setuppermissions {
 	$viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}.
                                                '/'.$env{'request.course.sec'});
     }
-    $Apache::lonhomework::viewgrades = $viewgrades; # File global variable...dirt.
+    $Apache::lonhomework::viewgrades = $viewgrades;
+
     if ($Apache::lonhomework::browse eq 'F' && 
 	$env{'form.devalidatecourseresdata'} eq 'on') {
 	my (undef,$courseid) = &Apache::lonxml::whichuser();
 	&Apache::lonnet::devalidatecourseresdata($env{"course.$courseid.num"},
 					      $env{"course.$courseid.domain"});
     }
+
     my $modifygrades = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
     if (! $modifygrades && 
 	exists($env{'request.course.sec'}) && 
@@ -561,6 +582,16 @@ sub setuppermissions {
 				     '/'.$env{'request.course.sec'});
     }
     $Apache::lonhomework::modifygrades = $modifygrades;
+
+    my $queuegrade = &Apache::lonnet::allowed('mqg',$env{'request.course.id'});
+    if (! $queuegrade && 
+	exists($env{'request.course.sec'}) && 
+	$env{'request.course.sec'} !~ /^\s*$/) {
+	$queuegrade = 
+	    &Apache::lonnet::allowed('qgr',$env{'request.course.id'}.
+				     '/'.$env{'request.course.sec'});
+    }
+    $Apache::lonhomework::queuegrade = $queuegrade;
     return '';
 }
 
@@ -967,7 +998,7 @@ sub handler {
 	}
     }
     if (&setupheader($request)) { return OK; }
-    &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
+    &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:$Apache::lonhomework::modifygrades:$Apache::lonhomework::queuegrade");
     &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'});
     my ($symb) = &Apache::lonxml::whichuser();
     &Apache::lonxml::debug('symb is '.$symb);