@@ -1622,7 +1623,7 @@ sub select_user {
$seclist
- | $fullname->{$student} ($studentdis) |
+ $classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] ($student) |
RESULT
}
@@ -1909,9 +1910,14 @@ sub get_instance {
my $mandatory_failed=0;
my $ungraded=0;
my $review=0;
+
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
foreach my $id (@{$dimension{$instance.'.criterias'}},
@{$dimension{'criterias'}}) {
my $link=&link($id);
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link};
$Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N');
@@ -1995,7 +2001,7 @@ sub grading_history {
sub start_IntroParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'web' || $target eq 'webgrade') {
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) {
$dimension{'intro'}=
&Apache::lonxml::get_all_text('/introparagraph',
@@ -2037,7 +2043,7 @@ sub start_InstanceText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $instance_id=$Apache::bridgetask::instance[-1];
my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
- if ($target eq 'web' || $target eq 'webgrade') {
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
$dimension{$instance_id.'.text'}=$text;
}
return '';
|