--- loncom/homework/bridgetask.pm	2007/02/22 21:40:40	1.226
+++ loncom/homework/bridgetask.pm	2007/04/07 00:12:43	1.231
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.226 2007/02/22 21:40:40 albertel Exp $
+# $Id: bridgetask.pm,v 1.231 2007/04/07 00:12:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,7 +38,6 @@ use Apache::lonlocal;
 use Apache::lonxml;
 use Apache::slotrequest();
 use Time::HiRes qw( gettimeofday tv_interval );
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
 
@@ -488,6 +487,7 @@ sub webgrade_standard_info {
 	    'stop'   => 'Quit Grading',
 	    'fail'   => 'Fail Rest',
 	    'cancel' => 'Cancel',
+	    'submit' => 'Submit Grades',
 	    );
     %lt=&Apache::lonlocal::texthash(%lt);
 
@@ -495,26 +495,35 @@ sub webgrade_standard_info {
   <div class="LC_GRADING_maincontrols">
 INFO
 
-    if (&grade_mode() eq 'regrade') {
+    if ($env{'request.state'} eq 'construct') {
 	$result.=<<INFO;
+    <input type="submit" name="next" value="$lt{'submit'}" />
+INFO
+    } else {
+	if (&grade_mode() eq 'regrade' && $env{'request.state'} ne 'construct') {
+	    $result.=<<INFO;
     <input type="submit" name="cancel" value="$lt{'cancel'}" />
 INFO
-    }
+        }
 
-    $result.=<<INFO;
+	$result.=<<INFO;
     <input type="submit" name="next" value="$lt{'done'}" />
     <input type="submit" name="stop" value="$lt{'stop'}" />
+INFO
+    }
+    $result.=<<INFO;
     <input type="button" name="fail" value="$lt{'fail'}" 
            onclick="javascript:onFailRest()" />
   </div>
   $file_list
 INFO
     return $result;
+
 }
 
 sub done_screen {
     my ($version) = @_;
-    my $title=&Apache::lonnet::gettitle();
+    my $title=&Apache::lonnet::gettitle($env{'request.uri'});
     my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
     my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();
     my $files = '<ul>';
@@ -620,7 +629,7 @@ sub start_Task {
 	    }
 	}
     }
