--- loncom/homework/bridgetask.pm 2006/06/12 18:57:20 1.166 +++ loncom/homework/bridgetask.pm 2006/06/13 20:28:49 1.169 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.166 2006/06/12 18:57:20 albertel Exp $ +# $Id: bridgetask.pm,v 1.169 2006/06/13 20:28:49 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,20 +46,20 @@ BEGIN { &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','ClosingParagraph')); } +my %dimension; sub initialize_bridgetask { # id of current Dimension, 0 means that no dimension is current # (inside only) - $Apache::bridgetask::dimension=''; + %Apache::bridgetask::dimension=(); # list of all Dimension ids seen - @Apache::bridgetask::dimensionlist=(); - # mandatory attribute of all Dimensions seen - %Apache::bridgetask::dimensionmandatory=(); + %Apache::bridgetask::top_dimensionlist=(); # list of all current Instance ids - @Apache::bridgetask::instance=(); + %Apache::bridgetask::instance=(); # list of all Instance ids seen in this problem @Apache::bridgetask::instancelist=(); # key of queud user data that we are currently grading $Apache::bridgetask::queue_key=''; + undef(%dimension); } sub proctor_check_auth { @@ -419,18 +419,39 @@ sub done_screen { my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'}); my (undef,undef,$domain,$user)= &Apache::lonxml::whichuser(); my $files = ''; - + my $subject = "Submission message for $title"; + my ($message_status,$comment_status); + my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'}; + $setting =~ s/^\s*(\S*)\s*$/$1/; + $setting = lc($setting); + if ($setting eq 'only_student' + || $setting eq 'student_and_user_notes_screen') { + $message_status = + &Apache::lonmsg::user_normal_msg($user,$domain,$subject,$msg); + $message_status = '

'.&mt('Message sent to user: [_1]', + $message_status).'

'; + } + if ($setting eq 'student_and_user_notes_screen') { + $comment_status = + &Apache::lonmsg::store_instructor_comment($subject.'
'. + $msg,$user,$domain); + $comment_status = '

'.&mt('Message sent to instructor: [_1]', + $comment_status).'

'; + } return <$title

Files submitted: $files

