--- loncom/homework/bridgetask.pm 2005/05/03 06:44:56 1.16
+++ loncom/homework/bridgetask.pm 2005/05/09 21:55:01 1.19
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.16 2005/05/03 06:44:56 albertel Exp $
+# $Id: bridgetask.pm,v 1.19 2005/05/09 21:55:01 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -194,6 +194,7 @@ sub start_Task {
$Apache::bridgetask::queue_key=$todo;
&Apache::structuretags::initialize_storage();
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
+ $result.="\n".'
';
} else {
$result.="\n".
'';
@@ -246,7 +247,7 @@ sub end_Task {
}
}
} elsif ($target eq 'webgrade') {
- $result.="\n
";
+ $result.="
\n
";
$result.=' ';
$result.='';
- foreach my $id (@{$dimension{$instance.'.criterias'}}) {
- $result.=''.
- $dimension{$instance.'.criteria.'.$id}.' |
';
+ if ($target eq 'web') {
+ $result=$dimension{'intro'}.$dimension{$instance.'.text'};
+ } elsif ($target eq 'webgrade') {
+ foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+ my $link='criteria_'.$instance.'_'.$id;
+ $result.=''.
+ ''.
+ ''.
+ ' '.
+ #$dimension{$instance.'.criteria.'.$id}.
+ ' | '.
+ 'Additional Comment for Student '.
+ ''.
+ ' | '.
+ ''.
+ ' '.
+ ' '.
+ ' '.
+ ' '.
+ ' | '.
+ ''.
+ 'Prev '.
+ 'Next '.
+ ' |
';
+ $last_link=$link;
+ }
+ } elsif ($target eq 'grade') {
+ my $optional_passed=0;
+ foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+ if ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'pass') {
+ } elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'fail') {
+ } elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'ungraded') {
+ } elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'review') {
+ }
+ }
}
- $result.='';
+ return $result;
}
- return $result;
}
sub start_IntroParagraph {
@@ -530,9 +566,12 @@ sub end_IntroParagraph {
sub start_Instance {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- push(@{$dimension{'instances'}},$Apache::lonxml::curdepth);
- push(@Apache::bridgetask::instance,$Apache::lonxml::curdepth);
- push(@Apache::bridgetask::instancelist,$Apache::lonxml::curdepth);
+ my $id=&get_id($parstack,$safeeval);
+ push(@{$dimension{'instances'}},$id);
+ push(@Apache::bridgetask::instance,$id);
+ push(@Apache::bridgetask::instancelist,$id);
+ $dimension{$instance_id.'.optionalrequired'}=
+ &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
return '';
}
@@ -571,8 +610,10 @@ sub end_Criteria {
my $instance_id=$Apache::bridgetask::instance[-1];
if ($target eq 'web' || $target eq 'webgrade') {
my $criteria=&Apache::lonxml::endredirection();
- my $id=$Apache::lonxml::curdepth;
+ my $id=&get_id($parstack,$safeeval);
$dimension{$instance_id.'.criteria.'.$id}=$criteria;
+ $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=
+ &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
push(@{$dimension{$instance_id.'.criterias'}},$id);
}
return '';