--- loncom/homework/bridgetask.pm 2005/11/03 22:59:35 1.75 +++ loncom/homework/bridgetask.pm 2005/12/01 18:46:31 1.87 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.75 2005/11/03 22:59:35 albertel Exp $ +# $Id: bridgetask.pm,v 1.87 2005/12/01 18:46:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,7 +60,7 @@ sub initialize_bridgetask { } sub proctor_check_auth { - my ($slot_name,$slot)=@_; + my ($slot_name,$slot,$type)=@_; my $user=$env{'form.proctorname'}; my $domain=$env{'form.proctordomain'}; @@ -79,7 +79,7 @@ sub proctor_check_auth { $authenticated=1; } } - if ($authenticated) { + if ($authenticated && $type eq 'Task') { my $version= $Apache::lonhomework::results{'resource.version'}= ++$Apache::lonhomework::history{'resource.version'}; @@ -93,6 +93,12 @@ sub proctor_check_auth { } } return 1; + } elsif ($authenticated && $type eq 'problem') { + &Apache::lonxml::debug("authed #slot_name"); + $Apache::lonhomework::results{"resource.0.checkedin"}= + $user.'@'.$domain; + $Apache::lonhomework::results{"resource.0.checkedin.slot"}= + $slot_name; } } } @@ -375,7 +381,7 @@ INFO } sub start_Task { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my ($status,$accessmsg,$slot); if ($target ne 'webgrade') { @@ -416,7 +422,7 @@ sub start_Task { $target eq 'tex') { my ($version,$previous)=&get_version(); ($status,$accessmsg,my $slot_name,$slot) = - &Apache::lonhomework::check_task_access('0'); + &Apache::lonhomework::check_slot_access('0','Task'); push(@Apache::inputtags::status,$status); $Apache::inputtags::slot_name=$slot_name; my $expression='$external::datestatus="'.$status.'";'; @@ -425,7 +431,7 @@ sub start_Task { &Apache::lonxml::debug("Got $status"); $body_tag_start.=&add_previous_version_button($status); if (!&show_task($status,$previous)) { - my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); + my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style); if ( $target eq "web" ) { $result.= $head_tag_start.''.$body_tag_start; if ($env{'request.state'} eq 'construct') { @@ -470,7 +476,12 @@ DONESCREEN } } elsif ($target eq 'grade' && !$env{'form.webgrade'}) { if ($status eq 'NEEDS_CHECKIN') { - &proctor_check_auth($slot_name,$slot); + if(&proctor_check_auth($slot_name,$slot,'Task') + && defined($Apache::inputtags::slot_name)) { + my $result=&add_to_queue('gradingqueue', + [$Apache::inputtags::slot_name]); + &Apache::lonxml::debug("add_to_queue said $result"); + } } } } elsif ($target eq 'web') { @@ -521,23 +532,27 @@ DONESCREEN } else { if ($target eq 'webgrade') { $result.="\n"; + my $back='

'. + &mt('Return to resource').'

'; if ($status_code eq 'stop') { - $result.=''.&mt("Stopped grading.").''; + $result.=''.&mt("Stopped grading.").''.$back; } elsif ($status_code eq 'lock_failed') { - $result.=''.&mt("Failed to lock the request record.").''; + $result.=''.&mt("Failed to lock the request record.") + .''.$back; } elsif ($status_code eq 'unlock') { - $result.=''.&mt("Unlocked the requested record.").''; + $result.=''.&mt("Unlocked the requested record.") + .''.$back; $result.=&show_queue($env{'form.queue'},1); } elsif ($status_code eq 'show_list') { $result.=&show_queue($env{'form.queue'},1); } elsif ($status_code eq 'select_user') { $result.=&select_user(); } else { - $result.=''.&mt("No user to be graded.").''; + $result.=''.&mt("No user to be graded.").''.$back; } } $webgrade='no'; - my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); + my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style); } if ($target eq 'webgrade' && defined($env{'form.queue'})) { if ($webgrade eq 'yes') { @@ -667,7 +682,6 @@ sub get_key_todo { } return (undef,undef) } - sub end_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; @@ -690,6 +704,9 @@ sub end_Task {

'.&mt('Submit Portfolio Files for Grading').'

'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'