@@ -438,6 +459,8 @@ sub done_screen {

Logout

Change to a different course

+$message_status +$comment_status DONESCREEN } @@ -542,7 +565,7 @@ sub start_Task { } elsif ($status eq 'WAITING_FOR_GRADE') { $msg.='

'.&mt('Your submission is in the grading queue.').'

'; } elsif ($env{'form.donescreen'}) { - $result .= &done_screen(); + $result .= &done_screen($version); } elsif ($status ne 'NOT_YET_VIEWED') { $msg.='

'.&mt('Not open to be viewed').'

'; } @@ -948,11 +971,11 @@ DONEBUTTON my $man_count=0; my $opt_count=0; my $opt_passed=0; - foreach my $dim_id (@Apache::bridgetask::dimensionlist) { - if ($Apache::bridgetask::dimensionmandatory{$dim_id} + foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) { + if ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'} eq 'N') { $opt_count++; - if ($Apache::lonhomework::history{"resource.$version.0.$dim_id.status"} eq 'pass') { + if ($Apache::lonhomework::history{"resource.$version.0.$dim.status"} eq 'pass') { $opt_passed++; } } else { @@ -1023,11 +1046,11 @@ DONEBUTTON my $ungraded=0; my $review=0; &Apache::lonhomework::showhash(%Apache::lonhomework::results); - foreach my $dim_id (@Apache::bridgetask::dimensionlist) { + foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) { my $status= - $Apache::lonhomework::results{"resource.$version.0.$dim_id.status"}; + $Apache::lonhomework::results{"resource.$version.0.$dim.status"}; my $mandatory= - ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N'); + ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'} ne 'N'); if ($status eq 'pass') { if (!$mandatory) { $optional_passed++; } } elsif ($status eq 'fail') { @@ -1043,7 +1066,7 @@ DONEBUTTON if ($optional_passed < $optional_required) { $mandatory_failed++; } - &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); + &Apache::lonxml::debug("all dim ".join(':',keys(%Apache::bridgetask::top_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'}; if ($review) { @@ -1865,6 +1888,10 @@ sub end_ClosingParagraph { return $result; } +sub get_dim_id { + return $Apache::bridgetask::dimension[-1]; +} + sub get_id { my ($parstack,$safeeval)=@_; my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval); @@ -1872,36 +1899,44 @@ sub get_id { return $id; } -my %dimension; sub start_Setup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - undef(%dimension); - my $dim_id=&get_id($parstack,$safeeval); - $Apache::bridgetask::dimension=$dim_id; - undef(@Apache::bridgetask::instance); + #undef(%dimension); + my $dim = &get_id($parstack,$safeeval); + push(@Apache::bridgetask::dimension,$dim); &Apache::lonxml::startredirection(); - return &internal_location($dim_id); + return &internal_location($dim); } sub start_Question { return &start_Dimension(@_); } sub start_Dimension { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - undef(%dimension); - my $dim_id=&get_id($parstack,$safeeval); - $Apache::bridgetask::dimension=$dim_id; - push(@Apache::bridgetask::dimensionlist,$dim_id); - undef(@Apache::bridgetask::instance); - $Apache::bridgetask::dimensionmandatory{$dim_id}= - &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); + my $dim = &get_id($parstack,$safeeval); + my $previous_dim; + if (@Apache::bridgetask::dimension) { + $previous_dim = $Apache::bridgetask::dimension[-1]; + push(@{$Apache::bridgetask::dimension{$previous_dim}{'contains'}}, + $dim); + # FIXME need to add as a 'criteria' for nesting + $dimension{$previous_dim}{'criteria.'.$dim}=''; + $dimension{$previous_dim}{'criteria.'.$dim.'.type'}='dimension'; + $dimension{$previous_dim}{'criteria.'.$dim.'.mandatory'}= + &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); + push(@{$dimension{$previous_dim}{'criterias'}},$dim); + } else { + $Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}= + &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); + } + push(@Apache::bridgetask::dimension,$dim); &Apache::lonxml::startredirection(); - return &internal_location($dim_id); + return &internal_location($dim); } sub start_QuestionText { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $dim_id=$Apache::bridgetask::dimension; + my $dim = &get_dim_id(); my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style); if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { - $dimension{'questiontext'}=$text; + $dimension{$dim}{'questiontext'}=$text; } return ''; } @@ -1917,7 +1952,7 @@ sub get_instance { $rand_alg eq '64bit2' || $rand_alg eq '64bit3' || $rand_alg eq '64bit4' ) { &Apache::response::pushrandomnumber(); - my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); + my @order=&Math::Random::random_permutation(@{$dimension{$dim}{'instances'}}); my $num=@order; my $version=&get_version(); my $which=($version-1)%$num; @@ -1929,10 +1964,10 @@ sub get_instance { if (defined($instance)) { return $instance; } &Apache::response::pushrandomnumber(); - my @instances = @{$dimension{'instances'}}; + my @instances = @{$dimension{$dim}{'instances'}}; # remove disabled instances for (my $i=0; $i < $#instances; $i++) { - if ($dimension{$instances[$i].'.disabled'}) { + if ($dimension{$dim}{$instances[$i].'.disabled'}) { splice(@instances,$i,1); $i--; } @@ -1949,6 +1984,18 @@ sub get_instance { } } +sub get_criteria { + my ($what,$version,$dim,$id) = @_; + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + my $prefix = ($type eq 'criteria') ? "$dim.$id" + : "$id"; + my $entry = "resource.$version.0.$prefix.$what"; + if (exists($Apache::lonhomework::results{$entry})) { + return $Apache::lonhomework::results{$entry}; + } + return $Apache::lonhomework::history{$entry}; +} + { my $last_link; sub link { @@ -1965,19 +2012,21 @@ sub get_instance { my $version=&get_version(); if ($target eq 'web') { @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'intro'}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); my @instances = $instance; if (&Apache::response::showallfoils()) { - @instances = @{$dimension{'instances'}}; + @instances = @{$dimension{$dim}{'instances'}}; } my $shown_question_text; foreach my $instance (@instances) { @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'questiontext'}); - if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' || - $Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') { + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); + + my $task_status = + $Apache::lonhomework::history{"resource.$version.0.status"}; + if ($task_status eq 'pass' || $task_status eq 'fail') { my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"}; my $mandatory='Mandatory'; @@ -1995,24 +2044,21 @@ sub get_instance { my $man_passed=0; my $opt_count=0; my $opt_passed=0; - foreach my $id ( @{$dimension{$instance.'.criterias'}}, - @{$dimension{'criterias'}} ) { - if ($dimension{'criteria.'.$id.'.mandatory'} + foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}} ) { + my $status = &get_criteria('status',$version,$dim,$id); + if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} eq 'N') { $opt_count++; - if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"} eq 'pass') { - $opt_passed++; - } + if ($status eq 'pass') { $opt_passed++; } } else { $man_count++; - if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') { - $man_passed++; - } + if ($status eq 'pass') { $man_passed++; } } } if ($man_passed eq $man_count) { $man_passed='all'; } - my $opt_req=$dimension{$instance.'.optionalrequired'}; + my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; if ($opt_req !~ /\S/) { $opt_req= &Apache::lonxml::get_param('OptionalRequired', @@ -2024,11 +2070,15 @@ sub get_instance { my $internal_location=&internal_location($dim); $result=~s/\Q$internal_location\E/$dim_info/; - foreach my $id (@{$dimension{$instance.'.criterias'}}, - @{$dimension{'criterias'}}) { - my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"}; - my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}; - my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N'); + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}}) { + # FIXME need to collect the dimension style criteria + # and output them here. + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + next if ($type eq 'dimension'); + my $status= &get_criteria('status', $version,$dim,$id); + my $comment=&get_criteria('comment',$version,$dim,$id); + my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); if ($mandatory) { $mandatory='Mandatory'; } else { @@ -2045,10 +2095,11 @@ sub get_instance { '

' .$mandatory.' Criteria

'; @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'criteria.'.$id}); $result.='

'.$status_display.'

'; - if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}) { - $result.='

'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'

'; + if ($comment) { + $result.='

'. + &mt('Comment: [_1]',$comment).'

'; } $result.='
'; } @@ -2057,21 +2108,25 @@ sub get_instance { } elsif ($target eq 'webgrade') { # in case of any side effects that we need @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{'intro'}); + &Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$instance.'.text'}); + &Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{'questiontext'}); - foreach my $id (@{$dimension{$instance.'.criterias'}}, - @{$dimension{'criterias'}} ) { + &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}} ) { + # dimensional 'criteria' don't get assigned grades + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + next if ($type eq 'dimension'); + my $link=&link($id); - my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"}; + my $status= &get_criteria('status',$version,$dim,$id); $result.='
'."\n". '
'."\n"; @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'criteria.'.$id}); $result.='
'."\n". - #$dimension{'criteria.'.$id}. + #$dimension{$dim}{'criteria.'.$id}. '
'."\n". ''."\n". ''."\n". @@ -2079,7 +2134,7 @@ sub get_instance { ''."\n". '
'."\n". ''."\n". '
    '."\n". '
  • Prev
    • '."\n". @@ -2096,18 +2151,25 @@ sub get_instance { my $review=0; @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'intro'}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{'questiontext'}); + &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); - foreach my $id (@{$dimension{$instance.'.criterias'}}, - @{$dimension{'criterias'}}) { + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}}) { my $link=&link($id); - 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'); + + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'criteria') { + # dimensional 'criteria' don't get assigned grades + $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 $status= &get_criteria('status',$version,$dim,$id); + + my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); if ($status eq 'pass') { if (!$mandatory) { $optional_passed++; } } elsif ($status eq 'fail') { @@ -2121,7 +2183,7 @@ sub get_instance { } } # FIXME optional required can apply to only right now... - my $opt_req=$dimension{$instance.'.optionalrequired'}; + my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; if ($opt_req !~ /\S/) { $opt_req= &Apache::lonxml::get_param('OptionalRequired', @@ -2131,7 +2193,7 @@ sub get_instance { if ($optional_passed < $opt_req) { $mandatory_failed++; } - &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); + &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$dim}{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); if ($review) { $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= 'review'; @@ -2149,6 +2211,7 @@ sub get_instance { # any other targets no output undef($result); } + pop(@Apache::bridgetask::dimension); return $result; } @@ -2160,30 +2223,31 @@ sub get_instance { my $version=&get_version(); if ($target eq 'web') { @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'intro'}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); my @instances = $instance; if (&Apache::response::showallfoils()) { - @instances = @{$dimension{'instances'}}; + @instances = @{$dimension{$dim}{'instances'}}; } foreach my $instance (@instances) { @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'questiontext'}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); } } elsif ($target eq 'webgrade' || $target eq 'grade' && $env{'form.webgrade'}) { # in case of any side effects that we need @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{'intro'}); + &Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$instance.'.text'}); + &Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{'questiontext'}); + &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); } else { # any other targets no output undef($result); } + pop(@Apache::bridgetask::dimension); return $result; } } @@ -2223,9 +2287,10 @@ sub grading_history { sub start_IntroParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; + my $dim = &get_dim_id(); if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) { - $dimension{'intro'}= + $dimension{$dim}{'intro'}= &Apache::lonxml::get_all_text('/introparagraph', $parser,$style); } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { @@ -2245,15 +2310,16 @@ sub end_IntroParagraph { sub start_Instance { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $id=&get_id($parstack,$safeeval); - push(@{$dimension{'instances'}},$id); - push(@Apache::bridgetask::instance,$id); + my $dim = &get_dim_id(); + my $id = &get_id($parstack,$safeeval); + push(@{$dimension{$dim}{'instances'}},$id); + push(@{$Apache::bridgetask::instance{$dim}},$id); push(@Apache::bridgetask::instancelist,$id); - $dimension{$id.'.optionalrequired'}= + $dimension{$dim}{$id.'.optionalrequired'}= &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval); my $disabled = &Apache::lonxml::get_param('Disabled',$parstack,$safeeval); if (lc($disabled) eq 'yes') { - $dimension{$id.'.disabled'}='1'; + $dimension{$dim}{$id.'.disabled'}='1'; } return ''; } @@ -2263,10 +2329,11 @@ sub end_Instance { sub start_InstanceText { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $instance_id=$Apache::bridgetask::instance[-1]; + my $dim = &get_dim_id(); + my $instance_id=$Apache::bridgetask::instance{$dim}[-1]; my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style); if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { - $dimension{$instance_id.'.text'}=$text; + $dimension{$dim}{$instance_id.'.text'}=$text; } return ''; } @@ -2279,18 +2346,22 @@ sub start_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style); if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { + my $dim = &get_dim_id(); my $id=&get_id($parstack,$safeeval); + &Apache::lonxml::debug("Criteria $id with $dim"); if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) { - my $instance_id=$Apache::bridgetask::instance[-1]; - $dimension{"criteria.$instance_id.$id"}=$criteria; - $dimension{"criteria.$instance_id.$id.mandatory"}= + my $instance_id=$Apache::bridgetask::instance{$dim}[-1]; + $dimension{$dim}{"criteria.$instance_id.$id"}=$criteria; + $dimension{$dim}{"criteria.$instance_id.$id.type"}='criteria'; + $dimension{$dim}{"criteria.$instance_id.$id.mandatory"}= &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); - push(@{$dimension{$instance_id.'.criterias'}},"$instance_id.$id"); + push(@{$dimension{$dim}{$instance_id.'.criterias'}},"$instance_id.$id"); } else { - $dimension{'criteria.'.$id}=$criteria; - $dimension{'criteria.'.$id.'.mandatory'}= + $dimension{$dim}{'criteria.'.$id}=$criteria; + $dimension{$dim}{'criteria.'.$id.'.type'}='criteria'; + $dimension{$dim}{'criteria.'.$id.'.mandatory'}= &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); - push(@{$dimension{'criterias'}},$id); + push(@{$dimension{$dim}{'criterias'}},$id); } } return '';