--- loncom/homework/bridgetask.pm 2005/05/24 19:33:28 1.30 +++ loncom/homework/bridgetask.pm 2005/11/04 15:31:53 1.76 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.30 2005/05/24 19:33:28 albertel Exp $ +# $Id: bridgetask.pm,v 1.76 2005/11/04 15:31:53 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 { @@ -67,8 +68,18 @@ sub proctor_check_auth { foreach my $possible (@allowed) { my ($puser,$pdom)=(split('@',$possible)); if ($puser eq $user && $pdom eq $domain) { - my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom); - if ($authhost ne 'no_host') { + my $authenticated=0; + if ( $slot->{'secret'} =~ /\S/ && + $env{'form.proctorpassword'} eq $slot->{'secret'} ) { + $authenticated=1; + } else { + + my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom); + if ($authhost ne 'no_host') { + $authenticated=1; + } + } + if ($authenticated) { my $version= $Apache::lonhomework::results{'resource.version'}= ++$Apache::lonhomework::history{'resource.version'}; @@ -91,6 +102,7 @@ sub proctor_check_auth { sub get_version { my ($version,$previous); if ($env{'form.previousversion'} && + $env{'form.previousversion'} ne 'current' && defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) { $version=$env{'form.previousversion'}; $previous=1; @@ -129,6 +141,7 @@ sub add_previous_version_button { my $list='\n\n"; + $list.=''; $result.='
'."\n"; + $sec_select .= "\n"; + foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) { + $sec_select .= "\n"; + } + $sec_select .= "\n"; + my $result=' '; $result.=''; + if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { + my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); + $result.='

Specify a section: '.$sec_select.'

'; + $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); + + $result.='

'."\n"; + + ($entries,$ready,$locks)=&get_queue_counts('reviewqueue'); + $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; - $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.=''. + ''. + ''. + ''. + ''; return $result; } @@ -166,13 +231,160 @@ 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; + } + if ($env{'form.donescreen'}) { return 0; } + return 1; +} + +sub internal_location { + my ($id)=@_; + return ''; +} + +sub submission_time_stamp { + my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); + my $submissiontime; + my $version=$Apache::lonhomework::history{'resource.version'}; + for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) { + if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) { + $submissiontime=$Apache::lonhomework::history{$v.':timestamp'}; + } + } + my $result; + if ($submissiontime) { + my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'}; + my %slot=&Apache::lonnet::get_slot($slot_name); + my $diff = $slot{'endtime'} - $submissiontime; + my ($color,$when)=('#FF6666','after'); + if ($diff > 0) { ($color,$when)=('#336600','before'); } + my $info; + 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'}))). + '

'; + } + return $result; +} + +sub webgrade_standard_info { + my ($version)=&get_version(); + my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); + my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; + my $file_list="
    \n"; + 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); + $file_list.='
  • '.$file. + '
    • '."\n"; + } + $file_list.="
\n"; + + my %lt=&Apache::lonlocal::texthash('done' => 'Done', + 'stop' => 'Stop', + ); + + my $result=< + + + $file_list + +INFO + return $result; +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my ($status,$accessmsg,$slot); 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') { + &Apache::structuretags::setup_rndseed($safeeval); + } } $Apache::lonhomework::parsing_a_task=1; @@ -180,14 +392,26 @@ sub start_Task { my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); - if ($target eq 'web') { + if ($target eq 'web' && $env{'request.state'} ne 'construct') { if ($Apache::lonhomework::modifygrades) { $body_tag_start.='
'.&add_grading_button()."
"; + my $symb=&Apache::lonnet::symbread(); + if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { + $body_tag_start.='
'. + ''. + ''. + ''. + '
'; + } } } + if ($target eq 'web' && $env{'request.state'} eq 'construct') { + $form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'}); + } if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || $target eq 'tex') { my ($version,$previous)=&get_version(); @@ -200,27 +424,36 @@ 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; + if ($env{'request.state'} eq 'construct') { + $result.=$form_tag_start; + } my $msg; if ($status eq 'UNAVAILABLE') { $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); } elsif ($status eq 'WAITING_FOR_GRADE') { $msg.='

'.&mt('Your submission is in the grading queue.').'

'; + } elsif ($env{'form.donescreen'}) { + my $title=&Apache::lonnet::gettitle(); + my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'}); + my $files='
  • '.join('
  • ',@files).'