'). ""; + } + if (!$previous && $status ne 'SHOW_ANSWER' && + &show_task($status,$previous)) { $result.=&Apache::inputtags::gradestatus('0'); $result.=''; $result.=< DONEBUTTON - } + } if (&show_task($status,$previous) && $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) { my $bt_status=$Apache::lonhomework::history{"resource.$version.status"}; my $title=&Apache::lonnet::gettitle(); - my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name); + + my $slot_name= + $Apache::lonhomework::history{"resource.$version.checkedin.slot"}; + my %slot=&Apache::lonnet::get_slot($slot_name); my $start_time= &Apache::lonlocal::locallocaltime($slot{'starttime'}); - my $status; - $status.="\n
\n"; + my $status = "\n
\n"; if ($bt_status eq 'pass') { $status.='

You passed the '.$title.' given on '. - $start_time.'.

'; + $start_time.''; } if ($bt_status eq 'fail') { $status.='

You did not pass the '.$title.' given on '. - $start_time.'.

'; + $start_time.''; if (!$previous) { $status.=&add_request_another_attempt_button(); } @@ -765,12 +784,16 @@ DONEBUTTON $Apache::lonhomework::results{"resource.$version.0.submission"}=''; } else { delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}); + $award = ''; } &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); - if ($award eq 'SUBMITTED') { - &add_to_queue('gradingqueue',$Apache::inputtags::slot_name); + if ($award eq 'SUBMITTED' + && defined($Apache::inputtags::slot_name)) { + &add_to_queue('gradingqueue',[$Apache::inputtags::slot_name]); } + } elsif ($Apache::lonhomework::results{'INTERNAL_store'}) { + &Apache::structuretags::finalize_storage(); } if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') { my $optional_required= @@ -882,13 +905,14 @@ DONEBUTTON $result.=''.&Apache::loncommon::endbodytag().''; } elsif ($target eq 'meta') { $result.=&Apache::response::meta_package_write('Task'); - $result.=&meta_stores_write('solved','string','Problem Status'); - $result.=&meta_stores_write('tries','int_zeropos', - 'Number of Attempts'); - $result.=&meta_stores_write('awarded','float', - 'Partial Credit Factor'); - $result.=&meta_stores_write('status','string', - 'Bridge Task Status'); + $result.=&Apache::response::meta_stores_write('solved','string', + 'Problem Status'); + $result.=&Apache::response::meta_stores_write('tries','int_zeropos', + 'Number of Attempts'); + $result.=&Apache::response::meta_stores_write('awarded','float', + 'Partial Credit Factor'); + $result.=&Apache::response::meta_stores_write('status','string', + 'Bridge Task Status'); } undef($Apache::lonhomework::parsing_a_task); return $result; @@ -903,7 +927,7 @@ sub move_between_queues { } else { $cur_data = ['none']; } - my $result=&add_to_queue($dest_queue,$cur_data->[0]); + my $result=&add_to_queue($dest_queue,[$cur_data->[0]]); if ($result ne 'ok') { return $result; } @@ -932,13 +956,17 @@ sub check_queue_unlock { } sub remove_from_queue { - my ($queue)=@_; + my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_; if ($queue eq 'none') { return 'ok'; } - my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); - my $cnum=$env{'course.'.$cid.'.num'}; - my $cdom=$env{'course.'.$cid.'.domain'}; - my $key="$symb\0queue\0$uname\@$udom"; + if (!defined($symb) || !defined($cdom) || !defined($cnum) + || !defined($udom) || !defined($uname)) { + ($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser(); + $cnum=$env{'course.'.$cid.'.num'}; + $cdom=$env{'course.'.$cid.'.domain'}; + } + my $key=&encode_queue_key($symb,$udom,$uname); my @keys=($key,"$key\0locked"); + &Apache::lonnet::logthis("removing @keys"); return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum); } @@ -966,10 +994,10 @@ sub get_queue_data { return undef; } + sub check_queue_for_key { - my ($cid,$queue,$todo)=@_; - my $cnum=$env{'course.'.$cid.'.num'}; - my $cdom=$env{'course.'.$cid.'.domain'}; + my ($cdom,$cnum,$queue,$todo)=@_; + my %results= &Apache::lonnet::get($queue,[$todo,"$todo\0locked"],$cdom,$cnum); @@ -977,10 +1005,17 @@ sub check_queue_for_key { if (defined($results{"$todo\0locked"})) { return 'locked'; } - my $slot=$results{$todo}->[0]; - my %slot_data=&Apache::lonnet::get_slot($slot); - if ($slot_data{'endtime'} > time) { - return 'in_progress'; + my $slot; + if (ref($results{$todo}) eq 'ARRAY') { + $slot = $results{$todo}[0]; + } elsif (ref($results{$todo}) eq 'HASH') { + $slot = $results{$todo}{'slot'}; + } + if (defined($slot)) { + my %slot_data=&Apache::lonnet::get_slot($slot); + if ($slot_data{'endtime'} > time) { + return 'in_progress'; + } } return 'enqueued'; } @@ -988,14 +1023,17 @@ sub check_queue_for_key { } sub add_to_queue { - my ($queue,$slot_name)=@_; + my ($queue,$user_data)=@_; if ($queue eq 'none') { return 'ok'; } my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + if (!$cid || $env{'request.state'} eq 'construct') { + return 'no_queue'; + } my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; my %data; - $data{"$symb\0queue\0$uname\@$udom"}=[$slot_name]; - return &Apache::lonnet::put($queue,\%data,$cdom,$cnum); + $data{"$symb\0queue\0$uname\@$udom"}=$user_data; + return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum); } sub show_queue { @@ -1021,7 +1059,7 @@ sub show_queue { if ($tmp=~/^error: 2 /) { return "\n

Current Queue - $queue

Empty
"; } - $result.="\n

Current Queue - $queue

"; + $result.="\n

Current Queue - $symb $queue

"; if ($with_selects) { $result.=""; } $result.=""; foreach my $key (sort(keys(%queue))) { @@ -1209,6 +1247,27 @@ sub lock_key { return 0; } +sub get_queue_symb_status { + my ($queue,$symb,$cdom,$cnum) = @_; + if (!defined($cdom) || !defined($cnum)) { + my (undef,$cid)=&Apache::lonxml::whichuser(); + $cnum=$env{'course.'.$cid.'.num'}; + $cdom=$env{'course.'.$cid.'.domain'}; + } + my $regexp="^$symb\0"; + my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); + my ($tmp)=%queue; + if ($tmp=~/^error: 2 /) { return; } + my @users; + foreach my $key (sort(keys(%queue))) { + next if ($key=~/locked$/); + next if ($key=~/timestamp$/); + my ($symb,$uname,$udom) = &decode_queue_key($key); + push(@users,"$uname:$udom"); + } + return @users; +} + sub get_from_queue { my ($queue)=@_; my $result; @@ -1220,8 +1279,8 @@ sub get_from_queue { if ($todo) { return $todo; } while (1) { my $starttime=time; - &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime}, - $cdom,$cnum); + &Apache::lonnet::cput($queue,{"$symb\0timestamp"=>$starttime}, + $cdom,$cnum); &Apache::lonxml::debug("$starttime"); my $regexp="^$symb\0queue\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); @@ -1292,7 +1351,9 @@ sub select_user { foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) { my ($uname,$udom) = split(/:/,$student); - my %status = &get_student_status($symb,$cid,$udom,$uname); + my $cnum=$env{'course.'.$cid.'.num'}; + my $cdom=$env{'course.'.$cid.'.domain'}; + my %status = &get_student_status($symb,$cdom,$cnum,$udom,$uname); my $queue = 'none'; my $cannot_grade; if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) { @@ -1371,17 +1432,23 @@ RESULT } sub get_student_status { - my ($symb,$cid,$udom,$uname)=@_; - my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'}, - $udom,$uname); + my ($symb,$cdom,$cnum,$udom,$uname,$type)=@_; + my %status; - $status{'status'}=$record{'resource.status'}; - $status{'version'}=$record{'resource.version'}; - $status{'grader'}=$record{'resource.grader'}; - $status{'reviewqueue'}=&check_queue_for_key($cid,'reviewqueue', - &encode_queue_key($symb,$udom,$uname)); - $status{'gradingqueue'}=&check_queue_for_key($cid,'gradingqueue', - &encode_queue_key($symb,$udom,$uname)); + + if ($type eq 'Task') { + my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'}, + $udom,$uname); + $status{'status'}=$record{'resource.status'}; + $status{'version'}=$record{'resource.version'}; + $status{'grader'}=$record{'resource.grader'}; + } + $status{'reviewqueue'}= + &check_queue_for_key($cdom,$cnum,'reviewqueue', + &encode_queue_key($symb,$udom,$uname)); + $status{'gradingqueue'}= + &check_queue_for_key($cdom,$cnum,'gradingqueue', + &encode_queue_key($symb,$udom,$uname)); return %status; } @@ -1457,6 +1524,7 @@ sub get_instance { $instance = $instances[($version-1)%scalar(@instances)]; $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = $instance; + $Apache::lonhomework::results{'INTERNAL_store'} = 1; &Apache::response::poprandomnumber(); return $instance; } @@ -1473,75 +1541,81 @@ sub get_instance { if ($target eq 'web') { @Apache::scripttag::parser_env = @_; $result.=&Apache::scripttag::xmlparse($dimension{'intro'}); - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); - if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' || - $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { - - my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"}; - my $mandatory='Mandatory'; - if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') { - $mandatory='Optional'; - } - my $dim_info="
\n"; - if ($dim_status eq 'pass') { - $dim_info.='

