loncom/homework/bridgetask.pm - diff

Return to bridgetask.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/bridgetask.pm between versions 1.24 and 1.32

version 1.24, 2005/05/13 15:34:50	version 1.32, 2005/05/27 17:08:03
Line 71 sub proctor_check_auth {	Line 71 sub proctor_check_auth {
if ($authhost ne 'no_host') {	if ($authhost ne 'no_host') {
my $version=	my $version=
$Apache::lonhomework::results{'resource.version'}=	$Apache::lonhomework::results{'resource.version'}=
$Apache::lonhomework::history{'resource.version'}++;	++$Apache::lonhomework::history{'resource.version'};
$Apache::lonhomework::results{"resource.$version.checkedin"}=	$Apache::lonhomework::results{"resource.$version.checkedin"}=
$user.'@'.$domain;	$user.'@'.$domain;
$Apache::lonhomework::results{"resource.$version.checkedin.slot"}=	$Apache::lonhomework::results{"resource.$version.checkedin.slot"}=
$slot_name;	$slot_name;
	foreach my $key (keys(%Apache::lonhomework::history)) {
	if ($key=~/^resource\.0\./) {
	$Apache::lonhomework::results{$key}='';
	}
	}
return 1;	return 1;
}	}
}	}
Line 83 sub proctor_check_auth {	Line 88 sub proctor_check_auth {
return 0;	return 0;
}	}

	sub get_version {
	my ($version,$previous);
	if ($env{'form.previousversion'} &&
	defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
	$version=$env{'form.previousversion'};
	$previous=1;
	} else {
	$version=$Apache::lonhomework::history{'resource.version'};
	$previous=0;
	}
	if (wantarray) {
	return ($version,$previous);
	}
	return $version;
	}

sub add_previous_version_button {	sub add_previous_version_button {
	my ($status)=@_;
my $result;	my $result;
$result.=&mt(' Show a previously done version: [_1]','<select name="previousversion">	if ($Apache::lonhomework::history{'resource.version'} eq '') {
<option>Pick one</option>	return '';
</select>');	}
	if ($Apache::lonhomework::history{'resource.version'} < 2 &&
	$status ne 'NEEDS_CHECKIN') {
	return '';
	}
	my $version=&get_version();
	if ($env{'form.previousversion'} ne '' &&
	$env{'form.previousversion'} eq $version) {
	$result.="<h3>".&mt("Showing previous version [_1]",$version).
	"</h3>\n";
	}
	my @to_show;
	foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) {
	if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) {
	push(@to_show,$test_version);
	}
	}
	my $list='<option>'.
	join("</option>\n<option>",@to_show).
	"</option>\n";
	$result.='<form name="getprevious" method="POST" action="';
	my $uri=$env{'request.uri'};
	if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
	$result.=$uri.'">'.
	&mt(' Show a previously done version: [_1]','<select onchange="this.form.submit()" name="previousversion">
	<option>'.&mt('Pick one').'</option>
	'.$list.'
	</select>')."</form>";
return $result;	return $result;
}	}

sub add_grading_button {	sub add_grading_button {
my $result;	my $result=' <input type="submit" name="gradeasubmission" value="'.
$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 ( 1) {
	#need a permissions for limitng this to 'powerful users'
	#check if review queue has items
	$result.=' <input type="submit" name="reviewasubmission" value="'.
	&mt("Select an entry from the review queue").'" />';
	}
return $result;	return $result;
}	}

sub add_request_another_attempt_button {	sub add_request_another_attempt_button {
	my $result;
	$result.=' <input type="submit" name="requestattempt" value="'.
	&mt("Request another attempt").'" />';
	return $result;
	}

	sub preserve_grade_info {
	my $result;
	# if we are viewing someone else preserve that info
	if (defined $env{'form.grade_symb'}) {
	foreach my $field ('symb','courseid','domain','username') {
	$result .= '<input type="hidden" name="grade_'.$field.
	'" value="'.$env{"form.grade_$field"}.'" />'."\n";
	}
	}
	return $result;
}	}

