--- loncom/homework/bridgetask.pm 2005/05/31 21:11:56 1.36 +++ loncom/homework/bridgetask.pm 2005/09/29 19:18:37 1.55 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.36 2005/05/31 21:11:56 albertel Exp $ +# $Id: bridgetask.pm,v 1.55 2005/09/29 19:18:37 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,7 @@ use Apache::File(); use Apache::lonmenu; use Apache::lonlocal; use Apache::lonxml; +use Apache::slotrequest(); use Time::HiRes qw( gettimeofday tv_interval ); BEGIN { @@ -146,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); @@ -159,19 +158,36 @@ 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; } sub add_request_another_attempt_button { + my ($text)=@_; + if (!$text) { $text="Request another attempt"; } my $result; my $symb=&Apache::lonnet::symbread(); + my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb); + my $action='get_reservation'; + if ($slot_name) { + $text="Change reservation."; + $action='change_reservation'; + my $description=&Apache::slotrequest::get_description($slot_name, + $slot); + $result.=(< Will be next available: $description

+STUFF + } + if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } $symb=&Apache::lonnet::escape($symb); $result.='
'. ''. + ''. ''. + &mt($text).'" />'. '
'; return $result; } @@ -188,6 +204,87 @@ 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 show_task { + my ($status,$previous)=@_; + if (!$previous && ( + ( $status eq 'CLOSED' ) || + ( $status eq 'BANNED') || + ( $status eq 'UNAVAILABLE') || + ( $status eq 'NOT_IN_A_SLOT') || + ( $status eq 'NEEDS_CHECKIN') || + ( $status eq 'WAITING_FOR_GRADE') || + ( $status eq 'INVALID_ACCESS') )) { + return 0; + } + return 1; +} + +sub internal_location { + my ($id)=@_; + return ''; +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -208,6 +305,15 @@ sub start_Task { my $uri=$env{'request.uri'}; if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } $body_tag_start.=$uri.'">'.&add_grading_button().""; + my $symb=&Apache::lonnet::symbread(); + 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' || @@ -222,14 +328,7 @@ sub start_Task { &Apache::run::run($expression,$safeeval); &Apache::lonxml::debug("Got $status"); $body_tag_start.=&add_previous_version_button($status); - if (!$previous && ( - ( $status eq 'CLOSED' ) || - ( $status eq 'BANNED') || - ( $status eq 'UNAVAILABLE') || - ( $status eq 'NOT_IN_A_SLOT') || - ( $status eq 'NEEDS_CHECKIN') || - ( $status eq 'WAITING_FOR_GRADE') || - ( $status eq 'INVALID_ACCESS') )) { + if (!&show_task($status,$previous)) { my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); if ( $target eq "web" ) { $result.= $head_tag_start.''.$body_tag_start; @@ -238,6 +337,7 @@ sub start_Task { $msg.='

'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'

'; } elsif ($status eq 'NOT_IN_A_SLOT') { $msg.='

'.&mt('You are not currently signed up to work at this time and/or place.').'

'; + $msg.=&add_request_another_attempt_button("Sign up for time to work."); } elsif ($status eq 'NEEDS_CHECKIN') { $msg.='

'.&mt('You need the Proctor to validate you.'). '

