--- loncom/homework/bridgetask.pm 2006/03/28 20:45:58 1.123
+++ loncom/homework/bridgetask.pm 2006/04/10 07:37:39 1.138
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.123 2006/03/28 20:45:58 albertel Exp $
+# $Id: bridgetask.pm,v 1.138 2006/04/10 07:37:39 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -66,7 +66,7 @@ sub proctor_check_auth {
my @allowed=split(",",$slot->{'proctor'});
foreach my $possible (@allowed) {
- my ($puser,$pdom)=(split('@',$possible));
+ my ($puser,$pdom)=(split(':',$possible));
if ($puser eq $user && $pdom eq $domain) {
my $authenticated=0;
if ( $slot->{'secret'} =~ /\S/ &&
@@ -95,7 +95,7 @@ sub proctor_check_auth {
#setup new version and who did it
$Apache::lonhomework::results{'resource.0.version'}=$version;
$Apache::lonhomework::results{"resource.$version.0.checkedin"}=
- $user.'@'.$domain;
+ $user.':'.$domain;
$Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
$slot_name;
@@ -103,7 +103,7 @@ sub proctor_check_auth {
} elsif ($authenticated && $type eq 'problem') {
&Apache::lonxml::debug("authed $slot_name");
$Apache::lonhomework::results{"resource.0.checkedin"}=
- $user.'@'.$domain;
+ $user.':'.$domain;
$Apache::lonhomework::results{"resource.0.checkedin.slot"}=
$slot_name;
}
@@ -259,64 +259,14 @@ sub preserve_grade_info {
}
sub style {
- return (<
+ my ($target) = @_;
+ if ($target eq 'web'
+ || $target eq 'webgrade') {
+ return (<
STYLE
-
+ }
+ return;
}
sub show_task {
@@ -429,6 +379,7 @@ sub start_Task {
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ $head_tag_start .= &style($target);
$body_tag_start .= '
'."\n";
if ($target eq 'web' || $target eq 'webgrade') {
@@ -547,7 +498,7 @@ DONESCREEN
}
} elsif ($target eq 'web') {
$result.="$head_tag_start
- $body_tag_start \n".&style();
+ $body_tag_start \n";
$result.=&preserve_grade_info();
$result.=&internal_location();
@@ -559,7 +510,11 @@ DONESCREEN
$target eq 'webgrade') {
my $webgrade='yes';
if ($target eq 'webgrade') {
- $result.=$head_tag_start.''.$body_tag_start;
+ $result.=$head_tag_start.
+ ''.$body_tag_start.
+ "\n".'
'."\n".
+ '';
#$result.='
Review'.&show_queue('reviewqueue');
#$result.='
Grade'.&show_queue('gradingqueue');
}
@@ -677,7 +632,7 @@ sub get_key_todo {
}
- my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $me=$env{'user.name'}.':'.$env{'user.domain'};
#need to try both queues..
if (defined($env{'form.regradeaspecificsubmission'}) &&
@@ -723,7 +678,7 @@ sub get_key_todo {
#otherwise (defined($who) && $who ne $me) some else has it...
return (undef,'not_allowed',
&mt('Another user ([_1]) currently has the record for [_2] locked.',
- $who,$env{'form.gradinguser'}.'@'.$env{'form.gradingdomain'}));
+ $who,$env{'form.gradinguser'}.':'.$env{'form.gradingdomain'}));
}
@@ -951,7 +906,7 @@ DONEBUTTON
}
&Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
$Apache::lonhomework::results{'resource.0.regrader'}=
- $env{'user.name'}.'@'.$env{'user.domain'};
+ $env{'user.name'}.':'.$env{'user.domain'};
if ($review) {
$Apache::lonhomework::results{"resource.$version.0.status"}='review';
if ($env{'form.queue'} eq 'reviewqueue') {
@@ -1019,7 +974,7 @@ DONEBUTTON
&Apache::structuretags::finalize_storage();
}
} elsif ($target eq 'webgrade') {
- $result.="
\n
";
+ $result.="
";
#$result.=' ';
#$result.=' ';
#$result.=' ';
- $result.=''."\n\n".
+ $result.=''."\n\n\n".
&Apache::loncommon::endbodytag().'