--- loncom/homework/bridgetask.pm 2005/08/09 16:48:15 1.39 +++ loncom/homework/bridgetask.pm 2005/09/21 21:54:20 1.52 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.39 2005/08/09 16:48:15 albertel Exp $ +# $Id: bridgetask.pm,v 1.52 2005/09/21 21:54:20 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -147,9 +147,7 @@ sub add_grading_button { my $result=' '; $result.=''; - if ( 1) { - #need a permissions for limitng this to 'powerful users' - + if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); $result.='

'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks); @@ -160,6 +158,8 @@ sub add_grading_button { $result.='

'.&mt("Review Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks); $result.='

'."\n"; + $result.='

'."\n"; } return $result; } @@ -225,13 +225,14 @@ sub start_Task { if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } $body_tag_start.=$uri.'">'.&add_grading_button().""; my $symb=&Apache::lonnet::symbread(); - $body_tag_start.='
'. - ''. - ''. - ''. - '
'; - + if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { + $body_tag_start.='
'. + ''. + ''. + ''. + '
'; + } } } if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || @@ -284,14 +285,7 @@ sub start_Task { } } elsif ($target eq 'grade' && !$env{'form.webgrade'}) { if ($status eq 'NEEDS_CHECKIN') { - if (&proctor_check_auth($slot_name,$slot)) { - #FIXME immeadiatly add this to the grading queue - # with slot->{'endtime'} for when grading can - # begin on this resource - # FIXME I think the above is done by default, - # need to check that - # failure doesn't do this. - } + &proctor_check_auth($slot_name,$slot); } } } elsif ($target eq 'web') { @@ -319,8 +313,8 @@ sub start_Task { my $webgrade='yes'; if ($target eq 'webgrade') { $result.=$head_tag_start.$body_tag_start; - $result.='
Review'.&show_queue('reviewqueue'); - $result.='
Grade'.&show_queue('gradingqueue'); + #$result.='
Review'.&show_queue('reviewqueue'); + #$result.='
Grade'.&show_queue('gradingqueue'); } # FIXME Blast! still need to reorg this, need to reshow the # queue being reviewed once done with the grade pass... @@ -342,7 +336,7 @@ sub start_Task { &Apache::structuretags::initialize_storage(); &Apache::lonhomework::showhash(%Apache::lonhomework::history); if ($target eq 'webgrade') { - $result.='
After -'.&show_queue($env{'form.queue'}); + #$result.='
After -'.&show_queue($env{'form.queue'}); $result.="\n".''; if ($status_code eq 'selected') { $form_tag_start.= @@ -361,6 +355,8 @@ sub start_Task { $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.").''; } @@ -374,6 +370,10 @@ sub start_Task { $webgrade.'" />'; $result.=''; + if ($env{'form.regrade'}) { + $result.=''; + } } } else { # page_start returned a starting result, delete it if we don't need it @@ -398,6 +398,12 @@ sub get_key_todo { return (undef,'show_list'); } + if (defined($env{'form.regradeasubmission'})) { + &Apache::lonxml::debug("regrade a grading...."); + $env{'form.queue'}='none'; + return (undef,'select_user'); + } + my $queue=$env{'form.queue'}; if (!defined($queue)) { @@ -406,6 +412,20 @@ sub get_key_todo { my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'}); + if ($env{'form.queue'} eq 'none') { + if (defined($env{'form.gradingkey'})) { + if ($target eq 'webgrade') { + if ($env{'form.stop'}) { + return (undef,'stop'); + } elsif ($env{'form.next'}) { + return (undef,'show_list'); + } + } + return ($gradingkey,'selected'); + } else { + return (undef,'show_list'); + } + } if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'}) && !defined($env{'form.gradingaction'}) && $env{'form.queuemode'} eq 'selected') { @@ -470,7 +490,10 @@ sub end_Task { $result.="\n".'
'. &Apache::inputtags::file_selector("$version.0", "bridgetask","*", - 'portfolioonly'). + 'portfolioonly', + ' +

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

+

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

'). "
"; $result.=&Apache::inputtags::gradestatus('0'); } @@ -492,6 +515,8 @@ sub end_Task { $Apache::lonhomework::results{"resource.0.award"}= $Apache::lonhomework::results{"resource.$version.0.award"}= $award; + $Apache::lonhomework::results{"resource.0.submission"}= + $Apache::lonhomework::results{"resource.$version.0.submission"}=''; } &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); @@ -521,7 +546,9 @@ sub end_Task { $ungraded++; } elsif ($status eq 'review') { $review++; - } + } else { + $ungraded++; + } } if ($optional_passed < $optional_required) { $mandatory_failed++; @@ -535,14 +562,14 @@ sub end_Task { &check_queue_unlock($env{'form.queue'}); &Apache::lonxml::debug(" still needs review not changing status."); } else { - &move_between_queues('gradingqueue','reviewqueue'); + &move_between_queues($env{'form.queue'},'reviewqueue'); } } elsif ($ungraded) { $Apache::lonhomework::results{"resource.$version.status"}='ungraded'; - # FIXME if in review queue need to move back to grading queue - if ($env{'form.queue'} eq 'reviewqueue') { + if ($env{'form.queue'} eq 'reviewqueue' || + $env{'form.queue'} eq 'none' ) { &Apache::lonxml::debug("moving back."); - &move_between_queues('reviewqueue','gradingqueue'); + &move_between_queues($env{'form.queue'},'gradingqueue'); } else { &check_queue_unlock($env{'form.queue'}); } @@ -554,13 +581,16 @@ sub end_Task { &remove_from_queue($env{'form.queue'}); my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); - $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= - $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}; - &Apache::grades::version_portfiles( - \%Apache::lonhomework::results, - ["$version.0.bridgetask"],$courseid, - $symb,$udom,$uname, - ["$version.0.bridgetask"]); + + if ($env{'form.regrade'} ne 'yes') { + $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= + $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}; + &Apache::grades::version_portfiles( + \%Apache::lonhomework::results, + ["$version.0.bridgetask"],$courseid, + $symb,$udom,$uname, + ["$version.0.bridgetask"]); + } } else { $Apache::lonhomework::results{"resource.$version.status"}='pass'; $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; @@ -569,23 +599,25 @@ sub end_Task { &remove_from_queue($env{'form.queue'}); my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); - $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= - $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}; - &Apache::grades::version_portfiles( - \%Apache::lonhomework::results, - ["$version.0.bridgetask"],$courseid, - $symb,$udom,$uname, - ["$version.0.bridgetask"]); + if ($env{'form.regrade'} ne 'yes') { + $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= + $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}; + &Apache::grades::version_portfiles( + \%Apache::lonhomework::results, + ["$version.0.bridgetask"],$courseid, + $symb,$udom,$uname, + ["$version.0.bridgetask"]); + } } $Apache::lonhomework::results{"resource.status"}= $Apache::lonhomework::results{"resource.$version.status"}; if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) { $Apache::lonhomework::results{"resource.0.award"}= - $Apache::lonhomework::results{"resource.$version.award"}; + $Apache::lonhomework::results{"resource.$version.0.award"}; $Apache::lonhomework::results{"resource.0.awarded"}= - $Apache::lonhomework::results{"resource.$version.awarded"}; + $Apache::lonhomework::results{"resource.$version.0.awarded"}; $Apache::lonhomework::results{"resource.0.solved"}= - $Apache::lonhomework::results{"resource.$version.solved"}; + $Apache::lonhomework::results{"resource.$version.0.solved"}; } &Apache::structuretags::finalize_storage(); } @@ -611,8 +643,13 @@ sub end_Task { sub move_between_queues { my ($src_queue,$dest_queue)=@_; - my $cur_data=&get_queue_data($src_queue); - if (!$cur_data) { return 'not_exist'; } + my $cur_data; + if ($src_queue ne 'none') { + $cur_data=&get_queue_data($src_queue); + if (!$cur_data) { return 'not_exist'; } + } else { + $cur_data = ['none']; + } my $result=&add_to_queue($dest_queue,$cur_data->[0]); if ($result ne 'ok') { return $result; @@ -623,6 +660,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(); if (!defined($key)) { $key="$symb\0queue\0$uname\@$udom"; @@ -642,6 +680,7 @@ sub check_queue_unlock { sub remove_from_queue { my ($queue)=@_; + 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'}; @@ -674,8 +713,25 @@ 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 %results= + &Apache::lonnet::get($queue,[$todo,"$todo\0locked"],$cdom,$cnum); + + if (exists($results{$todo}) && ref($results{$todo})) { + if (defined($results{"$todo\0locked"})) { + return 'locked'; + } + return 'enqueued'; + } + return undef; +} + sub add_to_queue { my ($queue,$slot_name)=@_; + 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'}; @@ -787,6 +843,11 @@ sub get_queue_counts { return ($entries,$ready_to_grade,$locks); } +sub encode_queue_key { + my ($symb,$udom,$uname)=@_; + return "$symb\0queue\0$uname\@$udom"; +} + sub decode_queue_key { my ($key)=@_; my ($symb,undef,$user) = split("\0",$key); @@ -935,6 +996,88 @@ sub get_from_queue { return $todo; } +sub select_user { + my ($symb,$cid)=&Apache::lonxml::whichuser(); + my $result.=''; + + &Apache::grades::init_perm(); + my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all',); + &Apache::grades::reset_perm(); + + 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 $queue = 'none'; + if ($status{'reviewqueue'} eq 'enqueued') { + $queue = 'reviewqueue'; + } elsif ($status{'gradingqueue'} eq 'enqueued') { + $queue = 'gradingqueue'; + } + my $todo = + &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname)); + $result.=< + + '; + } + $result.='
+
+ + + + + +
+ 		$fullname->{$student} +RESULT + + if ($status{'status'} eq 'pass') { + $result .= ''.&mt('Passed').''; + } elsif ($status{'status'} eq 'fail') { + $result .= ''.&mt('Failed').''; + } elsif ($status{'status'} eq 'review') { + $result .= ''.&mt('Under Review').''; + } elsif ($status{'status'} eq 'ungraded') { + $result .= &mt('Ungraded'); + } elsif ($status{'status'} ne '') { + $result .= ''.&mt('Unknown Status').''; + } else { + $result.=" "; + } + if ($status{'version'}) { + $result .= ' '.&mt('Version').' '.$status{'version'}; + } + $result.= ''; + if ($status{'reviewqueue'} eq 'enqueued') { + $result .= &mt('Awaiting Review'); + } elsif ($status{'reviewqueue'} eq 'locked') { + $result .= &mt('Under Review'); + } elsif ($status{'gradingqueue'} eq 'enqueued') { + $result .= &mt('Awaiting Grading'); + } elsif ($status{'gradingqueue'} eq 'locked') { + $result .= &mt('Being Graded'); + } else { + $result.=" "; + } + $result.= '
'; + return $result; +} + +sub get_student_status { + my ($symb,$cid,$udom,$uname)=@_; + my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'}, + $udom,$uname); + 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)); + return %status; +} + sub start_ClosingParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; @@ -993,7 +1136,10 @@ sub get_instance { my $instance=&get_instance(); my $version=&get_version(); if ($target eq 'web') { - $result=$dimension{'intro'}.$dimension{$instance.'.text'}; + @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') { foreach my $id (@{$dimension{$instance.'.criterias'}}) { @@ -1005,7 +1151,7 @@ sub get_instance { } elsif ($status eq 'pass') { $result.=''.&mt('Passed').''; } else { - &Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status"); + &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status"); } $result.=''; if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) { @@ -1016,20 +1162,28 @@ 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::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{$instance.'.text'}); foreach my $id (@{$dimension{$instance.'.criterias'}}) { my $link='criteria_'.$instance.'_'.$id; my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"}; $result.=''. ''. ''. - '
'. + '
'. #$dimension{$instance.'.criteria.'.$id}. ''. 'Additional Comment for Student
'. ''. ''. ''. - '
'. + '
'. '
'. '
'. '
'. @@ -1044,13 +1198,14 @@ sub get_instance { ''; $result.=''; my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); - my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio'; - foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.bridgetask.portfiles"})) { + my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; + foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) { my $file=$file_url.$partial_file; + $file=~s|/+|/|g; &Apache::lonnet::allowuploaded('/adm/bridgetask',$file); - $result.=' '.$file. - ''; + ' '; } $result.=''; $last_link=$link; @@ -1073,7 +1228,7 @@ sub get_instance { } elsif ($status eq 'ungraded') { $ungraded++; } else { - &Apache::lonxml::error("got weird status --$status--"); + $ungraded++; } } if ($optional_passed < $dimension{$instance.'.optionalrequired'}) { @@ -1102,22 +1257,18 @@ sub start_IntroParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'web' || $target eq 'webgrade') { - if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') { - &Apache::lonxml::startredirection(); + if ($tagstack->[-2] eq 'Dimension') { + $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser); + + } elsif ($target eq 'webgrade') { + &Apache::lonxml::get_all_text('/introparagraph',$parser); } + } return $result; } sub end_IntroParagraph { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result; - if ($target eq 'web' || $target eq 'webgrade') { - if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') { - $dimension{'intro'}=&Apache::lonxml::endredirection(); - } - } - return $result; } sub start_Instance { @@ -1132,40 +1283,27 @@ sub start_Instance { } sub end_Instance { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - return ''; } sub start_InstanceText { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $instance_id=$Apache::bridgetask::instance[-1]; + my $text=&Apache::lonxml::get_all_text('/instancetext',$parser); if ($target eq 'web' || $target eq 'webgrade') { - &Apache::lonxml::startredirection(); + $dimension{$instance_id.'.text'}=$text; } return ''; } sub end_InstanceText { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $instance_id=$Apache::bridgetask::instance[-1]; - if ($target eq 'web' || $target eq 'webgrade') { - $dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection(); - } return ''; } sub start_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { - &Apache::lonxml::startredirection(); - } - return ''; -} - -sub end_Criteria { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $instance_id=$Apache::bridgetask::instance[-1]; + my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser); if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { - my $criteria=&Apache::lonxml::endredirection(); my $id=&get_id($parstack,$safeeval); $dimension{$instance_id.'.criteria.'.$id}=$criteria; $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}= @@ -1175,17 +1313,21 @@ sub end_Criteria { return ''; } +sub end_Criteria { +} + sub proctor_validation_screen { my ($slot) = @_; my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser(); my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg'); - $user=$env{'form.proctorname'}; - if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; } + my $name=&Apache::loncommon::plainname($user,$domain); + my $msg; if ($env{'form.proctorpassword'}) { $msg='

'.&mt("Failed to authenticate the proctor.") .'

'; } + if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; } my $result= (<Proctor Validation

Your room's proctor needs to validate your access to this resource.

@@ -1194,13 +1336,22 @@ sub proctor_validation_screen { - + - +
Proctor's Username:
Proctor's Username:
Password:
Proctor's Domain:
Proctor's Domain:

-Student who should be logged in is:
-
+ + +
+ + + + + + +
Student who should be logged in is:
Name:$name
Student ID:$env{'environment.id'}
Usename$user\@$domain
+
ENDCHECKOUT return $result;