--- loncom/homework/bridgetask.pm 2005/09/29 19:18:37 1.55 +++ loncom/homework/bridgetask.pm 2005/11/03 22:59:35 1.75 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.55 2005/09/29 19:18:37 albertel Exp $ +# $Id: bridgetask.pm,v 1.75 2005/11/03 22:59:35 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,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'}; @@ -144,11 +154,28 @@ sub add_previous_version_button { } sub add_grading_button { + my (undef,$cid)=&Apache::lonxml::whichuser(); + my $cnum=$env{'course.'.$cid.'.num'}; + my $cdom=$env{'course.'.$cid.'.domain'}; + my %sections; + my $numsections=&Apache::loncommon::get_sections($cdom,$cnum,\%sections); + my $size=5; + if (scalar(keys(%sections)) < 3) { + $size=scalar(keys(%sections))+2; + } + my $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.=' '. + &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"; + + 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; @@ -299,7 +392,7 @@ 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.='
'.$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.').'

'; @@ -343,6 +442,18 @@ sub start_Task { ''.&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=''; + $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').'

'; } @@ -367,10 +478,10 @@ sub start_Task { $result.="$head_tag_start$name $body_tag_start \n".&style(); - $result.=$form_tag_start. - ''; $result.=&preserve_grade_info(); $result.=&internal_location(); + $result.=$form_tag_start. + ''; &Apache::lonxml::startredirection(); } } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) || @@ -429,6 +540,9 @@ sub start_Task { 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.=''; @@ -438,7 +552,23 @@ sub start_Task { $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 = ''; @@ -482,12 +612,12 @@ sub get_key_todo { if ($env{'form.stop'}) { return (undef,'stop'); } elsif ($env{'form.next'}) { - return (undef,'show_list'); + return (undef,'select_user'); } } return ($gradingkey,'selected'); } else { - return (undef,'show_list'); + return (undef,'select_user'); } } if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'}) @@ -545,15 +675,13 @@ 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 (&show_task($status,$previous)) { $result.=&Apache::lonxml::endredirection(); } - if ($status eq 'CAN_ANSWER' && !$previous) { + if ($status eq 'CAN_ANSWER' && !$previous && + !$env{'form.donescreen'}) { $result.="\n".''. &Apache::inputtags::file_selector("$version.0", "bridgetask","*", @@ -563,8 +691,16 @@ sub end_Task {

'.&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)) { + 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); @@ -627,6 +763,8 @@ sub end_Task { $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(); @@ -743,9 +881,14 @@ 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; @@ -834,6 +977,11 @@ sub check_queue_for_key { if (defined($results{"$todo\0locked"})) { return 'locked'; } + my $slot=$results{$todo}->[0]; + my %slot_data=&Apache::lonnet::get_slot($slot); + if ($slot_data{'endtime'} > time) { + return 'in_progress'; + } return 'enqueued'; } return undef; @@ -856,6 +1004,17 @@ sub show_queue { 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); my ($tmp)=%queue; @@ -866,8 +1025,9 @@ sub show_queue { if ($with_selects) { $result.=""; } $result.="resourceusertypedata"; foreach my $key (sort(keys(%queue))) { + my ($symb,$uname,$udom) = &decode_queue_key($key); + if (!defined($classlist->{$uname.':'.$udom})) { next; } if ($key=~/locked$/ && !$with_selects) { - my ($symb,$uname,$udom) = &decode_queue_key($key); my $title=&Apache::lonnet::gettitle($symb); $result.="$title$uname"; $result.='lock'.$queue{$key}.''; @@ -878,7 +1038,6 @@ sub show_queue { $result.='last queue modification time'. &Apache::lonlocal::locallocaltime($queue{$key}).""; } elsif ($key!~/(timestamp|locked)$/) { - my ($symb,$uname,$udom) = &decode_queue_key($key); my $title=&Apache::lonnet::gettitle($symb); $result.=""; my $slot=$queue{$key}->[0]; @@ -894,6 +1053,11 @@ sub show_queue { ($action,$description)=('unlock',&mt('Unlock')); } } + my $seclist; + foreach my $sec (@chosen_sections) { + $seclist.=''; + } if (time > $slot_data{'endtime'}) { $result.=(< @@ -904,6 +1068,7 @@ sub show_queue { + $seclist FORM @@ -983,6 +1148,8 @@ 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); @@ -1108,24 +1275,49 @@ sub get_from_queue { sub select_user { my ($symb,$cid)=&Apache::lonxml::whichuser(); - my $result.=''; + my @chosen_sections= + &Apache::loncommon::get_env_multiple('form.chosensections'); &Apache::grades::init_perm(); - my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all',); + 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.='
'; 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') { + my $cannot_grade; + if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) { $queue = 'reviewqueue'; - } elsif ($status{'gradingqueue'} eq 'enqueued') { + 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)); - $result.=<{$student}. + ''; - $result.=''; $last_link=$link; } } elsif ($target eq 'grade' && $env{'form.webgrade'}) { @@ -1403,6 +1615,9 @@ sub get_instance { $Apache::lonhomework::results{"resource.$version.$dim.status"}= 'pass'; } + } else { + # any other targets no output + undef($result); } return $result; } @@ -1434,6 +1649,10 @@ 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 ''; }
'; + } else { + my $seclist; + foreach my $sec (@chosen_sections) { + $seclist.=''; + } + $result.=<
@@ -1133,12 +1325,13 @@ sub select_user { - + + $seclist
$fullname->{$student} RESULT - + } if ($status{'status'} eq 'pass') { $result .= ''.&mt('Passed').''; } elsif ($status{'status'} eq 'fail') { @@ -1160,10 +1353,14 @@ RESULT $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.=" "; } @@ -1230,12 +1427,39 @@ sub start_Dimension { } sub get_instance { - &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; + } } { @@ -1244,7 +1468,7 @@ sub get_instance { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; 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') { @Apache::scripttag::parser_env = @_; @@ -1267,6 +1491,7 @@ sub get_instance { $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'}}) { @@ -1278,12 +1503,15 @@ sub get_instance { } } else { $man_count++; + if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') { + $man_passed++; + } } } - my $opt_req=&Apache::lonxml::get_param('OptionalRequired', - $parstack,$safeeval); + 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 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"; + $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/; @@ -1346,23 +1574,7 @@ sub get_instance { '		'. 'Prev
'. 'Next


'. - ' '. - ' '. '
'; - 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.0.bridgetask.portfiles"})) { - my $file=$file_url.$partial_file; - $file=~s|/+|/|g; - &Apache::lonnet::allowuploaded('/adm/bridgetask',$file); - $result.=' '.$file. - ' '; - } - $result.='