--- loncom/homework/bridgetask.pm 2005/09/14 18:25:40 1.47 +++ loncom/homework/bridgetask.pm 2005/09/22 22:25:35 1.53 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.47 2005/09/14 18:25:40 albertel Exp $ +# $Id: bridgetask.pm,v 1.53 2005/09/22 22:25:35 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -158,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; } @@ -202,6 +204,67 @@ sub preserve_grade_info { return $result; } +sub style { + return (< +.fail, .pass, .neutral { + position: relative; + margin : 5px; + margin-bottom :10px; + padding : 4px; + padding-left : 75px; + border : thin solid; + font-weight : bolder; + font-size: smaller; + font-family: Arial; + background-color : rgb(255,240,225); +} + +.fail h4, .pass h4 { + position:absolute; + left: -4px; + top: -8px; + padding:2px; + margin:0; + background-color : rgb(255,240,225); + border : thin solid; +} + +.fail { + color: red; +} + +.pass { + color : green; +} + +.neutral { + color : blue; +} + +.question { + border : thin solid black; + padding : 4px; + margin-bottom : 1em; +} + +.grade { + font-size: x-large; + font-family: Arial; + position:absolute; + left: 5px; + top: -5px; + width: 70px; +} + +div#feedback h1 { + color : inherit; +} + +STYLE + +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -289,7 +352,7 @@ sub start_Task { } elsif ($target eq 'web') { my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval); $result.="$head_tag_start$name - $body_tag_start \n"; + $body_tag_start \n".&style(); my ($version,$previous)=&get_version(); if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { @@ -311,8 +374,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... @@ -334,7 +397,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.= @@ -353,6 +416,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.").''; } @@ -366,6 +431,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 @@ -390,6 +459,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)) { @@ -398,6 +473,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') { @@ -487,6 +576,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(); @@ -516,7 +607,9 @@ sub end_Task { $ungraded++; } elsif ($status eq 'review') { $review++; - } + } else { + $ungraded++; + } } if ($optional_passed < $optional_required) { $mandatory_failed++; @@ -530,13 +623,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'; - 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'}); } @@ -548,13 +642,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'; @@ -563,23 +660,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(); } @@ -605,8 +704,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; @@ -617,6 +721,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"; @@ -636,6 +741,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'}; @@ -668,8 +774,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'}; @@ -781,6 +904,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); @@ -929,6 +1057,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; @@ -996,20 +1206,27 @@ sub get_instance { 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"}; - $result.='
'; + my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); + if ($mandatory) { + $mandatory='Mandatory'; + } else { + $mandatory='Optional'; + } if ($status eq 'fail') { - $result.=''.&mt('Did not pass').''; } 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.='
'; + my $status_display=$status; + $status_display=~s/^([a-z])/uc($1)/e; + $result.='

'.$mandatory. + ' Criteria

'. + $dimension{$instance.'.criteria.'.$id}. + '

'.$status_display.'

'; if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) { - $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'
'; + $result.='

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

'; } - $result.=$dimension{$instance.'.criteria.'.$id}. - '
'; + $result.=''; } } } elsif ($target eq 'webgrade') { @@ -1049,13 +1266,14 @@ sub get_instance { ''; $result.=''; my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); - my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio'; + 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;