--- loncom/homework/bridgetask.pm	2005/05/10 16:44:35	1.21
+++ loncom/homework/bridgetask.pm	2005/05/19 21:22:44	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.21 2005/05/10 16:44:35 albertel Exp $
+# $Id: bridgetask.pm,v 1.25 2005/05/19 21:22:44 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,7 +59,7 @@ sub initialize_bridgetask {
 }
 
 sub proctor_check_auth {
-    my ($slot)=@_;
+    my ($slot_name,$slot)=@_;
     my $user=$env{'form.proctorname'};
     my $domain=$env{'form.proctordomain'};
     
@@ -69,8 +69,13 @@ sub proctor_check_auth {
 	if ($puser eq $user && $pdom eq $domain) {
 	    my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
 	    if ($authhost ne 'no_host') {
-		$Apache::lonhomework::results{'resource.checkedin'}=
+		my $version=
+		    $Apache::lonhomework::results{'resource.version'}=
+		    $Apache::lonhomework::history{'resource.version'}++;
+		$Apache::lonhomework::results{"resource.$version.checkedin"}=
 		    $user.'@'.$domain;
+		$Apache::lonhomework::results{"resource.$version.checkedin.slot"}=
+		    $slot_name;
 		return 1;
 	    }
 	}
@@ -78,8 +83,25 @@ sub proctor_check_auth {
     return 0;
 }
 
+sub get_version {
+    if ($env{'form.previousversion'} && 
+	defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
+	return $env{'form.previousversion'};
+    }
+    return $Apache::lonhomework::history{'resource.version'};
+}
+
 sub add_previous_version_button {
+    my ($status)=@_;
     my $result;
+    if ($Apache::lonhomework::history{'resource.version'} eq '0') {
+	return '';
+    }
+    my $version=&get_version();
+    if ($version ne $Apache::lonhomework::history{'resource.version'}) {
+	return '';
+    }
+
     $result.=&mt(' Show a previously done version: [_1]','<select name="previousversion">
 <option>Pick one</option>
 </select>');
@@ -94,6 +116,13 @@ sub add_grading_button {
     return $result;
 }
 
+sub add_request_another_attempt_button {
+    my $result;
+    $result.=' <input type="submit" name="requestattempt" value="'.
+	&mt("Request another attempt").'" />';
+    return $result;
+}
+
 sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
@@ -109,7 +138,6 @@ sub start_Task {
 	&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
     
     if ($target eq 'web') {
-	$body_tag_start.=&add_previous_version_button();
 	if ($Apache::lonhomework::modifygrades) {
 	    $body_tag_start.='<form name="gradesubmission" method="POST" action="';
 	    my $uri=$env{'request.uri'};
@@ -119,19 +147,22 @@ sub start_Task {
     }
     if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
 	$target eq 'tex') {
+	my $version=&get_version();
 	($status,$accessmsg,my $slot_name,$slot) = 
 	    &Apache::lonhomework::check_task_access('0');
 	push(@Apache::inputtags::status,$status);
 	$Apache::inputtags::slot_name=$slot_name;
 	my $expression='$external::datestatus="'.$status.'";';
-	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
+	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';
 	&Apache::run::run($expression,$safeeval);
 	&Apache::lonxml::debug("Got $status");
+	$body_tag_start.=&add_previous_version_button($status);
 	if (( $status eq 'CLOSED' ) ||
 	    ( $status eq 'BANNED') ||
 	    ( $status eq 'UNAVAILABLE') ||
 	    ( $status eq 'NOT_IN_A_SLOT') ||
 	    ( $status eq 'NEEDS_CHECKIN') ||
+	    ( $status eq 'WAITING_FOR_GRADE') ||
 	    ( $status eq 'INVALID_ACCESS')) {
 	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
 	    if ( $target eq "web" ) {
@@ -144,6 +175,8 @@ sub start_Task {
 		} elsif ($status eq 'NEEDS_CHECKIN') {
 		    $msg.='<h1>'.&mt('You need the Proctor to validate you.').
 			'</h1>'.&proctor_validation_screen($slot);
+		} elsif ($status eq 'WAITING_FOR_GRADE') {
+		    $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
 		} elsif ($status ne 'NOT_YET_VIEWED') {
 		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
 		}
@@ -158,12 +191,15 @@ sub start_Task {
 		} else {
 		    $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
 		}
-	    } elsif ($target eq 'grade') {
+	    } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
 		if ($status eq 'NEEDS_CHECKIN') {
-		    if (&proctor_check_auth($slot)) {
+		    if (&proctor_check_auth($slot_name,$slot)) {
 			#FIXME immeadiatly add this to the grading queue
                         #      with slot->{'endtime'} for when grading can 
                         #      begin on this resource
+			# FIXME I think the above is done by default,
+                        #        need to check that
+                        #        failure doesn't do this.
  		    }
 		}
 	    }
@@ -179,6 +215,14 @@ sub start_Task {
 			'" value="'.$env{"form.grade_$field"}.'" />'."\n";
 		}
 	    }
+	    my $version=&get_version();
+	    if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+		$result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';
+		$result.=&add_request_another_attempt_button();
+	    }
+	    if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
+		$result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
+	    }
 	}
     } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
 	      $target eq 'webgrade') {
@@ -217,6 +261,7 @@ sub end_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
     my $status=$Apache::inputtags::status['-1'];
+    my $version=&get_version();
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex') {
 	if (
@@ -226,7 +271,8 @@ sub end_Task {
 	    if ($target eq 'web') {
 		if ($status eq 'CAN_ANSWER') {
 		    $result.="\n".'<table border="1">'.
-			&Apache::inputtags::file_selector('0',"bridgetask","*",
+			&Apache::inputtags::file_selector($version,
+							  "bridgetask","*",
 							  'portfolioonly').
 							  "</table>";
 		    $result.=&Apache::inputtags::gradestatus('0');
@@ -241,11 +287,11 @@ sub end_Task {
 	    &Apache::essayresponse::file_submission('0','bridgetask',
 						    'portfiles',\$award);
 	    if ($award eq 'SUBMITTED' &&
-		$Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) {
-		$Apache::lonhomework::results{"resource.0.tries"}=
-		    1+$Apache::lonhomework::history{"resource.0.tries"};
+		$Apache::lonhomework::results{"resource.$version.bridgetask.portfiles"}) {
+		$Apache::lonhomework::results{"resource.$version.tries"}=
+		    1+$Apache::lonhomework::history{"resource.$version.tries"};
 	    }
-	    $Apache::lonhomework::results{"resource.0.award"}=$award;
+	    $Apache::lonhomework::results{"resource.$version.award"}=$award;
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &Apache::structuretags::finalize_storage();
 	    if ($award eq 'SUBMITTED') {
@@ -263,7 +309,7 @@ sub end_Task {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
 		my $status=
-		    $Apache::lonhomework::results{"resource.$dim_id.status"};
+		    $Apache::lonhomework::results{"resource.$version.$dim_id.status"};
 		my $mandatory=
 		    ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
 		if ($status eq 'pass') {
@@ -283,20 +329,34 @@ sub end_Task {
 	    $Apache::lonhomework::results{'resource.grader'}=
 		$env{'user.name'}.'@'.$env{'user.domain'};
 	    if ($review) {
-		$Apache::lonhomework::results{'resource.status'}='review';
+		$Apache::lonhomework::results{"resource.$version.status"}='review';
 		&move_to_review_queue();
 	    } elsif ($ungraded) {
-		$Apache::lonhomework::results{'resource.status'}='ungraded';
+		$Apache::lonhomework::results{"resource.$version.status"}='ungraded';
 		&check_queue_unlock();
 	    } elsif ($mandatory_failed) {
-		$Apache::lonhomework::results{'resource.status'}='fail';
-		$Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS';
+		$Apache::lonhomework::results{"resource.$version.status"}='fail';
+		$Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
+		$Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';
+		$Apache::lonhomework::results{"resource.$version.0.awarded"}='0';
 		&remove_from_queue();
 	    } else {
-		$Apache::lonhomework::results{'resource.status'}='pass';
-		$Apache::lonhomework::results{"resource.0.award"}='INCORRECT';
+		$Apache::lonhomework::results{"resource.$version.status"}='pass';
+		$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
+		$Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';
+		$Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
 		&remove_from_queue();
 	    }
+	    $Apache::lonhomework::results{'resource.status'}=
+		$Apache::lonhomework::results{'resource.$version.status'};
+	    if (defined($Apache::lonhomework::results{'resource.$version.awarded'})) {
+		$Apache::lonhomework::results{'resource.0.award'}=
+		    $Apache::lonhomework::results{'resource.$version.award'};
+		$Apache::lonhomework::results{'resource.0.awarded'}=
+		    $Apache::lonhomework::results{'resource.$version.awarded'};
+		$Apache::lonhomework::results{'resource.0.solved'}=
+		    $Apache::lonhomework::results{'resource.$version.solved'};
+	    }
 	    &Apache::structuretags::finalize_storage();
 	}
     } elsif ($target eq 'webgrade') {
@@ -573,14 +633,36 @@ sub get_instance {
     sub end_Dimension {
 	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 	my $result;
-	my $dim_id=&get_id($parstack,$safeeval);
+	my $dim=&get_id($parstack,$safeeval);
 	my $instance=&get_instance();
+	my $version=&get_version();
 	if ($target eq 'web') {
 	    $result=$dimension{'intro'}.$dimension{$instance.'.text'};
+	    if ($Apache::lonhomework::history{'resource.$version.status'} eq 'pass' ||
+		$Apache::lonhomework::history{'resource.$version.status'} eq 'fail') {
+		foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+		    my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
+		    my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
+		    $result.='<table border="1"><tr><td>';
+		    if ($status eq 'fail') {
+			$result.='<font color="red">'.&mt('Did not pass').'</font>';
+		    } elsif ($status eq 'pass') {
+			$result.='<font color="green">'.&mt('Passed').'</font>';
+		    } else {
+			&Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");
+		    }
+		    $result.='</td></tr><tr><td>';
+		    if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
+			$result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>';
+		    }
+		    $result.=$dimension{$instance.'.criteria.'.$id}.
+			'</td></tr></table>';
+		}
+	    }
 	} elsif ($target eq 'webgrade') {
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
 		my $link='criteria_'.$instance.'_'.$id;
-		my $status=$Apache::lonhomework::history{'resource.'.$instance.'.'.$id.'.status'};
+		my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
 		$result.='<tr><td width="100%" valign="top">'.
 		    '<a name="'.$link.'" />'.
 		    '<a name="next_'.$last_link.'" />'.
@@ -588,7 +670,7 @@ sub get_instance {
 		    #$dimension{$instance.'.criteria.'.$id}.
 		    '</td>'.
 		    '<td><nobr>Additional Comment for Student</nobr> <br />'.
-		    '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{'resource.'.$instance.'.'.$id.'.comment'}).'</textarea>'.
+		    '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'.
 		    '</td>'.
 		    '<td>'.
 		    '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>Ungraded</label></nobr><br />'.
@@ -602,16 +684,27 @@ sub get_instance {
 		    '<input type="submit" name="next" value="'.
 		    &mt('Done').'" /> '.
 		    '</td></tr>';
+		$result.='<tr><td colspan="4">';
+		my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
+		my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
+		foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.bridgetask.portfiles"})) {
+		    my $file=$file_url.$partial_file;
+		    &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
+		    $result.='<a href="'.$file.'" target="lonGRDs"><img src="'.
+			&Apache::loncommon::icon($file).'" border=0"> '.$file.
+			'</a>';
+		}
+		$result.='</td></tr>';
 		$last_link=$link;
 	    }
-	} elsif ($target eq 'grade') {
+	} elsif ($target eq 'grade' && $env{'form.webgrade'}) {
 	    my $optional_passed=0;
 	    my $mandatory_failed=0;
 	    my $ungraded=0;
 	    my $review=0;
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		my $status=$Apache::lonhomework::results{'resource.'.$instance.'.'.$id.'.status'}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
-		$Apache::lonhomework::results{'resource.'.$instance.'.'.$id.'.comment'}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
+		my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
+		$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
 		my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
 		if ($status eq 'pass') {
 		    if (!$mandatory) { $optional_passed++; }
@@ -622,7 +715,7 @@ sub get_instance {
 		} elsif ($status eq 'ungraded') {
 		    $ungraded++;
 		} else {
-		    &Apache::lonxml::error("got wierd status --$status--");
+		    &Apache::lonxml::error("got weird status --$status--");
 		}
 	    }
 	    if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
@@ -630,13 +723,17 @@ sub get_instance {
 	    }
 	    &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
 	    if ($review) {
-		$Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='review';
+		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		    'review';
 	    } elsif ($ungraded) {
-		$Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='ungraded';
+		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		    'ungraded';
 	    } elsif ($mandatory_failed) {
-		$Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='fail';
+		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		    'fail';
 	    } else {
-		$Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='pass';
+		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		    'pass';
 	    }
 	}
 	return $result;