--- loncom/homework/bridgetask.pm 2005/11/03 22:59:35 1.75 +++ loncom/homework/bridgetask.pm 2005/11/21 17:47:37 1.80 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.75 2005/11/03 22:59:35 albertel Exp $ +# $Id: bridgetask.pm,v 1.80 2005/11/21 17:47:37 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -470,7 +470,11 @@ DONESCREEN } } elsif ($target eq 'grade' && !$env{'form.webgrade'}) { if ($status eq 'NEEDS_CHECKIN') { - &proctor_check_auth($slot_name,$slot); + if(&proctor_check_auth($slot_name,$slot)) { + my $result=&add_to_queue('gradingqueue', + $Apache::inputtags::slot_name); + &Apache::lonxml::debug("add_to_queue said $result"); + } } } } elsif ($target eq 'web') { @@ -667,7 +671,6 @@ sub get_key_todo { } return (undef,undef) } - sub end_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; @@ -690,6 +693,9 @@ sub end_Task {

'.&mt('Submit Portfolio Files for Grading').'

'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'

'). ""; + } + if (!$previous && $status ne 'SHOW_ANSWER' && + &show_task($status,$previous)) { $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 $slot_name= + $Apache::lonhomework::history{"resource.$version.checkedin.slot"}; + my %slot=&Apache::lonnet::get_slot($slot_name); my $start_time= &Apache::lonlocal::locallocaltime($slot{'starttime'}); - my $status; - $status.="\n
\n"; + my $status = "\n
\n"; if ($bt_status eq 'pass') { $status.='

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

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

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

'; + $start_time.''; if (!$previous) { $status.=&add_request_another_attempt_button(); } @@ -765,12 +773,15 @@ DONEBUTTON $Apache::lonhomework::results{"resource.$version.0.submission"}=''; } else { delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}); + $award = ''; } &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); if ($award eq 'SUBMITTED') { &add_to_queue('gradingqueue',$Apache::inputtags::slot_name); } + } elsif ($Apache::lonhomework::results{'INTERNAL_store'}) { + &Apache::structuretags::finalize_storage(); } if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') { my $optional_required= @@ -882,13 +893,14 @@ DONEBUTTON $result.=''.&Apache::loncommon::endbodytag().''; } elsif ($target eq 'meta') { $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'); + $result.=&Apache::response::meta_stores_write('solved','string', + 'Problem Status'); + $result.=&Apache::response::meta_stores_write('tries','int_zeropos', + 'Number of Attempts'); + $result.=&Apache::response::meta_stores_write('awarded','float', + 'Partial Credit Factor'); + $result.=&Apache::response::meta_stores_write('status','string', + 'Bridge Task Status'); } undef($Apache::lonhomework::parsing_a_task); return $result; @@ -995,7 +1007,7 @@ sub add_to_queue { my $cdom=$env{'course.'.$cid.'.domain'}; my %data; $data{"$symb\0queue\0$uname\@$udom"}=[$slot_name]; - return &Apache::lonnet::put($queue,\%data,$cdom,$cnum); + return &Apache::lonnet::newput($queue,\%data,$cdom,$cnum); } sub show_queue { @@ -1457,6 +1469,7 @@ sub get_instance { $instance = $instances[($version-1)%scalar(@instances)]; $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = $instance; + $Apache::lonhomework::results{'INTERNAL_store'} = 1; &Apache::response::poprandomnumber(); return $instance; } @@ -1473,75 +1486,81 @@ sub get_instance { if ($target eq 'web') { @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 $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 { + 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'; } - if ($status eq 'fail') { - } elsif ($status eq 'pass') { - } else { - &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status"); + my $dim_info="
\n"; + if ($dim_status eq 'pass') { + $dim_info.='

Question : you passed this '.$mandatory.' question

'; } - 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"}.'

'; + 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.='
'; } } } elsif ($target eq 'webgrade') {