--- loncom/homework/bridgetask.pm 2005/05/31 16:27:43 1.34
+++ loncom/homework/bridgetask.pm 2005/06/04 08:17:06 1.37
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.34 2005/05/31 16:27:43 albertel Exp $
+# $Id: bridgetask.pm,v 1.37 2005/06/04 08:17:06 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,6 +36,7 @@ use Apache::File();
use Apache::lonmenu;
use Apache::lonlocal;
use Apache::lonxml;
+use Apache::slotrequest();
use Time::HiRes qw( gettimeofday tv_interval );
BEGIN {
@@ -91,6 +92,7 @@ sub proctor_check_auth {
sub get_version {
my ($version,$previous);
if ($env{'form.previousversion'} &&
+ $env{'form.previousversion'} ne 'current' &&
defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
$version=$env{'form.previousversion'};
$previous=1;
@@ -129,6 +131,7 @@ sub add_previous_version_button {
my $list='\n\n";
+ $list.='';
$result.='
';
+ my $symb=&Apache::lonnet::symbread();
+ my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
+ if ($slot_name) {
+ my $description=&Apache::slotrequest::get_description($slot_name,
+ $slot);
+ $result.=(< Will be next available: $description
+STUFF
+
+ } else {
+ if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
+ $symb=&Apache::lonnet::escape($symb);
+ $result.='';
+ }
return $result;
}
@@ -264,9 +283,8 @@ sub start_Task {
} elsif ($target eq 'web') {
my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
$result.="$head_tag_start$name
- $body_tag_start \n $form_tag_start".
- '';
- $result.=&preserve_grade_info();
+ $body_tag_start \n";
+
my ($version,$previous)=&get_version();
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
$result.='
'.&mt('Did not pass').'
';
@@ -277,6 +295,10 @@ sub start_Task {
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
$result.='
";
+ my $slot=$queue{$key}->[0];
+ my %slot_data=&Apache::lonnet::get_slot($slot);
if ($with_selects) {
my $ekey=&Apache::lonnet::escape($key);
my ($action,$description)=('select',&mt('Select'));
@@ -672,7 +696,8 @@ sub show_queue {
($action,$description)=('unlock',&mt('Unlock'));
}
}
- $result.=(<
FORM
+
+ } else {
+ $result.='
'.&mt("In Progress").'
'
+ }
}
$result.="
$title
$uname
";
- my $slot=$queue{$key}->[0];
- my %slot_data=&Apache::lonnet::get_slot($slot);
$result.='
queue entry
Slot: '.$slot.' End time: '.
&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
"