'.&proctor_validation_screen($slot); @@ -259,43 +359,27 @@ 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') { 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') { - $result.='

'.&mt('Did not pass').'

'; - if (!$previous) { - $result.=&add_request_another_attempt_button(); - } - } - if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { - $result.='

'.&mt('Passed').'

'; - } $result.=$form_tag_start. ''; $result.=&preserve_grade_info(); - + $result.=&internal_location(); + &Apache::lonxml::startredirection(); } } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) || $target eq 'webgrade') { 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... @@ -304,7 +388,6 @@ sub start_Task { # there isn't reshow the queue.... my ($todo,$status_code)=&get_key_todo($target); - &Apache::lonnet::logthis("got todo -$todo- stat -$status_code-"); if ($todo) { &setup_env_for_other_user($todo,$safeeval); my ($symb,$uname,$udom)=&decode_queue_key($todo); @@ -317,7 +400,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.= @@ -336,6 +419,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.").''; } @@ -349,6 +434,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 @@ -362,7 +451,7 @@ sub get_key_todo { my $todo; if (defined($env{'form.reviewasubmission'})) { - &Apache::lonnet::logthis("review a submission...."); + &Apache::lonxml::debug("review a submission...."); $env{'form.queue'}='reviewqueue'; return (undef,'show_list'); } @@ -373,6 +462,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)) { @@ -381,6 +476,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') { @@ -441,14 +550,63 @@ sub end_Task { ($target eq 'answer') || ($target eq 'tex') ) { if ($target eq 'web') { + if (&show_task($status,$previous)) { + $result.=&Apache::lonxml::endredirection(); + } if ($status eq 'CAN_ANSWER' && !$previous) { $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'); } + if (&show_task($status,$previous)) { + 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 $start_time= + &Apache::lonlocal::locallocaltime($slot{'starttime'}); + + my $status; + $status.="\n
\n"; + + if ($bt_status eq 'pass') { + $status.='

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

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

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

'; + if (!$previous) { + $status.=&add_request_another_attempt_button(); + } + } + 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} + eq 'N') { + $opt_count++; + if ($Apache::lonhomework::history{"resource.$version.$dim_id.status"} eq 'pass') { + $opt_passed++; + } + } else { + $man_count++; + } + } + my $opt_req=&Apache::lonxml::get_param('OptionalRequired', + $parstack,$safeeval); + if ($opt_req !~ /\S/) { $opt_req='0'; } + $status.="\n

".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components on the bridge task.',$man_count,$opt_req,$opt_count)."

\n"; + + my $internal_location=&internal_location(); + $result=~s/\Q$internal_location\E/$status/; + } } if ($target eq 'web' || $target eq 'webgrade') { $result.=&Apache::lonxml::xmlend().''; @@ -467,6 +625,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(); @@ -496,7 +656,9 @@ sub end_Task { $ungraded++; } elsif ($status eq 'review') { $review++; - } + } else { + $ungraded++; + } } if ($optional_passed < $optional_required) { $mandatory_failed++; @@ -510,14 +672,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'}); } @@ -526,23 +688,46 @@ sub end_Task { $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'}); + &remove_from_queue($env{'form.queue'}); + + my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); + + 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'; $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(); + 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(); } @@ -568,8 +753,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; @@ -580,6 +770,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"; @@ -599,6 +790,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'}; @@ -631,8 +823,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'}; @@ -744,6 +953,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); @@ -892,6 +1106,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; @@ -929,7 +1225,8 @@ sub start_Dimension { undef(@Apache::bridgetask::instance); $Apache::bridgetask::dimensionmandatory{$dim_id}= &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); - return ''; + &Apache::lonxml::startredirection(); + return &internal_location($dim_id); } sub get_instance { @@ -945,48 +1242,103 @@ sub get_instance { my $last_link; sub end_Dimension { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result; + my $result=&Apache::lonxml::endredirection(); my $dim=&get_id($parstack,$safeeval); 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') { + + 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 $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++; + } + } + my $opt_req=&Apache::lonxml::get_param('OptionalRequired', + $parstack,$safeeval); + if ($opt_req !~ /\S/) { $opt_req='0'; } + $dim_info.="\n

".&mt('You passed all of the mandatory components and [_1] of the [_2] optional components, of which you were required to pass [_3].',$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"}; - $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; + @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.=&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') { + # 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
'. ''. ''. ''. - '
'. + '
'. '
'. '
'. '
'. @@ -1001,13 +1353,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; @@ -1030,7 +1383,7 @@ sub get_instance { } elsif ($status eq 'ungraded') { $ungraded++; } else { - &Apache::lonxml::error("got weird status --$status--"); + $ungraded++; } } if ($optional_passed < $dimension{$instance.'.optionalrequired'}) { @@ -1059,22 +1412,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 { @@ -1089,40 +1438,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'}= @@ -1132,17 +1468,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.

@@ -1151,13 +1491,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;