Question : you passed this '.$mandatory.' question

'; - } - if ($dim_status eq 'fail') { - $dim_info.='

Question : you did not pass this '.$mandatory.' question

'; - } - my $man_count=0; - my $man_passed=0; - my $opt_count=0; - my $opt_passed=0; - foreach my $id (@{$dimension{$instance.'.criterias'}}) { - if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} - eq 'N') { - $opt_count++; - if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') { - $opt_passed++; - } - } else { - $man_count++; - if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') { - $man_passed++; - } - } - } - if ($man_passed eq $man_count) { $man_passed='all'; } - my $opt_req=$dimension{$instance.'.optionalrequired'}; - if ($opt_req !~ /\S/) { $opt_req='0'; } - $dim_info.="\n

".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."

\n
"; - - my $internal_location=&internal_location($dim); - $result=~s/\Q$internal_location\E/$dim_info/; - - foreach my $id (@{$dimension{$instance.'.criterias'}}) { - my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"}; - my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}; - my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); - if ($mandatory) { - $mandatory='Mandatory'; - } else { + my @instances = $instance; + if (&Apache::response::showallfoils()) { + @instances = @{$dimension{'instances'}}; + } + foreach my $instance (@instances) { + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); + if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' || + $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { + + my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"}; + my $mandatory='Mandatory'; + if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') { $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 $dim_info="
\n"; + if ($dim_status eq 'pass') { + $dim_info.='

Question : you passed this '.$mandatory.' question

'; + } + if ($dim_status eq 'fail') { + $dim_info.='

Question : you did not pass this '.$mandatory.' question

'; + } + my $man_count=0; + my $man_passed=0; + my $opt_count=0; + my $opt_passed=0; + foreach my $id (@{$dimension{$instance.'.criterias'}}) { + if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} + eq 'N') { + $opt_count++; + if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') { + $opt_passed++; + } + } else { + $man_count++; + if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') { + $man_passed++; + } + } } - my $status_display=$status; - $status_display=~s/^([a-z])/uc($1)/e; - @Apache::scripttag::parser_env = @_; - $result.='

'.$mandatory. - ' Criteria

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

'.$status_display.'

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

'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'

'; + if ($man_passed eq $man_count) { $man_passed='all'; } + my $opt_req=$dimension{$instance.'.optionalrequired'}; + if ($opt_req !~ /\S/) { $opt_req='0'; } + $dim_info.="\n

".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."

\n
"; + + my $internal_location=&internal_location($dim); + $result=~s/\Q$internal_location\E/$dim_info/; + + foreach my $id (@{$dimension{$instance.'.criterias'}}) { + my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"}; + my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}; + my $mandatory=($dimension{$instance.'.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; + @Apache::scripttag::parser_env = @_; + $result.='

'.$mandatory. + ' Criteria

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

'.$status_display.'

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

'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'

'; + } + $result.='
'; } - $result.='
'; } } } elsif ($target eq 'webgrade') { @@ -1624,14 +1698,14 @@ sub get_instance { } sub start_IntroParagraph { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'web' || $target eq 'webgrade') { if ($tagstack->[-2] eq 'Dimension') { - $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser); + $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style); } elsif ($target eq 'webgrade') { - &Apache::lonxml::get_all_text('/introparagraph',$parser); + &Apache::lonxml::get_all_text('/introparagraph',$parser,$style); } } @@ -1660,9 +1734,9 @@ sub end_Instance { } sub start_InstanceText { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $instance_id=$Apache::bridgetask::instance[-1]; - my $text=&Apache::lonxml::get_all_text('/instancetext',$parser); + my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style); if ($target eq 'web' || $target eq 'webgrade') { $dimension{$instance_id.'.text'}=$text; } @@ -1674,9 +1748,9 @@ sub end_InstanceText { } sub start_Criteria { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $instance_id=$Apache::bridgetask::instance[-1]; - my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser); + my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style); if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { my $id=&get_id($parstack,$safeeval); $dimension{$instance_id.'.criteria.'.$id}=$criteria;
resourceusertypedata