--- loncom/homework/bridgetask.pm 2006/06/13 21:34:28 1.171 +++ loncom/homework/bridgetask.pm 2006/11/06 17:53:06 1.193 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.171 2006/06/13 21:34:28 albertel Exp $ +# $Id: bridgetask.pm,v 1.193 2006/11/06 17:53:06 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,14 +43,14 @@ use LONCAPA; BEGIN { - &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','ClosingParagraph')); + &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','GraderNote','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::top_dimensionlist=(); # list of all current Instance ids @@ -83,7 +83,7 @@ sub proctor_check_auth { } } if ($authenticated) { - &create_new_version($type,$user,$domain,$slot_name); + &check_in($type,$user,$domain,$slot_name); return 1; } } @@ -91,8 +91,43 @@ sub proctor_check_auth { return 0; } +sub check_in { + my ($type,$user,$domain,$slot_name) = @_; + my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); + if ( $useslots eq 'map_map') { + &check_in_sequence($user,$domain,$slot_name); + } else { + &create_new_version($type,$user,$domain,$slot_name); + } + return 1; +} + +sub check_in_sequence { + my ($user,$domain,$slot_name) = @_; + my $navmap = Apache::lonnavmaps::navmap->new(); + my ($symb) = &Apache::lonnet::whichuser(); + my ($map) = &Apache::lonnet::decode_symb($symb); + my @resources = + $navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0); + my %old_history = %Apache::lonhomework::history; + my %old_results = %Apache::lonhomework::results; + + foreach my $res (@resources) { + &Apache::lonxml::debug("doing ".$res->src); + &Apache::structuretags::initialize_storage($res->symb); + my $type = ($res->is_task()) ? 'Task' : 'problem'; + &create_new_version($type,$user,$domain,$slot_name); + &Apache::structuretags::finalize_storage($res->symb); + } + + %Apache::lonhomework::history = %old_history; + %Apache::lonhomework::results = %old_results; +} + sub create_new_version { my ($type,$user,$domain,$slot_name) = @_; + + my $id = '0'; if ($type eq 'Task') { # increment version my $version= @@ -107,28 +142,27 @@ sub create_new_version { } #setup new version and who did it - $Apache::lonhomework::results{'resource.0.version'}=$version; - if (defined($user) && defined($domain)) { - $Apache::lonhomework::results{"resource.$version.0.checkedin"}= - $user.':'.$domain; - } else { - $Apache::lonhomework::results{"resource.$version.0.checkedin"}= - $env{'user.name'}.':'.$env{'user.domain'}; - } - if (defined($slot_name)) { - $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}= - $slot_name; + $Apache::lonhomework::results{'resource.0.version'}=$version; + $id = "$version.0"; + if (!defined($user) || !defined($domain)) { + $user = $env{'user.name'}; + $domain = $env{'user.domain'}; } + } elsif ($type eq 'problem') { &Apache::lonxml::debug("authed $slot_name"); - if (defined($user) && defined($domain)) { - $Apache::lonhomework::results{"resource.0.checkedin"}= - $user.':'.$domain; - } - if (defined($slot_name)) { - $Apache::lonhomework::results{"resource.0.checkedin.slot"}= - $slot_name; - } + } + if (!defined($user) || !defined($domain)) { + $user = $env{'user.name'}; + $domain = $env{'user.domain'}; + } + + $Apache::lonhomework::results{"resource.$id.checkedin"}= + $user.':'.$domain; + + if (defined($slot_name)) { + $Apache::lonhomework::results{"resource.$id.checkedin.slot"}= + $slot_name; } } @@ -191,7 +225,7 @@ sub add_previous_version_button { } sub add_grading_button { - my (undef,$cid)=&Apache::lonxml::whichuser(); + my (undef,$cid)=&Apache::lonnet::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; my %sections = &Apache::loncommon::get_sections($cdom,$cnum); @@ -292,9 +326,22 @@ sub style { my ($target) = @_; if ($target eq 'web' || $target eq 'webgrade') { - return (< STYLE + if ($env{'browser.type'} eq 'explorer' + && $env{'browser.os'} eq 'win' ) { + if ($env{'browser.version'} < 7) { + $style .= (< +STYLE + } else { + $style .= (< +STYLE + } + } + return $style; } return; } @@ -316,18 +363,52 @@ sub show_task { return 1; } +my @delay; +sub nest { + if (@delay) { + return $delay[-1]; + } else { + return; + } +} + +sub nested_parse { + my ($str,$env,$args) = @_; + my @old_env = @Apache::scripttag::parser_env; + @Apache::scripttag::parser_env = @$env; + if (exists($args->{'set_dim_id'})) { + &enable_dimension_parsing($args->{'set_dim_id'}); + } + push(@delay,(($args->{'delayed_dim_results'})? 1 : 0)); + my $result = &Apache::scripttag::xmlparse($$str); + pop(@delay); + if (exists($args->{'set_dim_id'})) { + &disable_dimension_parsing(); + } + @Apache::scripttag::parser_env = @old_env; + if ($args->{'delayed_dim_results'}) { + my $dim = &get_dim_id(); + &Apache::lonxml::debug(" tossing out $result "); + &Apache::lonxml::debug(" usining out $dim 's ". $dimension{$dim}{'result'}); + return $dimension{$dim}{'result'}; + } + return $result; +} + sub internal_location { my ($id)=@_; return ''; } sub submission_time_stamp { - my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser(); my $submissiontime; my $version=$Apache::lonhomework::history{'resource.0.version'}; for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) { - if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) { + if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'}) + && defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.tries'})) { $submissiontime=$Apache::lonhomework::history{$v.':timestamp'}; + last; } } my $result; @@ -338,16 +419,18 @@ sub submission_time_stamp { my ($color,$when)=('#FF6666','after'); if ($diff > 0) { ($color,$when)=('#336600','before'); } my $info; + $diff = abs($diff); if ($diff%60) { $info=($diff%60).' seconds'; } $diff=int($diff/60); if ($diff%60) { $info=($diff%60).' minutes '.$info; } $diff=int($diff/60); if ($diff) { $info=$diff.' hours '.$info; } $result='