'; + $result.=<$title +

Files submitted: $files

+

You are now done with this Bridge Task

+
+

Logout

+

Change to a different course

+DONESCREEN } elsif ($status ne 'NOT_YET_VIEWED') { $msg.='

'.&mt('Not open to be viewed').'

'; } @@ -237,71 +470,105 @@ 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 $form_tag_start". - ''; + $body_tag_start \n".&style(); + $result.=&preserve_grade_info(); - 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.=&internal_location(); + $result.=$form_tag_start. + ''; + &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.$form_tag_start; - $result.=''; - $result.='
Before'.&show_queue('gradingqueue'); - } - my $todo; - # don't get something new from the queue if they hit the stop button - if (!($env{'form.stop'} && $target eq 'webgrade')) { - $todo=&get_from_queue('gradingqueue'); - } + $result.=$head_tag_start.$body_tag_start; + #$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... + # Hrrm, vaildation pass should perhaps say 'not_locked' + # perhaps do a search if there is a key that is mine and if + # there isn't reshow the queue.... + my ($todo,$status_code)=&get_key_todo($target); + if ($todo) { &setup_env_for_other_user($todo,$safeeval); my ($symb,$uname,$udom)=&decode_queue_key($todo); $result.="\n".'
Found '. &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'
'; - $result.=''; $Apache::bridgetask::queue_key=$todo; &Apache::structuretags::initialize_storage(); &Apache::lonhomework::showhash(%Apache::lonhomework::history); if ($target eq 'webgrade') { - $result.='
After'.&show_queue('gradingqueue'); + #$result.='
After -'.&show_queue($env{'form.queue'}); $result.="\n".''; + if ($status_code eq 'selected') { + $form_tag_start.= + ''; + } } } else { if ($target eq 'webgrade') { - $result.="\n".'
'; - if ($env{'form.stop'}) { - $result.=&mt("Stopped grading."); + $result.="\n"; + if ($status_code eq 'stop') { + $result.=''.&mt("Stopped grading.").''; + } elsif ($status_code eq 'lock_failed') { + $result.=''.&mt("Failed to lock the request record.").''; + } elsif ($status_code eq 'unlock') { + $result.=''.&mt("Unlocked the requested record.").''; + $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.").''; } - $result.='
'; } + $webgrade='no'; my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); } + if ($target eq 'webgrade' && defined($env{'form.queue'})) { + if ($webgrade eq 'yes') { + $result.=&submission_time_stamp(); + } + $result.=$form_tag_start; + $result.=''; + $result.=''; + if ($env{'form.regrade'}) { + $result.=''; + } + if ($env{'form.chosensections'}) { + my @chosen_sections= + &Apache::loncommon::get_env_multiple('form.chosensections'); + foreach my $sec (@chosen_sections) { + $result.=''; + } + } + if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); } + } + } elsif ($target eq 'edit') { + $result.=$head_tag_start."".$body_tag_start.$form_tag_start. + &Apache::structuretags::problem_edit_header(); + $Apache::lonxml::warnings_error_header= + &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."
"; + my $temp=&Apache::edit::insertlist($target,$token); + $result.=$temp; } else { # page_start returned a starting result, delete it if we don't need it $result = ''; @@ -309,6 +576,98 @@ sub start_Task { return $result; } +sub get_key_todo { + my ($target)=@_; + my $todo; + + if (defined($env{'form.reviewasubmission'})) { + &Apache::lonxml::debug("review a submission...."); + $env{'form.queue'}='reviewqueue'; + return (undef,'show_list'); + } + + if (defined($env{'form.reviewagrading'})) { + &Apache::lonxml::debug("review a grading...."); + $env{'form.queue'}='gradingqueue'; + 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)) { + $env{'form.queue'}=$queue='gradingqueue'; + } + + 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,'select_user'); + } + } + return ($gradingkey,'selected'); + } else { + return (undef,'select_user'); + } + } + if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'}) + && !defined($env{'form.gradingaction'}) + && $env{'form.queuemode'} eq 'selected') { + + my $who=&queue_key_locked($queue,$gradingkey); + my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + if ($who eq $me) { + &Apache::lonxml::debug("Found a key was given to me"); + return ($gradingkey,'selected'); + } else { + return (undef,'show_list'); + } + + } + + if ($target eq 'webgrade' && $env{'form.queuemode'} eq 'selected') { + if ($env{'form.gradingaction'} eq 'resume') { + delete($env{'form.gradingaction'}); + &Apache::lonxml::debug("Resuming a key"); + return ($gradingkey); + } elsif ($env{'form.gradingaction'} eq 'unlock') { + &Apache::lonxml::debug("Unlocking a key ". + &check_queue_unlock($queue,$gradingkey,1)); + return (undef,'unlock'); + } elsif ($env{'form.gradingaction'} eq 'select') { + &Apache::lonxml::debug("Locking a key"); + if (&lock_key($queue,$gradingkey)) { + &Apache::lonxml::debug("Success $queue"); + return ($gradingkey); + } + &Apache::lonxml::debug("Failed $queue"); + return (undef,'lock_failed'); + } + } + + if ($env{'form.queuemode'} ne 'selected') { + # don't get something new from the queue if they hit the stop button + if (!($env{'form.stop'} && $target eq 'webgrade') + && !$env{'form.gradingaction'}) { + &Apache::lonxml::debug("Getting anew $queue"); + return (&get_from_queue($queue)); + } else { + return (undef,'stop'); + } + } + return (undef,undef) +} + sub end_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; @@ -316,18 +675,73 @@ sub end_Task { my ($version,$previous)=&get_version(); if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { - if ( - (($target eq 'web') && ($env{'request.state'} ne 'construct')) || - ($target eq 'answer') || ($target eq 'tex') - ) { + if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') { if ($target eq 'web') { - if ($status eq 'CAN_ANSWER' && !$previous) { + if (&show_task($status,$previous)) { + $result.=&Apache::lonxml::endredirection(); + } + if ($status eq 'CAN_ANSWER' && !$previous && + !$env{'form.donescreen'}) { $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'); + $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 $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') { @@ -347,14 +761,18 @@ 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"}=''; + } else { + delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}); } &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); if ($award eq 'SUBMITTED') { - &add_to_queue('gradingqueue'); + &add_to_queue('gradingqueue',$Apache::inputtags::slot_name); } } - if ($target eq 'grade' && $env{'form.webgrade'}) { + if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') { my $optional_required= &Apache::lonxml::get_param('OptionalRequired',$parstack, $safeeval); @@ -376,7 +794,9 @@ sub end_Task { $ungraded++; } elsif ($status eq 'review') { $review++; - } + } else { + $ungraded++; + } } if ($optional_passed < $optional_required) { $mandatory_failed++; @@ -386,32 +806,66 @@ sub end_Task { $env{'user.name'}.'@'.$env{'user.domain'}; if ($review) { $Apache::lonhomework::results{"resource.$version.status"}='review'; - &move_to_review_queue(); + 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.status"}='ungraded'; - &check_queue_unlock('gradingqueue'); + 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.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('gradingqueue'); + &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(); + &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(); } @@ -427,40 +881,65 @@ sub end_Task { # &mt('Save Partial Grade and Continue Grading').'" /> '; $result.=''.&Apache::loncommon::endbodytag().''; } elsif ($target eq 'meta') { - $result.=''."\n"; - #$result.=&Apache::response::meta_part_order(); - #$result.=&Apache::response::meta_response_order(); + $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'); } undef($Apache::lonhomework::parsing_a_task); return $result; } -sub move_to_review_queue { - - &Apache::lonxml::debug("Want to move"); +sub move_between_queues { + my ($src_queue,$dest_queue)=@_; + 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; + } + &check_queue_unlock($src_queue); + return &remove_from_queue($src_queue); } sub check_queue_unlock { - my ($queue)=@_; + 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"; + } my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; - my $key="$symb\0queue\0$uname\@$udom"; my $me=$env{'user.name'}.'@'.$env{'user.domain'}; my $who=&queue_key_locked($queue,$key,$cdom,$cnum); if ($who eq $me) { - &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum); + return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum); + } elsif ($allow_not_me) { + &Apache::lonxml::debug("unlocking $who by $me"); + return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum); } + return 'not_owner'; } 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'}; my $key="$symb\0queue\0$uname\@$udom"; my @keys=($key,"$key\0locked"); - &Apache::lonnet::del($queue,\@keys,$cdom,$cnum); + return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum); } sub setup_env_for_other_user { @@ -474,44 +953,131 @@ sub setup_env_for_other_user { &Apache::lonxml::initialize_rndseed($safeeval); } -sub add_to_queue { +sub get_queue_data { my ($queue)=@_; my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; + my $todo="$symb\0queue\0$uname\@$udom"; + my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum); + if ($key eq $todo && ref($value)) { + return $value; + } + 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'; + } + my $slot=$results{$todo}->[0]; + my %slot_data=&Apache::lonnet::get_slot($slot); + if ($slot_data{'endtime'} > time) { + return 'in_progress'; + } + 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'}; my %data; - $data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name]; - &Apache::lonnet::put($queue,\%data,$cdom,$cnum); + $data{"$symb\0queue\0$uname\@$udom"}=[$slot_name]; + return &Apache::lonnet::put($queue,\%data,$cdom,$cnum); } sub show_queue { - my ($queue)=@_; + my ($queue,$with_selects)=@_; my $result; my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; + + my @chosen_sections= + &Apache::loncommon::get_env_multiple('form.chosensections'); + &Apache::grades::init_perm(); + my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,); + &Apache::grades::reset_perm(); + if (!(grep(/^all$/,@chosen_sections))) { + $result.='

