--- loncom/homework/lonhomework.pm	2005/04/29 21:22:33	1.205
+++ loncom/homework/lonhomework.pm	2005/11/15 18:23:17	1.223
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.205 2005/04/29 21:22:33 albertel Exp $
+# $Id: lonhomework.pm,v 1.223 2005/11/15 18:23:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -85,13 +85,11 @@ sub get_target {
 	    return ($env{'form.grade_target'});
 	} elsif ( defined($env{'form.grade_target'}  ) 
 		  && ($Apache::lonhomework::viewgrades eq 'F' )) {
-	    if ($env{'form.grade_target'} eq 'webgrade') {
-		if ($Apache::lonhomework::modifygrades eq 'F' ) {
-		    return ($env{'form.grade_target'});
-		}
-	    } else {
-		return ($env{'form.grade_target'});
-	    }
+	    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'})) &&
@@ -126,10 +124,10 @@ sub get_target {
 		    if ( $env{'form.submit'} eq &mt('Submit Changes and View') ) {
 			return ('modified','web','answer');
 		    } else {
-			return ('modified','edit');
+			return ('modified','no_output_web','edit');
 		    }
 		} else {
-		    return ('edit');
+		    return ('no_output_web','edit');
 		}
 	    } else {
 		return ('web');
@@ -168,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;
 	}
     }
@@ -181,7 +183,10 @@ sub proctor_checked_in {
 $Apache::lonxml::browse='';
 sub check_ip_acc {
     my ($acc)=@_;
-    if (!defined($acc) || $acc =~ /^\s*$/) { return 1; }
+    &Apache::lonxml::debug("acc is $acc");
+    if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) { 
+	return 1;
+    }
     my $allowed=0;
     my $ip=$ENV{'REMOTE_ADDR'};
     my $name;
@@ -226,7 +231,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' ||
@@ -238,14 +244,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"} &&
+	$Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
+	return ('SHOW_ANSWER');
+    }
     my ($id)=@_;
-    my @slots=split(':',&Apache::lonnet::EXT("resource.$id.available"));
+    my @slots=
+	(split(':',&Apache::lonnet::EXT("resource.$id.availablestudent")),
+	 split(':',&Apache::lonnet::EXT("resource.$id.available")));
+
 #    if (!@slots) {
 #	return ($status,$datemsg);
 #    }
     my $slotstatus='NOT_IN_A_SLOT';
-    my $returned_slot;
+    my ($returned_slot,$slot_name);
     foreach my $slot (@slots) {
 	&Apache::lonxml::debug("getting $slot");
 	my %slot=&Apache::lonnet::get_slot($slot);
@@ -256,15 +269,24 @@ 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' && 
+	$Apache::lonhomework::history{"resource.$version.checkedin"}) {
+	if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+	    return ('SHOW_ANSWER');
+	} else {
+	    return ('WAITING_FOR_GRADE');
+	}
+    }
+    return ($slotstatus,$datemsg,$slot_name,$returned_slot);
 }
 
 # JB, 9/24/2002: Any changes in this function may require a change
