version 1.62, 2005/10/01 04:06:29
|
version 1.67, 2005/10/04 19:41:02
|
Line 294 sub show_task {
|
Line 294 sub show_task {
|
( $status eq 'INVALID_ACCESS') )) { |
( $status eq 'INVALID_ACCESS') )) { |
return 0; |
return 0; |
} |
} |
|
if ($env{'form.donescreen'}) { return 0; } |
return 1; |
return 1; |
} |
} |
|
|
Line 392 sub start_Task {
|
Line 393 sub start_Task {
|
'</h1>'.&proctor_validation_screen($slot); |
'</h1>'.&proctor_validation_screen($slot); |
} elsif ($status eq 'WAITING_FOR_GRADE') { |
} elsif ($status eq 'WAITING_FOR_GRADE') { |
$msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>'; |
$msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>'; |
|
} elsif ($env{'form.donescreen'}) { |
|
my $title=&Apache::lonnet::gettitle(); |
|
my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'}); |
|
my $files='<ul><li>'.join('</li><li>',@files).'</li></ul>'; |
|
$result.=<<DONESCREEN; |
|
<h2>$title</h2> |
|
<p> Files submitted: $files </p> |
|
<p> You are now done with this Bridge Task </p> |
|
<hr /> |
|
<p> <a href="/adm/logout">Logout</a> </p> |
|
<p> <a href="/adm/roles">Change to a different course</a> </p> |
|
DONESCREEN |
} elsif ($status ne 'NOT_YET_VIEWED') { |
} elsif ($status ne 'NOT_YET_VIEWED') { |
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>'; |
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>'; |
} |
} |
Line 613 sub end_Task {
|
Line 626 sub end_Task {
|
if (&show_task($status,$previous)) { |
if (&show_task($status,$previous)) { |
$result.=&Apache::lonxml::endredirection(); |
$result.=&Apache::lonxml::endredirection(); |
} |
} |
if ($status eq 'CAN_ANSWER' && !$previous) { |
if ($status eq 'CAN_ANSWER' && !$previous && |
|
!$env{'form.donescreen'}) { |
$result.="\n".'<table border="1">'. |
$result.="\n".'<table border="1">'. |
&Apache::inputtags::file_selector("$version.0", |
&Apache::inputtags::file_selector("$version.0", |
"bridgetask","*", |
"bridgetask","*", |
Line 623 sub end_Task {
|
Line 637 sub end_Task {
|
<p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>'). |
<p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>'). |
"</table>"; |
"</table>"; |
$result.=&Apache::inputtags::gradestatus('0'); |
$result.=&Apache::inputtags::gradestatus('0'); |
|
$result.='</form>'; |
|
$result.=<<DONEBUTTON; |
|
<form method="POST"> |
|
<input type="hidden" name="donescreen" value="1" /> |
|
<input type="submit" value="Done" /> |
|
</form> |
|
DONEBUTTON |
} |
} |
if (&show_task($status,$previous) && |
if (&show_task($status,$previous) && |
$Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) { |
$Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) { |
Line 688 sub end_Task {
|
Line 709 sub end_Task {
|
$award; |
$award; |
$Apache::lonhomework::results{"resource.0.submission"}= |
$Apache::lonhomework::results{"resource.0.submission"}= |
$Apache::lonhomework::results{"resource.$version.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::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::structuretags::finalize_storage(); |
&Apache::structuretags::finalize_storage(); |
Line 928 sub show_queue {
|
Line 951 sub show_queue {
|
&Apache::grades::init_perm(); |
&Apache::grades::init_perm(); |
my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,); |
my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,); |
&Apache::grades::reset_perm(); |
&Apache::grades::reset_perm(); |
|
if (!(grep(/^all$/,@chosen_sections))) { |
|
$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections). |
|
'</tt>.</p> '."\n"; |
|
} |
|
|
my $regexp="^$symb\0"; |
my $regexp="^$symb\0"; |
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
Line 1187 sub get_from_queue {
|
Line 1214 sub get_from_queue {
|
|
|
sub select_user { |
sub select_user { |
my ($symb,$cid)=&Apache::lonxml::whichuser(); |
my ($symb,$cid)=&Apache::lonxml::whichuser(); |
my $result.='<table border="1">'; |
|
|
|
my @chosen_sections= |
my @chosen_sections= |
&Apache::loncommon::get_env_multiple('form.chosensections'); |
&Apache::loncommon::get_env_multiple('form.chosensections'); |
&Apache::grades::init_perm(); |
&Apache::grades::init_perm(); |
my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,); |
my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,); |
&Apache::grades::reset_perm(); |
&Apache::grades::reset_perm(); |
|
|
|
my $result; |
|
if (!(grep(/^all$/,@chosen_sections))) { |
|
$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections). |
|
'</tt>.</p> '."\n"; |
|
} |
|
$result.='<table border="1">'; |
|
|
foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) { |
foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) { |
my ($uname,$udom) = split(/:/,$student); |
my ($uname,$udom) = split(/:/,$student); |
Line 1370 sub get_instance {
|
Line 1403 sub get_instance {
|
$dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>'; |
$dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>'; |
} |
} |
my $man_count=0; |
my $man_count=0; |
|
my $man_passed=0; |
my $opt_count=0; |
my $opt_count=0; |
my $opt_passed=0; |
my $opt_passed=0; |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
Line 1381 sub get_instance {
|
Line 1415 sub get_instance {
|
} |
} |
} else { |
} else { |
$man_count++; |
$man_count++; |
|
if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') { |
|
$man_passed++; |
|
} |
} |
} |
} |
} |
my $opt_req=&Apache::lonxml::get_param('OptionalRequired', |
if ($man_passed eq $man_count) { $man_passed='all'; } |
$parstack,$safeeval); |
my $opt_req=$dimension{$instance.'.optionalrequired'}; |
if ($opt_req !~ /\S/) { $opt_req='0'; } |
if ($opt_req !~ /\S/) { $opt_req='0'; } |
$dim_info.="\n<p>".&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)."</p>\n</div>"; |
$dim_info.="\n<p>".&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)."</p>\n</div>"; |
|
|
my $internal_location=&internal_location($dim); |
my $internal_location=&internal_location($dim); |
$result=~s/\Q$internal_location\E/$dim_info/; |
$result=~s/\Q$internal_location\E/$dim_info/; |