Showing only sections '.join(', ',@chosen_sections). + '.

'."\n"; + } + my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); - $result.="\n

Current Queue

". - ""; + my ($tmp)=%queue; + if ($tmp=~/^error: 2 /) { + return "\n

Current Queue - $queue

resourceusertypedata
Empty
"; + } + $result.="\n

Current Queue - $queue

"; + if ($with_selects) { $result.=""; } + $result.=""; foreach my $key (sort(keys(%queue))) { - if ($key=~/locked$/) { - my ($symb,$uname,$udom) = &decode_queue_key($key); + my ($symb,$uname,$udom) = &decode_queue_key($key); + if (!defined($classlist->{$uname.':'.$udom})) { next; } + if ($key=~/locked$/ && !$with_selects) { my $title=&Apache::lonnet::gettitle($symb); $result.=""; $result.=''; - } elsif ($key=~/timestamp$/) { + } elsif ($key=~/timestamp$/ && !$with_selects) { my ($symb,undef) = split("\0",$key); my $title=&Apache::lonnet::gettitle($symb); $result.=""; $result.='"; - } else { - my ($symb,$uname,$udom) = &decode_queue_key($key); + } elsif ($key!~/(timestamp|locked)$/) { my $title=&Apache::lonnet::gettitle($symb); - $result.=""; + $result.=""; my $slot=$queue{$key}->[0]; my %slot_data=&Apache::lonnet::get_slot($slot); + if ($with_selects) { + my $ekey=&Apache::lonnet::escape($key); + my ($action,$description)=('select',&mt('Select')); + if (exists($queue{"$key\0locked"})) { + my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + if ($me eq $queue{"$key\0locked"}) { + ($action,$description)=('resume',&mt('Resume')); + } else { + ($action,$description)=('unlock',&mt('Unlock')); + } + } + my $seclist; + foreach my $sec (@chosen_sections) { + $seclist.=''; + } + if (time > $slot_data{'endtime'}) { + $result.=(< +
+ + + + + + + $seclist + + +FORM + + } else { + $result.='' + } + } + $result.=""; $result.='"; @@ -521,6 +1087,42 @@ sub show_queue { return $result; } +sub get_queue_counts { + my ($queue)=@_; + my $result; + my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my $cnum=$env{'course.'.$cid.'.num'}; + my $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 (0,0,0); + } + my ($entries,$ready_to_grade,$locks)=(0,0,0); + foreach my $key (sort(keys(%queue))) { + if ($key=~/locked$/) { + $locks++; + } elsif ($key=~/timestamp$/) { + #ignore + } elsif ($key!~/(timestamp|locked)$/) { + my ($symb,$uname,$udom) = &decode_queue_key($key); + $entries++; + my $slot=$queue{$key}->[0]; + my %slot_data=&Apache::lonnet::get_slot($slot); + if (time > $slot_data{'endtime'}) { + $ready_to_grade++; + } + } + } + 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); @@ -530,6 +1132,11 @@ sub decode_queue_key { sub queue_key_locked { my ($queue,$key,$cdom,$cnum)=@_; + if (!defined($cdom) || !defined($cnum)) { + my (undef,$cid)=&Apache::lonxml::whichuser(); + $cnum=$env{'course.'.$cid.'.num'}; + $cdom=$env{'course.'.$cid.'.domain'}; + } my ($key_locked,$value)= &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum); if ($key_locked eq "$key\0locked") { @@ -541,22 +1148,24 @@ sub queue_key_locked { sub pick_from_queue_data { my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_; foreach my $key (keys(%$queuedata)) { + if ($key =~ /\0locked$/) { next; } + if ($key =~ /\0timestamp$/) { next; } my ($symb,$uname,$udom)=&decode_queue_key($key); if ($check_section) { my $section=&Apache::lonnet::getsection($uname,$udom); if ($section eq $check_section) { - &Apache::lonnet::logthis("my sec"); + &Apache::lonxml::debug("my sec"); next; } } my $slot=$queuedata->{$key}[0]; my %slot_data=&Apache::lonnet::get_slot($slot); if ($slot_data{'endtime'} > time) { - &Apache::lonnet::logthis("not time"); + &Apache::lonxml::debug("not time"); next; } if (&queue_key_locked($queue,$key,$cdom,$cnum)) { - &Apache::lonnet::logthis("someone already has um."); + &Apache::lonxml::debug("someone already has um."); next; } return $key; @@ -585,53 +1194,62 @@ sub find_mid_grade { return undef; } +sub lock_key { + my ($queue,$todo)=@_; + my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + my (undef,$cid)=&Apache::lonxml::whichuser(); + my $cnum=$env{'course.'.$cid.'.num'}; + my $cdom=$env{'course.'.$cid.'.domain'}; + my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me}, + $cdom,$cnum); + &Apache::lonxml::debug("success $success $todo"); + if ($success eq 'ok') { + return 1; + } + return 0; +} + sub get_from_queue { my ($queue)=@_; my $result; my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; - my $todo; - # FIXME need to find if I am 'mid grading' - $todo=&find_mid_grade($queue,$symb,$cdom,$cnum); - &Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo))); + my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum); + &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo))); if ($todo) { return $todo; } while (1) { my $starttime=time; &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime}, $cdom,$cnum); - &Apache::lonnet::logthis("$starttime"); + &Apache::lonxml::debug("$starttime"); my $regexp="^$symb\0queue\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); - #make a pass looking for a user in my section + #make a pass looking for a user _not_ in my section if ($env{'request.course.sec'}) { - &Apache::lonnet::logthis("sce"); + &Apache::lonxml::debug("sce"); $todo=&pick_from_queue_data($queue,$env{'request.course.sec'}, \%queue,$cdom,$cnum); - &Apache::lonnet::logthis("sce $todo"); + &Apache::lonxml::debug("sce $todo"); } - # no one in our section so look for any user that is ready for grading + # no one _not_ in our section so look for any user that is + # ready for grading if (!$todo) { - &Apache::lonnet::logthis("no sce"); - $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue, - $cdom,$cnum); - &Apache::lonnet::logthis("no sce $todo"); + &Apache::lonxml::debug("no sce"); + $todo=&pick_from_queue_data($queue,$env{'request.course.sec'}, + \%queue,$cdom,$cnum); + &Apache::lonxml::debug("no sce $todo"); } # no user to grade if (!$todo) { last; } - &Apache::lonnet::logthis("got $todo"); + &Apache::lonxml::debug("got $todo"); # otherwise found someone so lets try to lock them - my $success=&Apache::lonnet::newput($queue, - {"$todo\0locked"=> - $env{'user.name'}.'@'.$env{'user.domain'}}, - $cdom,$cnum); - # someone else already picked them - &Apache::lonnet::logthis("success $todo"); - if ($success ne 'ok') { next; } + # unless someone else already picked them + if (!&lock_key($queue,$todo)) { next; } my (undef,$endtime)= &Apache::lonnet::get($queue,["$symb\0timestamp"], $cdom,$cnum); - &Apache::lonnet::logthis("emd $endtime"); + &Apache::lonxml::debug("emd $endtime"); # someone else already modified the queue, # perhaps our picked user wass already fully graded between # when we picked him and when we locked his record? so lets @@ -640,21 +1258,133 @@ sub get_from_queue { my ($key,$value)= &Apache::lonnet::get($queue,["$todo"], $cdom,$cnum); - &Apache::lonnet::logthis("check $key .. $value"); + &Apache::lonxml::debug("check $key .. $value"); if ($key eq $todo && ref($value)) { } else { &Apache::lonnet::del($queue,["$todo\0locked"], $cdom,$cnum); - &Apache::lonnet::logthis("del"); + &Apache::lonxml::debug("del"); next; } } - &Apache::lonnet::logthis("last $todo"); + &Apache::lonxml::debug("last $todo"); last; } return $todo; } +sub select_user { + my ($symb,$cid)=&Apache::lonxml::whichuser(); + + my @chosen_sections= + &Apache::loncommon::get_env_multiple('form.chosensections'); + &Apache::grades::init_perm(); + my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,); + &Apache::grades::reset_perm(); + + my $result; + if (!(grep(/^all$/,@chosen_sections))) { + $result.='

Showing only sections '.join(', ',@chosen_sections). + '.

'."\n"; + } + $result.='
resourceusertypedata
$title$unamelock'.$queue{$key}.'
$titlelast queue modification time'. &Apache::lonlocal::locallocaltime($queue{$key})."
$title$uname
'.&mt("In Progress").'$title$unamequeue entrySlot: '.$slot.' End time: '. &Apache::lonlocal::locallocaltime($slot_data{'endtime'}). "
'; + + 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'; + my $cannot_grade; + if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) { + $queue = 'reviewqueue'; + if ($status{'reviewqueue'} eq 'in_progress') { + $cannot_grade=1; + } + } elsif ($status{'gradingqueue'} =~ /^(in_progress|enqueue)$/) { + $queue = 'gradingqueue'; + if ($status{'gradingqueue'} eq 'in_progress') { + $cannot_grade=1; + } + } + my $todo = + &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname)); + if ($cannot_grade) { + $result.=' + '; + } + $result.='
 '.$fullname->{$student}. + ''; + } else { + my $seclist; + foreach my $sec (@chosen_sections) { + $seclist.=''; + } + $result.=< + +
