--- loncom/homework/bridgetask.pm 2005/05/09 21:55:01 1.19
+++ loncom/homework/bridgetask.pm 2005/05/10 16:44:35 1.21
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.19 2005/05/09 21:55:01 albertel Exp $
+# $Id: bridgetask.pm,v 1.21 2005/05/10 16:44:35 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -48,6 +48,8 @@ sub initialize_bridgetask {
$Apache::bridgetask::dimension='';
# list of all Dimension ids seen
@Apache::bridgetask::dimensionlist=();
+ # mandatory attribute of all Dimensions seen
+ %Apache::bridgetask::dimensionmandatory=();
# list of all current Instance ids
@Apache::bridgetask::instance=();
# list of all Instance ids seen in this problem
@@ -115,7 +117,7 @@ sub start_Task {
$body_tag_start.=$uri.'">'.&add_grading_button()."";
}
}
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+ if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
$target eq 'tex') {
($status,$accessmsg,my $slot_name,$slot) =
&Apache::lonhomework::check_task_access('0');
@@ -178,11 +180,13 @@ sub start_Task {
}
}
}
- } elsif ($target eq 'webgrade') {
- $result.=$head_tag_start.$body_tag_start.$form_tag_start;
- $result.=
- ' ';
- $result.=&show_queue();
+ } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
+ $target eq 'webgrade') {
+ if ($target eq 'webgrade') {
+ $result.=$head_tag_start.$body_tag_start.$form_tag_start;
+ $result.=' ';
+ $result.=&show_queue();
+ }
my $todo=&get_from_queue();
if ($todo) {
&setup_env_for_other_user($todo,$safeeval);
@@ -196,11 +200,12 @@ sub start_Task {
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
$result.="\n".'
';
} else {
- $result.="\n".
- '';
+ if ($target eq 'webgrade') {
+ $result.="\n".
+ '';
+ }
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
}
-
} else {
# page_start returned a starting result, delete it if we don't need it
$result = '';
@@ -231,9 +236,10 @@ sub end_Task {
$result.=&Apache::lonxml::xmlend().'