-    if ($target eq 'web' && $env{'request.state'} eq 'construct') {
+    if ($target =~/(web|webgrade)/ && $env{'request.state'} eq 'construct') {
 	$form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});
     }
     if ($target eq 'web' 
@@ -724,8 +733,12 @@ sub start_Task {
 	if ($todo) {
 	    &setup_env_for_other_user($todo,$safeeval);
 	    my ($symb,$uname,$udom)=&decode_queue_key($todo);
-	    $result.="\n".'<table><tr><td>Found '.
-		&Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
+	    if ($env{'request.state'} eq 'construct') {
+		$symb = $env{'request.uri'};
+	    }
+	    $result.="\n".'<p>'.
+		&mt('Grading [_1] for [_2] at [_3]',
+		    &Apache::lonnet::gettitle($symb),$uname,$udom).'</p>';
 	    $form_tag_start.=
 		'<input type="hidden" name="gradingkey" value="'.
 		&escape($todo).'" />';
@@ -800,6 +813,12 @@ sub start_Task {
 		}
 	    }
 	    if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
+	} elsif ($target eq 'webgrade' 
+		 && $env{'request.state'} eq 'construct') {
+	    $result.=$form_tag_start;
+	    $result.='<input type="hidden" name="webgrade" value="'.
+		$webgrade.'" />';
+	    $result.=&webgrade_standard_info();
 	}
 	if ($target eq 'webgrade') {
 	    $result.="\n".'<div id="LC_GRADING_criterialist">';
@@ -847,6 +866,12 @@ sub get_key_todo {
     my ($target)=@_;
     my $todo;
 
+    if ($env{'request.state'} eq 'construct') {
+	my ($symb,$cid,$udom,$uname) = &Apache::lonnet::whichuser();
+	my $gradingkey=&encode_queue_key($symb,$udom,$uname);
+	return ($gradingkey);
+    }
+
     if (defined($env{'form.reviewasubmission'})) {
 	&Apache::lonxml::debug("review a submission....");
 	$env{'form.queue'}='reviewqueue';
@@ -1057,8 +1082,7 @@ DONEBUTTON
 		if (&show_task($status,$previous) &&
 		    $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) {
 		    my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
-		    my $title=&Apache::lonnet::gettitle();
-
+		    my $title=&Apache::lonnet::gettitle($env{'request.uri'});
 		    my $start_time;
 
 		    my $slot_name=
@@ -1332,9 +1356,7 @@ DONEBUTTON
 	$result.=&Apache::response::meta_stores_write('status','string',
 						      'Bridge Task Status');
     } elsif ($target eq 'edit') {
-	&Apache::structuretags::reset_problem_globals('Task');
-	undef($Apache::lonhomework::parsing_a_task);
-	return ('','no');
+	$result.= &Apache::structuretags::problem_edit_footer();
     }
     &Apache::structuretags::reset_problem_globals('Task');
     undef($Apache::lonhomework::parsing_a_task);
@@ -2078,13 +2100,8 @@ sub start_ClosingParagraph {
     } elsif ($target eq 'webgrade') {
 	&Apache::lonxml::startredirection();
     } elsif ($target eq 'edit') {
-	my $bodytext=&Apache::lonxml::get_all_text("/closingparagraph",
-						   $parser);
 	$result = &Apache::edit::tag_start($target,$token);
-	$result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
     } elsif ($target eq 'modified') {
-	$result = $token->[4].&Apache::edit::modifiedfield('/closingparagraph',
-							   $parser);
     }
     return $result;
 }
@@ -2099,6 +2116,14 @@ sub end_ClosingParagraph {
     return $result;
 }
 
+sub insert_ClosingParagraph {
+    return '
+<ClosingParagraph>
+    <startouttext />
+    <endouttext />
+</ClosingParagraph>';
+}
+
 sub get_dim_id {
     if (@Apache::bridgetask::dimension) {
 	return $Apache::bridgetask::dimension[-1];
@@ -2225,12 +2250,8 @@ sub start_QuestionText {
     my $dim = &get_dim_id();
 	$dimension{$dim}{'questiontext'}=$text;
     } elsif ($target eq 'edit') {
-	my $bodytext=&Apache::lonxml::get_all_text("/questiontext",$parser);
 	$result = &Apache::edit::tag_start($target,$token);
-	$result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
     } elsif ($target eq 'modified') {
-	$result = $token->[4].&Apache::edit::modifiedfield('/questiontext',
-							   $parser);
     }
     return $result;
 }
@@ -2239,6 +2260,14 @@ sub end_QuestionText {
     return '';
 }
 
+sub insert_QuestionText {
+    return '
+<QuestionText>
+    <startouttext />
+    <endouttext />
+</QuestionText>';
+}
+
 sub get_instance {
     my ($dim)=@_;
     my $rand_alg=&Apache::lonnet::get_rand_alg();
@@ -2707,12 +2736,8 @@ sub start_IntroParagraph {
 	}
 	
     } elsif ($target eq 'edit') {
-	my $bodytext=&Apache::lonxml::get_all_text("/introparagraph",$parser);
 	$result = &Apache::edit::tag_start($target,$token);
-	$result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
     } elsif ($target eq 'modified') {
-	$result = $token->[4].&Apache::edit::modifiedfield('/introparagraph',
-							   $parser);
     }
     return $result;
 }
@@ -2724,6 +2749,14 @@ sub end_IntroParagraph {
     }
 }
 
+sub insert_IntroParagraph {
+    return '
+<IntroParagraph>
+    <startouttext />
+    <endouttext />
+</IntroParagraph>';
+}
+
 sub start_Instance {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $dim = &get_dim_id();
@@ -2780,12 +2813,8 @@ sub start_InstanceText {
 	my $instance_id=$Apache::bridgetask::instance{$dim}[-1];
 	$dimension{$dim}{$instance_id.'.text'}=$text;
     } elsif ($target eq 'edit') {
-	my $bodytext=&Apache::lonxml::get_all_text("/instancetext",$parser);
 	$result = &Apache::edit::tag_start($target,$token);
-	$result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
     } elsif ($target eq 'modified') {
-	$result = $token->[4].&Apache::edit::modifiedfield('/instancetext',
-							   $parser);
     }
     return $result;
 }
@@ -2794,6 +2823,14 @@ sub end_InstanceText {
     return '';
 }
 
+sub insert_InstanceText {
+    return '
+<InstanceText>
+    <startouttext />
+    <endouttext />
+</InstanceText>';
+}
+
 sub start_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
@@ -2826,35 +2863,6 @@ sub start_Criteria {
 	    push(@{$dimension{$dim}{'criterias'}},$id);
 	}
     } elsif ($target eq 'edit') {
-	if (0) {
-	    $result = &Apache::edit::tag_start($target,$token);
-	    my $text=&Apache::lonxml::get_all_text("/criteria",$parser);
-	    &Apache::lonnet::logthis("get_all_text criteria \n$text");
-	    my $local_parser = HTML::LCParser->new(\$text);
-	    $local_parser->xml_mode(1);
-	    $local_parser->marked_sections(1);
-	    while (1) {
-		my $criteria_text = 
-		    &Apache::lonxml::get_all_text('gradernote',$local_parser);
-		$result.=
-		    &Apache::edit::editfield($token->[1],$criteria_text,'',80,4);
-		
-		# check for a <GraderNote> next might be end
-		my $token = $local_parser->get_token();
-		# is the end
-		last if (!$token);
-		my $gradernote = &Apache::lonxml::get_all_text('/gradernote',
-							       $local_parser);
-		# purge the end tag
-		my $token = $local_parser->get_token();
-		$gradernote = '<GraderNote>'.$gradernote.'</GraderNote>';
-		@Apache::scripttag::parser_env = @_;
-		$result .= 
-		    &Apache::edit::end_row().&Apache::edit::start_spanning_row().
-		    &Apache::scripttag::xmlparse($gradernote).
-		    &Apache::edit::end_row().&Apache::edit::start_spanning_row();
-	    }
-	}
 	$result .=&Apache::edit::tag_start($target,$token);
 	$result.=  
 	    &Apache::edit::text_arg('Id:','id',$token,10).' '.
@@ -2960,6 +2968,15 @@ sub end_Criteria {
     } elsif ($target eq 'modified') {
     }
 }
+sub insert_Criteria {
+    return '
+<Criteria>
+    <CriteriaText>
+        <startouttext />
+        <endouttext />
+    </CriteriaText>
+</Criteria>';
+}
 
 sub start_CriteriaText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -2967,12 +2984,8 @@ sub start_CriteriaText {
     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
 	
     } elsif ($target eq 'edit') {
-	my $bodytext=&Apache::lonxml::get_all_text("/criteriatext",$parser);
 	$result = &Apache::edit::tag_start($target,$token);
-	$result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
     } elsif ($target eq 'modified') {
-	$result = $token->[4].&Apache::edit::modifiedfield('/criteriatext',
-							   $parser);
     }
     return $result;
 }
