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.83 and 1.155

version 1.83, 2005/11/21 22:42:22	version 1.155, 2006/05/25 19:39:13
Line 40 use Apache::slotrequest();	Line 40 use Apache::slotrequest();
use Time::HiRes qw( gettimeofday tv_interval );	use Time::HiRes qw( gettimeofday tv_interval );

BEGIN {	BEGIN {
&Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph'));	&Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','Instance','InstanceText','Criteria','ClosingParagraph'));
}	}

sub initialize_bridgetask {	sub initialize_bridgetask {
Line 66 sub proctor_check_auth {	Line 66 sub proctor_check_auth {

my @allowed=split(",",$slot->{'proctor'});	my @allowed=split(",",$slot->{'proctor'});
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 $authenticated=0;	my $authenticated=0;
if ( $slot->{'secret'} =~ /\S/ &&	if ( $slot->{'secret'} =~ /\S/ &&
Line 79 sub proctor_check_auth {	Line 79 sub proctor_check_auth {
$authenticated=1;	$authenticated=1;
}	}
}	}
if ($authenticated && $type eq 'Task') {	if ($authenticated) {
my $version=	&create_new_version($type,$user,$domain,$slot_name);
$Apache::lonhomework::results{'resource.version'}=
++$Apache::lonhomework::history{'resource.version'};
$Apache::lonhomework::results{"resource.$version.checkedin"}=
$user.'@'.$domain;
$Apache::lonhomework::results{"resource.$version.checkedin.slot"}=
$slot_name;
foreach my $key (keys(%Apache::lonhomework::history)) {
if ($key=~/^resource\.0\./) {
$Apache::lonhomework::results{$key}='';
}
}
return 1;	return 1;
} elsif ($authenticated && $type eq 'problem') {
&Apache::lonxml::debug("authed #slot_name");
$Apache::lonhomework::results{"resource.0.checkedin"}=
$user.'@'.$domain;
$Apache::lonhomework::results{"resource.0.checkedin.slot"}=
$slot_name;
}	}
}	}
}	}
return 0;	return 0;
}	}

	sub create_new_version {
	my ($type,$user,$domain,$slot_name) = @_;
	if ($type eq 'Task') {
	# increment version
	my $version=
	$Apache::lonhomework::history{'resource.0.version'};
	$version++;
	&Apache::lonxml::debug("Making version $version");
	#clean out all current results
	foreach my $key (keys(%Apache::lonhomework::history)) {
	if ($key=~/^resource\.0\./) {
	$Apache::lonhomework::results{$key}='';
	}
	}

	#setup new version and who did it
	$Apache::lonhomework::results{'resource.0.version'}=$version;
	if (defined($user) && defined($domain)) {
	$Apache::lonhomework::results{"resource.$version.0.checkedin"}=
	$user.':'.$domain;
	} else {
	$Apache::lonhomework::results{"resource.$version.0.checkedin"}=
	$env{'user.name'}.':'.$env{'user.domain'};
	}
	if (defined($slot_name)) {
	$Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
	$slot_name;
	}
	} elsif ($type eq 'problem') {
	&Apache::lonxml::debug("authed $slot_name");
	if (defined($user) && defined($domain)) {
	$Apache::lonhomework::results{"resource.0.checkedin"}=
	$user.':'.$domain;
	}
	if (defined($slot_name)) {
	$Apache::lonhomework::results{"resource.0.checkedin.slot"}=
	$slot_name;
	}
	}
	}

