--- loncom/homework/bridgetask.pm 2005/05/03 05:31:51 1.15
+++ loncom/homework/bridgetask.pm 2005/05/10 16:44:35 1.21
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.15 2005/05/03 05:31:51 albertel Exp $
+# $Id: bridgetask.pm,v 1.21 2005/05/10 16:44:35 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -48,6 +48,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
@@ -95,14 +97,17 @@ sub add_grading_button {
sub start_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- &Apache::structuretags::initialize_storage();
- &Apache::lonhomework::showhash(%Apache::lonhomework::history);
my ($status,$accessmsg,$slot);
+ if ($target ne 'webgrade') {
+ &Apache::structuretags::initialize_storage();
+ &Apache::lonhomework::showhash(%Apache::lonhomework::history);
+ }
+
$Apache::lonhomework::parsing_a_task=1;
#should get back a or the neccesary stuff to start XML/MathML
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') {
$body_tag_start.=&add_previous_version_button();
if ($Apache::lonhomework::modifygrades) {
@@ -112,7 +117,7 @@ sub start_Task {
$body_tag_start.=$uri.'">'.&add_grading_button()."";
}
}
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+ if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
$target eq 'tex') {
($status,$accessmsg,my $slot_name,$slot) =
&Apache::lonhomework::check_task_access('0');
@@ -175,23 +180,32 @@ sub start_Task {
}
}
}
- } elsif ($target eq 'webgrade') {
- $result.=$head_tag_start.$body_tag_start.$form_tag_start;
- $result.=&show_queue();
+ } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
+ $target eq 'webgrade') {
+ if ($target eq 'webgrade') {
+ $result.=$head_tag_start.$body_tag_start.$form_tag_start;
+ $result.='';
+ $result.=&show_queue();
+ }
my $todo=&get_from_queue();
if ($todo) {
+ &setup_env_for_other_user($todo,$safeeval);
my ($symb,$uname,$udom)=&decode_queue_key($todo);
- $result.="\n".'
Found'.
- $symb.':'.$uname.':'.$udom.' |
';
+ $result.="\n".'Found '.
+ &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.' |
';
$result.='';
+ &Apache::lonnet::escape($todo).'" />';
$Apache::bridgetask::queue_key=$todo;
+ &Apache::structuretags::initialize_storage();
+ &Apache::lonhomework::showhash(%Apache::lonhomework::history);
+ $result.="\n".'';
} else {
- $result.="\n".
- '';
+ if ($target eq 'webgrade') {
+ $result.="\n".
+ '';
+ }
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
}
-
} else {
# page_start returned a starting result, delete it if we don't need it
$result = '';
@@ -222,9 +236,10 @@ sub end_Task {
$result.=&Apache::lonxml::xmlend().'';
}
}
- if ($target eq 'grade') {
+ if ($target eq 'grade' && !$env{'form.webgrade'}) {
my $award='SUBMITTED';
- &Apache::essayresponse::file_submission('0','bridgetask','portfiles',\$award);
+ &Apache::essayresponse::file_submission('0','bridgetask',
+ 'portfiles',\$award);
if ($award eq 'SUBMITTED' &&
$Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) {
$Apache::lonhomework::results{"resource.0.tries"}=
@@ -237,14 +252,63 @@ sub end_Task {
&add_to_queue();
}
}
+ if ($target eq 'grade' && $env{'form.webgrade'}) {
+ my $optional_required=
+ &Apache::lonxml::get_param('OptionalRequired',$parstack,
+ $safeeval);
+ my $optional_passed=0;
+ my $mandatory_failed=0;
+ my $ungraded=0;
+ my $review=0;
+ &Apache::lonhomework::showhash(%Apache::lonhomework::results);
+ foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
+ my $status=
+ $Apache::lonhomework::results{"resource.$dim_id.status"};
+ my $mandatory=
+ ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
+ if ($status eq 'pass') {
+ if (!$mandatory) { $optional_passed++; }
+ } elsif ($status eq 'fail') {
+ if ($mandatory) { $mandatory_failed++; }
+ } elsif ($status eq 'ungraded') {
+ $ungraded++;
+ } elsif ($status eq 'review') {
+ $review++;
+ }
+ }
+ if ($optional_passed < $optional_required) {
+ $mandatory_failed++;
+ }
+ &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
+ $Apache::lonhomework::results{'resource.grader'}=
+ $env{'user.name'}.'@'.$env{'user.domain'};
+ if ($review) {
+ $Apache::lonhomework::results{'resource.status'}='review';
+ &move_to_review_queue();
+ } elsif ($ungraded) {
+ $Apache::lonhomework::results{'resource.status'}='ungraded';
+ &check_queue_unlock();
+ } elsif ($mandatory_failed) {
+ $Apache::lonhomework::results{'resource.status'}='fail';
+ $Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS';
+ &remove_from_queue();
+ } else {
+ $Apache::lonhomework::results{'resource.status'}='pass';
+ $Apache::lonhomework::results{"resource.0.award"}='INCORRECT';
+ &remove_from_queue();
+ }
+ &Apache::structuretags::finalize_storage();
+ }
} elsif ($target eq 'webgrade') {
- $result.="\n
";
- $result.=' ';
- $result.=' ';
- $result.=' ';
+ $result.="
\n
";
+ #$result.=' ';
+ #$result.=' ';
+ #$result.=' ';
+ #$result.=' ';
$result.=''.&Apache::loncommon::endbodytag().'