version 1.54, 2005/09/29 19:15:47
|
version 1.79, 2005/11/18 20:29:13
|
Line 68 sub proctor_check_auth {
|
Line 68 sub proctor_check_auth {
|
foreach my $possible (@allowed) { |
foreach my $possible (@allowed) { |
my ($puser,$pdom)=(split('@',$possible)); |
my ($puser,$pdom)=(split('@',$possible)); |
if ($puser eq $user && $pdom eq $domain) { |
if ($puser eq $user && $pdom eq $domain) { |
my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom); |
my $authenticated=0; |
if ($authhost ne 'no_host') { |
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) { |
my $version= |
my $version= |
$Apache::lonhomework::results{'resource.version'}= |
$Apache::lonhomework::results{'resource.version'}= |
++$Apache::lonhomework::history{'resource.version'}; |
++$Apache::lonhomework::history{'resource.version'}; |
Line 144 sub add_previous_version_button {
|
Line 154 sub add_previous_version_button {
|
} |
} |
|
|
sub add_grading_button { |
sub add_grading_button { |
|
my (undef,$cid)=&Apache::lonxml::whichuser(); |
|
my $cnum=$env{'course.'.$cid.'.num'}; |
|
my $cdom=$env{'course.'.$cid.'.domain'}; |
|
my %sections; |
|
my $numsections=&Apache::loncommon::get_sections($cdom,$cnum,\%sections); |
|
my $size=5; |
|
if (scalar(keys(%sections)) < 3) { |
|
$size=scalar(keys(%sections))+2; |
|
} |
|
my $sec_select = '<select multiple name="chosensections" size="'.$size.'">'."\n"; |
|
$sec_select .= "<option value='all' selected='selected'>all</option>\n"; |
|
foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) { |
|
$sec_select .= "<option name=\"$sec\">$sec</option>\n"; |
|
} |
|
$sec_select .= "<option value='none'>none</option></select>\n"; |
|
|
my $result=' <input type="submit" name="gradeasubmission" value="'. |
my $result=' <input type="submit" name="gradeasubmission" value="'. |
&mt("Get a submission to grade").'" />'; |
&mt("Get a submission to grade").'" />'; |
$result.='<input type="hidden" name="grade_target" value="webgrade" />'; |
$result.='<input type="hidden" name="grade_target" value="webgrade" />'; |
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { |
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { |
my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); |
my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); |
|
$result.='<p>Specify a section: '.$sec_select.'</p>'; |
$result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks); |
$result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks); |
|
|
$result.=' <input type="submit" name="reviewagrading" value="'. |
$result.=' <input type="submit" name="reviewagrading" value="'. |
Line 277 sub show_task {
|
Line 304 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 285 sub internal_location {
|
Line 313 sub internal_location {
|
return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->'; |
return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->'; |
} |
} |
|
|
|
sub submission_time_stamp { |
|
my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); |
|
my $submissiontime; |
|
my $version=$Apache::lonhomework::history{'resource.version'}; |
|
for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) { |
|
if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) { |
|
$submissiontime=$Apache::lonhomework::history{$v.':timestamp'}; |
|
} |
|
} |
|
my $result; |
|
if ($submissiontime) { |
|
my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'}; |
|
my %slot=&Apache::lonnet::get_slot($slot_name); |
|
my $diff = $slot{'endtime'} - $submissiontime; |
|
my ($color,$when)=('#FF6666','after'); |
|
if ($diff > 0) { ($color,$when)=('#336600','before'); } |
|
my $info; |
|
if ($diff%60) { $info=($diff%60).' seconds'; } |
|
$diff=int($diff/60); |
|
if ($diff%60) { $info=($diff%60).' minutes '.$info; } |
|
$diff=int($diff/60); |
|
if ($diff) { $info=$diff.' hours '.$info; } |
|
$result='<p><font color="'.$color.'">'. |
|
&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'}))). |
|
'</font></p>'; |
|
} |
|
return $result; |
|
} |
|
|
|
sub webgrade_standard_info { |
|
my ($version)=&get_version(); |
|
my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); |
|
my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; |
|
my $file_list="<ul>\n"; |
|
foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) { |
|
my $file=$file_url.$partial_file; |
|
$file=~s|/+|/|g; |
|
&Apache::lonnet::allowuploaded('/adm/bridgetask',$file); |
|
$file_list.='<li><nobr><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'. |
|
&Apache::loncommon::icon($file).'" border=0"> '.$file. |
|
'</a></nobr></li>'."\n"; |
|
} |
|
$file_list.="</ul>\n"; |
|
|
|
my %lt=&Apache::lonlocal::texthash('done' => 'Done', |
|
'stop' => 'Stop', |
|
); |
|
|
|
my $result=<<INFO; |
|
<div class="handininfo"> |
|
<input type="submit" name="next" value="$lt{'done'}" /> |
|
<input type="submit" name="stop" value="$lt{'stop'}" /> |
|
$file_list |
|
</div> |
|
INFO |
|
return $result; |
|
} |
|
|
sub start_Task { |
sub start_Task { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
|
my ($status,$accessmsg,$slot); |
my ($status,$accessmsg,$slot); |
if ($target ne 'webgrade') { |
if ($target ne 'webgrade') { |
|
&Apache::structuretags::init_problem_globals('Task'); |
&Apache::structuretags::initialize_storage(); |
&Apache::structuretags::initialize_storage(); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
|
if ($env{'request.state'} eq 'construct') { |
|
&Apache::structuretags::setup_rndseed($safeeval); |
|
} |
} |
} |
|
|
$Apache::lonhomework::parsing_a_task=1; |
$Apache::lonhomework::parsing_a_task=1; |
Line 299 sub start_Task {
|
Line 392 sub start_Task {
|
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
|
|
if ($target eq 'web') { |
if ($target eq 'web' && $env{'request.state'} ne 'construct') { |
if ($Apache::lonhomework::modifygrades) { |
if ($Apache::lonhomework::modifygrades) { |
$body_tag_start.='<form name="gradesubmission" method="POST" action="'; |
$body_tag_start.='<form name="gradesubmission" method="POST" action="'; |
my $uri=$env{'request.uri'}; |
my $uri=$env{'request.uri'}; |
Line 316 sub start_Task {
|
Line 409 sub start_Task {
|
} |
} |
} |
} |
} |
} |
|
if ($target eq 'web' && $env{'request.state'} eq 'construct') { |
|
$form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'}); |
|
} |
if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || |
if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || |
$target eq 'tex') { |
$target eq 'tex') { |
my ($version,$previous)=&get_version(); |
my ($version,$previous)=&get_version(); |
Line 332 sub start_Task {
|
Line 428 sub start_Task {
|
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
if ( $target eq "web" ) { |
if ( $target eq "web" ) { |
$result.= $head_tag_start.'</head>'.$body_tag_start; |
$result.= $head_tag_start.'</head>'.$body_tag_start; |
|
if ($env{'request.state'} eq 'construct') { |
|
$result.=$form_tag_start; |
|
} |
my $msg; |
my $msg; |
if ($status eq 'UNAVAILABLE') { |
if ($status eq 'UNAVAILABLE') { |
$msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>'; |
$msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>'; |
Line 343 sub start_Task {
|
Line 442 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 359 sub start_Task {
|
Line 470 sub start_Task {
|
} |
} |
} elsif ($target eq 'grade' && !$env{'form.webgrade'}) { |
} elsif ($target eq 'grade' && !$env{'form.webgrade'}) { |
if ($status eq 'NEEDS_CHECKIN') { |
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') { |
} elsif ($target eq 'web') { |
Line 367 sub start_Task {
|
Line 482 sub start_Task {
|
$result.="$head_tag_start<title>$name</title></head> |
$result.="$head_tag_start<title>$name</title></head> |
$body_tag_start \n".&style(); |
$body_tag_start \n".&style(); |
|
|
$result.=$form_tag_start. |
|
'<input type="hidden" name="submitted" value="yes" />'; |
|
$result.=&preserve_grade_info(); |
$result.=&preserve_grade_info(); |
$result.=&internal_location(); |
$result.=&internal_location(); |
|
$result.=$form_tag_start. |
|
'<input type="hidden" name="submitted" value="yes" />'; |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
} |
} |
} elsif ( ($target eq 'grade' && $env{'form.webgrade'}) || |
} elsif ( ($target eq 'grade' && $env{'form.webgrade'}) || |
Line 429 sub start_Task {
|
Line 544 sub start_Task {
|
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
} |
} |
if ($target eq 'webgrade' && defined($env{'form.queue'})) { |
if ($target eq 'webgrade' && defined($env{'form.queue'})) { |
|
if ($webgrade eq 'yes') { |
|
$result.=&submission_time_stamp(); |
|
} |
$result.=$form_tag_start; |
$result.=$form_tag_start; |
$result.='<input type="hidden" name="webgrade" value="'. |
$result.='<input type="hidden" name="webgrade" value="'. |
$webgrade.'" />'; |
$webgrade.'" />'; |
Line 438 sub start_Task {
|
Line 556 sub start_Task {
|
$result.='<input type="hidden" name="regrade" value="'. |
$result.='<input type="hidden" name="regrade" value="'. |
$env{'form.regrade'}.'" />'; |
$env{'form.regrade'}.'" />'; |
} |
} |
} |
if ($env{'form.chosensections'}) { |
|
my @chosen_sections= |
|
&Apache::loncommon::get_env_multiple('form.chosensections'); |
|
foreach my $sec (@chosen_sections) { |
|
$result.='<input type="hidden" name="chosensections" |
|
value="'.$sec.'" />'; |
|
} |
|
} |
|
if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); } |
|
} |
|
} elsif ($target eq 'edit') { |
|
$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start. |
|
&Apache::structuretags::problem_edit_header(); |
|
$Apache::lonxml::warnings_error_header= |
|
&mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />"; |
|
my $temp=&Apache::edit::insertlist($target,$token); |
|
$result.=$temp; |
} else { |
} else { |
# page_start returned a starting result, delete it if we don't need it |
# page_start returned a starting result, delete it if we don't need it |
$result = ''; |
$result = ''; |
Line 482 sub get_key_todo {
|
Line 616 sub get_key_todo {
|
if ($env{'form.stop'}) { |
if ($env{'form.stop'}) { |
return (undef,'stop'); |
return (undef,'stop'); |
} elsif ($env{'form.next'}) { |
} elsif ($env{'form.next'}) { |
return (undef,'show_list'); |
return (undef,'select_user'); |
} |
} |
} |
} |
return ($gradingkey,'selected'); |
return ($gradingkey,'selected'); |
} else { |
} else { |
return (undef,'show_list'); |
return (undef,'select_user'); |
} |
} |
} |
} |
if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'}) |
if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'}) |
Line 537 sub get_key_todo {
|
Line 671 sub get_key_todo {
|
} |
} |
return (undef,undef) |
return (undef,undef) |
} |
} |
|
|
sub end_Task { |
sub end_Task { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result=''; |
my $result=''; |
Line 545 sub end_Task {
|
Line 678 sub end_Task {
|
my ($version,$previous)=&get_version(); |
my ($version,$previous)=&get_version(); |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex') { |
$target eq 'tex') { |
if ( |
if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') { |
(($target eq 'web') && ($env{'request.state'} ne 'construct')) || |
|
($target eq 'answer') || ($target eq 'tex') |
|
) { |
|
if ($target eq 'web') { |
if ($target eq 'web') { |
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 562 sub end_Task {
|
Line 693 sub end_Task {
|
<h2>'.&mt('Submit Portfolio Files for Grading').'</h2> |
<h2>'.&mt('Submit Portfolio Files for Grading').'</h2> |
<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'); |
|
} |
} |
if (&show_task($status,$previous)) { |
if (!$previous && $status ne 'SHOW_ANSWER' && |
|
&show_task($status,$previous)) { |
|
$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) && |
|
$Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) { |
my $bt_status=$Apache::lonhomework::history{"resource.$version.status"}; |
my $bt_status=$Apache::lonhomework::history{"resource.$version.status"}; |
my $title=&Apache::lonnet::gettitle(); |
my $title=&Apache::lonnet::gettitle(); |
my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name); |
my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name); |
my $description=&Apache::slotrequest::get_description($Apache::inputtags::slot_name,\%slot); |
my $start_time= |
|
&Apache::lonlocal::locallocaltime($slot{'starttime'}); |
|
|
my $status; |
my $status; |
$status.="\n<div class='$bt_status'>\n"; |
$status.="\n<div class='$bt_status'>\n"; |
|
|
if ($bt_status eq 'pass') { |
if ($bt_status eq 'pass') { |
$status.='<h2>You passed the '.$title.' given on '. |
$status.='<h2>You passed the '.$title.' given on '. |
$description.'.</h2>'; |
$start_time.'.</h2>'; |
} |
} |
if ($bt_status eq 'fail') { |
if ($bt_status eq 'fail') { |
$status.='<h2>You did not pass the '.$title.' given on '. |
$status.='<h2>You did not pass the '.$title.' given on '. |
$description.'.</h2>'; |
$start_time.'.</h2>'; |
if (!$previous) { |
if (!$previous) { |
$status.=&add_request_another_attempt_button(); |
$status.=&add_request_another_attempt_button(); |
} |
} |
Line 626 sub end_Task {
|
Line 769 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"}); |
|
$award = ''; |
} |
} |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::structuretags::finalize_storage(); |
&Apache::structuretags::finalize_storage(); |
if ($award eq 'SUBMITTED') { |
if ($award eq 'SUBMITTED') { |
&add_to_queue('gradingqueue',$Apache::inputtags::slot_name); |
&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') { |
if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') { |
my $optional_required= |
my $optional_required= |
Line 742 sub end_Task {
|
Line 890 sub end_Task {
|
# &mt('Save Partial Grade and Continue Grading').'" /> '; |
# &mt('Save Partial Grade and Continue Grading').'" /> '; |
$result.='</form>'.&Apache::loncommon::endbodytag().'</html>'; |
$result.='</form>'.&Apache::loncommon::endbodytag().'</html>'; |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$result.='<parameter part="0" package="Task"></parameter>'."\n"; |
$result.=&Apache::response::meta_package_write('Task'); |
#$result.=&Apache::response::meta_part_order(); |
$result.=&Apache::response::meta_stores_write('solved','string', |
#$result.=&Apache::response::meta_response_order(); |
'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); |
undef($Apache::lonhomework::parsing_a_task); |
return $result; |
return $result; |
Line 833 sub check_queue_for_key {
|
Line 987 sub check_queue_for_key {
|
if (defined($results{"$todo\0locked"})) { |
if (defined($results{"$todo\0locked"})) { |
return 'locked'; |
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 'enqueued'; |
} |
} |
return undef; |
return undef; |
Line 846 sub add_to_queue {
|
Line 1005 sub add_to_queue {
|
my $cdom=$env{'course.'.$cid.'.domain'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
my %data; |
my %data; |
$data{"$symb\0queue\0$uname\@$udom"}=[$slot_name]; |
$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 { |
sub show_queue { |
Line 855 sub show_queue {
|
Line 1014 sub show_queue {
|
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
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.='<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); |
my ($tmp)=%queue; |
my ($tmp)=%queue; |
Line 865 sub show_queue {
|
Line 1035 sub show_queue {
|
if ($with_selects) { $result.="<th></th>"; } |
if ($with_selects) { $result.="<th></th>"; } |
$result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>"; |
$result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>"; |
foreach my $key (sort(keys(%queue))) { |
foreach my $key (sort(keys(%queue))) { |
|
my ($symb,$uname,$udom) = &decode_queue_key($key); |
|
if (!defined($classlist->{$uname.':'.$udom})) { next; } |
if ($key=~/locked$/ && !$with_selects) { |
if ($key=~/locked$/ && !$with_selects) { |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
|
my $title=&Apache::lonnet::gettitle($symb); |
my $title=&Apache::lonnet::gettitle($symb); |
$result.="<tr><td>$title</td><td>$uname</td>"; |
$result.="<tr><td>$title</td><td>$uname</td>"; |
$result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>'; |
$result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>'; |
Line 877 sub show_queue {
|
Line 1048 sub show_queue {
|
$result.='<td>last queue modification time</td><td>'. |
$result.='<td>last queue modification time</td><td>'. |
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>"; |
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>"; |
} elsif ($key!~/(timestamp|locked)$/) { |
} elsif ($key!~/(timestamp|locked)$/) { |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
|
my $title=&Apache::lonnet::gettitle($symb); |
my $title=&Apache::lonnet::gettitle($symb); |
$result.="<tr>"; |
$result.="<tr>"; |
my $slot=$queue{$key}->[0]; |
my $slot=$queue{$key}->[0]; |
Line 893 sub show_queue {
|
Line 1063 sub show_queue {
|
($action,$description)=('unlock',&mt('Unlock')); |
($action,$description)=('unlock',&mt('Unlock')); |
} |
} |
} |
} |
|
my $seclist; |
|
foreach my $sec (@chosen_sections) { |
|
$seclist.='<input type="hidden" name="chosensections" |
|
value="'.$sec.'" />'; |
|
} |
if (time > $slot_data{'endtime'}) { |
if (time > $slot_data{'endtime'}) { |
$result.=(<<FORM); |
$result.=(<<FORM); |
<td> |
<td> |
Line 903 sub show_queue {
|
Line 1078 sub show_queue {
|
<input type="hidden" name="webgrade" value="no" /> |
<input type="hidden" name="webgrade" value="no" /> |
<input type="hidden" name="queuemode" value="selected" /> |
<input type="hidden" name="queuemode" value="selected" /> |
<input type="submit" name="submit" value="$description" /> |
<input type="submit" name="submit" value="$description" /> |
|
$seclist |
</form> |
</form> |
</td> |
</td> |
FORM |
FORM |
Line 982 sub queue_key_locked {
|
Line 1158 sub queue_key_locked {
|
sub pick_from_queue_data { |
sub pick_from_queue_data { |
my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_; |
my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_; |
foreach my $key (keys(%$queuedata)) { |
foreach my $key (keys(%$queuedata)) { |
|
if ($key =~ /\0locked$/) { next; } |
|
if ($key =~ /\0timestamp$/) { next; } |
my ($symb,$uname,$udom)=&decode_queue_key($key); |
my ($symb,$uname,$udom)=&decode_queue_key($key); |
if ($check_section) { |
if ($check_section) { |
my $section=&Apache::lonnet::getsection($uname,$udom); |
my $section=&Apache::lonnet::getsection($uname,$udom); |
Line 1107 sub get_from_queue {
|
Line 1285 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= |
|
&Apache::loncommon::get_env_multiple('form.chosensections'); |
&Apache::grades::init_perm(); |
&Apache::grades::init_perm(); |
my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all',); |
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); |
|
|
my %status = &get_student_status($symb,$cid,$udom,$uname); |
my %status = &get_student_status($symb,$cid,$udom,$uname); |
my $queue = 'none'; |
my $queue = 'none'; |
if ($status{'reviewqueue'} eq 'enqueued') { |
my $cannot_grade; |
|
if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) { |
$queue = 'reviewqueue'; |
$queue = 'reviewqueue'; |
} elsif ($status{'gradingqueue'} eq 'enqueued') { |
if ($status{'reviewqueue'} eq 'in_progress') { |
|
$cannot_grade=1; |
|
} |
|
} elsif ($status{'gradingqueue'} =~ /^(in_progress|enqueue)$/) { |
$queue = 'gradingqueue'; |
$queue = 'gradingqueue'; |
|
if ($status{'gradingqueue'} eq 'in_progress') { |
|
$cannot_grade=1; |
|
} |
} |
} |
my $todo = |
my $todo = |
&Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname)); |
&Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname)); |
$result.=<<RESULT; |
if ($cannot_grade) { |
|
$result.='<tr><td> </td><td>'.$fullname->{$student}. |
|
'</td><td>'; |
|
} else { |
|
my $seclist; |
|
foreach my $sec (@chosen_sections) { |
|
$seclist.='<input type="hidden" name="chosensections" |
|
value="'.$sec.'" />'; |
|
} |
|
$result.=<<RESULT; |
<tr> |
<tr> |
<td> |
<td> |
<form method="POST"> |
<form method="POST"> |
Line 1132 sub select_user {
|
Line 1335 sub select_user {
|
<input type="hidden" name="queue" value="$queue" /> |
<input type="hidden" name="queue" value="$queue" /> |
<input type="hidden" name="webgrade" value="no" /> |
<input type="hidden" name="webgrade" value="no" /> |
<input type="hidden" name="regrade" value="yes" /> |
<input type="hidden" name="regrade" value="yes" /> |
<input type="submit" name="submit" value="Regrade" /> |
<input type="submit" name="submit" value="Regrade" /> |
|
$seclist |
</form> |
</form> |
<td>$fullname->{$student}</td> |
<td>$fullname->{$student}</td> |
<td> |
<td> |
RESULT |
RESULT |
|
} |
if ($status{'status'} eq 'pass') { |
if ($status{'status'} eq 'pass') { |
$result .= '<font color="green">'.&mt('Passed').'</font>'; |
$result .= '<font color="green">'.&mt('Passed').'</font>'; |
} elsif ($status{'status'} eq 'fail') { |
} elsif ($status{'status'} eq 'fail') { |
Line 1159 RESULT
|
Line 1363 RESULT
|
$result .= &mt('Awaiting Review'); |
$result .= &mt('Awaiting Review'); |
} elsif ($status{'reviewqueue'} eq 'locked') { |
} elsif ($status{'reviewqueue'} eq 'locked') { |
$result .= &mt('Under Review'); |
$result .= &mt('Under Review'); |
|
} elsif ($status{'reviewqueue'} eq 'in_progress') { |
|
$result .= &mt('Still being worked on.'); |
} elsif ($status{'gradingqueue'} eq 'enqueued') { |
} elsif ($status{'gradingqueue'} eq 'enqueued') { |
$result .= &mt('Awaiting Grading'); |
$result .= &mt('Awaiting Grading'); |
} elsif ($status{'gradingqueue'} eq 'locked') { |
} elsif ($status{'gradingqueue'} eq 'locked') { |
$result .= &mt('Being Graded'); |
$result .= &mt('Being Graded'); |
|
} elsif ($status{'gradingqueue'} eq 'in_progress') { |
|
$result .= &mt('Still being worked on.'); |
} else { |
} else { |
$result.=" "; |
$result.=" "; |
} |
} |
Line 1229 sub start_Dimension {
|
Line 1437 sub start_Dimension {
|
} |
} |
|
|
sub get_instance { |
sub get_instance { |
&Apache::response::pushrandomnumber(); |
my ($dim)=@_; |
my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); |
my $rand_alg=&Apache::lonnet::get_rand_alg(); |
my $num=@order; |
if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' || |
my $version=&get_version(); |
$rand_alg eq '64bit2' || $rand_alg eq '64bit3' || |
my $which=($version-1)%$num; |
$rand_alg eq '64bit4' ) { |
return $order[$which]; |
&Apache::response::pushrandomnumber(); |
|
my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); |
|
my $num=@order; |
|
my $version=&get_version(); |
|
my $which=($version-1)%$num; |
|
return $order[$which]; |
|
} else { |
|
my ($version,$previous) = &get_version(); |
|
my $instance = |
|
$Apache::lonhomework::history{"resource.$version.0.$dim.instance"}; |
|
if (defined($instance)) { return $instance; } |
|
|
|
&Apache::response::pushrandomnumber(); |
|
my @instances = @{$dimension{'instances'}}; |
|
# remove disabled instances |
|
for (my $i=0; $i < $#instances; $i++) { |
|
if ($dimension{$instances[$i].'.disabled'}) { |
|
splice(@instances,$i,1); |
|
$i--; |
|
} |
|
} |
|
@instances = &Math::Random::random_permutation(@instances); |
|
$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; |
|
} |
} |
} |
|
|
{ |
{ |
Line 1243 sub get_instance {
|
Line 1479 sub get_instance {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result=&Apache::lonxml::endredirection(); |
my $result=&Apache::lonxml::endredirection(); |
my $dim=&get_id($parstack,$safeeval); |
my $dim=&get_id($parstack,$safeeval); |
my $instance=&get_instance(); |
my $instance=&get_instance($dim); |
my $version=&get_version(); |
my $version=&get_version(); |
if ($target eq 'web') { |
if ($target eq 'web') { |
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
$result.=&Apache::scripttag::xmlparse($dimension{'intro'}); |
$result.=&Apache::scripttag::xmlparse($dimension{'intro'}); |
@Apache::scripttag::parser_env = @_; |
my @instances = $instance; |
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
if (&Apache::response::showallfoils()) { |
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' || |
@instances = @{$dimension{'instances'}}; |
$Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { |
} |
|
foreach my $instance (@instances) { |
my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"}; |
@Apache::scripttag::parser_env = @_; |
my $mandatory='Mandatory'; |
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') { |
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' || |
$mandatory='Optional'; |
$Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { |
} |
|
my $dim_info="<div class='$dim_status'>\n"; |
my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"}; |
if ($dim_status eq 'pass') { |
my $mandatory='Mandatory'; |
$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>'; |
if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') { |
} |
|
if ($dim_status eq 'fail') { |
|
$dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>'; |
|
} |
|
my $man_count=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++; |
|
} |
|
} |
|
my $opt_req=&Apache::lonxml::get_param('OptionalRequired', |
|
$parstack,$safeeval); |
|
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>"; |
|
|
|
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'; |
$mandatory='Optional'; |
} |
} |
if ($status eq 'fail') { |
my $dim_info="<div class='$dim_status'>\n"; |
} elsif ($status eq 'pass') { |
if ($dim_status eq 'pass') { |
} else { |
$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>'; |
&Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status"); |
|
} |
} |
my $status_display=$status; |
if ($dim_status eq 'fail') { |
$status_display=~s/^([a-z])/uc($1)/e; |
$dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>'; |
@Apache::scripttag::parser_env = @_; |
} |
$result.='<div class="'.$status.'"><h4>'.$mandatory. |
my $man_count=0; |
' Criteria</h4><p>'; |
my $man_passed=0; |
@Apache::scripttag::parser_env = @_; |
my $opt_count=0; |
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id}); |
my $opt_passed=0; |
$result.='</p><p class="grade">'.$status_display.'</p>'; |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) { |
if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} |
$result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</p>'; |
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<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); |
|
$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.='<div class="'.$status.'"><h4>'.$mandatory. |
|
' Criteria</h4><p>'; |
|
@Apache::scripttag::parser_env = @_; |
|
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id}); |
|
$result.='</p><p class="grade">'.$status_display.'</p>'; |
|
if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) { |
|
$result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</p>'; |
|
} |
|
$result.='</div>'; |
} |
} |
$result.='</div>'; |
|
} |
} |
} |
} |
} elsif ($target eq 'webgrade') { |
} elsif ($target eq 'webgrade') { |
Line 1345 sub get_instance {
|
Line 1591 sub get_instance {
|
'<td>'. |
'<td>'. |
'<a href="#'.$last_link.'">Prev</a><br />'. |
'<a href="#'.$last_link.'">Prev</a><br />'. |
'<a href="#next_'.$link.'">Next</a><br /><br /><br />'. |
'<a href="#next_'.$link.'">Next</a><br /><br /><br />'. |
'<input type="submit" name="next" value="'. |
|
&mt('Done').'" /> '. |
|
'<input type="submit" name="stop" value="'. |
|
&mt('Stop').'" /> '. |
|
'</td></tr>'; |
'</td></tr>'; |
$result.='<tr><td colspan="4">'; |
|
my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); |
|
my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; |
|
foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) { |
|
my $file=$file_url.$partial_file; |
|
$file=~s|/+|/|g; |
|
&Apache::lonnet::allowuploaded('/adm/bridgetask',$file); |
|
$result.='<nobr><a href="'.$file.'" target="lonGRDs"><img src="'. |
|
&Apache::loncommon::icon($file).'" border=0"> '.$file. |
|
'</a></nobr> '; |
|
} |
|
$result.='</td></tr>'; |
|
$last_link=$link; |
$last_link=$link; |
} |
} |
} elsif ($target eq 'grade' && $env{'form.webgrade'}) { |
} elsif ($target eq 'grade' && $env{'form.webgrade'}) { |
Line 1402 sub get_instance {
|
Line 1632 sub get_instance {
|
$Apache::lonhomework::results{"resource.$version.$dim.status"}= |
$Apache::lonhomework::results{"resource.$version.$dim.status"}= |
'pass'; |
'pass'; |
} |
} |
|
} else { |
|
# any other targets no output |
|
undef($result); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 1433 sub start_Instance {
|
Line 1666 sub start_Instance {
|
push(@Apache::bridgetask::instancelist,$id); |
push(@Apache::bridgetask::instancelist,$id); |
$dimension{$id.'.optionalrequired'}= |
$dimension{$id.'.optionalrequired'}= |
&Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval); |
&Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval); |
|
my $disabled = &Apache::lonxml::get_param('Disabled',$parstack,$safeeval); |
|
if (lc($disabled) eq 'yes') { |
|
$dimension{$id.'.disabled'}='1'; |
|
} |
return ''; |
return ''; |
} |
} |
|
|