--- loncom/homework/lonhomework.pm	2006/04/11 21:05:54	1.238
+++ loncom/homework/lonhomework.pm	2006/06/20 03:33:55	1.251
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.238 2006/04/11 21:05:54 albertel Exp $
+# $Id: lonhomework.pm,v 1.251 2006/06/20 03:33:55 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'}) &&
@@ -157,6 +161,8 @@ sub proctor_checked_in {
     my ($slot_name,$slot,$type)=@_;
     my @possible_proctors=split(",",$slot->{'proctor'});
     
+    return 1 if (!@possible_proctors);
+
     my $key;
     if ($type eq 'Task') {
 	my $version=$Apache::lonhomework::history{'resource.0.version'};
@@ -164,9 +170,14 @@ sub proctor_checked_in {
     } elsif ($type eq 'problem') {
 	$key ='resource.0.checkedin';
     }
-    
+    # backward compatability, used to be username@domain, 
+    # now is username:domain
+    my $who = $Apache::lonhomework::history{$key};
+    if ($who !~ /:/) {
+	$who =~ tr/@/:/;
+    }     
     foreach my $possible (@possible_proctors) { 
-	if ($Apache::lonhomework::history{$key} eq $possible
+	if ($who eq $possible
 	    && $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) {
 	    return 1;
 	}
@@ -234,7 +245,8 @@ 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' 
+	&& $useslots ne 'map_map') {
 	return ($status,$datemsg);
     }
 
@@ -266,6 +278,7 @@ sub check_slot_access {
     my $slotstatus='NOT_IN_A_SLOT';
     my ($returned_slot,$slot_name);
     foreach my $slot (@slots) {
+	$slot =~ s/(^\s*|\s*$)//g;
 	&Apache::lonxml::debug("getting $slot");
 	my %slot=&Apache::lonnet::get_slot($slot);
 	&Apache::lonhomework::showhash(%slot);
@@ -303,9 +316,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');
     }
@@ -377,7 +391,12 @@ sub check_access {
 	
 	foreach my $temp ("opendate","duedate","answerdate") {
 	    $lastdate = $date;
-	    $date = &Apache::lonnet::EXT("resource.$id.$temp");
+	    if ($temp eq 'duedate') {
+		$date = &due_date($id);
+	    } else {
+		$date = &Apache::lonnet::EXT("resource.$id.$temp");
+	    }
+	    
 	    my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
 	    if ($thistype =~ /^(con_lost|no_such_host)/ ||
 		$date     =~ /^(con_lost|no_such_host)/) {
@@ -445,18 +464,12 @@ sub check_access {
 	    &Apache::lonxml::debug("looking for accesstime $first_access");
 	    if (!$first_access) {
 		$status='NOT_YET_VIEWED';
-		$datemsg=&seconds_to_human_length($interval);
-	    } else {
-		my $newdate=localtime($first_access+$interval);
-		if (time > ($first_access+$interval)) {
-		    $status='CLOSED';
-		    $datemsg = &mt("was due on")." $newdate".&mt(", and answers will be available on")." $date";
-		} else {
-		    $datemsg = &mt("is due at")." $newdate";
-		}
+		my $due_date = &due_date($id);
+		$datemsg=&seconds_to_human_length($due_date-time);
 	    }
 	}
     }
+
   #if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
   #    (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
   #    return ('UNCHECKEDOUT','needs to be checked out');
@@ -472,6 +485,29 @@ sub check_access {
 
     return ($status,$datemsg);
 }
+# this should work exactly like the copy in lonnavmaps.pm
+sub due_date {
+    my ($part_id,$symb,$udom,$uname)=@_;
+    my $date;
+    my $interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb,
+				       $udom,$uname);
+    &Apache::lonxml::debug("looking for interval $part_id $symb $interval");
+    my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb,
+				       $udom,$uname);
+    &Apache::lonxml::debug("looking for due_date $part_id $symb $due_date");
+    if (defined($interval)) {
+	my $first_access=&Apache::lonnet::get_first_access('map',$symb);
+	if (defined($first_access)) {
+	    $interval = $first_access+$interval;
+	    $date = ($interval < $due_date)? $interval : $due_date;
+	} else {
+	    $date = $due_date;
+	}
+    } else {
+	$date = $due_date;
+    }
+    return $date
+}
 
 sub seconds_to_human_length {
     my ($length)=@_;
@@ -544,13 +580,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'}) && 
@@ -560,6 +598,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 '';
 }
 
@@ -623,8 +671,8 @@ sub handle_save_or_undo {
 sub analyze_header {
     my ($request) = @_;
     my $result =
-	&Apache::loncommon::start_page('Analyzing a problem',undef,
-				       {'only_body' => ($env{'environment.remote'} ne 'off'),});
+	&Apache::loncommon::start_page('Analyzing a problem',undef);
+
     $result .= 
 	&Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
@@ -756,9 +804,7 @@ sub editxmlmode {
 	if ($rows < 20) { $rows = 20; }
 	my $start_page = 
 	    &Apache::loncommon::start_page("EditXML $file",
-					   &Apache::edit::js_change_detection(),
-					   {'only_body' =>
-						($env{'environment.remote'} ne 'off')});
+					   &Apache::edit::js_change_detection());
 
 	$result.=$start_page.
 	    &renderpage($request,$file,['no_output_web'],1).
@@ -911,8 +957,8 @@ sub newproblem {
 	    $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";
 	}
 	my $instructions;
-	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
-					($env{'environment.remote'} ne 'off'));
+	my $start_page = 
+	    &Apache::loncommon::start_page("Create New $extension");
 	if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");}
 	my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
 			  'resource' => 'resource',
@@ -923,7 +969,7 @@ sub newproblem {
 			  'Create' => 'Create',
 			  'button' => 'button');
 	$request->print(<<ENDNEWPROBLEM);
-$bodytag
+$start_page
 <h1>$lt{'create'} $extension $lt{'resource'}</h1>
 $errormsg
 $lt{'requested'} <tt>$shownurl</tt> $lt{'not exist'}.
@@ -941,25 +987,6 @@ ENDNEWPROBLEM
     return '';
 }
 
-sub view_or_edit_menu {
-    my ($request) = @_;
-    my $url=&HTML::Entities::encode($request->uri,'<>&"');
-    my %lt=&Apache::lonlocal::texthash( 'would' => 'Would you like to',
-		      'view' => 'View',
-		      'Edit' => 'edit',
-		      'or' => 'or',
-		      'the problem' => 'the problem');
-    $request->print(<<EDITMENU);
-<body bgcolor="#FFFFFF">
-<form action="$url" method="POST">
-$lt{'would'} <input type="submit" name="problemmode" accesskey="v" value="&lt{'view'}">
-&lt{'or'} <input type="submit" name="problemmode" accesskey="e" value="&lt{'Edit'}">
-&lt{'the problem'}.
-</form>
-</body>
-EDITMENU
-}
-
 sub handler {
     #my $t0 = [&gettimeofday()];
     my $request=$_[0];
@@ -987,7 +1014,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);
@@ -997,7 +1024,6 @@ sub handler {
 						    ['problemmode']);
 	    if (!(defined $env{'form.problemmode'})) {
 		#first visit to problem in construction space
-		#&view_or_edit_menu($request);
 		$env{'form.problemmode'}='View';
 		&renderpage($request,$file);
 	    } elsif ($env{'form.problemmode'} eq &mt('EditXML') ||