'. + &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 start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -225,13 +356,14 @@ sub start_Task { if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } $body_tag_start.=$uri.'">'.&add_grading_button().""; my $symb=&Apache::lonnet::symbread(); - $body_tag_start.=''; - + if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { + $body_tag_start.=''; + } } } if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || @@ -246,14 +378,7 @@ 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; @@ -268,6 +393,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='- '.join('
- ',@files).'
Files submitted: $files
+You are now done with this Bridge Task
++ + +DONESCREEN } elsif ($status ne 'NOT_YET_VIEWED') { $msg.='
'.&mt('Not open to be viewed').'
'; } @@ -284,43 +421,27 @@ 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'.&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.=&preserve_grade_info(); + $result.=&internal_location(); $result.=$form_tag_start. ''; - $result.=&preserve_grade_info(); - + &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; - $result.='Review'.&show_queue('reviewqueue'); - $result.='
Grade'.&show_queue('gradingqueue'); + #$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... @@ -329,7 +450,6 @@ sub start_Task { # there isn't reshow the queue.... my ($todo,$status_code)=&get_key_todo($target); - &Apache::lonnet::logthis("got todo -$todo- stat -$status_code-"); if ($todo) { &setup_env_for_other_user($todo,$safeeval); my ($symb,$uname,$udom)=&decode_queue_key($todo); @@ -342,7 +462,7 @@ sub start_Task { &Apache::structuretags::initialize_storage(); &Apache::lonhomework::showhash(%Apache::lonhomework::history); if ($target eq 'webgrade') { - $result.='
After -'.&show_queue($env{'form.queue'}); + #$result.='
After -'.&show_queue($env{'form.queue'}); $result.="\n".'
\n";
+
+ if ($bt_status eq 'pass') {
+ $status.='
\n";
+
+ my $internal_location=&internal_location();
+ $result=~s/\Q$internal_location\E/$status/;
}
}
if ($target eq 'web' || $target eq 'webgrade') {
@@ -492,6 +707,10 @@ 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();
@@ -521,7 +740,9 @@ sub end_Task {
$ungraded++;
} elsif ($status eq 'review') {
$review++;
- }
+ } else {
+ $ungraded++;
+ }
}
if ($optional_passed < $optional_required) {
$mandatory_failed++;
@@ -535,14 +756,14 @@ sub end_Task {
&check_queue_unlock($env{'form.queue'});
&Apache::lonxml::debug(" still needs review not changing status.");
} else {
- &move_between_queues('gradingqueue','reviewqueue');
+ &move_between_queues($env{'form.queue'},'reviewqueue');
}
} elsif ($ungraded) {
$Apache::lonhomework::results{"resource.$version.status"}='ungraded';
- # FIXME if in review queue need to move back to grading queue
- if ($env{'form.queue'} eq 'reviewqueue') {
+ if ($env{'form.queue'} eq 'reviewqueue' ||
+ $env{'form.queue'} eq 'none' ) {
&Apache::lonxml::debug("moving back.");
- &move_between_queues('reviewqueue','gradingqueue');
+ &move_between_queues($env{'form.queue'},'gradingqueue');
} else {
&check_queue_unlock($env{'form.queue'});
}
@@ -551,23 +772,46 @@ sub end_Task {
$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($env{'form.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"]);
+ }
} 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($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();
}
@@ -593,8 +837,13 @@ sub end_Task {
sub move_between_queues {
my ($src_queue,$dest_queue)=@_;
- my $cur_data=&get_queue_data($src_queue);
- if (!$cur_data) { return 'not_exist'; }
+ 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;
@@ -605,6 +854,7 @@ sub move_between_queues {
sub check_queue_unlock {
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";
@@ -624,6 +874,7 @@ sub check_queue_unlock {
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'};
@@ -656,8 +907,30 @@ sub get_queue_data {
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'};
@@ -672,6 +945,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.='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)."
Showing only sections '.join(', ',@chosen_sections). + '.
'."\n"; + } + my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); my ($tmp)=%queue; @@ -682,8 +966,9 @@ sub show_queue { if ($with_selects) { $result.="Showing only sections '.join(', ',@chosen_sections). + '.
'."\n"; + } + $result.='| '.$fullname->{$student}. + ' | ';
+ } else {
+ my $seclist;
+ foreach my $sec (@chosen_sections) {
+ $seclist.='';
+ }
+ $result.=<|
+
+ | $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.= ' | |
\n";
+ if ($dim_status eq 'pass') {
+ $dim_info.='
";
+
+ 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"};
- $result.='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 $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); + if ($mandatory) { + $mandatory='Mandatory'; + } else { + $mandatory='Optional'; + } 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::lonxml::error("Student viewing a graded bridgetask was shown a status of $status"); } - $result.=' |
';
+ 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.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.' |
| ';
+ $result.=' '.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.' '; } - $result.=$dimension{$instance.'.criteria.'.$id}. - ' |
'. + '
'. #$dimension{$instance.'.criteria.'.$id}. '
'. ''. '
'. + '
'. '
'. '
'. '
'. @@ -1026,13 +1493,14 @@ sub get_instance { '
'.&mt("Failed to authenticate the proctor.") .'
'; } + if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; } my $result= (<Your room's proctor needs to validate your access to this resource.
@@ -1176,13 +1631,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:
-
+
+
| ||||||||||