@@ -301,6 +323,9 @@ sub check_access {
     &Apache::lonxml::debug("checking for part :$id:");
     &Apache::lonxml::debug("time:".time);
 
+    my ($symb)=&Apache::lonxml::whichuser();
+    &Apache::lonxml::debug("symb:".$symb);
+    #if ($env{'request.state'} ne "construct" && $symb ne '') {
     if ($env{'request.state'} ne "construct") {
 	my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc"));
 	if (!$allowed && ($Apache::lonhomework::browse ne 'F')) {
@@ -353,7 +378,8 @@ sub check_access {
 	    $datemsg = &mt("was due on")." $lastdate".&mt(", and answers will be available on")." $date";
 	}
     }
-    if ($status eq 'CAN_ANSWER') {
+    if ($status eq 'CAN_ANSWER' ||
+	(($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED'))) {
 	#check #tries, and if correct.
 	my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
 	my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
@@ -555,10 +581,8 @@ sub handle_save_or_undo {
 
 sub analyze_header {
     my ($request) = @_;
-    my $bodytag='<body bgcolor="#ffffff">';
-    if ($env{'environment.remote'} eq 'off') {
-	$bodytag=&Apache::loncommon::bodytag();
-    }
+    my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
+					    ($env{'environment.remote'} ne 'off'));
     my $html=&Apache::lonxml::xmlbegin();
     my $result.=$html.'
             <head><title>'.&mt("Analyzing a problem").'</title></head>
@@ -589,6 +613,7 @@ sub analyze {
     &Apache::lonxml::debug("Analyze");
     my $result;
     my %overall;
+    my %seedexample;
     my %allparts;
     my $rndseed=$env{'form.rndseed'};
     &analyze_header($request);
@@ -601,9 +626,10 @@ sub analyze {
 	&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,
 						 &mt('last problem'));
 	if (&Apache::loncommon::connection_aborted($request)) { return; }
+        my $thisseed=$i+$rndseed;
 	my $subresult=&Apache::lonnet::ssi($request->uri,
 					   ('grade_target' => 'analyze'),
-					   ('rndseed' => $i+$rndseed));
+					   ('rndseed' => $thisseed));
 	(my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2);
 	my %analyze=&Apache::lonnet::str2hash($subresult);
 	my @parts;
@@ -615,8 +641,13 @@ sub analyze {
 	    if ($analyze{$part.'.type'} eq 'numericalresponse'	||
 		$analyze{$part.'.type'} eq 'stringresponse'	||
 		$analyze{$part.'.type'} eq 'formularesponse'   ) {
+		my $concatanswer=join("\0",@{ $analyze{$part.'.answer'} });
+		if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {
+		    @{$analyze{$part.'.answer'}}=('<font color="red">'.&mt('Error').'</font>');
+		}
 		push( @{ $overall{$part.'.answer'} },
 		      [@{ $analyze{$part.'.answer'} }]);
+                $seedexample{join("\0",@{ $analyze{$part.'.answer'}})}=$thisseed;
 	    }
 	}
     }
@@ -626,17 +657,18 @@ sub analyze {
     foreach my $part (sort(keys(%allparts))) {
 	if (defined(@{ $overall{$part.'.answer'} })) {
 	    my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });
-	    $request->print('<table><tr><th colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part.'</th></tr>');
+	    $request->print('<table class="thinborder"><tr><th colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part.'</th></tr>');
 	    my %frequency;
 	    foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
 		$frequency{join("\0",@{ $answer })}++;
 	    }
-	    $request->print('<tr><th colspan="'.($num_cols).'">'.&mt('Answer').'</th><th>'.&mt('Frequency').'</th></tr>');
+	    $request->print('<tr><th colspan="'.($num_cols).'">'.&mt('Answer').'</th><th>'.&mt('Frequency').'<br />('
+			    .&mt('click for example').')</th></tr>');
 	    foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
-		$request->print('<tr><td align="right">'.
-				join('</td><td align="right">',split("\0",$answer)).
-				'</td><td>('.$frequency{$answer}.
-				')</td></tr>');
+		$request->print('<tr><td class="center">'.
+				join('</td><td class="center">',split("\0",$answer)).
+				'</td><td class="center"><a href="'.$request->uri.'?rndseed='.$seedexample{$answer}.'">'.$frequency{$answer}.
+				'</a></td></tr>');
 	    }
 	    $request->print('</table>');
 	} else {
@@ -645,7 +677,7 @@ sub analyze {
 	}
     }
     if (scalar(keys(%allparts)) == 0 ) {
-	$request->print('<p>'.&mt('Found no analyzable respones in this problem, currently only Numerical, Formula and String response styles are supported.').'</p>');
+	$request->print('<p>'.&mt('Found no analyzable responses in this problem, currently only Numerical, Formula and String response styles are supported.').'</p>');
     }
     &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state);
     &analyze_footer($request);
@@ -683,12 +715,12 @@ sub editxmlmode {
 	if ($cols > 80) { $cols = 80; }
 	if ($cols < 70) { $cols = 70; }
 	if ($rows < 20) { $rows = 20; }
-	my $bodytag='<body bgcolor="#ffffff">';
-	if ($env{'environment.remote'} eq 'off') {
-	    $bodytag=&Apache::loncommon::bodytag();
-	}
+	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
+					($env{'environment.remote'} ne 'off'));
 	my $html=&Apache::lonxml::xmlbegin();
-	$result.=$html.$bodytag.&Apache::lonxml::message_location().'
+	$result.=$html.$bodytag.
+	    &renderpage($request,$file,['no_output_web'],1).
+	    &Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
 	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
 	    &Apache::structuretags::remember_problem_state().'
@@ -714,9 +746,9 @@ sub editxmlmode {
 #    Render the page in whatever target desired.
 #
 sub renderpage {
-    my ($request,$file) = @_;
+    my ($request,$file,$targets,$return_string) = @_;
 
-    my (@targets) = &get_target();
+    my @targets = @{$targets || [&get_target()]};
     &Apache::lonhomework::showhashsubset(\%env,'form.');
     &Apache::lonxml::debug("Running targets ".join(':',@targets));
     my $overall_result;
@@ -729,22 +761,28 @@ sub renderpage {
 	#    $request->print(" You most likely shouldn't see me.");
 	#}
 	#my $t0 = [&gettimeofday()];
+	my $output=1;
+	if ($target eq 'no_output_web') {
+	    $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='';
 	}
 
 	my %mystyle;
-	my $result = '';
 	if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); }
 	if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
 	if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');}
 
 	&Apache::lonxml::debug("Should be parsing now");
-	$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:");
 	if ($target eq 'modified') {
 	    &handle_save_or_undo($request,\$problem,\$result);
@@ -765,9 +803,13 @@ sub renderpage {
 	#$request->print(":Result ends");
 	#my $td=&tv_interval($t0);
     }
-    &Apache::lonxml::add_messages(\$overall_result);
-    $request->print($overall_result);   
-    $request->rflush();   
+    if (!$return_string) {
+	&Apache::lonxml::add_messages(\$overall_result);
+	$request->print($overall_result);   
+	$request->rflush();   
+    } else {
+	return $overall_result;
+    }
 }
 
 # with no arg it returns a HTML <option> list of the template titles
@@ -877,7 +919,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();