--- loncom/homework/bridgetask.pm 2005/10/03 21:30:58 1.65
+++ loncom/homework/bridgetask.pm 2005/10/05 20:24:59 1.68
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.65 2005/10/03 21:30:58 albertel Exp $
+# $Id: bridgetask.pm,v 1.68 2005/10/05 20:24:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -395,12 +395,12 @@ sub start_Task {
$msg.='
'.&mt('Your submission is in the grading queue.').'
';
} elsif ($env{'form.donescreen'}) {
my $title=&Apache::lonnet::gettitle();
- my $files=$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'};
- $result.= $head_tag_start.''.$body_tag_start;
+ my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
+ my $files='';
$result.=<$title
Files submitted: $files
- You are now done with the Bridge Task
+ You are now done with this Bridge Task
Logout
Change to a different course
@@ -1089,6 +1089,8 @@ sub queue_key_locked {
sub pick_from_queue_data {
my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
foreach my $key (keys(%$queuedata)) {
+ if ($key =~ /\0locked$/) { next; }
+ if ($key =~ /\0timestamp$/) { next; }
my ($symb,$uname,$udom)=&decode_queue_key($key);
if ($check_section) {
my $section=&Apache::lonnet::getsection($uname,$udom);
@@ -1421,8 +1423,7 @@ sub get_instance {
}
}
if ($man_passed eq $man_count) { $man_passed='all'; }
- my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
- $parstack,$safeeval);
+ my $opt_req=$dimension{$instance.'.optionalrequired'};
if ($opt_req !~ /\S/) { $opt_req='0'; }
$dim_info.="\n".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."
\n";