--- loncom/homework/bridgetask.pm 2005/05/06 20:26:35 1.18 +++ loncom/homework/bridgetask.pm 2006/05/09 19:01:19 1.146 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.18 2005/05/06 20:26:35 albertel Exp $ +# $Id: bridgetask.pm,v 1.146 2006/05/09 19:01:19 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 { @@ -48,6 +49,8 @@ sub initialize_bridgetask { $Apache::bridgetask::dimension=''; # list of all Dimension ids seen @Apache::bridgetask::dimensionlist=(); + # mandatory attribute of all Dimensions seen + %Apache::bridgetask::dimensionmandatory=(); # list of all current Instance ids @Apache::bridgetask::instance=(); # list of all Instance ids seen in this problem @@ -57,91 +60,423 @@ sub initialize_bridgetask { } sub proctor_check_auth { - my ($slot)=@_; + my ($slot_name,$slot,$type)=@_; my $user=$env{'form.proctorname'}; my $domain=$env{'form.proctordomain'}; my @allowed=split(",",$slot->{'proctor'}); foreach my $possible (@allowed) { - my ($puser,$pdom)=(split('@',$possible)); + 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') { - $Apache::lonhomework::results{'resource.checkedin'}= - $user.'@'.$domain; + 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 && $type eq 'Task') { + # increment version + my $version= + $Apache::lonhomework::history{'resource.0.version'}; + $version++; + + #clean out all current results + foreach my $key (keys(%Apache::lonhomework::history)) { + if ($key=~/^resource\.0\./) { + $Apache::lonhomework::results{$key}=''; + } + } + + #setup new version and who did it + $Apache::lonhomework::results{'resource.0.version'}=$version; + $Apache::lonhomework::results{"resource.$version.0.checkedin"}= + $user.':'.$domain; + $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}= + $slot_name; + return 1; + } elsif ($authenticated && $type eq 'problem') { + &Apache::lonxml::debug("authed $slot_name"); + $Apache::lonhomework::results{"resource.0.checkedin"}= + $user.':'.$domain; + $Apache::lonhomework::results{"resource.0.checkedin.slot"}= + $slot_name; } } } return 0; } +sub get_version { + my ($version,$previous); + if ($env{'form.previousversion'} && + $env{'form.previousversion'} ne 'current' && + defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.0.status'})) { + $version=$env{'form.previousversion'}; + $previous=1; + } else { + $version=$Apache::lonhomework::history{'resource.0.version'}; + $previous=0; + } + if (wantarray) { + return ($version,$previous); + } + return $version; +} + sub add_previous_version_button { + my ($status)=@_; my $result; - $result.=&mt(' Show a previously done version: [_1]',''); + if ($Apache::lonhomework::history{'resource.0.version'} eq '') { + return ''; + } + if ($Apache::lonhomework::history{'resource.0.version'} < 2 && + $status ne 'NEEDS_CHECKIN') { + return ''; + } + my $version=&get_version(); + if ($env{'form.previousversion'} ne '' && + $env{'form.previousversion'} eq $version) { + $result.="
Specify a section: | '.$sec_select.' | '; + $result.=''.' '; + + $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' |
'. + ' '; + $result.=&mt("[_1] entries, [_2] ready, [_3] being graded", + $entries,$ready,$locks).' | ||
'."\n"; + $result.=''; + $result.=&Apache::loncommon::select_dom_form($env{'user.domain'}, + 'gradingdomain'); + $result.=' '. + &Apache::loncommon::selectstudent_link('gradesubmission', + 'gradinguser', + 'gradingdomain'); + $result.=&Apache::loncommon::studentbrowser_javascript(); + $result.= '
'; + } + 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.=(<'. + &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 file_list { + my ($files,$uname,$udom) = @_; + if (!defined($uname) || !defined($udom)) { + (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); + } + my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; + + my $file_list="Files submitted: $files
+You are now done with this Bridge Task
+Found '. &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.' |
No user to be graded. |
'. + &mt('Return to resource').'
'; + if ($status_code eq 'stop') { + $result.=''.&mt("Stopped grading.").''.$back; + } elsif ($status_code eq 'lock_failed') { + $result.=''.&mt("Failed to lock the requested record.") + .''.$back; + } elsif ($status_code eq 'unlock') { + $result.=''.&mt("Unlocked the requested record.") + .''.$back; + $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(); + } elsif ($status_code eq 'unable') { + $result.=''.&mt("Unable to aqcuire a user to grade.").''.$back; + } elsif ($status_code eq 'not_allowed') { + $result.=''.&mt('Not allowed to grade the requested user.').' '.$msg.''.$back; + } else { + $result.=''.&mt("No user to be graded.").''.$back; + } + } + $webgrade='no'; + my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style); } - + 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(); } + } + if ($target eq 'webgrade') { + $result.="\n".'".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."