--- loncom/homework/bridgetask.pm	2005/03/31 21:24:29	1.8
+++ loncom/homework/bridgetask.pm	2005/04/07 06:56:21	1.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.8 2005/03/31 21:24:29 albertel Exp $
+# $Id: bridgetask.pm,v 1.11 2005/04/07 06:56:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,20 +37,33 @@ use Apache::lonmenu;
 use Apache::lonlocal;
 use Apache::lonxml;
 use Time::HiRes qw( gettimeofday tv_interval );
+
 BEGIN {
     &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph'));
 }
 
+sub initialize_bridgetask {
+    # id of current Dimension, 0 means that no dimension is current 
+    # (inside <Task> only)
+    $Apache::bridgetask::dimension='';
+    # list of all Dimension ids seen
+    @Apache::bridgetask::dimensionlist=();
+    # list of all current Instance ids
+    @Apache::bridgetask::instance=();
+    # list of all Instance ids seen in this problem
+    @Apache::bridgetask::instancelist=();
+}
+
 sub proctor_check_auth {
     my ($slot)=@_;
-    my $user=$ENV{'form.proctorname'};
-    my $domain=$ENV{'form.proctordomain'};
+    my $user=$env{'form.proctorname'};
+    my $domain=$env{'form.proctordomain'};
     
     my @allowed=split(",",$slot->{'proctor'});
     foreach my $possible (@allowed) {
 	my ($puser,$pdom)=(split('@',$possible));
 	if ($puser eq $user && $pdom eq $domain) {
-	    my $authhost=&Apache::lonnet::authenticate($puser,$ENV{'form.proctorpassword'},$pdom);
+	    my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
 	    if ($authhost ne 'no_host') {
 		$Apache::lonhomework::results{'resource.checkedin'}=
 		    $user.'@'.$domain;
@@ -63,9 +76,9 @@ sub proctor_check_auth {
 
 sub add_previous_version_button {
     my $result;
-    $result.=' Show a previously done version: <select name="previousversion">
+    $result.=&mt(' Show a previously done version: [_1]','<select name="previousversion">
 <option>Pick one</option>
-</select>';
+</select>');
     return $result;
 }
 
@@ -88,7 +101,7 @@ sub start_Task {
 	$target eq 'tex') {
 	($status,$accessmsg,$slot) = 
 	    &Apache::lonhomework::check_task_access('0');
-	push (@Apache::inputtags::status,$status);
+	push(@Apache::inputtags::status,$status);
 	my $expression='$external::datestatus="'.$status.'";';
 	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
 	&Apache::run::run($expression,$safeeval);
@@ -139,10 +152,10 @@ sub start_Task {
               $body_tag_start \n $form_tag_start".	
 	      '<input type="hidden" name="submitted" value="yes" />';
 	    # if we are viewing someone else preserve that info
-	    if (defined $ENV{'form.grade_symb'}) {
+	    if (defined $env{'form.grade_symb'}) {
 		foreach my $field ('symb','courseid','domain','username') {
 		    $result .= '<input type="hidden" name="grade_'.$field.
-			'" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
+			'" value="'.$env{"form.grade_$field"}.'" />'."\n";
 		}
 	    }
 	}
@@ -160,18 +173,26 @@ sub end_Task {
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex') {
 	if (
-	    (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
+	    (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
 	    if ($target eq 'web') {
-		$result.='<table border="1">'.
-		    &Apache::inputtags::file_selector("bridge","task","*",
-						      'portfolioonly').
-						      "</table>";
+		if ($status eq 'CAN_ANSWER') {
+		    $result.='<table border="1">'.
+			&Apache::inputtags::file_selector('0',"bridgetask","*",
+							  'portfolioonly').
+							  "</table>";
+		    $result.=&Apache::inputtags::gradestatus('0');
+		}
 		$result.=&Apache::lonxml::xmlend().'</html>';
 	    }
 	}
 	if ($target eq 'grade') {
+	    &Apache::essayresponse::file_submission('0','bridgetask','portfiles','SUBMITTED');
+	    if ($Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) {
+		$Apache::lonhomework::results{"resource.0.tries"}=
+		    1+$Apache::lonhomework::history{"resource.0.tries"};
+	    }
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &Apache::structuretags::finalize_storage();
 	}
@@ -201,11 +222,13 @@ sub end_ClosingParagraph {
 }
 
 my %dimension;
-my $dim_id;
 sub start_Dimension {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     undef(%dimension);
-    $dim_id=$Apache::lonxml::curdepth;
+    my $dim_id=$Apache::lonxml::curdepth;
+    $Apache::bridgetask::dimension=$dim_id;
+    push(@Apache::bridgetask::dimensionlist,$dim_id);
+    undef(@Apache::bridgetask::instance);
     return '';
 }
 
@@ -216,9 +239,10 @@ sub end_Dimension {
 	#FIXME just grabbing the first one for now, need
 	#to randomly pick one until all have been seen
 	#then start repicking
-	my $instance=$dimension{'instances'}->[0];
-	$result=$dimension{'intro'}.
-	    $dimension{$instance.'.text'};
+	&Apache::response::pushrandomnumber();
+	my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
+	my $instance=$order[0];
+	$result=$dimension{'intro'}.$dimension{$instance.'.text'};
 	#FIXME: don't show the criteria yet
 	#foreach my $id (@{$dimension{$instance.'.criterias'}}) {
 	#    $result.=$dimension{$instance.'.criteria.'.$id};
@@ -249,11 +273,11 @@ sub end_IntroParagraph {
     return $result;
 }
 
-my $instance_id;
 sub start_Instance {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     push(@{$dimension{'instances'}},$Apache::lonxml::curdepth);
-    $instance_id=$Apache::lonxml::curdepth;
+    push(@Apache::bridgetask::instance,$Apache::lonxml::curdepth);
+    push(@Apache::bridgetask::instancelist,$Apache::lonxml::curdepth);
     return '';
 }
 
@@ -272,6 +296,7 @@ sub start_InstanceText {
 
 sub end_InstanceText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $instance_id=$Apache::bridgetask::instance[-1];
     if ($target eq 'web') {
 	$dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection();
     }
@@ -288,6 +313,7 @@ sub start_Criteria {
 
 sub end_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $instance_id=$Apache::bridgetask::instance[-1];
     if ($target eq 'web') {
 	my $criteria=&Apache::lonxml::endredirection();
 	my $id=$Apache::lonxml::curdepth;
@@ -301,10 +327,10 @@ sub proctor_validation_screen {
     my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
     my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
-    $user=$ENV{'form.proctorname'};
-    if ($ENV{'form.proctordomain'}) { $domain=$ENV{'form.proctordomain'}; }
+    $user=$env{'form.proctorname'};
+    if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; }
     my $msg;
-    if ($ENV{'form.proctorpassword'}) {
+    if ($env{'form.proctorpassword'}) {
 	$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
 	    .'</font></p>';
     }
@@ -312,7 +338,7 @@ sub proctor_validation_screen {
 <h2>Proctor Validation</h2>
     <p>Your room's proctor needs to validate your access to this resource.</p>
     $msg
-<form name="checkout" method="POST" action="$ENV{'request.uri'}">
+<form name="checkout" method="POST" action="$env{'request.uri'}">
 <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />
 <table>