sub start_Task {	sub start_Task {
Line 118 sub start_Task {	Line 187 sub start_Task {
&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') {
$body_tag_start.=&add_previous_version_button();
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 128 sub start_Task {	Line 196 sub start_Task {
}	}
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=$Apache::lonhomework::history{'resource.version'};	my ($version,$previous)=&get_version();
($status,$accessmsg,my $slot_name,$slot) =	($status,$accessmsg,my $slot_name,$slot) =
&Apache::lonhomework::check_task_access('0');	&Apache::lonhomework::check_task_access('0');
push(@Apache::inputtags::status,$status);	push(@Apache::inputtags::status,$status);
Line 137 sub start_Task {	Line 205 sub start_Task {
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';
&Apache::run::run($expression,$safeeval);	&Apache::run::run($expression,$safeeval);
&Apache::lonxml::debug("Got $status");	&Apache::lonxml::debug("Got $status");
if (( $status eq 'CLOSED' ) \|\|	$body_tag_start.=&add_previous_version_button($status);
( $status eq 'BANNED') \|\|	if (!$previous && (
( $status eq 'UNAVAILABLE') \|\|	( $status eq 'CLOSED' ) \|\|
( $status eq 'NOT_IN_A_SLOT') \|\|	( $status eq 'BANNED') \|\|
( $status eq 'NEEDS_CHECKIN') \|\|	( $status eq 'UNAVAILABLE') \|\|
( $status eq 'WAITING_FOR_GRADE') \|\|	( $status eq 'NOT_IN_A_SLOT') \|\|
( $status eq 'INVALID_ACCESS')) {	( $status eq 'NEEDS_CHECKIN') \|\|
	( $status eq 'WAITING_FOR_GRADE') \|\|
	( $status eq 'INVALID_ACCESS') )) {
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;
Line 188 sub start_Task {	Line 258 sub start_Task {
$result.="$head_tag_start<title>$name</title></head>	$result.="$head_tag_start<title>$name</title></head>
$body_tag_start \n $form_tag_start".	$body_tag_start \n $form_tag_start".
'<input type="hidden" name="submitted" value="yes" />';	'<input type="hidden" name="submitted" value="yes" />';
# if we are viewing someone else preserve that info	$result.=&preserve_grade_info();
if (defined $env{'form.grade_symb'}) {	my ($version,$previous)=&get_version();
foreach my $field ('symb','courseid','domain','username') {	if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
$result .= '<input type="hidden" name="grade_'.$field.
'" value="'.$env{"form.grade_$field"}.'" />'."\n";
}
}
if ($Apache::lonhomework::history{'resource.status'} eq 'fail') {
$result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';	$result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';
$result.=&request_another_attempt_button();	if (!$previous) {
	$result.=&add_request_another_attempt_button();
	}
}	}
if ($Apache::lonhomework::history{'resource.status'} eq 'pass') {	if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
$result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';	$result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
}	}
}	}
} elsif ( ($target eq 'grade' && $env{'form.webgrade'}) \|\|	} elsif ( ($target eq 'grade' && $env{'form.webgrade'}) \|\|
$target eq 'webgrade') {	$target eq 'webgrade') {
	my $webgrade='yes';
if ($target eq 'webgrade') {	if ($target eq 'webgrade') {
$result.=$head_tag_start.$body_tag_start.$form_tag_start;	#FIXME FORM conflcit with the 'show queue',1
$result.='<input type="hidden" name="webgrade" value="yes" />';	$result.=$head_tag_start.$body_tag_start;
$result.=&show_queue();	$result.='<br />Review'.&show_queue('reviewqueue');
}	$result.='<br />Before'.&show_queue('gradingqueue');
my $todo=&get_from_queue();	}
if ($todo) {	if (defined($env{'form.reviewasubmission'})) {
&setup_env_for_other_user($todo,$safeeval);	$result.=&show_queue('reviewqueue',1);
my ($symb,$uname,$udom)=&decode_queue_key($todo);	my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
$result.="\n".'<table><tr><td>Found '.
&Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
$result.='<input type="hidden" name="gradingkey" value="'.
&Apache::lonnet::escape($todo).'" />';
$Apache::bridgetask::queue_key=$todo;
&Apache::structuretags::initialize_storage();
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
$result.="\n".'<table width="100%" style="width:100%" border="1">';
} else {	} else {
if ($target eq 'webgrade') {	my ($todo,$status_code)=&get_key_todo($target);
$result.="\n".	if ($todo) {
'<table><tr><td>No user to be graded.</td></tr></table>';	&setup_env_for_other_user($todo,$safeeval);
	my ($symb,$uname,$udom)=&decode_queue_key($todo);
	$result.="\n".'<table><tr><td>Found '.
	&Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
	$result.='<input type="hidden" name="gradingkey" value="'.
	&Apache::lonnet::escape($todo).'" />';
	$Apache::bridgetask::queue_key=$todo;
	&Apache::structuretags::initialize_storage();
	&Apache::lonhomework::showhash(%Apache::lonhomework::history);
	if ($target eq 'webgrade') {
	$result.='<br />After'.&show_queue('gradingqueue');
	$result.="\n".'<table width="100%" style="width:100%" border="1">';
	}
	} else {
	if ($target eq 'webgrade') {
	$result.="\n".'<table><tr><td><b>';
	if ($status_code eq 'stop') {
	$result.=&mt("Stopped grading.");
	} elsif ($status_code eq 'lock_failed') {
	$result.=&mt("Failed to lock the request record.");
	} elsif ($status_code eq 'unlock') {
	$result.=&mt("Unlocked the requested user.");
	} else {
	$result.=&mt("No user to be graded.");
	}
	$result.='</b></td></tr></table>';
	}
	$webgrade='no';
	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'})) {
	$result.=$form_tag_start;
	$result.='<input type="hidden" name="webgrade" value="'.
	$webgrade.'" />';
	$result.='<input type="hidden" name="queue" value="'.
	$env{'form.queue'}.'" />';
}	}
} 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
Line 236 sub start_Task {	Line 330 sub start_Task {
return $result;	return $result;
}	}

	sub get_key_todo {
	my ($target)=@_;
	my $todo;
	my $queue=$env{'form.queue'};
	if (!defined($queue)) {
	$env{'form.queue'}=$queue='gradingqueue';
	}
	my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});
	if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
	&& !defined($env{'form.action'})) {
	#FIXME probably need to do some cheking here for more validity
	&Apache::lonnet::logthis("Found a key was given to me");
	return ($gradingkey);
	}
	if ($env{'form.action'} eq 'resume') {
	&Apache::lonnet::logthis("Resuming a key");
	return ($gradingkey);
	} elsif ($env{'form.action'} eq 'unlock') {
	&Apache::lonnet::logthis("Unlocking a key ".
	&check_queue_unlock($queue,$gradingkey,1));
	return (undef,'unlock');
	} elsif ($env{'form.action'} eq 'select') {
	if (&lock_key($queue,$gradingkey)) {
	return ($gradingkey);
	}
	return (undef,'lock_failed');
	}
	# don't get something new from the queue if they hit the stop button
	if (!($env{'form.stop'} && $target eq 'webgrade')) {
	return (&get_from_queue($queue));
	} else {
	return (undef,'stop');
	}
	}

sub end_Task {	sub end_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';	my $result='';
my $status=$Apache::inputtags::status['-1'];	my $status=$Apache::inputtags::status['-1'];
my $version=$Apache::lonhomework::history{'resource.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 (
Line 248 sub end_Task {	Line 377 sub end_Task {
($target eq 'answer') \|\| ($target eq 'tex')	($target eq 'answer') \|\| ($target eq 'tex')
) {	) {
if ($target eq 'web') {	if ($target eq 'web') {
if ($status eq 'CAN_ANSWER') {	if ($status eq 'CAN_ANSWER' && !$previous) {
$result.="\n".'<table border="1">'.	$result.="\n".'<table border="1">'.
&Apache::inputtags::file_selector($version,	&Apache::inputtags::file_selector("$version.0",
"bridgetask","*",	"bridgetask","*",
'portfolioonly').	'portfolioonly').
"</table>";	"</table>";
Line 261 sub end_Task {	Line 390 sub end_Task {
$result.=&Apache::lonxml::xmlend().'</html>';	$result.=&Apache::lonxml::xmlend().'</html>';
}	}
}	}
if ($target eq 'grade' && !$env{'form.webgrade'}) {	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
my $award='SUBMITTED';	my $award='SUBMITTED';
&Apache::essayresponse::file_submission('0','bridgetask',	&Apache::essayresponse::file_submission("$version.0",'bridgetask',
'portfiles',\$award);	'portfiles',\$award);
if ($award eq 'SUBMITTED' &&	if ($award eq 'SUBMITTED' &&
$Apache::lonhomework::results{"resource.$version.bridgetask.portfiles"}) {	$Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) {
$Apache::lonhomework::results{"resource.$version.tries"}=	$Apache::lonhomework::results{"resource.0.tries"}=
1+$Apache::lonhomework::history{"resource.$version.tries"};	$Apache::lonhomework::results{"resource.$version.0.tries"}=
	1+$Apache::lonhomework::history{"resource.$version.0.tries"};

	$Apache::lonhomework::results{"resource.0.award"}=
	$Apache::lonhomework::results{"resource.$version.0.award"}=
	$award;
}	}
$Apache::lonhomework::results{"resource.$version.award"}=$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();	&add_to_queue('gradingqueue',$Apache::inputtags::slot_name);
}	}
}	}
if ($target eq 'grade' && $env{'form.webgrade'}) {	if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') {
my $optional_required=	my $optional_required=
&Apache::lonxml::get_param('OptionalRequired',$parstack,	&Apache::lonxml::get_param('OptionalRequired',$parstack,
$safeeval);	$safeeval);
Line 288 sub end_Task {	Line 421 sub end_Task {
&Apache::lonhomework::showhash(%Apache::lonhomework::results);	&Apache::lonhomework::showhash(%Apache::lonhomework::results);
foreach my $dim_id (@Apache::bridgetask::dimensionlist) {	foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
my $status=	my $status=
$Apache::lonhomework::results{"resource.$dim_id.status"};	$Apache::lonhomework::results{"resource.$version.$dim_id.status"};
my $mandatory=	my $mandatory=
($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');	($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
if ($status eq 'pass') {	if ($status eq 'pass') {
Line 308 sub end_Task {	Line 441 sub end_Task {
$Apache::lonhomework::results{'resource.grader'}=	$Apache::lonhomework::results{'resource.grader'}=
$env{'user.name'}.'@'.$env{'user.domain'};	$env{'user.name'}.'@'.$env{'user.domain'};
if ($review) {	if ($review) {
$Apache::lonhomework::results{'resource.status'}='review';	$Apache::lonhomework::results{"resource.$version.status"}='review';
&move_to_review_queue();	# FIXME won't work well when already in review queues
	&move_between_queues('gradingqueue','reviewqueue');
} elsif ($ungraded) {	} elsif ($ungraded) {
$Apache::lonhomework::results{'resource.status'}='ungraded';	$Apache::lonhomework::results{"resource.$version.status"}='ungraded';
&check_queue_unlock();	# FIXME if in review queue need to move back to grading queue
	&check_queue_unlock($env{'form.queue'});
} elsif ($mandatory_failed) {	} elsif ($mandatory_failed) {
$Apache::lonhomework::results{'resource.status'}='fail';	$Apache::lonhomework::results{"resource.$version.status"}='fail';
$Apache::lonhomework::results{"resource.$version.award"}='EXACT_ANS';	$Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
&remove_from_queue();	$Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';
	$Apache::lonhomework::results{"resource.$version.0.awarded"}='0';
	&remove_from_queue($env{'form.queue'});
} else {	} else {
$Apache::lonhomework::results{'resource.status'}='pass';	$Apache::lonhomework::results{"resource.$version.status"}='pass';
$Apache::lonhomework::results{"resource.$version.award"}='INCORRECT';	$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
&remove_from_queue();	$Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';
	$Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
	&remove_from_queue($env{'form.queue'});
	}
	$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.0.awarded"}=
	$Apache::lonhomework::results{"resource.$version.awarded"};
	$Apache::lonhomework::results{"resource.0.solved"}=
	$Apache::lonhomework::results{"resource.$version.solved"};
}	}
&Apache::structuretags::finalize_storage();	&Apache::structuretags::finalize_storage();
}	}
Line 344 sub end_Task {	Line 493 sub end_Task {
return $result;	return $result;
}	}

sub move_to_review_queue {	sub move_between_queues {
&Apache::lonxml::debug("Want to move");	my ($src_queue,$dest_queue)=@_;
	my $cur_data=&get_queue_data($src_queue);
	if (!$cur_data) { return 'not_exist'; }
	my $result=&add_to_queue($dest_queue,$cur_data->[0]);
	if ($result ne 'ok') {
	return $result;
	}
	&check_queue_unlock($src_queue);
	return &remove_from_queue($src_queue);
}	}

sub check_queue_unlock {	sub check_queue_unlock {
&Apache::lonxml::debug("Want to unlock?");	my ($queue,$key,$allow_not_me)=@_;
	my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
	if (!defined($key)) {
	$key="$symb\0queue\0$uname\@$udom";
	}
	my $cnum=$env{'course.'.$cid.'.num'};
	my $cdom=$env{'course.'.$cid.'.domain'};
	my $me=$env{'user.name'}.'@'.$env{'user.domain'};
	my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
	if ($who eq $me) {
	return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
	} elsif ($allow_not_me) {
	&Apache::lonnet::logthis("unlocking $who by $me");
	return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
	}
	return 'not_owner';
}	}

sub remove_from_queue {	sub remove_from_queue {
&Apache::lonxml::debug("Want to remove. Done?");	my ($queue)=@_;
	my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
	my $cnum=$env{'course.'.$cid.'.num'};
	my $cdom=$env{'course.'.$cid.'.domain'};
	my $key="$symb\0queue\0$uname\@$udom";
	my @keys=($key,"$key\0locked");
	return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);
}	}

sub setup_env_for_other_user {	sub setup_env_for_other_user {
my ($queue_key,$safeeval)=@_;	my ($queue_key,$safeeval)=@_;
my ($symb,$uname,$udom)=&decode_queue_key($queue_key);	my ($symb,$uname,$udom)=&decode_queue_key($queue_key);
	&Apache::lonxml::debug("setup_env for $queue_key");
$env{'form.grade_symb'}=$symb;	$env{'form.grade_symb'}=$symb;
$env{'form.grade_domain'}=$udom;	$env{'form.grade_domain'}=$udom;
$env{'form.grade_username'}=$uname;	$env{'form.grade_username'}=$uname;
Line 366 sub setup_env_for_other_user {	Line 545 sub setup_env_for_other_user {
&Apache::lonxml::initialize_rndseed($safeeval);	&Apache::lonxml::initialize_rndseed($safeeval);
}	}

	sub get_queue_data {
	my ($queue)=@_;
	my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
	my $cnum=$env{'course.'.$cid.'.num'};
	my $cdom=$env{'course.'.$cid.'.domain'};
	my $todo="$symb\0queue\0$uname\@$udom";
	my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);
	if ($key eq $todo && ref($value)) {
	return $value;
	}
	return undef;
	}

sub add_to_queue {	sub add_to_queue {
	my ($queue,$slot_name)=@_;
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 %data;	my %data;
$data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name];	$data{"$symb\0queue\0$uname\@$udom"}=[$slot_name];
&Apache::lonnet::put('gradingqueue',\%data,$cdom,$cnum);	return &Apache::lonnet::put($queue,\%data,$cdom,$cnum);
}	}

sub show_queue {	sub show_queue {
	my ($queue,$with_selects)=@_;
my $result;	my $result;
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 $regexp="^$symb\0";	my $regexp="^$symb\0";
my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);	my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
$result.="\n<h3>Current Queue</h3><table><tr><th>resource</th>".	my ($tmp)=%queue;
"<th>user</th><th>type</th><th>data</th></tr>";	if ($tmp=~/^error: 2 /) {
	return "\n<h3>Current Queue</h3><table border='1'><tr><td>Empty</td></tr></table>";
	}
	$result.="\n<h3>Current Queue</h3><table border='1'><tr>";
	if ($with_selects) { $result.="<th></th>"; }
	$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))) {
if ($key=~/locked$/) {	if ($key=~/locked$/ && !$with_selects) {
my ($symb,$uname,$udom) = &decode_queue_key($key);	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><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>';
} elsif ($key=~/timestamp$/) {	} elsif ($key=~/timestamp$/ && !$with_selects) {
my ($symb,undef) = split("\0",$key);	my ($symb,undef) = split("\0",$key);
my $title=&Apache::lonnet::gettitle($symb);	my $title=&Apache::lonnet::gettitle($symb);
$result.="<tr><td>$title</td><td></td><td>";	$result.="<tr><td>$title</td><td></td>";
$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>";
} else {	} elsif ($key!~/(timestamp\|locked)$/) {
my ($symb,$uname,$udom) = &decode_queue_key($key);	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><td>";	$result.="<tr>";
	if ($with_selects) {
	my $ekey=&Apache::lonnet::escape($key);
	my ($action,$description)=('select',&mt('Select'));
	if (exists($queue{"$key\0locked"})) {
	my $me=$env{'user.name'}.'@'.$env{'user.domain'};
	if ($me eq $queue{"$key\0locked"}) {
	($action,$description)=('resume',&mt('Resume'));
	} else {
	($action,$description)=('unlock',&mt('Unlock'));
	}
	}
	$result.=(<<FORM);
	<td>
	<form method="POST">
	<input type="hidden" name="gradingkey" value="$ekey" />
	<input type="hidden" name="queue" value="$queue" />
	<input type="hidden" name="gradingaction" value="$action" />
	<input type="hidden" name="webgrade" value="no" />
	<input type="submit" name="submit" value="$description" />
	</form>
	</td>
	FORM
	}
	$result.="<td>$title</td><td>$uname</td>";
my $slot=$queue{$key}->[0];	my $slot=$queue{$key}->[0];
my %slot_data=&Apache::lonnet::get_slot($slot);	my %slot_data=&Apache::lonnet::get_slot($slot);
$result.='<td>queue entry</td><td>End time: '.	$result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.
&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).	&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
"</td></tr>";	"</td></tr>";
}	}
Line 419 sub decode_queue_key {	Line 642 sub decode_queue_key {
}	}

sub queue_key_locked {	sub queue_key_locked {
my ($key,$cdom,$cnum)=@_;	my ($queue,$key,$cdom,$cnum)=@_;
my ($key_locked,$value)=	my ($key_locked,$value)=
&Apache::lonnet::get('gradingqueue',["$key\0locked"],$cdom,$cnum);	&Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);
if ($key_locked eq "$key\0locked") {	if ($key_locked eq "$key\0locked") {
return $value;	return $value;
}	}
Line 429 sub queue_key_locked {	Line 652 sub queue_key_locked {
}	}

sub pick_from_queue_data {	sub pick_from_queue_data {
my ($check_section,$queue,$cdom,$cnum)=@_;	my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
foreach my $key (keys(%$queue)) {	foreach my $key (keys(%$queuedata)) {
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 439 sub pick_from_queue_data {	Line 662 sub pick_from_queue_data {
next;	next;
}	}
}	}
my $slot=$queue->{$key}[0];	my $slot=$queuedata->{$key}[0];
my %slot_data=&Apache::lonnet::get_slot($slot);	my %slot_data=&Apache::lonnet::get_slot($slot);
if ($slot_data{'endtime'} > time) {	if ($slot_data{'endtime'} > time) {
&Apache::lonnet::logthis("not time");	&Apache::lonnet::logthis("not time");
next;	next;
}	}
if (&queue_key_locked($key,$cdom,$cnum)) {	if (&queue_key_locked($queue,$key,$cdom,$cnum)) {
&Apache::lonnet::logthis("someone already has um.");	&Apache::lonnet::logthis("someone already has um.");
next;	next;
}	}
Line 455 sub pick_from_queue_data {	Line 678 sub pick_from_queue_data {
}	}

sub find_mid_grade {	sub find_mid_grade {
my ($symb,$cdom,$cnum)=@_;	my ($queue,$symb,$cdom,$cnum)=@_;
my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});	my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
my $me=$env{'user.name'}.'@'.$env{'user.domain'};	my $me=$env{'user.name'}.'@'.$env{'user.domain'};
if ($todo) {	if ($todo) {
my $who=&queue_key_locked($todo,$cdom,$cnum);	my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
if ($who eq $me) { return $todo; }	if ($who eq $me) { return $todo; }
}	}
my $regexp="^$symb\0.*\0locked\$";	my $regexp="^$symb\0.*\0locked\$";
my %locks=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);	my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
foreach my $key (keys(%locks)) {	foreach my $key (keys(%locks)) {
my $who=$locks{$key};	my $who=$locks{$key};
if ($who eq $me) {	if ($who eq $me) {
Line 475 sub find_mid_grade {	Line 698 sub find_mid_grade {
return undef;	return undef;
}	}

	sub lock_key {
	my ($queue,$todo)=@_;
	my $me=$env{'user.name'}.'@'.$env{'user.domain'};
	my (undef,$cid)=&Apache::lonxml::whichuser();
	my $cnum=$env{'course.'.$cid.'.num'};
	my $cdom=$env{'course.'.$cid.'.domain'};
	my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},
	$cdom,$cnum);
	&Apache::lonnet::logthis("success $success $todo");
	if ($success eq 'ok') {
	return 1;
	}
	return 0;
	}

sub get_from_queue {	sub get_from_queue {
	my ($queue)=@_;
my $result;	my $result;
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 $todo;	my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);
# FIXME need to find if I am 'mid grading'
$todo=&find_mid_grade($symb,$cdom,$cnum);
&Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo)));	&Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo)));
if ($todo) { return $todo; }	if ($todo) { return $todo; }
while (1) {	while (1) {
my $starttime=time;	my $starttime=time;
&Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime},	&Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime},
$cdom,$cnum);	$cdom,$cnum);
&Apache::lonnet::logthis("$starttime");	&Apache::lonnet::logthis("$starttime");
my $regexp="^$symb\0queue\0";	my $regexp="^$symb\0queue\0";
my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);	my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
#make a pass looking for a user in my section	#make a pass looking for a user in my section
if ($env{'request.course.sec'}) {	if ($env{'request.course.sec'}) {
&Apache::lonnet::logthis("sce");	&Apache::lonnet::logthis("sce");
$todo=&pick_from_queue_data($env{'request.course.sec'},\%queue,	$todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
$cdom,$cnum);	\%queue,$cdom,$cnum);
&Apache::lonnet::logthis("sce $todo");	&Apache::lonnet::logthis("sce $todo");
}	}
# no one in our section so look for any user that is ready for grading	# no one in our section so look for any user that is ready for grading
if (!$todo) {	if (!$todo) {
&Apache::lonnet::logthis("no sce");	&Apache::lonnet::logthis("no sce");
$todo=&pick_from_queue_data($env{'request.course.sec'},\%queue,	$todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
$cdom,$cnum);	\%queue,$cdom,$cnum);
&Apache::lonnet::logthis("no sce $todo");	&Apache::lonnet::logthis("no sce $todo");
}	}
# no user to grade	# no user to grade
if (!$todo) { last; }	if (!$todo) { last; }
&Apache::lonnet::logthis("got $todo");	&Apache::lonnet::logthis("got $todo");
# otherwise found someone so lets try to lock them	# otherwise found someone so lets try to lock them
my $success=&Apache::lonnet::newput('gradingqueue',	# unless someone else already picked them
{"$todo\0locked"=>	if (!&lock_key($queue,$todo)) { next; }
$env{'user.name'}.'@'.$env{'user.domain'}},
$cdom,$cnum);
# someone else already picked them
&Apache::lonnet::logthis("success $todo");
if ($success ne 'ok') { next; }
my (undef,$endtime)=	my (undef,$endtime)=
&Apache::lonnet::get('gradingqueue',["$symb\0timestamp"],	&Apache::lonnet::get($queue,["$symb\0timestamp"],
$cdom,$cnum);	$cdom,$cnum);
&Apache::lonnet::logthis("emd $endtime");	&Apache::lonnet::logthis("emd $endtime");
# someone else already modified the queue,	# someone else already modified the queue,
Line 527 sub get_from_queue {	Line 759 sub get_from_queue {
# double check.	# double check.
if ($endtime != $starttime) {	if ($endtime != $starttime) {
my ($key,$value)=	my ($key,$value)=
&Apache::lonnet::get('gradingqueue',["$todo"],	&Apache::lonnet::get($queue,["$todo"],
$cdom,$cnum);	$cdom,$cnum);
&Apache::lonnet::logthis("check $key .. $value");	&Apache::lonnet::logthis("check $key .. $value");
if ($key eq $todo && ref($value)) {	if ($key eq $todo && ref($value)) {
} else {	} else {
&Apache::lonnet::del('gradingqueue',["$todo\0locked"],	&Apache::lonnet::del($queue,["$todo\0locked"],
$cdom,$cnum);	$cdom,$cnum);
&Apache::lonnet::logthis("del");	&Apache::lonnet::logthis("del");
next;	next;
Line 585 sub start_Dimension {	Line 817 sub start_Dimension {
}	}

sub get_instance {	sub get_instance {
#FIXME just grabbing the first one for now, need
#to randomly pick one until all have been seen
#then start repicking
&Apache::response::pushrandomnumber();	&Apache::response::pushrandomnumber();
my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});	my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
return $order[0];	my $num=@order;
	my $version=&get_version();
	my $which=($version-1)%$num;
	return $order[$which];
}	}

{	{
Line 598 sub get_instance {	Line 830 sub get_instance {
sub end_Dimension {	sub end_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;	my $result;
my $dim_id=&get_id($parstack,$safeeval);	my $dim=&get_id($parstack,$safeeval);
my $instance=&get_instance();	my $instance=&get_instance();
	my $version=&get_version();
if ($target eq 'web') {	if ($target eq 'web') {
$result=$dimension{'intro'}.$dimension{$instance.'.text'};	$result=$dimension{'intro'}.$dimension{$instance.'.text'};
if ($Apache::lonhomework::history{'resource.status'} eq 'pass' \|\|	if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' \|\|
$Apache::lonhomework::history{'resource.status'} eq 'fail') {	$Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
foreach my $id (@{$dimension{$instance.'.criterias'}}) {	foreach my $id (@{$dimension{$instance.'.criterias'}}) {
my $status=$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.status"};	my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
my $comment=$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"};	my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
$result.='<table border="1"><tr><td>';	$result.='<table border="1"><tr><td>';
if ($status eq 'fail') {	if ($status eq 'fail') {
$result.='<font color="red">'.&mt('Did not pass').'</font>';	$result.='<font color="red">'.&mt('Did not pass').'</font>';
Line 616 sub get_instance {	Line 849 sub get_instance {
&Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");	&Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");
}	}
$result.='</td></tr><tr><td>';	$result.='</td></tr><tr><td>';
if ($Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}) {	if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
$result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}.'</td></tr><tr><td>';	$result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>';
}	}
$result.=$dimension{$instance.'.criteria.'.$id}.	$result.=$dimension{$instance.'.criteria.'.$id}.
'</td></tr></table>';	'</td></tr></table>';
}	}
}	}
} elsif ($target eq 'webgrade') {	} elsif ($target eq 'webgrade') {
my $version=$Apache::lonhomework::history{'resource.version'};
foreach my $id (@{$dimension{$instance.'.criterias'}}) {	foreach my $id (@{$dimension{$instance.'.criterias'}}) {
my $link='criteria_'.$instance.'_'.$id;	my $link='criteria_'.$instance.'_'.$id;
my $status=$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.status"};	my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
$result.='<tr><td width="100%" valign="top">'.	$result.='<tr><td width="100%" valign="top">'.
'<a name="'.$link.'" />'.	'<a name="'.$link.'" />'.
'<a name="next_'.$last_link.'" />'.	'<a name="next_'.$last_link.'" />'.
Line 635 sub get_instance {	Line 867 sub get_instance {
#$dimension{$instance.'.criteria.'.$id}.	#$dimension{$instance.'.criteria.'.$id}.
'</td>'.	'</td>'.
'<td><nobr>Additional Comment for Student</nobr> <br />'.	'<td><nobr>Additional Comment for Student</nobr> <br />'.
'<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}).'</textarea>'.	'<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'.
'</td>'.	'</td>'.
'<td>'.	'<td>'.
'<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' \|\| !$status ? 'checked="checked"':'').'/>Ungraded</label></nobr><br />'.	'<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' \|\| !$status ? 'checked="checked"':'').'/>'.&mt('Ungraded').'</label></nobr><br />'.
'<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />Pass</label><br />'.	'<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.
'<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />Fail</label><br />'.	'<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.
'<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />Review</label><br />'.	'<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'.
'</td>'.	'</td>'.
'<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="'.	'<input type="submit" name="next" value="'.
&mt('Done').'" /> '.	&mt('Done').'" /> '.
	'<input type="submit" name="stop" value="'.
	&mt('Stop').'" /> '.
'</td></tr>';	'</td></tr>';
$result.='<tr><td colspan="4">';	$result.='<tr><td colspan="4">';
my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();	my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
Line 668 sub get_instance {	Line 902 sub get_instance {
my $ungraded=0;	my $ungraded=0;
my $review=0;	my $review=0;
foreach my $id (@{$dimension{$instance.'.criterias'}}) {	foreach my $id (@{$dimension{$instance.'.criterias'}}) {
my $status=$Apache::lonhomework::results{"resource.$dim_id.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};	my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
$Apache::lonhomework::results{"resource.$dim_id.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};	$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');	my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
if ($status eq 'pass') {	if ($status eq 'pass') {
if (!$mandatory) { $optional_passed++; }	if (!$mandatory) { $optional_passed++; }
Line 688 sub get_instance {	Line 922 sub get_instance {
}	}
&Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");	&Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
if ($review) {	if ($review) {
$Apache::lonhomework::results{"resource.$dim_id.status"}=	$Apache::lonhomework::results{"resource.$version.$dim.status"}=
'review';	'review';
} elsif ($ungraded) {	} elsif ($ungraded) {
$Apache::lonhomework::results{"resource.$dim_id.status"}=	$Apache::lonhomework::results{"resource.$version.$dim.status"}=
'ungraded';	'ungraded';
} elsif ($mandatory_failed) {	} elsif ($mandatory_failed) {
$Apache::lonhomework::results{"resource.$dim_id.status"}=	$Apache::lonhomework::results{"resource.$version.$dim.status"}=
'fail';	'fail';
} else {	} else {
$Apache::lonhomework::results{"resource.$dim_id.status"}=	$Apache::lonhomework::results{"resource.$version.$dim.status"}=
'pass';	'pass';
}	}
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.24
changed lines
	Added in v.1.32