sub get_version {	sub get_version {
my ($version,$previous);	my ($version,$previous);
if ($env{'form.previousversion'} &&	if ($env{'form.previousversion'} &&
$env{'form.previousversion'} ne 'current' &&	$env{'form.previousversion'} ne 'current' &&
defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {	defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.0.status'})) {
$version=$env{'form.previousversion'};	$version=$env{'form.previousversion'};
$previous=1;	$previous=1;
} else {	} else {
$version=$Apache::lonhomework::history{'resource.version'};	if (defined($Apache::lonhomework::results{'resource.0.version'})) {
	$version=$Apache::lonhomework::results{'resource.0.version'};
	} elsif (defined($Apache::lonhomework::history{'resource.0.version'})) {
	$version=$Apache::lonhomework::history{'resource.0.version'};
	}
$previous=0;	$previous=0;
}	}
if (wantarray) {	if (wantarray) {
Line 125 sub get_version {	Line 153 sub get_version {
sub add_previous_version_button {	sub add_previous_version_button {
my ($status)=@_;	my ($status)=@_;
my $result;	my $result;
if ($Apache::lonhomework::history{'resource.version'} eq '') {	if ($Apache::lonhomework::history{'resource.0.version'} eq '') {
return '';	return '';
}	}
if ($Apache::lonhomework::history{'resource.version'} < 2 &&	if ($Apache::lonhomework::history{'resource.0.version'} < 2 &&
$status ne 'NEEDS_CHECKIN') {	$status ne 'NEEDS_CHECKIN') {
return '';	return '';
}	}
Line 139 sub add_previous_version_button {	Line 167 sub add_previous_version_button {
"</h3>\n";	"</h3>\n";
}	}
my @to_show;	my @to_show;
foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) {	foreach my $test_version (1..$Apache::lonhomework::history{'resource.0.version'}) {
if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) {	if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.0.status'})) {
push(@to_show,$test_version);	push(@to_show,$test_version);
}	}
}	}
Line 148 sub add_previous_version_button {	Line 176 sub add_previous_version_button {
join("</option>\n<option>",@to_show).	join("</option>\n<option>",@to_show).
"</option>\n";	"</option>\n";
$list.='<option value="current">'.&mt('Current').'</option>';	$list.='<option value="current">'.&mt('Current').'</option>';
$result.='<form name="getprevious" method="POST" action="';	$result.='<form name="getprevious" method="post" action="';
my $uri=$env{'request.uri'};	my $uri=$env{'request.uri'};
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }	if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
$result.=$uri.'">'.	$result.=$uri.'">'.
Line 163 sub add_grading_button {	Line 191 sub add_grading_button {
my (undef,$cid)=&Apache::lonxml::whichuser();	my (undef,$cid)=&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 %sections;	my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
my $numsections=&Apache::loncommon::get_sections($cdom,$cnum,\%sections);
my $size=5;	my $size=5;
if (scalar(keys(%sections)) < 3) {	if (scalar(keys(%sections)) < 3) {
$size=scalar(keys(%sections))+2;	$size=scalar(keys(%sections))+2;
}	}
my $sec_select = '<select multiple name="chosensections" size="'.$size.'">'."\n";	my $sec_select = '<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
$sec_select .= "<option value='all' selected='selected'>all</option>\n";	$sec_select .= "<option value='all' selected='selected'>all</option>\n";
foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {	foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
$sec_select .= "<option name=\"$sec\">$sec</option>\n";	$sec_select .= "<option value=\"$sec\">$sec</option>\n";
}	}
$sec_select .= "<option value='none'>none</option></select>\n";	$sec_select .= "<option value='none'>none</option></select>\n";

Line 181 sub add_grading_button {	Line 209 sub add_grading_button {
$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.='<table><tr>';
$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.='<td rowspan="4">Specify a section: </td><td rowspan="4">'.$sec_select.'</td>';
	$result.='<td>'.' <input type="submit" name="reviewagrading" value="'.
	&mt("Select an entry from the grading queue:").'" /> ';

$result.=' <input type="submit" name="reviewagrading" value="'.	$result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' </td></tr>'."\n";
&mt("Select an entry from the grading queue").'" /> </p>'."\n";

($entries,$ready,$locks)=&get_queue_counts('reviewqueue');	($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
$result.='<p>'.&mt("Review Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);	$result.='<tr><td>'.
$result.=' <input type="submit" name="reviewasubmission" value="'.	' <input type="submit" name="reviewasubmission" value="'.
&mt("Select an entry from the review queue").'" /> </p>'."\n";	&mt("Select an entry from the review queue:").'" /> ';
$result.=' <input type="submit" name="regradeasubmission" value="'.	$result.=&mt("[_1] entries, [_2] ready, [_3] being graded",
&mt("Select a user to regrade.").'" /> </p>'."\n";	$entries,$ready,$locks).'</td></tr>'."\n";
	$result.='<tr><td> <input type="submit" name="regradeasubmission" value="'.
	&mt("List of user's grade status").'" /> </td></tr></table>'."\n";
	$result.='<p> <input type="submit" name="regradeaspecificsubmission" value="'.
	&mt("Regrade specific user:").'" />'."\n";
	$result.='<input type="text" size="12" name="gradinguser" />';
	$result.=&Apache::loncommon::select_dom_form($env{'user.domain'},
	'gradingdomain');
	$result.=' '.
	&Apache::loncommon::selectstudent_link('gradesubmission',
	'gradinguser',
	'gradingdomain');
	$result.=&Apache::loncommon::studentbrowser_javascript();
	$result.= '</p>';
}	}
return $result;	return $result;
}	}
Line 202 sub add_request_another_attempt_button {	Line 244 sub add_request_another_attempt_button {
if (!$text) { $text="Request another attempt"; }	if (!$text) { $text="Request another attempt"; }
my $result;	my $result;
my $symb=&Apache::lonnet::symbread();	my $symb=&Apache::lonnet::symbread();
	# not a slot access based resource
	my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
	if ($useslots =~ /^\sno\s$/i) {
	return '';
	}

my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);	my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
my $action='get_reservation';	my $action='get_reservation';
if ($slot_name) {	if ($slot_name) {
Line 216 STUFF	Line 264 STUFF

if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }	if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
$symb=&Apache::lonnet::escape($symb);	$symb=&Apache::lonnet::escape($symb);
$result.='<form method="POST" action="/adm/slotrequest">'.	$result.='<form method="post" action="/adm/slotrequest">'.
'<input type="hidden" name="symb" value="'.$symb.'" />'.	'<input type="hidden" name="symb" value="'.$symb.'" />'.
'<input type="hidden" name="command" value="'.$action.'" />'.	'<input type="hidden" name="command" value="'.$action.'" />'.
'<input type="submit" name="requestattempt" value="'.	'<input type="submit" name="requestattempt" value="'.
Line 238 sub preserve_grade_info {	Line 286 sub preserve_grade_info {
}	}

sub style {	sub style {
return (<<STYLE);	my ($target) = @_;
<style type="text/css">	if ($target eq 'web'
.fail, .pass, .neutral {	\|\| $target eq 'webgrade') {
position: relative;	return (<<STYLE);
margin : 5px;	<link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />
margin-bottom :10px;
padding : 4px;
padding-left : 75px;
border : thin solid;
font-weight : bolder;
font-size: smaller;
font-family: Arial;
background-color : rgb(255,240,225);
}

.fail h4, .pass h4 {
position:absolute;
left: -4px;
top: -8px;
padding:2px;
margin:0;
background-color : rgb(255,240,225);
border : thin solid;
}

.fail {
color: red;
}

.pass {
color : green;
}

.neutral {
color : blue;
}

.question {
border : thin solid black;
padding : 4px;
margin-bottom : 1em;
}

.grade {
font-size: x-large;
font-family: Arial;
position:absolute;
left: 5px;
top: -5px;
width: 70px;
}

div#feedback h1 {
color : inherit;
}
</style>
STYLE	STYLE
	}
	return;
}	}

sub show_task {	sub show_task {
Line 307 sub show_task {	Line 305 sub show_task {
( $status eq 'NOT_IN_A_SLOT') \|\|	( $status eq 'NOT_IN_A_SLOT') \|\|
( $status eq 'NEEDS_CHECKIN') \|\|	( $status eq 'NEEDS_CHECKIN') \|\|
( $status eq 'WAITING_FOR_GRADE') \|\|	( $status eq 'WAITING_FOR_GRADE') \|\|
( $status eq 'INVALID_ACCESS') )) {	( $status eq 'INVALID_ACCESS') \|\|
	( &get_version() eq ''))) {
return 0;	return 0;
}	}
if ($env{'form.donescreen'}) { return 0; }	if ($env{'form.donescreen'}) { return 0; }
Line 322 sub internal_location {	Line 321 sub internal_location {
sub submission_time_stamp {	sub submission_time_stamp {
my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();	my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
my $submissiontime;	my $submissiontime;
my $version=$Apache::lonhomework::history{'resource.version'};	my $version=$Apache::lonhomework::history{'resource.0.version'};
for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {	for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {
if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) {	if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) {
$submissiontime=$Apache::lonhomework::history{$v.':timestamp'};	$submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
Line 330 sub submission_time_stamp {	Line 329 sub submission_time_stamp {
}	}
my $result;	my $result;
if ($submissiontime) {	if ($submissiontime) {
my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'};	my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.0.checkedin.slot'};
my %slot=&Apache::lonnet::get_slot($slot_name);	my %slot=&Apache::lonnet::get_slot($slot_name);
my $diff = $slot{'endtime'} - $submissiontime;	my $diff = $slot{'endtime'} - $submissiontime;
my ($color,$when)=('#FF6666','after');	my ($color,$when)=('#FF6666','after');
Line 351 sub submission_time_stamp {	Line 350 sub submission_time_stamp {
return $result;	return $result;
}	}

sub webgrade_standard_info {	sub file_list {
my ($version)=&get_version();	my ($files,$uname,$udom) = @_;
my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();	if (!defined($uname) \|\| !defined($udom)) {
	(undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
	}
my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';	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_list="<ul class=\"LC_GRADING_handininfo\">\n";
	foreach my $partial_file (split(',',$files)) {
my $file=$file_url.$partial_file;	my $file=$file_url.$partial_file;
$file=~s\|/+\|/\|g;	$file=~s\|/+\|/\|g;
&Apache::lonnet::allowuploaded('/adm/bridgetask',$file);	&Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
$file_list.='<li><nobr><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.	$file_list.='<li><nobr><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
&Apache::loncommon::icon($file).'" border=0"> '.$file.	&Apache::loncommon::icon($file).'" border="0"> '.$file.
'</a></nobr></li>'."\n";	'</a></nobr></li>'."\n";
}	}
$file_list.="</ul>\n";	$file_list.="</ul>\n";
	return $file_list;
	}

my %lt=&Apache::lonlocal::texthash('done' => 'Done',	sub webgrade_standard_info {
'stop' => 'Stop',	my ($version)=&get_version();

	my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"});

	my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',
	'stop' => 'Quit Grading',
	'fail' => 'Fail Rest',
);	);

my $result=<<INFO;	my $result=<<INFO;
<div class="handininfo">	<div class="LC_GRADING_maincontrols">
<input type="submit" name="next" value="$lt{'done'}" />	<input type="submit" name="next" value="$lt{'done'}" />
<input type="submit" name="stop" value="$lt{'stop'}" />	<input type="submit" name="stop" value="$lt{'stop'}" />
	<input type="button" name="fail" value="$lt{'fail'}"
	onclick="javascript:onFailRest()" />
	</div>
$file_list	$file_list
</div>
INFO	INFO
return $result;	return $result;
}	}

sub start_Task {	sub start_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;

my ($status,$accessmsg,$slot);	my ($status,$accessmsg,$slot);
if ($target ne 'webgrade') {	if ($target ne 'webgrade') {
Line 394 sub start_Task {	Line 406 sub start_Task {
}	}

$Apache::lonhomework::parsing_a_task=1;	$Apache::lonhomework::parsing_a_task=1;
#should get back a <html> or the neccesary stuff to start XML/MathML
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=	my $name;
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);	if ($target eq 'web' \|\| $target eq 'webgrade') {
	$name = &Apache::structuretags::get_resource_name($parstack,$safeeval);
	}

	my ($result,$form_tag_start);
	if ($target eq 'web' \|\| $target eq 'webgrade' \|\| $target eq 'tex'
	\|\| $target eq 'edit') {
	($result,$form_tag_start) =
	&Apache::structuretags::page_start($target,$token,$tagstack,
	$parstack,$parser,$safeeval,
	$name,&style($target));
	$result .= '<div class="LC_task">'."\n";
	}

if ($target eq 'web' && $env{'request.state'} ne 'construct') {	if ($target eq 'web' && $env{'request.state'} ne 'construct') {
if ($Apache::lonhomework::modifygrades) {	if ($Apache::lonhomework::queuegrade
$body_tag_start.='<form name="gradesubmission" method="POST" action="';	\|\| $Apache::lonhomework::modifygrades) {
	$result.='<form name="gradesubmission" method="post" action="';
my $uri=$env{'request.uri'};	my $uri=$env{'request.uri'};
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }	if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
$body_tag_start.=$uri.'">'.&add_grading_button()."</form>";	$result.=$uri.'">'.&add_grading_button()."</form>";
my $symb=&Apache::lonnet::symbread();	my $symb=&Apache::lonnet::symbread();
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {	if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
$body_tag_start.='<form method="POST" action="/adm/slotrequest">'.	$result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
'<input type="hidden" name="symb" value="'.$symb.'" />'.	'<input type="hidden" name="symb" value="'.$symb.'" />'.
'<input type="hidden" name="command" value="showslots" />'.	'<input type="hidden" name="command" value="showslots" />'.
'<input type="submit" name="requestattempt" value="'.	'<input type="submit" name="requestattempt" value="'.
&mt('Show Slot list').'" />'.	&mt('Show Slot list').'" />'.
'</form>';	'</form>';
	my $target_id =
	&Apache::lonstathelpers::make_target_id({symb => $symb,
	part => '0'});
	$result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
	'<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
	'<input type="hidden" name="reportSelected" value="grading_analysis" />'.
	'<input type="submit" name="grading" value="'.
	&mt('Show Grading Status').'" />'.
	'</form>';
}	}
}	}
}	}
Line 423 sub start_Task {	Line 457 sub start_Task {
my ($version,$previous)=&get_version();	my ($version,$previous)=&get_version();
($status,$accessmsg,my $slot_name,$slot) =	($status,$accessmsg,my $slot_name,$slot) =
&Apache::lonhomework::check_slot_access('0','Task');	&Apache::lonhomework::check_slot_access('0','Task');
	if ($status eq 'CAN_ANSWER' && $version eq '') {
	&create_new_version('Task',undef,undef,$slot_name);
	&add_to_queue('gradingqueue',{'type' => 'Task',
	'time' => time,
	'slot' => $slot_name});
	($version,$previous)=&get_version();
	}

push(@Apache::inputtags::status,$status);	push(@Apache::inputtags::status,$status);
$Apache::inputtags::slot_name=$slot_name;	$Apache::inputtags::slot_name=$slot_name;
my $expression='$external::datestatus="'.$status.'";';	my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.0.solved"}.'";';
&Apache::run::run($expression,$safeeval);	&Apache::run::run($expression,$safeeval);
&Apache::lonxml::debug("Got $status");	&Apache::lonxml::debug("Got $status");
$body_tag_start.=&add_previous_version_button($status);	$result.=&add_previous_version_button($status);
if (!&show_task($status,$previous)) {	if (!&show_task($status,$previous)) {
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);	my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
if ( $target eq "web" ) {	if ( $target eq "web" ) {
$result.= $head_tag_start.'</head>'.$body_tag_start;
if ($env{'request.state'} eq 'construct') {	if ($env{'request.state'} eq 'construct') {
$result.=$form_tag_start;	$result.=$form_tag_start;
}	}
Line 451 sub start_Task {	Line 492 sub start_Task {
} elsif ($env{'form.donescreen'}) {	} elsif ($env{'form.donescreen'}) {
my $title=&Apache::lonnet::gettitle();	my $title=&Apache::lonnet::gettitle();
my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});	my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
my $files='<ul><li>'.join('</li><li>',@files).'</li></ul>';	my (undef,undef,$domain,$user)=
	&Apache::lonxml::whichuser();
	my $files = '<ul>';
	foreach my $file (@files) {
	my $url="/uploaded/$domain/$user/portfolio$file";
	if (! &Apache::lonnet::stat_file($url)) {
	$file = &mt('<font color="red"> Nonexistant file:</font> <tt>[_1]</tt>',$file);
	} else {
	$file = '<tt>'.$file.'</tt>';
	}
	$files .= '<li>'.$file.'</li>';
	}
	$files.='</ul>';

$result.=<<DONESCREEN;	$result.=<<DONESCREEN;
<h2>$title</h2>	<h2>$title</h2>
<p> Files submitted: $files </p>	<p> Files submitted: $files </p>
Line 478 DONESCREEN	Line 532 DONESCREEN
if ($status eq 'NEEDS_CHECKIN') {	if ($status eq 'NEEDS_CHECKIN') {
if(&proctor_check_auth($slot_name,$slot,'Task')	if(&proctor_check_auth($slot_name,$slot,'Task')
&& defined($Apache::inputtags::slot_name)) {	&& defined($Apache::inputtags::slot_name)) {
my $result=&add_to_queue('gradingqueue',	my $result=
[$Apache::inputtags::slot_name]);	&add_to_queue('gradingqueue',
	{'type' => 'Task',
	'time' => time,
	'slot' =>
	$Apache::inputtags::slot_name});
&Apache::lonxml::debug("add_to_queue said $result");	&Apache::lonxml::debug("add_to_queue said $result");
}	}
}	}
}	}
} elsif ($target eq 'web') {	} elsif ($target eq 'web') {
my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
$result.="$head_tag_start<title>$name</title></head>
$body_tag_start \n".&style();

$result.=&preserve_grade_info();	$result.=&preserve_grade_info();
$result.=&internal_location();	$result.=&internal_location();
$result.=$form_tag_start.	$result.=$form_tag_start.
Line 499 DONESCREEN	Line 554 DONESCREEN
$target eq 'webgrade') {	$target eq 'webgrade') {
my $webgrade='yes';	my $webgrade='yes';
if ($target eq 'webgrade') {	if ($target eq 'webgrade') {
$result.=$head_tag_start.$body_tag_start;	$result.= "\n".'<div class="LC_GRADING_task">'."\n".
	'<script type="text/javascript"
	src="/res/adm/includes/task_grading.js"></script>';
#$result.='<br />Review'.&show_queue('reviewqueue');	#$result.='<br />Review'.&show_queue('reviewqueue');
#$result.='<br />Grade'.&show_queue('gradingqueue');	#$result.='<br />Grade'.&show_queue('gradingqueue');
}	}
Line 508 DONESCREEN	Line 565 DONESCREEN
# Hrrm, vaildation pass should perhaps say 'not_locked'	# Hrrm, vaildation pass should perhaps say 'not_locked'
# perhaps do a search if there is a key that is mine and if	# perhaps do a search if there is a key that is mine and if
# there isn't reshow the queue....	# there isn't reshow the queue....
my ($todo,$status_code)=&get_key_todo($target);	my ($todo,$status_code,$msg)=&get_key_todo($target);

if ($todo) {	if ($todo) {
&setup_env_for_other_user($todo,$safeeval);	&setup_env_for_other_user($todo,$safeeval);
Line 521 DONESCREEN	Line 578 DONESCREEN
$Apache::bridgetask::queue_key=$todo;	$Apache::bridgetask::queue_key=$todo;
&Apache::structuretags::initialize_storage();	&Apache::structuretags::initialize_storage();
&Apache::lonhomework::showhash(%Apache::lonhomework::history);	&Apache::lonhomework::showhash(%Apache::lonhomework::history);
if ($target eq 'webgrade') {	if ($target eq 'webgrade' && $status_code eq 'selected') {
#$result.='<br />After -'.&show_queue($env{'form.queue'});	$form_tag_start.=
$result.="\n".'<table width="100%" style="width:100%" border="1">';	'<input type="hidden" name="queuemode" value="selected" />';
if ($status_code eq 'selected') {
$form_tag_start.=
'<input type="hidden" name="queuemode" value="selected" />';
}
}	}
} else {	} else {
if ($target eq 'webgrade') {	if ($target eq 'webgrade') {
Line 537 DONESCREEN	Line 590 DONESCREEN
if ($status_code eq 'stop') {	if ($status_code eq 'stop') {
$result.='<b>'.&mt("Stopped grading.").'</b>'.$back;	$result.='<b>'.&mt("Stopped grading.").'</b>'.$back;
} elsif ($status_code eq 'lock_failed') {	} elsif ($status_code eq 'lock_failed') {
$result.='<b>'.&mt("Failed to lock the request record.")	$result.='<b>'.&mt("Failed to lock the requested record.")
.'</b>'.$back;	.'</b>'.$back;
} elsif ($status_code eq 'unlock') {	} elsif ($status_code eq 'unlock') {
$result.='<b>'.&mt("Unlocked the requested record.")	$result.='<b>'.&mt("Unlocked the requested record.")
Line 547 DONESCREEN	Line 600 DONESCREEN
$result.=&show_queue($env{'form.queue'},1);	$result.=&show_queue($env{'form.queue'},1);
} elsif ($status_code eq 'select_user') {	} elsif ($status_code eq 'select_user') {
$result.=&select_user();	$result.=&select_user();
	} elsif ($status_code eq 'unable') {
	$result.='<b>'.&mt("Unable to aqcuire a user to grade.").'</b>'.$back;
	} elsif ($status_code eq 'not_allowed') {
	$result.='<b>'.&mt('Not allowed to grade the requested user.').' '.$msg.'</b>'.$back;
} else {	} else {
$result.='<b>'.&mt("No user to be graded.").'</b>'.$back;	$result.='<b>'.&mt("No user to be graded.").'</b>'.$back;
}	}
}	}
$webgrade='no';	$webgrade='no';
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);	my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
}	}
if ($target eq 'webgrade' && defined($env{'form.queue'})) {	if ($target eq 'webgrade' && defined($env{'form.queue'})) {
if ($webgrade eq 'yes') {	if ($webgrade eq 'yes') {
Line 577 DONESCREEN	Line 634 DONESCREEN
}	}
if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }	if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
}	}
	if ($target eq 'webgrade') {
	$result.="\n".'<div id="LC_GRADING_criterialist">';
	}
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.	$result.=$form_tag_start.
&Apache::structuretags::problem_edit_header();	&Apache::structuretags::problem_edit_header();
$Apache::lonxml::warnings_error_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 />";	&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 />";
Line 613 sub get_key_todo {	Line 673 sub get_key_todo {
return (undef,'select_user');	return (undef,'select_user');
}	}


	my $me=$env{'user.name'}.':'.$env{'user.domain'};

	#need to try both queues..
	if (defined($env{'form.regradeaspecificsubmission'}) &&
	defined($env{'form.gradinguser'}) &&
	defined($env{'form.gradingdomain'}) ) {
	my ($symb,$cid)=&Apache::lonxml::whichuser();
	my $cnum = $env{'course.'.$cid.'.num'};
	my $cdom = $env{'course.'.$cid.'.domain'};
	my $uname = $env{'form.gradinguser'};
	my $udom = $env{'form.gradingdomain'};

	my $gradingkey=&encode_queue_key($symb,$udom,$uname);

	my $queue;

	if (&in_queue('gradingqueue',$symb,$cdom,$cnum,$udom,$uname)) {
	$env{'form.queue'} = $queue = 'gradingqueue';
	} elsif (&in_queue('reviewqueue' ,$symb,$cdom,$cnum,$udom,$uname)) {
	$env{'form.queue'} = $queue = 'reviewqueue';
	}

	if (!$queue) {
	$env{'form.queue'} = $queue = 'none';
	#not queued so doing either a re or pre grade
	return ($gradingkey);
	}

	my $who=&queue_key_locked($queue,$gradingkey);
	if ($who eq $me) {
	#already have the lock
	$env{'form.gradingkey'}=&Apache::lonnet::escape($gradingkey);
	return ($gradingkey);
	}

	if (!defined($who)) {
	if (&lock_key($queue,$gradingkey)) {
	return ($gradingkey);
	} else {
	return (undef,'lock_failed');
	}
	}

	#otherwise (defined($who) && $who ne $me) some else has it...
	return (undef,'not_allowed',
	&mt('Another user ([_1]) currently has the record for [_2] locked.',
	$who,$env{'form.gradinguser'}.':'.$env{'form.gradingdomain'}));
	}


my $queue=$env{'form.queue'};	my $queue=$env{'form.queue'};

if (!defined($queue)) {	if (!defined($queue)) {
Line 640 sub get_key_todo {	Line 751 sub get_key_todo {
&& $env{'form.queuemode'} eq 'selected') {	&& $env{'form.queuemode'} eq 'selected') {

my $who=&queue_key_locked($queue,$gradingkey);	my $who=&queue_key_locked($queue,$gradingkey);
my $me=$env{'user.name'}.'@'.$env{'user.domain'};
if ($who eq $me) {	if ($who eq $me) {
&Apache::lonxml::debug("Found a key was given to me");	&Apache::lonxml::debug("Found a key was given to me");
return ($gradingkey,'selected');	return ($gradingkey,'selected');
Line 682 sub get_key_todo {	Line 792 sub get_key_todo {
}	}
return (undef,undef)	return (undef,undef)
}	}

	sub minimize_storage {
	foreach my $key (keys(%Apache::lonhomework::results)) {
	if ($key =~ /regrader$/) { next; }
	if ($Apache::lonhomework::results{$key} eq
	$Apache::lonhomework::history{$key}) {
	delete($Apache::lonhomework::results{$key});
	}
	}
	}

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 709 sub end_Task {	Line 830 sub end_Task {
&show_task($status,$previous)) {	&show_task($status,$previous)) {
$result.=&Apache::inputtags::gradestatus('0');	$result.=&Apache::inputtags::gradestatus('0');
$result.='</form>';	$result.='</form>';
	my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
$result.=<<DONEBUTTON;	$result.=<<DONEBUTTON;
<form method="POST">	<form name="done" method="post" action="$action">
<input type="hidden" name="donescreen" value="1" />	<input type="hidden" name="donescreen" value="1" />
<input type="submit" value="Done" />	<input type="submit" value="Done" />
</form>	</form>
DONEBUTTON	DONEBUTTON
}	}
if (&show_task($status,$previous) &&	if (&show_task($status,$previous) &&
$Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass\|fail)$/) {	$Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass\|fail)$/) {
my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};	my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
my $title=&Apache::lonnet::gettitle();	my $title=&Apache::lonnet::gettitle();

	my $start_time;

my $slot_name=	my $slot_name=
$Apache::lonhomework::history{"resource.$version.checkedin.slot"};	$Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
my %slot=&Apache::lonnet::get_slot($slot_name);	if ($slot_name) {
my $start_time=	my %slot=&Apache::lonnet::get_slot($slot_name);
&Apache::lonlocal::locallocaltime($slot{'starttime'});

my $status = "\n<div class='$bt_status'>\n";	$start_time=$slot{'starttime'}
	} else {
	$start_time=
	&Apache::lonnet::EXT('resource.0.opendate');
	}
	$start_time=&Apache::lonlocal::locallocaltime($start_time);

	my $status = "\n<div class='LC_$bt_status LC_criteria'>\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 '.
Line 747 DONEBUTTON	Line 877 DONEBUTTON
if ($Apache::bridgetask::dimensionmandatory{$dim_id}	if ($Apache::bridgetask::dimensionmandatory{$dim_id}
eq 'N') {	eq 'N') {
$opt_count++;	$opt_count++;
if ($Apache::lonhomework::history{"resource.$version.$dim_id.status"} eq 'pass') {	if ($Apache::lonhomework::history{"resource.$version.0.$dim_id.status"} eq 'pass') {
$opt_passed++;	$opt_passed++;
}	}
} else {	} else {
$man_count++;	$man_count++;
}	}
}	}

my $opt_req=&Apache::lonxml::get_param('OptionalRequired',	my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
$parstack,$safeeval);	$parstack,$safeeval);
if ($opt_req !~ /\S/) { $opt_req='0'; }	if ($opt_req !~ /\S/) { $opt_req='0'; }
$status.="\n<p>".&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)."</p></div>\n";	$status.="\n<p>".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."</p></div>\n";

my $internal_location=&internal_location();	my $internal_location=&internal_location();
$result=~s/\Q$internal_location\E/$status/;	$result=~s/\Q$internal_location\E/$status/;
}	}
}	$result.="\n</div>\n".
if ($target eq 'web' \|\| $target eq 'webgrade') {	&Apache::loncommon::end_page({'discussion' => 1});
$result.=&Apache::lonxml::xmlend().'</html>';
}	}
}	}
if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
Line 788 DONEBUTTON	Line 918 DONEBUTTON
}	}
&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') {
&& defined($Apache::inputtags::slot_name)) {	my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
&add_to_queue('gradingqueue',[$Apache::inputtags::slot_name]);	if ($useslots =~ /^\sno\s$/i) {
	&add_to_queue('gradingqueue',
	{'type' => 'Task',
	'time' => time});
	} elsif (defined($Apache::inputtags::slot_name)) {
	&add_to_queue('gradingqueue',
	{'type' => 'Task',
	'time' => time,
	'slot' => $Apache::inputtags::slot_name});
	}
}	}
} elsif ($Apache::lonhomework::results{'INTERNAL_store'}) {	} elsif ($Apache::lonhomework::results{'INTERNAL_store'}) {
&Apache::structuretags::finalize_storage();	&Apache::structuretags::finalize_storage();
Line 806 DONEBUTTON	Line 945 DONEBUTTON
&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.$version.$dim_id.status"};	$Apache::lonhomework::results{"resource.$version.0.$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 825 DONEBUTTON	Line 964 DONEBUTTON
$mandatory_failed++;	$mandatory_failed++;
}	}
&Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");	&Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
$Apache::lonhomework::results{'resource.grader'}=	$Apache::lonhomework::results{'resource.0.regrader'}=
$env{'user.name'}.'@'.$env{'user.domain'};	$env{'user.name'}.':'.$env{'user.domain'};
if ($review) {	if ($review) {
$Apache::lonhomework::results{"resource.$version.status"}='review';	$Apache::lonhomework::results{"resource.$version.0.status"}='review';
if ($env{'form.queue'} eq 'reviewqueue') {	if ($env{'form.queue'} eq 'reviewqueue') {
&check_queue_unlock($env{'form.queue'});	&check_queue_unlock($env{'form.queue'});
&Apache::lonxml::debug(" still needs review not changing status.");	&Apache::lonxml::debug(" still needs review not changing status.");
Line 836 DONEBUTTON	Line 975 DONEBUTTON
&move_between_queues($env{'form.queue'},'reviewqueue');	&move_between_queues($env{'form.queue'},'reviewqueue');
}	}
} elsif ($ungraded) {	} elsif ($ungraded) {
$Apache::lonhomework::results{"resource.$version.status"}='ungraded';	$Apache::lonhomework::results{"resource.$version.0.status"}='ungraded';
if ($env{'form.queue'} eq 'reviewqueue' \|\|	if ($env{'form.queue'} eq 'reviewqueue' \|\|
$env{'form.queue'} eq 'none' ) {	$env{'form.queue'} eq 'none' ) {
&Apache::lonxml::debug("moving back.");	&Apache::lonxml::debug("moving back.");
Line 845 DONEBUTTON	Line 984 DONEBUTTON
&check_queue_unlock($env{'form.queue'});	&check_queue_unlock($env{'form.queue'});
}	}
} elsif ($mandatory_failed) {	} elsif ($mandatory_failed) {
$Apache::lonhomework::results{"resource.$version.status"}='fail';	$Apache::lonhomework::results{"resource.$version.0.status"}='fail';
$Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';	$Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
$Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';	$Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';
$Apache::lonhomework::results{"resource.$version.0.awarded"}='0';	$Apache::lonhomework::results{"resource.$version.0.awarded"}='0';
Line 863 DONEBUTTON	Line 1002 DONEBUTTON
["$version.0.bridgetask"]);	["$version.0.bridgetask"]);
}	}
} else {	} else {
$Apache::lonhomework::results{"resource.$version.status"}='pass';	$Apache::lonhomework::results{"resource.$version.0.status"}='pass';
$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';	$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.award"}='EXACT_ANS';
$Apache::lonhomework::results{"resource.$version.0.awarded"}='1';	$Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
Line 880 DONEBUTTON	Line 1019 DONEBUTTON
["$version.0.bridgetask"]);	["$version.0.bridgetask"]);
}	}
}	}
$Apache::lonhomework::results{"resource.status"}=	$Apache::lonhomework::results{"resource.0.status"}=
$Apache::lonhomework::results{"resource.$version.status"};	$Apache::lonhomework::results{"resource.$version.0.status"};
if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) {	if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) {
$Apache::lonhomework::results{"resource.0.award"}=	$Apache::lonhomework::results{"resource.0.award"}=
$Apache::lonhomework::results{"resource.$version.0.award"};	$Apache::lonhomework::results{"resource.$version.0.award"};
Line 890 DONEBUTTON	Line 1029 DONEBUTTON
$Apache::lonhomework::results{"resource.0.solved"}=	$Apache::lonhomework::results{"resource.0.solved"}=
$Apache::lonhomework::results{"resource.$version.0.solved"};	$Apache::lonhomework::results{"resource.$version.0.solved"};
}	}
	&minimize_storage();