'. - &mt('Student submitted [_1] [_2] the deadline. - (Submission was at [_3], end of period was [_4].)', - $info,$when,scalar(localtime($submissiontime)), - scalar(localtime($slot{'endtime'}))). + &mt('Student submitted [_1] [_2] the deadline. '. + '(Submission was at [_3], end of period was [_4].)', + $info,$when, + &Apache::lonlocal::locallocaltime($submissiontime), + &Apache::lonlocal::locallocaltime($slot{'endtime'})). '

'; } return $result; @@ -356,7 +439,7 @@ sub submission_time_stamp { sub file_list { my ($files,$uname,$udom) = @_; if (!defined($uname) || !defined($udom)) { - (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); + (undef,undef,$udom,$uname) = &Apache::lonnet::whichuser(); } my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; @@ -417,7 +500,7 @@ sub done_screen { my ($version) = @_; my $title=&Apache::lonnet::gettitle(); my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'}); - my (undef,undef,$domain,$user)= &Apache::lonxml::whichuser(); + my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser(); my $files = '
    '; my $msg; foreach my $file (@files) { @@ -469,8 +552,8 @@ sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my ($status,$accessmsg,$slot); + &Apache::structuretags::init_problem_globals('Task'); if ($target ne 'webgrade') { - &Apache::structuretags::init_problem_globals('Task'); &Apache::structuretags::initialize_storage(); &Apache::lonhomework::showhash(%Apache::lonhomework::history); if ($env{'request.state'} eq 'construct') { @@ -533,7 +616,9 @@ sub start_Task { ($status,$accessmsg,my $slot_name,$slot) = &Apache::lonhomework::check_slot_access('0','Task'); if ($status eq 'CAN_ANSWER' && $version eq '') { - &create_new_version('Task',undef,undef,$slot_name); + # CAN_ANSWER mode, and no current version, unproctored access + # thus self-checkedin + &check_in('Task',undef,undef,$slot_name); &add_to_queue('gradingqueue',{'type' => 'Task', 'time' => time, 'slot' => $slot_name}); @@ -759,7 +844,7 @@ sub get_key_todo { if (defined($env{'form.regradeaspecificsubmission'}) && defined($env{'form.gradinguser'}) && defined($env{'form.gradingdomain'}) ) { - my ($symb,$cid)=&Apache::lonxml::whichuser(); + my ($symb,$cid)=&Apache::lonnet::whichuser(); my $cnum = $env{'course.'.$cid.'.num'}; my $cdom = $env{'course.'.$cid.'.domain'}; my $uname = $env{'form.gradinguser'}; @@ -995,6 +1080,17 @@ DONEBUTTON &Apache::loncommon::end_page({'discussion' => 1}); } } + + my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); + my %queue_data = ('type' => 'Task', + 'time' => time,); + if (defined($Apache::inputtags::slot_name)) { + $queue_data{'slot'} = $Apache::inputtags::slot_name; + } elsif (defined($Apache::lonhomework::history{"resource.$version.0.checkedin.slot"})) { + $queue_data{'slot'} = $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"}; + } + + if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { my $award='SUBMITTED'; &Apache::essayresponse::file_submission("$version.0",'bridgetask', @@ -1017,20 +1113,8 @@ DONEBUTTON &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); if ($award eq 'SUBMITTED') { - my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); - if ($useslots =~ /^\s*no\s*$/i) { - &add_to_queue('gradingqueue', - {'type' => 'Task', - 'time' => time}); - } elsif (defined($Apache::inputtags::slot_name)) { - &add_to_queue('gradingqueue', - {'type' => 'Task', - 'time' => time, - 'slot' => $Apache::inputtags::slot_name}); - } + &add_to_queue('gradingqueue',\%queue_data); } - } elsif ($Apache::lonhomework::results{'INTERNAL_store'}) { - &Apache::structuretags::finalize_storage(); } if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes' && exists($env{'form.cancel'})) { @@ -1071,29 +1155,14 @@ DONEBUTTON $env{'user.name'}.':'.$env{'user.domain'}; if ($review) { $Apache::lonhomework::results{"resource.$version.0.status"}='review'; - if ($env{'form.queue'} eq 'reviewqueue') { - &check_queue_unlock($env{'form.queue'}); - &Apache::lonxml::debug(" still needs review not changing status."); - } else { - &move_between_queues($env{'form.queue'},'reviewqueue'); - } } elsif ($ungraded) { $Apache::lonhomework::results{"resource.$version.0.status"}='ungraded'; - if ($env{'form.queue'} eq 'reviewqueue' || - $env{'form.queue'} eq 'none' ) { - &Apache::lonxml::debug("moving back."); - &move_between_queues($env{'form.queue'},'gradingqueue'); - } else { - &check_queue_unlock($env{'form.queue'}); - } } elsif ($mandatory_failed) { $Apache::lonhomework::results{"resource.$version.0.status"}='fail'; $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override'; $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT'; $Apache::lonhomework::results{"resource.$version.0.awarded"}='0'; - &remove_from_queue($env{'form.queue'}); - - my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser(); if ($env{'form.regrade'} ne 'yes') { $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= @@ -1109,9 +1178,7 @@ DONEBUTTON $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS'; $Apache::lonhomework::results{"resource.$version.0.awarded"}='1'; - &remove_from_queue($env{'form.queue'}); - - my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser(); if ($env{'form.regrade'} ne 'yes') { $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}; @@ -1134,6 +1201,38 @@ DONEBUTTON } &minimize_storage(); &Apache::structuretags::finalize_storage(); + + # data stored, now handle queue + if ($review) { + if ($env{'form.queue'} eq 'reviewqueue') { + &check_queue_unlock($env{'form.queue'}); + &Apache::lonxml::debug(" still needs review not changing status."); + } else { + if ($env{'form.queue'} ne 'none') { + &move_between_queues($env{'form.queue'},'reviewqueue'); + } else { + &add_to_queue('reviewqueue',\%queue_data); + } + } + } elsif ($ungraded) { + if ($env{'form.queue'} eq 'reviewqueue') { + &Apache::lonxml::debug("moving back."); + &move_between_queues($env{'form.queue'}, + 'gradingqueue'); + } elsif ($env{'form.queue'} eq 'none' ) { + &add_to_queue('gradingqueue',\%queue_data); + } else { + &check_queue_unlock($env{'form.queue'}); + } + } elsif ($mandatory_failed) { + &remove_from_queue($env{'form.queue'}); + } else { + &remove_from_queue($env{'form.queue'}); + } + } + if (exists($Apache::lonhomework::results{'INTERNAL_store'})) { + # instance generation occured and hasn't yet been stored + &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { $result.=""; @@ -1157,7 +1256,12 @@ DONEBUTTON 'Partial Credit Factor'); $result.=&Apache::response::meta_stores_write('status','string', 'Bridge Task Status'); + } elsif ($target eq 'edit') { + &Apache::structuretags::reset_problem_globals('Task'); + undef($Apache::lonhomework::parsing_a_task); + return ('','no'); } + &Apache::structuretags::reset_problem_globals('Task'); undef($Apache::lonhomework::parsing_a_task); return $result; } @@ -1182,7 +1286,7 @@ sub move_between_queues { sub check_queue_unlock { my ($queue,$key,$allow_not_me)=@_; if ($queue eq 'none') { return 'ok'; } - my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); if (!defined($key)) { $key="$symb\0queue\0$uname:$udom"; } @@ -1205,7 +1309,7 @@ sub in_queue { if ($queue eq 'none') { return 0; } if (!defined($symb) || !defined($cdom) || !defined($cnum) || !defined($udom) || !defined($uname)) { - ($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser(); + ($symb,my $cid,$udom,$uname)=&Apache::lonnet::whichuser(); $cnum=$env{'course.'.$cid.'.num'}; $cdom=$env{'course.'.$cid.'.domain'}; } @@ -1224,7 +1328,7 @@ sub remove_from_queue { if ($queue eq 'none') { return 'ok'; } if (!defined($symb) || !defined($cdom) || !defined($cnum) || !defined($udom) || !defined($uname)) { - ($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser(); + ($symb,my $cid,$udom,$uname)=&Apache::lonnet::whichuser(); $cnum=$env{'course.'.$cid.'.num'}; $cdom=$env{'course.'.$cid.'.domain'}; } @@ -1249,7 +1353,7 @@ sub setup_env_for_other_user { sub get_queue_data { my ($queue,$udom,$uname)=@_; - my ($symb,$cid,$other_udom,$other_uname)=&Apache::lonxml::whichuser(); + my ($symb,$cid,$other_udom,$other_uname)=&Apache::lonnet::whichuser(); if (!$uname || !$udom) { $uname=$other_uname; $udom =$other_udom; @@ -1295,7 +1399,7 @@ sub check_queue_for_key { sub add_to_queue { my ($queue,$user_data)=@_; if ($queue eq 'none') { return 'ok'; } - my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); if (!$cid || $env{'request.state'} eq 'construct') { return 'no_queue'; } @@ -1333,7 +1437,7 @@ sub get_limited_classlist { sub show_queue { my ($queue,$with_selects)=@_; my $result; - my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; @@ -1460,7 +1564,7 @@ FORM sub get_queue_counts { my ($queue)=@_; my $result; - my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; @@ -1477,7 +1581,6 @@ sub get_queue_counts { foreach my $key (sort(keys(%queue))) { my ($symb,$uname,$udom) = &decode_queue_key($key); if (!defined($classlist->{$uname.':'.$udom})) { next; } - if ($key=~/locked$/) { $locks++; } elsif ($key=~/timestamp$/) { @@ -1518,7 +1621,7 @@ sub decode_queue_key { sub queue_key_locked { my ($queue,$key,$cdom,$cnum)=@_; if (!defined($cdom) || !defined($cnum)) { - my (undef,$cid)=&Apache::lonxml::whichuser(); + my (undef,$cid)=&Apache::lonnet::whichuser(); $cnum=$env{'course.'.$cid.'.num'}; $cdom=$env{'course.'.$cid.'.domain'}; } @@ -1630,7 +1733,7 @@ sub find_mid_grade { sub lock_key { my ($queue,$todo)=@_; my $me=$env{'user.name'}.':'.$env{'user.domain'}; - my (undef,$cid)=&Apache::lonxml::whichuser(); + my (undef,$cid)=&Apache::lonnet::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me}, @@ -1645,7 +1748,7 @@ sub lock_key { sub get_queue_symb_status { my ($queue,$symb,$cdom,$cnum) = @_; if (!defined($cdom) || !defined($cnum)) { - my (undef,$cid)=&Apache::lonxml::whichuser(); + my (undef,$cid)=&Apache::lonnet::whichuser(); $cnum=$env{'course.'.$cid.'.num'}; $cdom=$env{'course.'.$cid.'.domain'}; } @@ -1669,7 +1772,7 @@ sub get_queue_symb_status { sub get_from_queue { my ($queue)=@_; my $result; - my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum); @@ -1745,7 +1848,7 @@ sub get_from_queue { } sub select_user { - my ($symb,$cid)=&Apache::lonxml::whichuser(); + my ($symb,$cid)=&Apache::lonnet::whichuser(); my @chosen_sections= &Apache::loncommon::get_env_multiple('form.chosensections'); @@ -1907,27 +2010,55 @@ sub start_Setup { &Apache::lonxml::startredirection(); return &internal_location($dim); } + +{ + my @allowed; + sub enable_dimension_parsing { + my ($id) = @_; + push(@allowed,$id); + } + sub disable_dimension_parsing { + pop(@allowed); + } + sub skip_dimension_parsing { + my ($check) = @_; + if (!@allowed) { return 0;} + # if unspecified allow any id + if ($allowed[-1] eq undef) { return 0;} + + return ($check ne $allowed[-1]); + } +} + sub start_Question { return &start_Dimension(@_); } sub start_Dimension { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; 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); - $dimension{$previous_dim}{'criteria.'.$dim}=''; + if(&skip_dimension_parsing($dim)) { + $dimension{$previous_dim}{'criteria.'.$dim} = + $token->[4] + .&Apache::lonxml::get_all_text('/'.$tagstack->[-1],$parser, + $style) + .'[-1].'>'; + } $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); $dimension{$dim}{'nested'}=$previous_dim; + &Apache::lonxml::debug("adding $dim as criteria to $previous_dim"); } else { $Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}= &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); } push(@Apache::bridgetask::dimension,$dim); &Apache::lonxml::startredirection(); + &enable_dimension_parsing($dim); return &internal_location($dim); } @@ -1964,20 +2095,22 @@ sub get_instance { if (defined($instance)) { return $instance; } &Apache::response::pushrandomnumber(); - my @instances = @{$dimension{$dim}{'instances'}}; - # remove disabled instances - for (my $i=0; $i < $#instances; $i++) { - if ($dimension{$dim}{$instances[$i].'.disabled'}) { - splice(@instances,$i,1); - $i--; + if (ref($dimension{$dim}{'instances'}) eq 'ARRAY') { + my @instances = @{$dimension{$dim}{'instances'}}; + # remove disabled instances + for (my $i=0; $i < $#instances; $i++) { + if ($dimension{$dim}{$instances[$i].'.disabled'}) { + splice(@instances,$i,1); + $i--; + } + } + @instances = &Math::Random::random_permutation(@instances); + $instance = $instances[($version-1)%scalar(@instances)]; + if ($version =~ /^\d$/) { + $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = + $instance; + $Apache::lonhomework::results{'INTERNAL_store'} = 1; } - } - @instances = &Math::Random::random_permutation(@instances); - $instance = $instances[($version-1)%scalar(@instances)]; - if ($version =~ /^\d$/) { - $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = - $instance; - $Apache::lonhomework::results{'INTERNAL_store'} = 1; } &Apache::response::poprandomnumber(); return $instance; @@ -2008,29 +2141,43 @@ sub get_criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=&Apache::lonxml::endredirection(); my $dim=&get_id($parstack,$safeeval); + if (&skip_dimension_parsing($dim)) { + &disable_dimension_parsing($dim); + pop(@Apache::bridgetask::dimension); + return; + } my $instance=&get_instance($dim); my $version=&get_version(); if ($target eq 'web') { - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); + $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); my @instances = $instance; if (&Apache::response::showallfoils()) { @instances = @{$dimension{$dim}{'instances'}}; } my $shown_question_text; foreach my $instance (@instances) { - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); - + $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'}, + [@_]); + $result .= &nested_parse(\$dimension{$dim}{'questiontext'}, + [@_],{'set_dim_id' => undef}); my $task_status = $Apache::lonhomework::history{"resource.$version.0.status"}; - if ($task_status eq 'pass' || $task_status eq 'fail') { + if ($task_status ne 'pass' && $task_status ne 'fail') { + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}}) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + &Apache::lonxml::debug("$id is $type"); + if ($type eq 'dimension') { + $result.= + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_],{'set_dim_id' => $id}); + } + } + } else { my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"}; my $mandatory='Mandatory'; - if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') { + if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') { $mandatory='Optional'; } my $dim_info="
    \n"; @@ -2077,53 +2224,25 @@ sub get_criteria { $result.=$dimension{$id}{'result'}; next; } - 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 { - $mandatory='Optional'; - } - if ($status eq 'fail') { - } elsif ($status eq 'pass') { - } else { - &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status"); - } - my $status_display=$status; - $status_display=~s/^([a-z])/uc($1)/e; - $result.= - '

    ' - .$mandatory.' Criteria

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

    '.$status_display.'

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

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

    '; - } - $result.='
    '; } } } - if (exists($dimension{$dim}{'nested'})) { - $dimension{$dim}{'result'}=$result; - undef($result); - } } elsif ($target eq 'webgrade') { # in case of any side effects that we need - @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); - @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); - @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); + &nested_parse(\$dimension{$dim}{'intro'},[@_]); + &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]); + $result.= + &nested_parse(\$dimension{$dim}{'questiontext'},[@_], + {'set_dim_id' => undef, + 'delayed_dim_results' => 1}); foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, @{$dimension{$dim}{'criterias'}} ) { my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; if ($type eq 'dimension') { # dimensional 'criteria' don't get assigned grades - $result.=$dimension{$id}{'result'}; + $result.= + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_],{'set_dim_id' => $id}); next; } @@ -2131,10 +2250,10 @@ sub get_criteria { my $status= &get_criteria('status',$version,$dim,$id); $result.='
    '."\n". '
    '."\n"; - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'criteria.'.$id}); + $result.= + &nested_parse(\$dimension{$dim}{'criteria.'.$id},[@_]); + $result.='
    '."\n". - #$dimension{$dim}{'criteria.'.$id}. '
    '."\n". ''."\n". ''."\n". @@ -2152,8 +2271,9 @@ sub get_criteria { $result.=&grading_history($version,$dim,$id); $last_link=$link; } - if (exists($dimension{$dim}{'nested'})) { - $dimension{$dim}{'result'}=$result; + if (&nest()) { + &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'}); + $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result; undef($result); } } elsif ($target eq 'grade' && $env{'form.webgrade'}) { @@ -2162,12 +2282,11 @@ sub get_criteria { my $ungraded=0; my $review=0; - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); - @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); + $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); + $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'}, + [@_]); + $result .= &nested_parse(\$dimension{$dim}{'questiontext'}, + [@_],{'set_dim_id' => undef}); foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, @{$dimension{$dim}{'criterias'}}) { @@ -2178,6 +2297,10 @@ sub get_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}; + } else { + $result .= + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_],{'set_dim_id' => $id}); } my $status= &get_criteria('status',$version,$dim,$id); @@ -2223,6 +2346,7 @@ sub get_criteria { # any other targets no output undef($result); } + &disable_dimension_parsing(); pop(@Apache::bridgetask::dimension); return $result; } @@ -2357,6 +2481,7 @@ sub end_InstanceText { sub start_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style); + my $result = ''; if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { my $dim = &get_dim_id(); my $id=&get_id($parstack,$safeeval); @@ -2374,17 +2499,67 @@ sub start_Criteria { $dimension{$dim}{'criteria.'.$id.'.mandatory'}= &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); push(@{$dimension{$dim}{'criterias'}},$id); + + my $version=&get_version(); + my $task_status = + $Apache::lonhomework::history{"resource.$version.0.status"}; + if ($target eq 'web' + && ($task_status eq 'pass' || $task_status eq 'fail')) { + 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 { + $mandatory='Optional'; + } + my $status_display=$status; + $status_display=~s/^([a-z])/uc($1)/e; + $result.= + '

    ' + .$mandatory.' Criteria

    '; + $result.= + &nested_parse(\$dimension{$dim}{'criteria.'.$id},[@_]); + $result.='

    '.$status_display.'

    '; + if ($comment =~ /\w/) { + $result.='

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

    '; + } + $result.='
    '; + } } } - return ''; + return $result; } sub end_Criteria { } +sub start_GraderNote { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + + if ($target eq 'webgrade') { + return '
    '. + &mt('Note to graders:').''; + } + my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); + return; +} + +sub end_GraderNote { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + + if ($target eq 'webgrade') { + return '
    '; + } + return; +} + + + sub proctor_validation_screen { my ($slot) = @_; - my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser(); + my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser(); my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg'); my $name=&Apache::loncommon::plainname($user,$domain);