--- loncom/homework/lonhomework.pm	2005/11/08 21:09:08	1.221
+++ loncom/homework/lonhomework.pm	2006/02/26 20:01:17	1.236
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.221 2005/11/08 21:09:08 albertel Exp $
+# $Id: lonhomework.pm,v 1.236 2006/02/26 20:01:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -166,17 +166,24 @@ sub send_footer {
 }
 
 sub proctor_checked_in {
-    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.$version.checkedin"} eq
-	    $possible &&
-	    $Apache::lonhomework::history{"resource.$version.checkedin.slot"}
-	       eq $slot_name) {
+    my ($slot_name,$slot,$type)=@_;
+    my @possible_proctors=split(",",$slot->{'proctor'});
+    
+    my $key;
+    if ($type eq 'Task') {
+	my $version=$Apache::lonhomework::history{'resource.0.version'};
+	$key ="resource.$version.0.checkedin";
+    } elsif ($type eq 'problem') {
+	$key ='resource.0.checkedin';
+    }
+    
+    foreach my $possible (@possible_proctors) { 
+	if ($Apache::lonhomework::history{$key} eq $possible
+	    && $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) {
 	    return 1;
 	}
     }
+    
     return 0;
 }
 
@@ -191,6 +198,8 @@ sub check_ip_acc {
     my $ip=$ENV{'REMOTE_ADDR'};
     my $name;
     foreach my $pattern (split(',',$acc)) {
+	$pattern =~ s/^\s*//;
+	$pattern =~ s/\s*$//;
 	if ($pattern =~ /\*$/) {
 	    #35.8.*
 	    $pattern=~s/\*//;
@@ -230,13 +239,19 @@ sub check_ip_acc {
     return $allowed;
 }
 
-sub check_task_access {
+sub check_slot_access {
+    my ($id,$type)=@_;
+
     # does it pass normal muster
-    # yes we really do want the default args passing
-    my ($status,$datemsg)=&check_access;
+    my ($status,$datemsg)=&check_access($id);
+    
+    my $useslots = &Apache::lonnet::EXT("resource.$id.useslots");
+    if ($useslots ne 'resource') {
+	return ($status,$datemsg);
+    }
+
     if ($status eq 'SHOW_ANSWER' ||
 	$status eq 'CLOSED' ||
-	$status eq 'CANNOT_ANSWER' ||
 	$status eq 'INVALID_ACCESS' ||
 	$status eq 'UNAVAILABLE') {
 	return ($status,$datemsg);
@@ -244,12 +259,15 @@ 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"} &&
-	$Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
-	return ('SHOW_ANSWER');
+    
+    if ($type eq 'Task') {
+	my $version=$Apache::lonhomework::history{'resource.version'};
+	if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} &&
+	    $Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {
+	    return ('SHOW_ANSWER');
+	}
     }
-    my ($id)=@_;
+
     my @slots=
 	(split(':',&Apache::lonnet::EXT("resource.$id.availablestudent")),
 	 split(':',&Apache::lonnet::EXT("resource.$id.available")));
@@ -274,18 +292,54 @@ sub check_task_access {
 	}
     }
     if ($slotstatus eq 'NEEDS_CHECKIN' &&
-	&proctor_checked_in($slot_name,$returned_slot)) {
+	&proctor_checked_in($slot_name,$returned_slot,$type)) {
 	&Apache::lonxml::debug("protoctor checked in");
 	$slotstatus='CAN_ANSWER';
     }
-    if ( $slotstatus eq 'NOT_IN_A_SLOT' && 
-	$Apache::lonhomework::history{"resource.$version.checkedin"}) {
-	if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+
+    my ($is_correct,$got_grade,$checkedin);
+    if ($type eq 'Task') {
+	my $version=$Apache::lonhomework::history{'resource.0.version'};
+	$got_grade = 
+	    ($Apache::lonhomework::history{"resource.$version.0.status"} 
+	     =~ /^(?:pass|fail)$/);
+	$is_correct =  
+	    ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass'
+	     || $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ );
+	$checkedin =
+	    $Apache::lonhomework::history{"resource.$version.0.checkedin"};
+    } elsif ($type eq 'problem') {
+	$got_grade = 1;
+	$checkedin = $Apache::lonhomework::history{"resource.0.checkedin"};
+    }
+    
+    &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 
+	&& !$got_grade) {
+	return ('WAITING_FOR_GRADE');
+    }
+
+    if ($slotstatus eq 'NOT_IN_A_SLOT' 
+	&& $checkedin ) {
+
+	if ($got_grade) {
 	    return ('SHOW_ANSWER');
 	} else {
 	    return ('WAITING_FOR_GRADE');
 	}
+
+    }
+    if ( $is_correct) {
+	return ('SHOW_ANSWER');
     }
+    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);
 }
 
@@ -297,7 +351,6 @@ sub check_access {
     my $status;
     my $datemsg = '';
     my $lastdate = '';
-    my $temp;
     my $type;
     my $passed;
 
@@ -334,7 +387,7 @@ sub check_access {
 	    return($status,$date);
 	}
 	
-	foreach $temp ("opendate","duedate","answerdate") {
+	foreach my $temp ("opendate","duedate","answerdate") {
 	    $lastdate = $date;
 	    $date = &Apache::lonnet::EXT("resource.$id.$temp");
 	    my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
@@ -718,23 +771,28 @@ sub editxmlmode {
 	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
 					($env{'environment.remote'} ne 'off'));
 	my $html=&Apache::lonxml::xmlbegin();
-	$result.=$html.$bodytag.
+	my $head="<head><title>EditXML $file</title>".
+	    &Apache::edit::js_change_detection()."</head>";
+
+	$result.=$html.$head.$bodytag.
 	    &renderpage($request,$file,['no_output_web'],1).
 	    &Apache::lonxml::message_location().'
-            <form name="lonhomework" method="POST" action="'.
+            <form '.&Apache::edit::form_change_detection().' name="lonhomework" method="POST" action="'.
 	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
 	    &Apache::structuretags::remember_problem_state().'
             <input type="hidden" name="problemmode" value="'.&mt('EditXML').'" />
             <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
-            <input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
+            <input type="submit" '.&Apache::edit::submit_ask_anyway().'name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
+            <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
             <hr />
             <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
             <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
-            <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
             <hr />
             ' . $xml_help . '
-            <textarea style="width:100%" rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
-	    &HTML::Entities::encode($problem,'<>&"').'</textarea>
+            <textarea '.&Apache::edit::element_change_detection().' style="width:100%" rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
+	    &HTML::Entities::encode($problem,'<>&"').'</textarea><br />
+            <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
+            <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
             </form></body></html>';
 	&Apache::lonxml::add_messages(\$result);
 	$request->print($result);
@@ -766,8 +824,10 @@ sub renderpage {
 	    $target = 'web'; $output=0;
 	}
 	my $problem=&Apache::lonnet::getfile($file);
+	my $result;
 	if ($problem eq -1) {
-	    &Apache::lonxml::error("<b> ".&mt('Unable to find')." <i>$file</i></b>");
+	    my $filename=(split('/',$file))[-1];
+	    $result.="<b> ".&mt('Unable to find')." <i>$filename</i></b>";
 	    $problem='';
 	}
 
@@ -777,8 +837,8 @@ sub renderpage {
 	if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');}
 
 	&Apache::lonxml::debug("Should be parsing now");
-	my $result = &Apache::lonxml::xmlparse($request, $target, $problem,
-					       &setup_vars($target),%mystyle);
+	$result .= &Apache::lonxml::xmlparse($request, $target, $problem,
+					     &setup_vars($target),%mystyle);
 	undef($Apache::lonhomework::parsing_a_problem);
 	if (!$output) { $result = ''; }
 	#$request->print("Result follows:");
@@ -917,7 +977,7 @@ EDITMENU
 sub handler {
     #my $t0 = [&gettimeofday()];
     my $request=$_[0];
-    
+    $Apache::lonxml::request=$request;
     $Apache::lonxml::debug=$env{'user.debug'};
     $env{'request.uri'}=$request->uri;
     &setuppermissions();
@@ -937,10 +997,6 @@ sub handler {
 	if ($Apache::lonhomework::browse ne 'F' && 
 	    $env{'request.state'} ne "construct") {
 	    #should know where we are, so ask
-	    if ( &Apache::lonnet::mod_perl_version() == 2 ) {
-		&Apache::lonnet::cleanenv();
-	    }
-	    &Apache::lonnet::logthis(&Apache::lonnet::mod_perl_version());
 	    $request->internal_redirect('/adm/ambiguous'); return OK;
 	}
     }
@@ -949,15 +1005,6 @@ sub handler {
     &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'});
     my ($symb) = &Apache::lonxml::whichuser();
     &Apache::lonxml::debug('symb is '.$symb);
-    if ($env{'request.state'} eq "construct" || $symb eq '') {
-	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
-	    $env{'form.resetdata'} eq &mt('New Problem Variation') ||
-	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
-	    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-	    &Apache::lonnet::tmpreset($symb,'',$domain,$name);
-	    &Apache::lonxml::debug("Attempt reset");
-	}
-    }
     if ($env{'request.state'} eq "construct") {
 	if ( -e $file ) {
 	    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},