&Apache::structuretags::finalize_storage();	&Apache::structuretags::finalize_storage();
}	}
} elsif ($target eq 'webgrade') {	} elsif ($target eq 'webgrade') {
$result.="</table>\n<hr />";	$result.="</div>";
#$result.='<input type="submit" name="next" value="'.	#$result.='<input type="submit" name="next" value="'.
# &mt('Save & Next').'" /> ';	# &mt('Save & Next').'" /> ';
#$result.='<input type="submit" name="end" value="'.	#$result.='<input type="submit" name="end" value="'.
Line 902 DONEBUTTON	Line 1042 DONEBUTTON
# &mt('Throw Away & Stop Grading').'" /> ';	# &mt('Throw Away & Stop Grading').'" /> ';
#$result.='<input type="submit" name="save" value="'.	#$result.='<input type="submit" name="save" value="'.
# &mt('Save Partial Grade and Continue Grading').'" /> ';	# &mt('Save Partial Grade and Continue Grading').'" /> ';
$result.='</form>'.&Apache::loncommon::endbodytag().'</html>';	$result.='</form>'."\n</div>\n</div>\n".
	&Apache::loncommon::end_page();
} elsif ($target eq 'meta') {	} elsif ($target eq 'meta') {
$result.=&Apache::response::meta_package_write('Task');	$result.=&Apache::response::meta_package_write('Task');
$result.=&Apache::response::meta_stores_write('solved','string',	$result.=&Apache::response::meta_stores_write('solved','string',
Line 927 sub move_between_queues {	Line 1068 sub move_between_queues {
} else {	} else {
$cur_data = ['none'];	$cur_data = ['none'];
}	}
my $result=&add_to_queue($dest_queue,[$cur_data->[0]]);	my $result=&add_to_queue($dest_queue,$cur_data);
if ($result ne 'ok') {	if ($result ne 'ok') {
return $result;	return $result;
}	}
Line 940 sub check_queue_unlock {	Line 1081 sub check_queue_unlock {
if ($queue eq 'none') { return 'ok'; }	if ($queue eq 'none') { return 'ok'; }
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();	my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
if (!defined($key)) {	if (!defined($key)) {
$key="$symb\0queue\0$uname\@$udom";	$key="$symb\0queue\0$uname:$udom";
}	}
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 $me=$env{'user.name'}.'@'.$env{'user.domain'};	my $me=$env{'user.name'}.':'.$env{'user.domain'};
my $who=&queue_key_locked($queue,$key,$cdom,$cnum);	my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
if ($who eq $me) {	if ($who eq $me) {
return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);	return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
Line 955 sub check_queue_unlock {	Line 1096 sub check_queue_unlock {
return 'not_owner';	return 'not_owner';
}	}

	sub in_queue {
	my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
	if ($queue eq 'none') { return 0; }
	if (!defined($symb) \|\| !defined($cdom) \|\| !defined($cnum)
	\|\| !defined($udom) \|\| !defined($uname)) {
	($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();
	$cnum=$env{'course.'.$cid.'.num'};
	$cdom=$env{'course.'.$cid.'.domain'};
	}

	my $key=&encode_queue_key($symb,$udom,$uname);
	my %results = &Apache::lonnet::get($queue,[$key],$cdom,$cnum);

	if (defined($results{$key})) {
	return 1;
	}
	return 0;
	}

sub remove_from_queue {	sub remove_from_queue {
my ($queue)=@_;	my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
if ($queue eq 'none') { return 'ok'; }	if ($queue eq 'none') { return 'ok'; }
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();	if (!defined($symb) \|\| !defined($cdom) \|\| !defined($cnum)
my $cnum=$env{'course.'.$cid.'.num'};	\|\| !defined($udom) \|\| !defined($uname)) {
my $cdom=$env{'course.'.$cid.'.domain'};	($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();
my $key="$symb\0queue\0$uname\@$udom";	$cnum=$env{'course.'.$cid.'.num'};
	$cdom=$env{'course.'.$cid.'.domain'};
	}
	if (!&in_queue($queue,$symb,$cdom,$cnum,$udom,$uname)) {
	return 'ok';
	}
	my $key=&encode_queue_key($symb,$udom,$uname);
my @keys=($key,"$key\0locked");	my @keys=($key,"$key\0locked");
return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);	return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);
}	}
Line 982 sub get_queue_data {	Line 1148 sub get_queue_data {
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="$symb\0queue\0$uname\@$udom";	my $todo="$symb\0queue\0$uname:$udom";
my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);	my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);
if ($key eq $todo && ref($value)) {	if ($key eq $todo && ref($value)) {
return $value;	return $value;
Line 990 sub get_queue_data {	Line 1156 sub get_queue_data {
return undef;	return undef;
}	}


sub check_queue_for_key {	sub check_queue_for_key {
my ($cid,$queue,$todo)=@_;	my ($cdom,$cnum,$queue,$todo)=@_;
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
my %results=	my %results=
&Apache::lonnet::get($queue,[$todo,"$todo\0locked"],$cdom,$cnum);	&Apache::lonnet::get($queue,[$todo,"$todo\0locked"],$cdom,$cnum);

Line 1001 sub check_queue_for_key {	Line 1167 sub check_queue_for_key {
if (defined($results{"$todo\0locked"})) {	if (defined($results{"$todo\0locked"})) {
return 'locked';	return 'locked';
}	}
my $slot=$results{$todo}->[0];	if (my $slot=&slotted_access($results{$todo})) {
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) {
return 'in_progress';	return 'in_progress';
	}
	} else {
	my ($symb) = &decode_queue_key($todo);
	my $due_date = &Apache::lonhomework::due_date('0',$symb);
	if ($due_date > time) {
	return 'in_progress';
	}
}	}
return 'enqueued';	return 'enqueued';
}	}
Line 1021 sub add_to_queue {	Line 1194 sub add_to_queue {
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"}=$user_data;	$data{"$symb\0queue\0$uname:$udom"}=$user_data;
return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);	return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);
}	}

Line 1048 sub show_queue {	Line 1221 sub show_queue {
if ($tmp=~/^error: 2 /) {	if ($tmp=~/^error: 2 /) {
return "\n<h3>Current Queue - $queue</h3><table border='1'><tr><td>Empty</td></tr></table>";	return "\n<h3>Current Queue - $queue</h3><table border='1'><tr><td>Empty</td></tr></table>";
}	}
$result.="\n<h3>Current Queue - $queue </h3><table border='1'><tr>";	my $title=&Apache::lonnet::gettitle($symb);
if ($with_selects) { $result.="<th></th>"; }	$result.="\n<h3>Current Queue - $title $queue </h3><table border='1'><tr>";
$result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";	if ($with_selects) { $result.="<th>Status</th><th></th>"; }
	$result.="<th>user</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);	my ($symb,$uname,$udom) = &decode_queue_key($key);
if (!defined($classlist->{$uname.':'.$udom})) { next; }	if (!defined($classlist->{$uname.':'.$udom})) { next; }
if ($key=~/locked$/ && !$with_selects) {	if ($key=~/locked$/ && !$with_selects) {
my $title=&Apache::lonnet::gettitle($symb);	$result.="<tr><td>$uname</td>";
$result.="<tr><td>$title</td><td>$uname</td>";	$result.='<td>'.$queue{$key}.'</td></tr>';
$result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
} elsif ($key=~/timestamp$/ && !$with_selects) {	} elsif ($key=~/timestamp$/ && !$with_selects) {
my ($symb,undef) = split("\0",$key);	$result.="<tr><td></td>";
my $title=&Apache::lonnet::gettitle($symb);	$result.='<td>'.
$result.="<tr><td>$title</td><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 $title=&Apache::lonnet::gettitle($symb);
$result.="<tr>";	$result.="<tr>";
my $slot=$queue{$key}->[0];	my ($end_time,$slot_text);
my %slot_data=&Apache::lonnet::get_slot($slot);	if (my $slot=&slotted_access($queue{$key})) {
	my %slot_data=&Apache::lonnet::get_slot($slot);
	$end_time = $slot_data{'endtime'};
	$slot_text = &mt('Slot: [_1]',$slot);
	} else {
	$end_time = &Apache::lonhomework::due_date('0',$symb);
	$slot_text = '';
	}
if ($with_selects) {	if ($with_selects) {
my $ekey=&Apache::lonnet::escape($key);	my $ekey=&Apache::lonnet::escape($key);
my ($action,$description)=('select',&mt('Select'));	my ($action,$description,$status)=('select',&mt('Select'));
if (exists($queue{"$key\0locked"})) {	if (exists($queue{"$key\0locked"})) {
my $me=$env{'user.name'}.'@'.$env{'user.domain'};	my $me=$env{'user.name'}.':'.$env{'user.domain'};
	$status=&mt('Locked by <tt>[_1]</tt>',$queue{"$key\0locked"});
if ($me eq $queue{"$key\0locked"}) {	if ($me eq $queue{"$key\0locked"}) {
($action,$description)=('resume',&mt('Resume'));	($action,$description)=('resume',&mt('Resume'));
} else {	} else {
Line 1085 sub show_queue {	Line 1263 sub show_queue {
$seclist.='<input type="hidden" name="chosensections"	$seclist.='<input type="hidden" name="chosensections"
value="'.$sec.'" />';	value="'.$sec.'" />';
}	}
if (time > $slot_data{'endtime'}) {	if ($end_time ne '' && time > $end_time) {
$result.=(<<FORM);	$result.=(<<FORM);
	<td>$status</td>
<td>	<td>
<form method="POST">	<form style="display: inline" method="post">
<input type="hidden" name="gradingkey" value="$ekey" />	<input type="hidden" name="gradingkey" value="$ekey" />
<input type="hidden" name="queue" value="$queue" />	<input type="hidden" name="queue" value="$queue" />
<input type="hidden" name="gradingaction" value="$action" />	<input type="hidden" name="gradingaction" value="$action" />
Line 1101 sub show_queue {	Line 1280 sub show_queue {
FORM	FORM

} else {	} else {
$result.='<td>'.&mt("In Progress").'</td>'	$result.='<td>'.&mt("In Progress").'</td><td> </td>'
}	}
}	}
$result.="<td>$title</td><td>$uname</td>";	$result.= "<td>".$fullname->{$uname.':'.$udom}.
$result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.	" <tt>($uname:$udom)</tt> </td>";
&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).	$result.='<td>'.$slot_text.' End time: '.
	&Apache::lonlocal::locallocaltime($end_time).
"</td></tr>";	"</td></tr>";
}	}
}	}
Line 1127 sub get_queue_counts {	Line 1307 sub get_queue_counts {
return (0,0,0);	return (0,0,0);
}	}
my ($entries,$ready_to_grade,$locks)=(0,0,0);	my ($entries,$ready_to_grade,$locks)=(0,0,0);
	my %slot_cache;
foreach my $key (sort(keys(%queue))) {	foreach my $key (sort(keys(%queue))) {
if ($key=~/locked$/) {	if ($key=~/locked$/) {
$locks++;	$locks++;
Line 1135 sub get_queue_counts {	Line 1316 sub get_queue_counts {
} elsif ($key!~/(timestamp\|locked)$/) {	} elsif ($key!~/(timestamp\|locked)$/) {
my ($symb,$uname,$udom) = &decode_queue_key($key);	my ($symb,$uname,$udom) = &decode_queue_key($key);
$entries++;	$entries++;
my $slot=$queue{$key}->[0];	if (my $slot=&slotted_access($queue{$key})) {
my %slot_data=&Apache::lonnet::get_slot($slot);	if (!exists($slot_cache{$slot})) {
if (time > $slot_data{'endtime'}) {	my %slot_data=&Apache::lonnet::get_slot($slot);
$ready_to_grade++;	$slot_cache{$slot} = \%slot_data;
	}
	if (time > $slot_cache{$slot}{'endtime'}) {
	$ready_to_grade++;
	}
	} else {
	my $due_date = &Apache::lonhomework::due_date('0',$symb);
	if ($due_date ne '' && time > $due_date) {
	$ready_to_grade++;
	}
}	}
}	}
}	}
Line 1147 sub get_queue_counts {	Line 1337 sub get_queue_counts {

sub encode_queue_key {	sub encode_queue_key {
my ($symb,$udom,$uname)=@_;	my ($symb,$udom,$uname)=@_;
return "$symb\0queue\0$uname\@$udom";	return "$symb\0queue\0$uname:$udom";
}	}

sub decode_queue_key {	sub decode_queue_key {
my ($key)=@_;	my ($key)=@_;
my ($symb,undef,$user) = split("\0",$key);	my ($symb,undef,$user) = split("\0",$key);
my ($uname,$udom) = split('@',$user);	my ($uname,$udom) = split(':',$user);
return ($symb,$uname,$udom);	return ($symb,$uname,$udom);
}	}

Line 1172 sub queue_key_locked {	Line 1362 sub queue_key_locked {
return undef;	return undef;
}	}

	sub slotted_access {
	my ($queue_entry) = @_;
	if (ref($queue_entry) eq 'ARRAY') {
	if (defined($queue_entry->[0])) {
	return $queue_entry->[0];
	}
	return undef;
	} elsif (ref($queue_entry) eq 'HASH') {
	if (defined($queue_entry->{'slot'})) {
	return $queue_entry->{'slot'};
	}
	return undef;
	}
	return undef;
	}

sub pick_from_queue_data {	sub pick_from_queue_data {
my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;	my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
	my @possible; # will hold queue entries that are valid to be selected
foreach my $key (keys(%$queuedata)) {	foreach my $key (keys(%$queuedata)) {
if ($key =~ /\0locked$/) { next; }	if ($key =~ /\0locked$/) { next; }
if ($key =~ /\0timestamp$/) { next; }	if ($key =~ /\0timestamp$/) { next; }
Line 1185 sub pick_from_queue_data {	Line 1392 sub pick_from_queue_data {
next;	next;
}	}
}	}
my $slot=$queuedata->{$key}[0];	my $end_time;
my %slot_data=&Apache::lonnet::get_slot($slot);	if (my $slot=&slotted_access($queuedata->{$key})) {
if ($slot_data{'endtime'} > time) {	&Apache::lonxml::debug("looking at slot $slot");
&Apache::lonxml::debug("not time");	my %slot_data=&Apache::lonnet::get_slot($slot);
next;	if ($slot_data{'endtime'} < time) {
	$end_time = $slot_data{'endtime'};
	} else {
	&Apache::lonxml::debug("not time ".$slot_data{'endtime'});
	next;
	}
	} else {
	my $due_date = &Apache::lonhomework::due_date('0',$symb);
	if ($due_date < time) {
	$end_time = $due_date;
	} else {
	&Apache::lonxml::debug("not time $due_date");
	next;
	}
}	}
if (&queue_key_locked($queue,$key,$cdom,$cnum)) {
	if (exists($queuedata->{"$key\0locked"})) {
&Apache::lonxml::debug("someone already has um.");	&Apache::lonxml::debug("someone already has um.");
next;	next;
}	}
return $key;	push(@possible,[$key,$end_time]);
	}
	if (@possible) {
	# sort entries in order by slot end time
	@possible = sort { $a->[1] <=> $b->[1] } @possible;
	# pick one of the entries in the top 10% in small queues and one
	# of the first ten entries in large queues
	#my $ten_percent = int($#possible * 0.1);
	#if ($ten_percent < 1 ) { $ten_percent = 1; }
	#if ($ten_percent > 10) { $ten_percent = 10; }
	#my $max=($#possible < $ten_percent) ? $#possible : $ten_percent;

	#return $possible[int(rand($max))][0];
	return $possible[0][0];
}	}
return undef;	return undef;
}	}
Line 1203 sub pick_from_queue_data {	Line 1437 sub pick_from_queue_data {
sub find_mid_grade {	sub find_mid_grade {
my ($queue,$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($queue,$todo,$cdom,$cnum);	my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
if ($who eq $me) { return $todo; }	if ($who eq $me) { return $todo; }
Line 1223 sub find_mid_grade {	Line 1457 sub find_mid_grade {

sub lock_key {	sub lock_key {
my ($queue,$todo)=@_;	my ($queue,$todo)=@_;
my $me=$env{'user.name'}.'@'.$env{'user.domain'};	my $me=$env{'user.name'}.':'.$env{'user.domain'};
my (undef,$cid)=&Apache::lonxml::whichuser();	my (undef,$cid)=&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'};
Line 1236 sub lock_key {	Line 1470 sub lock_key {
return 0;	return 0;
}	}

	sub get_queue_symb_status {
	my ($queue,$symb,$cdom,$cnum) = @_;
	if (!defined($cdom) \|\| !defined($cnum)) {
	my (undef,$cid)=&Apache::lonxml::whichuser();
	$cnum=$env{'course.'.$cid.'.num'};
	$cdom=$env{'course.'.$cid.'.domain'};
	}
	my $regexp="^$symb\0";
	my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
	my ($tmp)=%queue;
	if ($tmp=~/^error: 2 /) { return; }
	my @users;
	foreach my $key (sort(keys(%queue))) {
	next if ($key=~/locked$/);
	next if ($key=~/timestamp$/);
	my ($symb,$uname,$udom) = &decode_queue_key($key);
	push(@users,"$uname:$udom");
	}
	return @users;
	}

sub get_from_queue {	sub get_from_queue {
my ($queue)=@_;	my ($queue)=@_;
my $result;	my $result;
Line 1245 sub get_from_queue {	Line 1500 sub get_from_queue {
my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);	my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);
&Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo)));	&Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo)));
if ($todo) { return $todo; }	if ($todo) { return $todo; }
	my $attempts=0;
while (1) {	while (1) {
	if ($attempts > 2) {
	# tried twice to get a queue entry, giving up
	return (undef,'unable');
	}
my $starttime=time;	my $starttime=time;
&Apache::lonnet::cput($queue,{"$symb\0timestamp"=>$starttime},	&Apache::lonnet::cput($queue,{"$symb\0timestamp"=>$starttime},
$cdom,$cnum);	$cdom,$cnum);
&Apache::lonxml::debug("$starttime");	&Apache::lonxml::debug("$starttime");
my $regexp="^$symb\0queue\0";	my $regexp="^$symb\0queue\0";
	my $range= ($attempts < 1 ) ? '0-100' : '0-400';

my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);	my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
#make a pass looking for a user _not_ in my section	#make a pass looking for a user _not_ in my section
if ($env{'request.course.sec'}) {	if ($env{'request.course.sec'}) {
Line 1263 sub get_from_queue {	Line 1525 sub get_from_queue {
# ready for grading	# ready for grading
if (!$todo) {	if (!$todo) {
&Apache::lonxml::debug("no sce");	&Apache::lonxml::debug("no sce");
$todo=&pick_from_queue_data($queue,$env{'request.course.sec'},	$todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum);
\%queue,$cdom,$cnum);
&Apache::lonxml::debug("no sce $todo");	&Apache::lonxml::debug("no sce $todo");
}	}
# no user to grade	# no user to grade
Line 1272 sub get_from_queue {	Line 1533 sub get_from_queue {
&Apache::lonxml::debug("got $todo");	&Apache::lonxml::debug("got $todo");
# otherwise found someone so lets try to lock them	# otherwise found someone so lets try to lock them
# unless someone else already picked them	# unless someone else already picked them
if (!&lock_key($queue,$todo)) { next; }	if (!&lock_key($queue,$todo)) {
	$attempts++;
	next;
	}
my (undef,$endtime)=	my (undef,$endtime)=
&Apache::lonnet::get($queue,["$symb\0timestamp"],	&Apache::lonnet::get($queue,["$symb\0timestamp"],
$cdom,$cnum);	$cdom,$cnum);
Line 1291 sub get_from_queue {	Line 1555 sub get_from_queue {
&Apache::lonnet::del($queue,["$todo\0locked"],	&Apache::lonnet::del($queue,["$todo\0locked"],
$cdom,$cnum);	$cdom,$cnum);
&Apache::lonxml::debug("del");	&Apache::lonxml::debug("del");
	$attempts++;
next;	next;
}	}
}	}
Line 1319 sub select_user {	Line 1584 sub select_user {
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 $cnum=$env{'course.'.$cid.'.num'};
	my $cdom=$env{'course.'.$cid.'.domain'};
	my %status = &get_student_status($symb,$cdom,$cnum,$udom,$uname,
	'Task');
my $queue = 'none';	my $queue = 'none';
my $cannot_grade;	my $cannot_grade;
if ($status{'reviewqueue'} =~ /^(in_progress\|enqueue)$/) {	if ($status{'reviewqueue'} =~ /^(in_progress\|enqueue)$/) {
Line 1347 sub select_user {	Line 1615 sub select_user {
$result.=<<RESULT;	$result.=<<RESULT;
<tr>	<tr>
<td>	<td>
<form method="POST">	<form style="display: inline" method="post">
<input type="hidden" name="gradingkey" value="$todo" />	<input type="hidden" name="gradingkey" value="$todo" />
<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" />
Line 1355 sub select_user {	Line 1623 sub select_user {
<input type="submit" name="submit" value="Regrade" />	<input type="submit" name="submit" value="Regrade" />
$seclist	$seclist
</form>	</form>
<td>$fullname->{$student}</td>	<td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt></td>
<td>	<td>
RESULT	RESULT
}	}
Line 1375 RESULT	Line 1643 RESULT
if ($status{'version'}) {	if ($status{'version'}) {
$result .= ' '.&mt('Version').' '.$status{'version'};	$result .= ' '.&mt('Version').' '.$status{'version'};
}	}
	if ($status{'grader'}) {
	$result .= ' '.&mt('(Graded by [_1])',$status{'grader'}).' ';
	}
$result.= '</td><td>';	$result.= '</td><td>';
if ($status{'reviewqueue'} eq 'enqueued') {	if ($status{'reviewqueue'} eq 'enqueued') {
$result .= &mt('Awaiting Review');	$result .= &mt('Awaiting Review');
Line 1398 RESULT	Line 1669 RESULT
}	}

sub get_student_status {	sub get_student_status {
my ($symb,$cid,$udom,$uname)=@_;	my ($symb,$cdom,$cnum,$udom,$uname,$type)=@_;
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
$udom,$uname);
my %status;	my %status;
$status{'status'}=$record{'resource.status'};
$status{'version'}=$record{'resource.version'};	if ($type eq 'Task') {
$status{'grader'}=$record{'resource.grader'};	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
$status{'reviewqueue'}=&check_queue_for_key($cid,'reviewqueue',	$udom,$uname);
&encode_queue_key($symb,$udom,$uname));	$status{'status'}=$record{'resource.0.status'};
$status{'gradingqueue'}=&check_queue_for_key($cid,'gradingqueue',	$status{'version'}=$record{'resource.0.version'};
&encode_queue_key($symb,$udom,$uname));	$status{'grader'}=$record{'resource.0.regrader'};
	}
	$status{'reviewqueue'}=
	&check_queue_for_key($cdom,$cnum,'reviewqueue',
	&encode_queue_key($symb,$udom,$uname));
	$status{'gradingqueue'}=
	&check_queue_for_key($cdom,$cnum,'gradingqueue',
	&encode_queue_key($symb,$udom,$uname));
return %status;	return %status;
}	}

Line 1440 sub get_id {	Line 1717 sub get_id {
}	}

my %dimension;	my %dimension;
	sub start_Question { return &start_Dimension(@_); }
sub start_Dimension {	sub start_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
undef(%dimension);	undef(%dimension);
Line 1482 sub get_instance {	Line 1760 sub get_instance {
}	}
@instances = &Math::Random::random_permutation(@instances);	@instances = &Math::Random::random_permutation(@instances);
$instance = $instances[($version-1)%scalar(@instances)];	$instance = $instances[($version-1)%scalar(@instances)];
$Apache::lonhomework::results{"resource.$version.0.$dim.instance"} =	if ($version =~ /^\d$/) {
$instance;	$Apache::lonhomework::results{"resource.$version.0.$dim.instance"} =
$Apache::lonhomework::results{'INTERNAL_store'} = 1;	$instance;
	$Apache::lonhomework::results{'INTERNAL_store'} = 1;
	}
&Apache::response::poprandomnumber();	&Apache::response::poprandomnumber();
return $instance;	return $instance;
}	}
Line 1492 sub get_instance {	Line 1772 sub get_instance {

{	{
my $last_link;	my $last_link;
	sub link {
	my ($id) = @_;
	$id =~ s/\./_/g;
	return 'LC_GRADING_criteria_'.$id;
	}
	sub end_Question { return &end_Dimension(@_); }
sub end_Dimension {	sub end_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result=&Apache::lonxml::endredirection();	my $result=&Apache::lonxml::endredirection();
Line 1508 sub get_instance {	Line 1794 sub get_instance {
foreach my $instance (@instances) {	foreach my $instance (@instances) {
@Apache::scripttag::parser_env = @_;	@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});	$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' \|\|	if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' \|\|
$Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {	$Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') {

my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"};	my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
my $mandatory='Mandatory';	my $mandatory='Mandatory';
if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {	if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
$mandatory='Optional';	$mandatory='Optional';
}	}
my $dim_info="<div class='$dim_status'>\n";	my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";
if ($dim_status eq 'pass') {	if ($dim_status eq 'pass') {
$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';	$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
}	}
Line 1527 sub get_instance {	Line 1813 sub get_instance {
my $man_passed=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'}},
if ($dimension{$instance.'.criteria.'.$id.'.mandatory'}	@{$dimension{'criterias'}} ) {
	if ($dimension{'criteria.'.$id.'.mandatory'}
eq 'N') {	eq 'N') {
$opt_count++;	$opt_count++;
if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {	if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"} eq 'pass') {
$opt_passed++;	$opt_passed++;
}	}
} else {	} else {
$man_count++;	$man_count++;
if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {	if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
$man_passed++;	$man_passed++;
}	}
}	}
}	}
if ($man_passed eq $man_count) { $man_passed='all'; }	if ($man_passed eq $man_count) { $man_passed='all'; }

my $opt_req=$dimension{$instance.'.optionalrequired'};	my $opt_req=$dimension{$instance.'.optionalrequired'};
if ($opt_req !~ /\S/) { $opt_req='0'; }	if ($opt_req !~ /\S/) {
	$opt_req=
	&Apache::lonxml::get_param('OptionalRequired',
	$parstack,$safeeval);
	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>";	$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/;

foreach my $id (@{$dimension{$instance.'.criterias'}}) {	foreach my $id (@{$dimension{$instance.'.criterias'}},
my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};	@{$dimension{'criterias'}}) {
my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};	my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"};
my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');	my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"};
	my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N');
if ($mandatory) {	if ($mandatory) {
$mandatory='Mandatory';	$mandatory='Mandatory';
} else {	} else {
Line 1565 sub get_instance {	Line 1859 sub get_instance {
}	}
my $status_display=$status;	my $status_display=$status;
$status_display=~s/^([a-z])/uc($1)/e;	$status_display=~s/^([a-z])/uc($1)/e;
	$result.=
	'<div class="LC_'.$status.' LC_criteria"><h4>'
	.$mandatory.' Criteria</h4><p>';
@Apache::scripttag::parser_env = @_;	@Apache::scripttag::parser_env = @_;
$result.='<div class="'.$status.'"><h4>'.$mandatory.	$result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id});
' Criteria</h4><p>';	$result.='</p><p class="LC_grade">'.$status_display.'</p>';
@Apache::scripttag::parser_env = @_;	if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}) {
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});	$result.='<p class="LC_comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'</p>';
$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>';
}	}
Line 1584 sub get_instance {	Line 1878 sub get_instance {
&Apache::scripttag::xmlparse($dimension{'intro'});	&Apache::scripttag::xmlparse($dimension{'intro'});
@Apache::scripttag::parser_env = @_;	@Apache::scripttag::parser_env = @_;
&Apache::scripttag::xmlparse($dimension{$instance.'.text'});	&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
foreach my $id (@{$dimension{$instance.'.criterias'}}) {	foreach my $id (@{$dimension{$instance.'.criterias'}},
my $link='criteria_'.$instance.'_'.$id;	@{$dimension{'criterias'}} ) {
my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};	my $link=&link($id);
$result.='<tr><td width="100%" valign="top">'.	my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"};
'<a name="'.$link.'" />'.	$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
'<a name="next_'.$last_link.'" />'.	'<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n";
'<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">';
@Apache::scripttag::parser_env = @_;	@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});	$result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id});
$result.='</textarea>'.	$result.='</div>'."\n".
#$dimension{$instance.'.criteria.'.$id}.	#$dimension{'criteria.'.$id}.
'</td>'.	'<div class="LC_GRADING_grade">'."\n".
'<td><nobr>Additional Comment for Student</nobr> <br />'.	'<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' \|\| !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
'<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>'.	'<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
'</td>'.	'<label class="LC_GRADING_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
'<td>'.	'<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
'<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' \|\| !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label></nobr><br />'.	'</div>'."\n".
'<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.	'<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".
'<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.	'<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'</textarea>'."\n".
'<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'.	'</label>'."\n".
'</td>'.	'<ul class="LC_GRADING_navbuttons">'."\n".
'<td>'.	'<li><a href="#'.$last_link.'">Prev</a></li>'."\n".
'<a href="#'.$last_link.'">Prev</a><br />'.	'<li><a href="#next_'.$link.'">Next</a></li>'."\n".
'<a href="#next_'.$link.'">Next</a><br /><br /><br />'.	'</ul>'."\n".
'</td></tr>';	'</div>'."\n";
	$result.=&grading_history($version,$dim,$id);
$last_link=$link;	$last_link=$link;
}	}
} elsif ($target eq 'grade' && $env{'form.webgrade'}) {	} elsif ($target eq 'grade' && $env{'form.webgrade'}) {
Line 1616 sub get_instance {	Line 1910 sub get_instance {
my $mandatory_failed=0;	my $mandatory_failed=0;
my $ungraded=0;	my $ungraded=0;
my $review=0;	my $review=0;
foreach my $id (@{$dimension{$instance.'.criterias'}}) {
my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};	@Apache::scripttag::parser_env = @_;
$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};	$result.=&Apache::scripttag::xmlparse($dimension{'intro'});
my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');	foreach my $id (@{$dimension{$instance.'.criterias'}},
	@{$dimension{'criterias'}}) {
	my $link=&link($id);
	@Apache::scripttag::parser_env = @_;
	$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
	my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link};
	$Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
	my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N');
if ($status eq 'pass') {	if ($status eq 'pass') {
if (!$mandatory) { $optional_passed++; }	if (!$mandatory) { $optional_passed++; }
} elsif ($status eq 'fail') {	} elsif ($status eq 'fail') {
Line 1632 sub get_instance {	Line 1933 sub get_instance {
$ungraded++;	$ungraded++;
}	}
}	}
if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {	# FIXME optional required can apply to only <instance> right now...
	my $opt_req=$dimension{$instance.'.optionalrequired'};
	if ($opt_req !~ /\S/) {
	$opt_req=
	&Apache::lonxml::get_param('OptionalRequired',
	$parstack,$safeeval);
	if ($opt_req !~ /\S/) { $opt_req = 0; }
	}
	if ($optional_passed < $opt_req) {
$mandatory_failed++;	$mandatory_failed++;
}	}
&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.$version.$dim.status"}=	$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
'review';	'review';
} elsif ($ungraded) {	} elsif ($ungraded) {
$Apache::lonhomework::results{"resource.$version.$dim.status"}=	$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
'ungraded';	'ungraded';
} elsif ($mandatory_failed) {	} elsif ($mandatory_failed) {
$Apache::lonhomework::results{"resource.$version.$dim.status"}=	$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
'fail';	'fail';
} else {	} else {
$Apache::lonhomework::results{"resource.$version.$dim.status"}=	$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
'pass';	'pass';
}	}
} else {	} else {
Line 1657 sub get_instance {	Line 1966 sub get_instance {
}	}
}	}

	sub grading_history {
	my ($version,$dim,$id) = @_;
	if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
	return '';
	}
	my ($result,$grader);
	my $scope="resource.$version.0.$dim.$id";
	foreach my $t (1..$Apache::lonhomework::history{'version'}) {
	if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) {
	my ($gname,$gdom) =
	split(':',$Apache::lonhomework::history{$t.':resource.0.regrader'});
	my $fullname = &Apache::loncommon::plainname($gname,$gdom);
	$grader = &Apache::loncommon::aboutmewrapper($fullname,
	$gname,$gdom);
	}
	my $entry;
	if (exists($Apache::lonhomework::history{"$t:$scope.status"})) {
	$entry.="<tt>".$Apache::lonhomework::history{"$t:$scope.status"}.'</tt>';
	}
	if (exists($Apache::lonhomework::history{"$t:$scope.comment"})) {
	$entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
	}
	if ($entry) {
	$result.= "<li>$grader : $entry </li>";
	}
	}
	if ($result) {
	return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>';
	}
	return '';
	}

sub start_IntroParagraph {	sub start_IntroParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;	my $result;
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'webgrade') {
if ($tagstack->[-2] eq 'Dimension') {	if ($tagstack->[-2] eq 'Dimension' \|\| $tagstack->[-2] eq 'Question' ) {
$dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser);	$dimension{'intro'}=
	&Apache::lonxml::get_all_text('/introparagraph',
} elsif ($target eq 'webgrade') {	$parser,$style);
&Apache::lonxml::get_all_text('/introparagraph',$parser);	} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
	&Apache::lonxml::startredirection();
}	}

}	}
Line 1673 sub start_IntroParagraph {	Line 2015 sub start_IntroParagraph {
}	}

sub end_IntroParagraph {	sub end_IntroParagraph {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	if ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
	my $result = &Apache::lonxml::endredirection();
	}
}	}

sub start_Instance {	sub start_Instance {
Line 1694 sub end_Instance {	Line 2040 sub end_Instance {
}	}

sub start_InstanceText {	sub start_InstanceText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $instance_id=$Apache::bridgetask::instance[-1];	my $instance_id=$Apache::bridgetask::instance[-1];
my $text=&Apache::lonxml::get_all_text('/instancetext',$parser);	my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'webgrade') {
$dimension{$instance_id.'.text'}=$text;	$dimension{$instance_id.'.text'}=$text;
}	}
return '';	return '';
Line 1708 sub end_InstanceText {	Line 2054 sub end_InstanceText {
}	}

sub start_Criteria {	sub start_Criteria {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $instance_id=$Apache::bridgetask::instance[-1];	my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser);
if ($target eq 'web' \|\| $target eq 'webgrade' \|\| $target eq 'grade') {	if ($target eq 'web' \|\| $target eq 'webgrade' \|\| $target eq 'grade') {
my $id=&get_id($parstack,$safeeval);	my $id=&get_id($parstack,$safeeval);
$dimension{$instance_id.'.criteria.'.$id}=$criteria;	if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) {
$dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=	my $instance_id=$Apache::bridgetask::instance[-1];
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);	$dimension{"criteria.$instance_id.$id"}=$criteria;
push(@{$dimension{$instance_id.'.criterias'}},$id);	$dimension{"criteria.$instance_id.$id.mandatory"}=
	&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
	push(@{$dimension{$instance_id.'.criterias'}},"$instance_id.$id");
	} else {
	$dimension{'criteria.'.$id}=$criteria;
	$dimension{'criteria.'.$id.'.mandatory'}=
	&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
	push(@{$dimension{'criterias'}},$id);
	}
}	}
return '';	return '';
}	}
Line 1740 sub proctor_validation_screen {	Line 2093 sub proctor_validation_screen {
<h2>Proctor Validation</h2>	<h2>Proctor Validation</h2>
<p>Your room's proctor needs to validate your access to this resource.</p>	<p>Your room's proctor needs to validate your access to this resource.</p>
$msg	$msg
<form name="checkout" method="POST" action="$env{'request.uri'}">	<form name="checkout" method="post" action="$env{'request.uri'}">
<input type="hidden" name="validate" value="yes" />	<input type="hidden" name="validate" value="yes" />
<input type="hidden" name="submitted" value="yes" />	<input type="hidden" name="submitted" value="yes" />
<table>	<table>
Line 1755 sub proctor_validation_screen {	Line 2108 sub proctor_validation_screen {
<tr><td colspan="2">Student who should be logged in is:</td></tr>	<tr><td colspan="2">Student who should be logged in is:</td></tr>
<tr><td>Name:</td><td>$name</td></tr>	<tr><td>Name:</td><td>$name</td></tr>
<tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>	<tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
<tr><td>Usename</td><td>$user\@$domain</td></tr>	<tr><td>Usename</td><td>$user:$domain</td></tr>
<tr><td colspan="2"><img src="$url" /></td></tr>	<tr><td colspan="2"><img src="$url" /></td></tr>
</table>	</table>
</tr></td>	</tr></td>

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

Removed from v.1.83
changed lines
	Added in v.1.155