+ + + + + + $seclist +
+ 		$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{'reviewqueue'} eq 'in_progress') { + $result .= &mt('Still being worked on.'); + } elsif ($status{'gradingqueue'} eq 'enqueued') { + $result .= &mt('Awaiting Grading'); + } elsif ($status{'gradingqueue'} eq 'locked') { + $result .= &mt('Being Graded'); + } elsif ($status{'gradingqueue'} eq 'in_progress') { + $result .= &mt('Still being worked on.'); + } 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; @@ -692,67 +1422,157 @@ 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 { - #FIXME just grabbing the first one for now, need - #to randomly pick one until all have been seen - #then start repicking - &Apache::response::pushrandomnumber(); - my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); - my $num=@order; - my $version=&get_version(); - my $which=($version-1)%$num; - return $order[$which]; + my ($dim)=@_; + my $rand_alg=&Apache::lonnet::get_rand_alg(); + if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' || + $rand_alg eq '64bit2' || $rand_alg eq '64bit3' || + $rand_alg eq '64bit4' ) { + &Apache::response::pushrandomnumber(); + my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); + my $num=@order; + my $version=&get_version(); + my $which=($version-1)%$num; + return $order[$which]; + } else { + my ($version,$previous) = &get_version(); + my $instance = + $Apache::lonhomework::history{"resource.$version.0.$dim.instance"}; + if (defined($instance)) { return $instance; } + + &Apache::response::pushrandomnumber(); + my @instances = @{$dimension{'instances'}}; + # remove disabled instances + for (my $i=0; $i < $#instances; $i++) { + if ($dimension{$instances[$i].'.disabled'}) { + splice(@instances,$i,1); + $i--; + } + } + @instances = &Math::Random::random_permutation(@instances); + $instance = $instances[($version-1)%scalar(@instances)]; + $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = + $instance; + &Apache::response::poprandomnumber(); + return $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 $instance=&get_instance($dim); my $version=&get_version(); if ($target eq 'web') { - $result=$dimension{'intro'}.$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'}}) { - my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"}; - my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}; - $result.='
'; - 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::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{'intro'}); + 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'; } - $result.='
'; - if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) { - $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'
'; + 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 { + $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.=$dimension{$instance.'.criteria.'.$id}. - '
'; } } } 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
'. ''. ''. ''. - '
'. + '
'. '
'. '
'. '
'. @@ -760,22 +1580,7 @@ sub get_instance { ''. 'Prev
'. 'Next


