--- loncom/homework/bridgetask.pm	2005/11/15 19:50:22	1.77
+++ loncom/homework/bridgetask.pm	2005/11/21 17:47:37	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.77 2005/11/15 19:50:22 albertel Exp $
+# $Id: bridgetask.pm,v 1.80 2005/11/21 17:47:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -671,7 +671,6 @@ sub get_key_todo {
     }
     return (undef,undef)
 }
-
 sub end_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
@@ -695,7 +694,8 @@ sub end_Task {
 <p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
 							  "</table>";
 		}
-		if (!$previous && !$env{'form.donescreen'}) {
+		if (!$previous && $status ne 'SHOW_ANSWER' &&
+		    &show_task($status,$previous)) {
 		    $result.=&Apache::inputtags::gradestatus('0');
 		    $result.='</form>';
 		    $result.=<<DONEBUTTON;
@@ -709,20 +709,22 @@ DONEBUTTON
 		    $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {
 		    my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};
 		    my $title=&Apache::lonnet::gettitle();
-		    my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name);
+
+		    my $slot_name=
+			$Apache::lonhomework::history{"resource.$version.checkedin.slot"};
+		    my %slot=&Apache::lonnet::get_slot($slot_name);
 		    my $start_time=
 			&Apache::lonlocal::locallocaltime($slot{'starttime'});
 
-		    my $status;
-		    $status.="\n<div class='$bt_status'>\n";
+		    my $status = "\n<div class='$bt_status'>\n";
 		    
 		    if ($bt_status eq 'pass')  {
 			$status.='<h2>You passed the '.$title.' given on '.
-			    $start_time.'.</h2>';
+			    $start_time.'</h2>';
 		    }
 		    if ($bt_status eq 'fail')  {
 			$status.='<h2>You did not pass the '.$title.' given on '.
-			    $start_time.'.</h2>';
+			    $start_time.'</h2>';
 			if (!$previous) {
 			    $status.=&add_request_another_attempt_button();
 			}
@@ -778,6 +780,8 @@ DONEBUTTON
 	    if ($award eq 'SUBMITTED') {
 		&add_to_queue('gradingqueue',$Apache::inputtags::slot_name);
 	    }
+	} elsif ($Apache::lonhomework::results{'INTERNAL_store'}) {
+	    &Apache::structuretags::finalize_storage();
 	}
 	if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') {
 	    my $optional_required=
@@ -1465,6 +1469,7 @@ sub get_instance {
 	$instance  = $instances[($version-1)%scalar(@instances)];
 	$Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = 
 	    $instance;
+	$Apache::lonhomework::results{'INTERNAL_store'} = 1; 
 	&Apache::response::poprandomnumber();
 	return $instance;
     }