@@ -2981,6 +2994,14 @@ sub end_CriteriaText {
     return '';
 }
 
+sub insert_CriteriaText {
+    return '
+<CriteriaText>
+    <startouttext />
+    <endouttext />
+</CriteriaText>';
+}
+
 sub start_GraderNote {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
@@ -2988,12 +3009,8 @@ sub start_GraderNote {
 	$result = '<div class="LC_GRADING_gradernote"><b>'.
 	    &mt('Note to graders:').'</b>';
     } elsif ($target eq 'edit') {
-	my $bodytext=&Apache::lonxml::get_all_text("/gradernote",$parser);
 	$result = &Apache::edit::tag_start($target,$token);
-	$result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
     } elsif ($target eq 'modified') {
-	$result = $token->[4].&Apache::edit::modifiedfield('/gradernote',
-							   $parser);
     } elsif ($target eq 'web' || $target eq 'grade') {
 	my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); 
     }
@@ -3009,25 +3026,56 @@ sub end_GraderNote {
     return;
 }
 
+sub insert_GraderNote {
+    return '
+<GraderNote>
+    <startouttext />
+    <endouttext />
+</GraderNote>';
+}
 
 
 sub proctor_validation_screen {
     my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();
     my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
+    if ($url ne '/adm/lonKaputt/lonlogo_broken.gif') {
+	$url = "<tr><td colspan=\"2\"><img src=\"$url\" /></td></tr>";
+    } else {
+	undef($url);
+    }
+
     my $name=&Apache::loncommon::plainname($user,$domain);
     
     my $msg;
     if ($env{'form.proctorpassword'}) {
-	$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
-	    .'</font></p>';
+	$msg.='<p><span class="LC_warning">'
+	    .&mt("Failed to authenticate the proctor.")
+	    .'</span></p>';
+    }
+
+    my $valid;
+    my @possible_proctors=split(",",$slot->{'proctor'});
+    foreach my $proctor (@possible_proctors) {
+	if ($proctor =~ /$LONCAPA::username_re:$LONCAPA::domain_re/) {
+	    $valid = 1;
+	    last;
+	}
     }
+    if (!$valid) {
+	$msg.='<p><span class="LC_error">'
+	    .&mt("No valid poctors are defined.")
+	    .'</span></p>';
+    }
+    
     if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
+    my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
+    $uri = &HTML::Entities::encode($uri,'<>&"');
     my $result= (<<ENDCHECKOUT);
 <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="$uri">
 <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />
 <table>
@@ -3043,7 +3091,7 @@ sub proctor_validation_screen {
       <tr><td>Name:</td><td>$name</td></tr>
       <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
       <tr><td>Usename</td><td>$user:$domain</td></tr>
-      <tr><td colspan="2"><img src="$url" /></td></tr>
+      $url
     </table>
   </tr></td>
 </table>