'. - ' '. - ' '. ''; - $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=$file_url.$partial_file; - &Apache::lonnet::allowuploaded('/adm/bridgetask',$file); - $result.=' '.$file. - ''; - } - $result.=''; $last_link=$link; } } elsif ($target eq 'grade' && $env{'form.webgrade'}) { @@ -796,7 +1601,7 @@ sub get_instance { } elsif ($status eq 'ungraded') { $ungraded++; } else { - &Apache::lonxml::error("got weird status --$status--"); + $ungraded++; } } if ($optional_passed < $dimension{$instance.'.optionalrequired'}) { @@ -816,6 +1621,9 @@ sub get_instance { $Apache::lonhomework::results{"resource.$version.$dim.status"}= 'pass'; } + } else { + # any other targets no output + undef($result); } return $result; } @@ -825,22 +1633,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 { @@ -851,44 +1655,35 @@ sub start_Instance { push(@Apache::bridgetask::instancelist,$id); $dimension{$id.'.optionalrequired'}= &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval); + my $disabled = &Apache::lonxml::get_param('Disabled',$parstack,$safeeval); + if (lc($disabled) eq 'yes') { + $dimension{$id.'.disabled'}='1'; + } return ''; } 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'}= @@ -898,17 +1693,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.

@@ -917,13 +1716,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;