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.205 and 1.241

version 1.205, 2006/11/14 22:12:58	version 1.241, 2008/09/19 22:06:49
Line 38 use Apache::lonlocal;	Line 38 use Apache::lonlocal;
use Apache::lonxml;	use Apache::lonxml;
use Apache::slotrequest();	use Apache::slotrequest();
use Time::HiRes qw( gettimeofday tv_interval );	use Time::HiRes qw( gettimeofday tv_interval );
use lib '/home/httpd/lib/perl/';
use LONCAPA;	use LONCAPA;


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

my %dimension;	my %dimension;
Line 98 sub check_in {	Line 97 sub check_in {
&check_in_sequence($user,$domain,$slot_name);	&check_in_sequence($user,$domain,$slot_name);
} else {	} else {
&create_new_version($type,$user,$domain,$slot_name);	&create_new_version($type,$user,$domain,$slot_name);
	&Apache::structuretags::finalize_storage();
}	}
return 1;	return 1;
}	}
Line 244 sub add_grading_button {	Line 244 sub add_grading_button {
my $result="\n\t".'<input type="submit" name="gradeasubmission" value="'.	my $result="\n\t".'<input type="submit" name="gradeasubmission" value="'.
&mt("Get a submission to grade").'" />';	&mt("Get a submission to grade").'" />';
$result.="\n\t".'<input type="hidden" name="grade_target" value="webgrade" />';	$result.="\n\t".'<input type="hidden" name="grade_target" value="webgrade" />';
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {	my $see_all = &Apache::lonnet::allowed('mgq',$env{'request.course.id'});
	my $see_sec = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.
	'/'.$env{'request.course.sec'});

	if ($see_all \|\| $see_sec) {
my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');	my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
$result.="\n\t".'<table>'."\n\t\t".'<tr>';	$result.="\n\t".'<table>'."\n\t\t".'<tr>';
$result.="\n\t\t\t".'<td rowspan="4">Specify a section: </td>'.	if ($see_all \|\| (!&section_restricted())) {
"\n\t\t\t".'<td rowspan="4">'.$sec_select."\n\t\t\t".'</td>';	$result.="\n\t\t\t".'<td rowspan="4">'.&mt('Specify a section:').' </td>'.
	"\n\t\t\t".'<td rowspan="4">'.$sec_select."\n\t\t\t".'</td>';
	} else {
	$result.="\n\t\t\t".'<td rowspan="4">'.&mt('Grading section:').' </td>'.
	"\n\t\t\t".'<td rowspan="4">'.$env{'request.course.sec'}."\n\t\t\t".'</td>';
	}
$result.="\n\t\t\t".'<td>'.'<input type="submit" name="reviewagrading" value="'.	$result.="\n\t\t\t".'<td>'.'<input type="submit" name="reviewagrading" value="'.
&mt("Select an entry from the grading queue:").'" /> ';	&mt("Select an entry from the grading queue:").'" /> ';

Line 285 sub add_grading_button {	Line 294 sub add_grading_button {

sub add_request_another_attempt_button {	sub add_request_another_attempt_button {
my ($text)=@_;	my ($text)=@_;
if (!$text) { $text="Request another attempt"; }	if (!$text) { $text=&mt('Request another attempt'); }
my $result;	my $result;
my $symb=&Apache::lonnet::symbread();	my $symb=&Apache::lonnet::symbread();
# not a slot access based resource	# not a slot access based resource
Line 297 sub add_request_another_attempt_button {	Line 306 sub add_request_another_attempt_button {
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) {
$text="Change reservation.";	$text=&mt('Change reservation.');
$action='change_reservation';	$action='change_reservation';
my $description=&Apache::slotrequest::get_description($slot_name,	my $description=&Apache::slotrequest::get_description($slot_name,
$slot);	$slot);
$result.=(<<STUFF);	$result.='<p>'
<p> Will be next available: $description </p>	.&mt('Will be next available:')
STUFF	.' '.$description
	.'</p>';
}	}

if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }	if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
Line 313 STUFF	Line 323 STUFF
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n\t\t".	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n\t\t".
'<input type="hidden" name="command" value="'.$action.'" />'."\n\t\t".	'<input type="hidden" name="command" value="'.$action.'" />'."\n\t\t".
'<input type="submit" name="requestattempt" value="'.	'<input type="submit" name="requestattempt" value="'.
&mt($text).'" />'."\n\t".	$text.'" />'."\n\t".
'</form>'."\n";	'</form>'."\n";
return $result;	return $result;
}	}
Line 380 sub nest {	Line 390 sub nest {
}	}
}	}

	sub start_delay {
	push(@delay,1);
	}
	sub end_delay {
	pop(@delay);
	}

sub nested_parse {	sub nested_parse {
my ($str,$env,$args) = @_;	my ($str,$env,$args) = @_;
my @old_env = @Apache::scripttag::parser_env;	my @old_env = @Apache::scripttag::parser_env;
Line 480 sub webgrade_standard_info {	Line 497 sub webgrade_standard_info {
'stop' => 'Quit Grading',	'stop' => 'Quit Grading',
'fail' => 'Fail Rest',	'fail' => 'Fail Rest',
'cancel' => 'Cancel',	'cancel' => 'Cancel',
	'submit' => 'Submit Grades',
);	);
%lt=&Apache::lonlocal::texthash(%lt);	%lt=&Apache::lonlocal::texthash(%lt);

Line 487 sub webgrade_standard_info {	Line 505 sub webgrade_standard_info {
<div class="LC_GRADING_maincontrols">	<div class="LC_GRADING_maincontrols">
INFO	INFO

if (&grade_mode() eq 'regrade') {	if ($env{'request.state'} eq 'construct') {
$result.=<<INFO;	$result.=<<INFO;
	<input type="submit" name="next" value="$lt{'submit'}" />
	INFO
	} else {
	if (&grade_mode() eq 'regrade' && $env{'request.state'} ne 'construct') {
	$result.=<<INFO;
<input type="submit" name="cancel" value="$lt{'cancel'}" />	<input type="submit" name="cancel" value="$lt{'cancel'}" />
INFO	INFO
}	}

$result.=<<INFO;	$result.=<<INFO;
<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'}" />
	INFO
	}
	$result.=<<INFO;
<input type="button" name="fail" value="$lt{'fail'}"	<input type="button" name="fail" value="$lt{'fail'}"
onclick="javascript:onFailRest()" />	onclick="javascript:onFailRest()" />
</div>	</div>
$file_list	$file_list
INFO	INFO
return $result;	return $result;

}	}

sub done_screen {	sub done_screen {
my ($version) = @_;	my ($version) = @_;
my $title=&Apache::lonnet::gettitle();	my $title=&Apache::lonnet::gettitle($env{'request.uri'});
my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});	my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();	my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();
my $files = '<ul>';	my $files = '<ul>';
Line 514 sub done_screen {	Line 541 sub done_screen {
foreach my $file (@files) {	foreach my $file (@files) {
my $url="/uploaded/$domain/$user/portfolio$file";	my $url="/uploaded/$domain/$user/portfolio$file";
if (! &Apache::lonnet::stat_file($url)) {	if (! &Apache::lonnet::stat_file($url)) {
$file = &mt('<span class="LC_error"> Nonexistent file:</span> '.	$file = '<span class="LC_error">'
'<span class="LC_filename">[_1]</span>',$file);	.&mt('[_1]Nonexistent file:[_2]'
$msg .= "<p>Submitted non-existant file $file</p>\n";	,'<span class="LC_error"> '
	,'</span> <span class="LC_filename">'.$file.'</span>');
	$msg .= "<p>".&mt('Submitted non-existent file [_1]',$file)."</p>\n";
} else {	} else {
$file = '<span class="LC_filename">'.$file.'</span>';	$file = '<span class="LC_filename">'.$file.'</span>';
$msg .= "<p>Submitted file $file</p>\n";	$msg .= "<p>".&mt('Submitted file [_1]',$file)."</p>\n";
}	}
$files .= '<li>'.$file.'</li>';	$files .= '<li>'.$file.'</li>';
}	}
$files.='</ul>';	$files.='</ul>';
my $subject = "Submission message for $title";	my $subject = &mt('Submission message for [_1]',$title);
my ($message_status,$comment_status);	my ($message_status,$comment_status);
my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'};	my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'};
$setting =~ s/^\s(\S)\s*$/$1/;	$setting =~ s/^\s(\S)\s*$/$1/;
Line 543 sub done_screen {	Line 572 sub done_screen {
$comment_status = '<p>'.&mt('Message sent to instructor: [_1]',	$comment_status = '<p>'.&mt('Message sent to instructor: [_1]',
$comment_status).' </p>';	$comment_status).' </p>';
}	}
return <<DONESCREEN;	return "<h2>$title</h2>"
<h2>$title</h2>	.'<p>'.&mt('Files submitted: [_1]',$files).'</p>'
<p> Files submitted: $files </p>	.'<p>'.&mt('You are now done with this Bridge Task').'</p>'
<p> You are now done with this Bridge Task </p>	.'<hr />'
<hr />	.'<p><a href="/adm/logout">'.&mt('Logout').'</a></p>'
<p> <a href="/adm/logout">Logout</a> </p>	.'<p><a href="/adm/roles">'.&mt('Change to a different course').'</a></p>'
<p> <a href="/adm/roles">Change to a different course</a> </p>	.$message_status
$message_status	.$comment_status;
$comment_status
DONESCREEN

}	}

Line 583 sub start_Task {	Line 610 sub start_Task {
&Apache::structuretags::page_start($target,$token,$tagstack,	&Apache::structuretags::page_start($target,$token,$tagstack,
$parstack,$parser,$safeeval,	$parstack,$parser,$safeeval,
$name,&style($target));	$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') {
Line 594 sub start_Task {	Line 620 sub start_Task {
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }	if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
$result.=$uri.'">'.&add_grading_button()."</form>\n";	$result.=$uri.'">'.&add_grading_button()."</form>\n";
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'})
	\|\| &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
$result.='<form method="post" name="slotrequest" 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" />'.
Line 604 sub start_Task {	Line 631 sub start_Task {
my $target_id =	my $target_id =
&Apache::lonstathelpers::make_target_id({symb => $symb,	&Apache::lonstathelpers::make_target_id({symb => $symb,
part => '0'});	part => '0'});
$result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.	if (!&section_restricted()) {
'<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.	$result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
'<input type="hidden" name="reportSelected" value="grading_analysis" />'.	'<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
'<input type="submit" name="grading" value="'.	'<input type="hidden" name="reportSelected" value="grading_analysis" />'.
&mt('Show Grading Status').'" />'.	'<input type="submit" name="grading" value="'.
'</form>';	&mt('Show Grading Status').'" />'.
	'</form>';
	}
}	}
}	}
}	}
if ($target eq 'web' && $env{'request.state'} eq 'construct') {	if ($target =~/(web\|webgrade)/ && $env{'request.state'} eq 'construct') {
$form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});	$form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});
}	}
if ($target eq 'web'	if ($target eq 'web'
Line 632 sub start_Task {	Line 661 sub start_Task {
'slot' => $slot_name});	'slot' => $slot_name});
($version,$previous)=&get_version();	($version,$previous)=&get_version();
}	}

	my $status_id =
	($previous \|\| $status eq 'SHOW_ANSWER') ? 'LC_task_feedback'
	: 'LC_task_take';
	$result .= '<div class="LC_task" id="'.$status_id.'">'."\n";

push(@Apache::inputtags::status,$status);	push(@Apache::inputtags::status,$status);
$Apache::inputtags::slot_name=$slot_name;	$Apache::inputtags::slot_name=$slot_name;
Line 699 sub start_Task {	Line 733 sub start_Task {
$target eq 'webgrade') {	$target eq 'webgrade') {
my $webgrade='yes';	my $webgrade='yes';
if ($target eq 'webgrade') {	if ($target eq 'webgrade') {
	$result .= '<div class="LC_task">'."\n";
$result.= "\n".'<div class="LC_GRADING_task">'."\n".	$result.= "\n".'<div class="LC_GRADING_task">'."\n".
'<script type="text/javascript"	'<script type="text/javascript"
src="/res/adm/includes/task_grading.js"></script>';	src="/res/adm/includes/task_grading.js"></script>';
Line 711 sub start_Task {	Line 746 sub start_Task {
if ($todo) {	if ($todo) {
&setup_env_for_other_user($todo,$safeeval);	&setup_env_for_other_user($todo,$safeeval);
my ($symb,$uname,$udom)=&decode_queue_key($todo);	my ($symb,$uname,$udom)=&decode_queue_key($todo);
$result.="\n".'<table><tr><td>Found '.	if ($env{'request.state'} eq 'construct') {
&Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';	$symb = $env{'request.uri'};
	}
	$result.="\n".'<p>'.
	&mt('Grading [_1] for [_2] at [_3]',
	&Apache::lonnet::gettitle($symb),$uname,$udom).'</p>';
$form_tag_start.=	$form_tag_start.=
'<input type="hidden" name="gradingkey" value="'.	'<input type="hidden" name="gradingkey" value="'.
&escape($todo).'" />';	&escape($todo).'" />';
Line 778 sub start_Task {	Line 817 sub start_Task {
$result.='<input type="hidden" name="regrade" value="'.	$result.='<input type="hidden" name="regrade" value="'.
$env{'form.regrade'}.'" />';	$env{'form.regrade'}.'" />';
}	}
if ($env{'form.chosensections'}) {	if ($env{'form.chosensections'} \|\| &section_restricted()) {
my @chosen_sections=	my @chosen_sections = &get_allowed_sections();
&Apache::loncommon::get_env_multiple('form.chosensections');
foreach my $sec (@chosen_sections) {	foreach my $sec (@chosen_sections) {
$result.='<input type="hidden" name="chosensections"	$result.='<input type="hidden" name="chosensections"
value="'.$sec.'" />';	value="'.$sec.'" />';
}	}
}	}
if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }	if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
	} elsif ($target eq 'webgrade'
	&& $env{'request.state'} eq 'construct') {
	$result.=$form_tag_start;
	$result.='<input type="hidden" name="webgrade" value="'.
	$webgrade.'" />';
	$result.=&webgrade_standard_info();
}	}
if ($target eq 'webgrade') {	if ($target eq 'webgrade') {
$result.="\n".'<div id="LC_GRADING_criterialist">';	$result.="\n".'<div id="LC_GRADING_criterialist">';
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
	&start_delay();
	$dimension{$top}{'result'}=$result;
	undef($result);
}	}
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=$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 />";
my $temp=&Apache::edit::insertlist($target,$token);	$result.= &Apache::edit::text_arg('Required number of passed optional elements to pass the Task:','OptionalRequired',$token,10)." <br />\n";
$result.=$temp;	$result.= &Apache::edit::insertlist($target,$token);
	} elsif ($target eq 'modified') {
	my $constructtag=
	&Apache::edit::get_new_args($token,$parstack,$safeeval,
	'OptionalRequired');
	if ($constructtag) {
	$result = &Apache::edit::rebuild_tag($token);
	}
} else {	} else {
# page_start returned a starting result, delete it if we don't need it	# page_start returned a starting result, delete it if we don't need it
$result = '';	$result = '';
Line 824 sub get_key_todo {	Line 878 sub get_key_todo {
my ($target)=@_;	my ($target)=@_;
my $todo;	my $todo;

	if ($env{'request.state'} eq 'construct') {
	my ($symb,$cid,$udom,$uname) = &Apache::lonnet::whichuser();
	my $gradingkey=&encode_queue_key($symb,$udom,$uname);
	return ($gradingkey);
	}

if (defined($env{'form.reviewasubmission'})) {	if (defined($env{'form.reviewasubmission'})) {
&Apache::lonxml::debug("review a submission....");	&Apache::lonxml::debug("review a submission....");
$env{'form.queue'}='reviewqueue';	$env{'form.queue'}='reviewqueue';
Line 852 sub get_key_todo {	Line 912 sub get_key_todo {
my ($symb,$cid)=&Apache::lonnet::whichuser();	my ($symb,$cid)=&Apache::lonnet::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 $uname = $env{'form.gradinguser'};	my $uname = &LONCAPA::clean_username($env{'form.gradinguser'});
my $udom = $env{'form.gradingdomain'};	my $udom = &LONCAPA::clean_domain($env{'form.gradingdomain'});

	if (&section_restricted()) {
	my $classlist=&get_limited_classlist();
	if (!&allow_grade_user($classlist->{$uname.':'.$udom})) {
	return (undef,'not_allowed',
	&mt('Requested student ([_1]) is in a section you aren\'t allowed to grade.',$uname.':'.$udom));
	}
	}
my $gradingkey=&encode_queue_key($symb,$udom,$uname);	my $gradingkey=&encode_queue_key($symb,$udom,$uname);

my $queue;	my $queue;
Line 1016 sub end_Task {	Line 1083 sub end_Task {
}	}
if (!$previous && $status ne 'SHOW_ANSWER' &&	if (!$previous && $status ne 'SHOW_ANSWER' &&
&show_task($status,$previous)) {	&show_task($status,$previous)) {
$result.=&Apache::inputtags::gradestatus('0');	$result.=&Apache::inputtags::gradestatus('0',$target,1);
}	}

$result.='</form>';	$result.='</form>';
Line 1024 sub end_Task {	Line 1091 sub end_Task {
if (!$previous && $status ne 'SHOW_ANSWER' &&	if (!$previous && $status ne 'SHOW_ANSWER' &&
&show_task($status,$previous)) {	&show_task($status,$previous)) {
my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});	my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
	my $donetext = &mt('Done');
$result.=<<DONEBUTTON;	$result.=<<DONEBUTTON;
<form name="done" method="post" action="$action">	<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="$donetext" />
</form>	</form>
DONEBUTTON	DONEBUTTON
}	}
if (&show_task($status,$previous) &&	if (&show_task($status,$previous) &&
$Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass\|fail)$/) {	$Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass\|fail)$/) {
my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};	my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
my $title=&Apache::lonnet::gettitle();	my $title=&Apache::lonnet::gettitle($env{'request.uri'});

my $start_time;	my $start_time;

my $slot_name=	my $slot_name=
Line 1051 DONEBUTTON	Line 1118 DONEBUTTON
$start_time=&Apache::lonlocal::locallocaltime($start_time);	$start_time=&Apache::lonlocal::locallocaltime($start_time);

my $status =	my $status =
"\n<div class='LC_$bt_status LC_criteria'>\n\t";	"\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'>\n\t";

	my $dim = $top;
	my %counts = &get_counts($dim,undef,$parstack,
	$safeeval);
	my $question_status ="\n\t<p>".
	&question_status_message(\%counts,-1).
	"</p>\n";

if ($bt_status eq 'pass') {	if ($bt_status eq 'pass') {
$status.='<h2>You passed the '.$title.' given on '.	$status.='<h2>'
$start_time.'</h2>';	.&mt('You passed the [_1] given on [_2].',$title,$start_time)
	.'</h2>';
	$status.=$question_status;
}	}
if ($bt_status eq 'fail') {	if ($bt_status eq 'fail') {
$status.='<h2>You did not pass the '.$title.' given on '.	$status.='<h2>'
$start_time.'</h2>';	.&mt('You did not pass the [_1] given on [_2].',$title,$start_time)
	.'</h2>';
	$status.=$question_status;
if (!$previous) {	if (!$previous) {
$status.=&add_request_another_attempt_button();	$status.=&add_request_another_attempt_button();
}	}
}	}
$status.="\n".'</div>'."\n";
my $dim = $top;
my %counts = &get_counts($dim,undef,$parstack,
$safeeval);
$status.="\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'>\n\t<p>".
&question_status_message(\%counts,-1).
"</p>\n</div>\n";

	$status.="\n".'</div>'."\n";

foreach my $id (@{$dimension{$dim}{'criterias'}}) {	foreach my $id (@{$dimension{$dim}{'criterias'}}) {
my $type = $dimension{$dim}{'criteria.'.$id.'.type'};	my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
Line 1103 DONEBUTTON	Line 1175 DONEBUTTON
}	}


if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous
	&& $status eq 'CAN_ANSWER') {
my $award='SUBMITTED';	my $award='SUBMITTED';
&Apache::essayresponse::file_submission("$version.0",'bridgetask',	&Apache::essayresponse::file_submission("$version.0",'bridgetask',
'portfiles',\$award);	'portfiles',\$award);
Line 1253 DONEBUTTON	Line 1326 DONEBUTTON
}	}
}	}
if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {	if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {
# instance generation occured and hasn't yet been stored	# instance generation occurred and hasn't yet been stored
&Apache::structuretags::finalize_storage();	&Apache::structuretags::finalize_storage();
}	}
} elsif ($target eq 'webgrade') {	} elsif ($target eq 'webgrade') {
$result.=&Apache::lonxml::endredirection();	if (&nest()) {
	&Apache::lonxml::endredirection();
	&end_delay();
	$result.=$dimension{$top}{'result'};
	} else {
	$result.=&Apache::lonxml::endredirection();
	}
my $dim = $top;	my $dim = $top;
foreach my $id (@{$dimension{$dim}{'criterias'}} ) {	foreach my $id (@{$dimension{$dim}{'criterias'}} ) {
my $type = $dimension{$dim}{'criteria.'.$id.'.type'};	my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
Line 1269 DONEBUTTON	Line 1348 DONEBUTTON
[@_]);	[@_]);
$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);	$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
my $internal_location=&internal_location($id);	my $internal_location=&internal_location($id);
$result=~s/\Q$internal_location\E/$criteria/;	if ($result =~ m/\Q$internal_location\E/) {
	$result=~s/\Q$internal_location\E/$criteria/;
	} else {
	$result.=$criteria;
	}

}	}
}	}
$result.="</div>";	$result.="</div>";
Line 1294 DONEBUTTON	Line 1378 DONEBUTTON
$result.=&Apache::response::meta_stores_write('status','string',	$result.=&Apache::response::meta_stores_write('status','string',
'Bridge Task Status');	'Bridge Task Status');
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
&Apache::structuretags::reset_problem_globals('Task');	$result.= &Apache::structuretags::problem_edit_footer();
undef($Apache::lonhomework::parsing_a_task);
return ('','no');
}	}
&Apache::structuretags::reset_problem_globals('Task');	&Apache::structuretags::reset_problem_globals('Task');
undef($Apache::lonhomework::parsing_a_task);	undef($Apache::lonhomework::parsing_a_task);
Line 1458 sub get_limited_classlist {	Line 1540 sub get_limited_classlist {
}	}
}	}

if (ref($sections) && !grep('all',@{ $sections })) {	if (ref($sections) && !grep {$_ eq 'all'} (@{ $sections })) {
foreach my $student (keys(%$classlist)) {	foreach my $student (keys(%$classlist)) {
my $section =	my $section =
$classlist->{$student}[&Apache::loncoursedata::CL_SECTION()];	$classlist->{$student}[&Apache::loncoursedata::CL_SECTION()];
if (! grep($section,@{ $sections })) {	if (! grep {$_ eq $section} (@{ $sections })) {
delete($classlist->{$student});	delete($classlist->{$student});
}	}
}	}
Line 1478 sub show_queue {	Line 1560 sub show_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 @chosen_sections=	my @chosen_sections = &get_allowed_sections();
&Apache::loncommon::get_env_multiple('form.chosensections');

my $classlist = &get_limited_classlist(\@chosen_sections);	my $classlist = &get_limited_classlist(\@chosen_sections);

if (!(grep(/^all$/,@chosen_sections))) {	if (!(grep(/^all$/,@chosen_sections))) {
$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).	$result.='<p>'
'</tt>.</p> '."\n";	.&mt('Showing only sections [_1].'
	,'<tt>'.join(', ',@chosen_sections).'</tt>')
	."</p>\n";
}	}

my ($view,$view_section);	my ($view,$view_section);
Line 1499 sub show_queue {	Line 1582 sub show_queue {
}	}
}	}

	$result .=
	'<p><a href="/adm/flip?postdata=return:">'.
	&mt('Return to resource').'</a></p><hr />'.
	"\n<h3>".&mt('Current Queue - [_1]',$queue)."</h3>";
my $regexp="^$symb\0";	my $regexp="^$symb\0";
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);	my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
my ($tmp)=%queue;	my ($tmp)=%queue;
if ($tmp=~/^error: 2 /) {	if ($tmp=~/^error: 2 /) {
return "\n<h3>Current Queue - $queue</h3>".	$result.=
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_row().	&Apache::loncommon::start_data_table_row().
'<td>'.&mt('Empty').'</td>'.	'<td>'.&mt('Empty').'</td>'.
&Apache::loncommon::end_data_table_row().	&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table();	&Apache::loncommon::end_data_table();
	return $result;
}	}
my $title=&Apache::lonnet::gettitle($symb);	my $title=&Apache::lonnet::gettitle($symb);
$result.="\n<h3>Current Queue - $title $queue </h3>".	$result.=
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row();	&Apache::loncommon::start_data_table_header_row();
if ($with_selects) { $result.="<th>Status</th><th></th>"; }	if ($with_selects) { $result.='<th>'.&mt('Status').'</th><th></th>'; }
$result.="<th>user</th><th>data</th>".	$result.='<th>'.&mt('User').'</th><th>'.&mt('Data').'</th>'.
&Apache::loncommon::end_data_table_header_row();	&Apache::loncommon::end_data_table_header_row();
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; }	next if (!defined($classlist->{$uname.':'.$udom}));
	next if (!&allow_grade_user($classlist->{$uname.':'.$udom}));

my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];	my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];

Line 1553 sub show_queue {	Line 1642 sub show_queue {
my $ekey=&escape($key);	my $ekey=&escape($key);
my ($action,$description,$status)=('select',&mt('Select'));	my ($action,$description,$status)=('select',&mt('Select'));
if (exists($queue{"$key\0locked"})) {	if (exists($queue{"$key\0locked"})) {
	my ($locker,$time) =
	&get_lock_info($queue{"$key\0locked"});
	if ($time) {
	$time =
	&Apache::lonnavmaps::timeToHumanString($time,
	'start');
	}
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"});	$status=&mt('Locked by [_1] [_2]','<tt>'.$locker.'</tt>',$time);
if ($me eq $queue{"$key\0locked"}) {	if ($me eq $locker) {
($action,$description)=('resume',&mt('Resume'));	($action,$description)=('resume',&mt('Resume'));
} else {	} else {
($action,$description)=('unlock',&mt('Unlock'));	($action,$description)=('unlock',&mt('Unlock'));
Line 1589 FORM	Line 1685 FORM
}	}
$result.= "<td>".$classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_FULLNAME()].	$result.= "<td>".$classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_FULLNAME()].
" <tt>($uname:$udom)</tt> </td>";	" <tt>($uname:$udom)</tt> </td>";
$result.='<td>'.$slot_text.' End time: '.	$result.='<td>'.$slot_text.' '
&Apache::lonlocal::locallocaltime($end_time).	.&mt('End time: [_1]'
"</td>".&Apache::loncommon::end_data_table_row();	,&Apache::lonlocal::locallocaltime($end_time))
	.'</td>'
	.&Apache::loncommon::end_data_table_row();
}	}
}	}
$result.= &Apache::loncommon::end_data_table()."<hr />\n";	$result.= &Apache::loncommon::end_data_table()."<hr />\n";
return $result;	return $result;
}	}

	sub get_allowed_sections {
	my @chosen_sections;
	if (&section_restricted()) {
	@chosen_sections = ($env{'request.course.sec'});
	} else {
	@chosen_sections =
	&Apache::loncommon::get_env_multiple('form.chosensections');
	}

	return @chosen_sections;
	}

	sub section_restricted {
	my $cid =(&Apache::lonnet::whichuser())[1];
	return (lc($env{'course.'.$cid.'.task_grading'}) eq 'section'
	&& $env{'request.course.sec'} ne '' );
	}

	sub allow_grade_user {
	my ($classlist_entry) = @_;

	if (&section_restricted()
	&& $env{'request.course.sec'} ne
	$classlist_entry->[&Apache::loncoursedata::CL_SECTION()]) {
	return 0;
	}
	return 1;
	}

sub get_queue_counts {	sub get_queue_counts {
my ($queue)=@_;	my ($queue)=@_;
my $result;	my $result;
Line 1613 sub get_queue_counts {	Line 1740 sub get_queue_counts {
if ($tmp=~/^error: 2 /) {	if ($tmp=~/^error: 2 /) {
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;	my %slot_cache;
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; }	next if (!defined($classlist->{$uname.':'.$udom}));
	next if (!&allow_grade_user($classlist->{$uname.':'.$udom}));

if ($key=~/locked$/) {	if ($key=~/locked$/) {
$locks++;	$locks++;
} elsif ($key=~/timestamp$/) {	} elsif ($key=~/timestamp$/) {
Line 1665 sub queue_key_locked {	Line 1795 sub queue_key_locked {
my ($key_locked,$value)=	my ($key_locked,$value)=
&Apache::lonnet::get($queue,["$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 &get_lock_info($value);
}	}
return undef;	return undef;
}	}
Line 1694 sub pick_from_queue_data {	Line 1824 sub pick_from_queue_data {
if ($key =~ /\0timestamp$/) { next; }	if ($key =~ /\0timestamp$/) { next; }

my ($symb,$uname,$udom)=&decode_queue_key($key);	my ($symb,$uname,$udom)=&decode_queue_key($key);
if (!defined($classlist->{$uname.':'.$udom})) { next; }	next if (!defined($classlist->{$uname.':'.$udom}));
	next if (!&allow_grade_user($classlist->{$uname.':'.$udom}));

if ($check_section) {	if ($check_section) {
my $section =	my $section =
Line 1746 sub pick_from_queue_data {	Line 1877 sub pick_from_queue_data {
return undef;	return undef;
}	}

	sub get_lock_info {
	my ($lock_info) = @_;
	if (wantarray) {
	if (ref($lock_info) eq 'ARRAY') {
	return @{$lock_info};
	} else {
	return ($lock_info);
	}
	} else {
	if (ref($lock_info) eq 'ARRAY') {
	return $lock_info->[0];
	} else {
	return $lock_info;
	}
	}
	return;
	}

sub find_mid_grade {	sub find_mid_grade {
my ($queue,$symb,$cdom,$cnum)=@_;	my ($queue,$symb,$cdom,$cnum)=@_;
my $todo=&unescape($env{'form.gradingkey'});	my $todo=&unescape($env{'form.gradingkey'});
Line 1757 sub find_mid_grade {	Line 1906 sub find_mid_grade {
my $regexp="^$symb\0.*\0locked\$";	my $regexp="^$symb\0.*\0locked\$";
my %locks=&Apache::lonnet::dump($queue,$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= &get_lock_info($locks{$key});
if ($who eq $me) {	if ($who eq $me) {
$todo=$key;	$todo=$key;
$todo=~s/\0locked$//;	$todo=~s/\0locked$//;
Line 1773 sub lock_key {	Line 1922 sub lock_key {
my (undef,$cid)=&Apache::lonnet::whichuser();	my (undef,$cid)=&Apache::lonnet::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 $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},	my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> [$me,time]},
$cdom,$cnum);	$cdom,$cnum);
&Apache::lonxml::debug("success $success $todo");	&Apache::lonxml::debug("success $success $todo");
if ($success eq 'ok') {	if ($success eq 'ok') {
Line 1785 sub lock_key {	Line 1934 sub lock_key {
sub get_queue_symb_status {	sub get_queue_symb_status {
my ($queue,$symb,$cdom,$cnum) = @_;	my ($queue,$symb,$cdom,$cnum) = @_;
if (!defined($cdom) \|\| !defined($cnum)) {	if (!defined($cdom) \|\| !defined($cnum)) {
my (undef,$cid)=&Apache::lonnet::whichuser();	my (undef,$cid) =&Apache::lonnet::whichuser();
$cnum=$env{'course.'.$cid.'.num'};	$cnum=$env{'course.'.$cid.'.num'};
$cdom=$env{'course.'.$cid.'.domain'};	$cdom=$env{'course.'.$cid.'.domain'};
}	}
Line 1801 sub get_queue_symb_status {	Line 1950 sub get_queue_symb_status {
next if ($key=~/timestamp$/);	next if ($key=~/timestamp$/);
my ($symb,$uname,$udom) = &decode_queue_key($key);	my ($symb,$uname,$udom) = &decode_queue_key($key);
next if (!defined($classlist->{$uname.':'.$udom}));	next if (!defined($classlist->{$uname.':'.$udom}));
	next if (!&allow_grade_user($classlist->{$uname.':'.$udom}));
push(@users,"$uname:$udom");	push(@users,"$uname:$udom");
}	}
return @users;	return @users;
Line 1887 sub get_from_queue {	Line 2037 sub get_from_queue {
sub select_user {	sub select_user {
my ($symb,$cid)=&Apache::lonnet::whichuser();	my ($symb,$cid)=&Apache::lonnet::whichuser();

my @chosen_sections=	my @chosen_sections = &get_allowed_sections();
&Apache::loncommon::get_env_multiple('form.chosensections');

my $classlist = &get_limited_classlist(\@chosen_sections);	my $classlist = &get_limited_classlist(\@chosen_sections);

my $result;	my $result;
if (!(grep(/^all$/,@chosen_sections))) {	if (!(grep(/^all$/,@chosen_sections))) {
$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).	$result.='<p>'
'</tt>.</p> '."\n";	.&mt('Showing only sections [_1].'
	,'<tt>'.join(', ',@chosen_sections).'</tt>')
	.'</p> '."\n";
}	}
$result.=&Apache::loncommon::start_data_table();	$result.=&Apache::loncommon::start_data_table();

Line 1942 sub select_user {	Line 2092 sub select_user {
<input type="submit" name="submit" value="Regrade" />	<input type="submit" name="submit" value="Regrade" />
$seclist	$seclist
</form>	</form>
<td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt></td>	<td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt> Sec: $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]</td>
<td>	<td>
RESULT	RESULT
}	}
Line 2014 sub start_ClosingParagraph {	Line 2164 sub start_ClosingParagraph {
if ($target eq 'web') {	if ($target eq 'web') {
} elsif ($target eq 'webgrade') {	} elsif ($target eq 'webgrade') {
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
	} elsif ($target eq 'edit') {
	$result = &Apache::edit::tag_start($target,$token);
	} elsif ($target eq 'modified') {
}	}
return $result;	return $result;
}	}
Line 2028 sub end_ClosingParagraph {	Line 2181 sub end_ClosingParagraph {
return $result;	return $result;
}	}

	sub insert_ClosingParagraph {
	return '
	<ClosingParagraph>
	<startouttext />
	<endouttext />
	</ClosingParagraph>';
	}

sub get_dim_id {	sub get_dim_id {
if (@Apache::bridgetask::dimension) {	if (@Apache::bridgetask::dimension) {
return $Apache::bridgetask::dimension[-1];	return $Apache::bridgetask::dimension[-1];
Line 2038 sub get_dim_id {	Line 2199 sub get_dim_id {

sub get_id {	sub get_id {
my ($parstack,$safeeval)=@_;	my ($parstack,$safeeval)=@_;
my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval);	return &Apache::lonxml::get_id($parstack,$safeeval);
if (!$id) { $id=$Apache::lonxml::curdepth; }
return $id;
}	}

sub start_Setup {	sub start_Setup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
#undef(%dimension);	my $result;
my $dim = &get_id($parstack,$safeeval);	my $dim = &get_id($parstack,$safeeval);
push(@Apache::bridgetask::dimension,$dim);	push(@Apache::bridgetask::dimension,$dim);
&Apache::lonxml::startredirection();	if ($target eq 'web' \|\| $target eq 'webgrade' \|\| $target eq 'grade') {
return &internal_location($dim);	&Apache::lonxml::startredirection();
	} elsif ($target eq 'edit') {
	$result = &Apache::edit::tag_start($target,$token);
	$result.= &Apache::edit::text_arg('Id:','id',$token,10).
	&Apache::edit::end_row().
	&Apache::edit::start_spanning_row();
	} elsif ($target eq 'modified') {
	my $constructtag=
	&Apache::edit::get_new_args($token,$parstack,$safeeval,'id');
	if ($constructtag) {
	$result = &Apache::edit::rebuild_tag($token);
	}
	}
	return $result;
}	}

{	{
Line 2076 sub start_Dimension {	Line 2248 sub start_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $dim = &get_id($parstack,$safeeval);	my $dim = &get_id($parstack,$safeeval);
my $previous_dim;	my $previous_dim;
if (@Apache::bridgetask::dimension) {	my $result;
$previous_dim = $Apache::bridgetask::dimension[-1];	if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'webgrade') {
push(@{$Apache::bridgetask::dimension{$previous_dim}{'contains'}},	if (@Apache::bridgetask::dimension) {
$dim);	$previous_dim = $Apache::bridgetask::dimension[-1];
if(&skip_dimension_parsing($dim)) {	push(@{$Apache::bridgetask::dimension{$previous_dim}{'contains'}},
$dimension{$previous_dim}{'criteria.'.$dim} =	$dim);
$token->[4]	if(&skip_dimension_parsing($dim)) {
.&Apache::lonxml::get_all_text('/'.$tagstack->[-1],$parser,	$dimension{$previous_dim}{'criteria.'.$dim} =
$style)	$token->[4]
.'</'.$tagstack->[-1].'>';	.&Apache::lonxml::get_all_text('/'.$tagstack->[-1],$parser,
}	$style)
$dimension{$previous_dim}{'criteria.'.$dim.'.type'}='dimension';	.'</'.$tagstack->[-1].'>';
$dimension{$previous_dim}{'criteria.'.$dim.'.mandatory'}=	}
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);	$dimension{$previous_dim}{'criteria.'.$dim.'.type'}='dimension';
push(@{$dimension{$previous_dim}{'criterias'}},$dim);	$dimension{$previous_dim}{'criteria.'.$dim.'.mandatory'}=
$dimension{$dim}{'nested'}=$previous_dim;	&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
$dimension{$dim}{'depth'} = 1 + $dimension{$previous_dim}{'depth'};	push(@{$dimension{$previous_dim}{'criterias'}},$dim);
	$dimension{$dim}{'nested'}=$previous_dim;
&Apache::lonxml::debug("adding $dim as criteria to $previous_dim");	$dimension{$dim}{'depth'} = 1 + $dimension{$previous_dim}{'depth'};
} else {
$dimension{$top}{'depth'}=0;	&Apache::lonxml::debug("adding $dim as criteria to $previous_dim");
$dimension{$top}{'criteria.'.$dim.'.type'}='dimension';	} else {
$dimension{$top}{'criteria.'.$dim.'.mandatory'}=	$dimension{$top}{'depth'}=0;
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);	$dimension{$top}{'criteria.'.$dim.'.type'}='dimension';
push(@{$dimension{$top}{'criterias'}},$dim);	$dimension{$top}{'criteria.'.$dim.'.mandatory'}=
}	&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
push(@Apache::bridgetask::dimension,$dim);	push(@{$dimension{$top}{'criterias'}},$dim);
&Apache::lonxml::startredirection();	$dimension{$dim}{'nested'}=$top;
if (!&skip_dimension_parsing($dim)) {	}
&enable_dimension_parsing($dim);	push(@Apache::bridgetask::dimension,$dim);
	&Apache::lonxml::startredirection();
	if (!&skip_dimension_parsing($dim)) {
	&enable_dimension_parsing($dim);
	}
	} elsif ($target eq 'edit') {
	$result = &Apache::edit::tag_start($target,$token);
	$result.=
	&Apache::edit::text_arg('Id:','id',$token,10).' '.
	&Apache::edit::select_arg('Passing is Mandatory:','Mandatory',
	[['Y', 'Yes'],
	['N','No'],],
	$token).' <br /> '.
	&Apache::edit::text_arg('Required number of passed optional elements to pass the '.$token->[1].':',
	'OptionalRequired',$token,4).
	&Apache::edit::end_row().
	&Apache::edit::start_spanning_row();
	} elsif ($target eq 'modified') {
	my $constructtag=
	&Apache::edit::get_new_args($token,$parstack,$safeeval,
	'id','Mandatory','OptionalRequired');
	if ($constructtag) {
	$result = &Apache::edit::rebuild_tag($token);
	}
}	}
return &internal_location($dim);	return $result;# &internal_location($dim);
}	}

sub start_QuestionText {	sub start_QuestionText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $dim = &get_dim_id();	my $result;
my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style);
if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'webgrade') {
	my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style);
	my $dim = &get_dim_id();
$dimension{$dim}{'questiontext'}=$text;	$dimension{$dim}{'questiontext'}=$text;
	} elsif ($target eq 'edit') {
	$result = &Apache::edit::tag_start($target,$token);
	} elsif ($target eq 'modified') {
}	}
return '';	return $result;
}	}

sub end_QuestionText {	sub end_QuestionText {
return '';	return '';
}	}

	sub insert_QuestionText {
	return '
	<QuestionText>
	<startouttext />
	<endouttext />
	</QuestionText>';
	}

sub get_instance {	sub get_instance {
my ($dim)=@_;	my ($dim)=@_;
my $rand_alg=&Apache::lonnet::get_rand_alg();	my $rand_alg=&Apache::lonnet::get_rand_alg();
Line 2185 sub link {	Line 2392 sub link {
sub end_Question { return &end_Dimension(@_); }	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;
my $dim=&get_id($parstack,$safeeval);	my $dim=&get_id($parstack,$safeeval);
if (&skip_dimension_parsing($dim)) {	if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'webgrade') {
&disable_dimension_parsing($dim);	$result=&Apache::lonxml::endredirection();
pop(@Apache::bridgetask::dimension);	if (&skip_dimension_parsing($dim)) {
return;	pop(@Apache::bridgetask::dimension);
	return;
	}
}	}
my $instance=&get_instance($dim);	my $instance=&get_instance($dim);
my $version=&get_version();	my $version=&get_version();
if ($target eq 'web') {	if ($target eq 'web') {
$result .= "\n".'<div class="LC_question">'."\n";
$result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);	$result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
my @instances = $instance;	my @instances = $instance;
if (&Apache::response::showallfoils()) {	if (&Apache::response::showallfoils()) {
Line 2229 sub end_Dimension {	Line 2437 sub end_Dimension {
}	}
my $dim_info=	my $dim_info=
"\n<div class='LC_$dim_status LC_question_grade'>\n\t";	"\n<div class='LC_$dim_status LC_question_grade'>\n\t";
my $question = ('sub' x $dimension{$dim}{'depth'}).'question';	my $ucquestion =
$question =~ s/^(.)/uc($1)/e;	my $question =
	('sub' x $dimension{$dim}{'depth'}).'question';
	$ucquestion =~ s/^(.)/uc($1)/e;
if ($dim_status eq 'pass') {	if ($dim_status eq 'pass') {
$dim_info.='<h3>'.$question.' : you passed the above '.$mandatory.' question</h3>';	$dim_info.='<h3>'.$ucquestion.' : '
	.&mt('you passed this [_1] [_2]',$mandatory,$question)
	.'</h3>';
}	}
if ($dim_status eq 'fail') {	if ($dim_status eq 'fail') {
$dim_info.='<h3>'.$question.' : you did not pass the above '.$mandatory.' question</h3>';	$dim_info.='<h3>'.$ucquestion.' : '
	.&mt('you did not pass this [_1] [_2]',$mandatory,$question)
	.'</h3>';
}	}
my %counts = &get_counts($dim,$instance,$parstack,	my %counts = &get_counts($dim,$instance,$parstack,
$safeeval);	$safeeval);
Line 2265 sub end_Dimension {	Line 2479 sub end_Dimension {
}	}
}	}
# puts the results at the end of the dimension	# puts the results at the end of the dimension
$result .= $dim_info;	if ($result =~m{<QuestionGradeInfo\s*/>}) {
	$result=~s{<QuestionGradeInfo\s*/>}{$dim_info};
	} else {
	$result .= $dim_info;
	}
# puts the results at the beginning of the dimension	# puts the results at the beginning of the dimension
# 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/;
}	}
}	}
$result .= "\n</div>\n";	if ($result !~ /^\s*$/s) {
	# FIXME? this maybe unneccssary in the future, (CSE101 BT
	# from Fall 2006 geenrate a div that attempts to hide some
	# of the output in an odd way, this is a workaround so
	# those old ones will continue to work. # It puts the
	# LC_question div to come after any starting closie div
	# that the dimension produces
	if ($result =~ m{^\s*</div>}) {
	$result =~ s{^(\s*</div>)}
	{$1\n<div id="$dim" class="LC_question">};
	} else {
	$result = "\n".'<div id="'.$dim.'" class="LC_question">'.
	"\n".$result;
	}
	$result .= "\n</div>\n";
	}
} elsif ($target eq 'webgrade') {	} elsif ($target eq 'webgrade') {
# in case of any side effects that we need	# in case of any side effects that we need
&nested_parse(\$dimension{$dim}{'intro'},[@_]);	&nested_parse(\$dimension{$dim}{'intro'},[@_]);
Line 2295 sub end_Dimension {	Line 2527 sub end_Dimension {
[@_]);	[@_]);
$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);	$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
my $internal_location=&internal_location($id);	my $internal_location=&internal_location($id);
$result=~s/\Q$internal_location\E/$criteria/;	if ($result =~ m/\Q$internal_location\E/) {
	$result =~ s/\Q$internal_location\E/$criteria/;
	} else {
	$result.=$criteria ;
	}
}	}
}	}
if (&nest()) {	if (&nest()) {
Line 2369 sub end_Dimension {	Line 2605 sub end_Dimension {
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=	$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
'pass';	'pass';
}	}
	} elsif ($target eq 'edit') {
	} elsif ($target eq 'modified') {
} else {	} else {
# any other targets no output	# any other targets no output
undef($result);	undef($result);
}	}
&disable_dimension_parsing();	if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'webgrade') {
pop(@Apache::bridgetask::dimension);	&disable_dimension_parsing();
	pop(@Apache::bridgetask::dimension);
	}
return $result;	return $result;
}	}

Line 2389 sub question_status_message {	Line 2629 sub question_status_message {
foreach my $type ('cri','dim') {	foreach my $type ('cri','dim') {
if ($counts->{$req.'_'.$type}) {	if ($counts->{$req.'_'.$type}) {
push(@sections,	push(@sections,
$counts->{$req.'_'.$type.'_passed'}.' of '.	$counts->{$req.'_'.$type.'_passed'}.' of the '.
$counts->{$req.'_'.$type}.' '.	$counts->{$req.'_'.$type}.' '.
$req{$req}.' '.$type{$type});	$req{$req}.' '.$type{$type});
}	}
Line 2408 sub question_status_message {	Line 2648 sub question_status_message {
}	}
$status .= '.';	$status .= '.';
if ($counts->{'opt'}) {	if ($counts->{'opt'}) {
$status .= ' You were required to pass '.$counts->{'opt_req'}.	if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
' optional component'.($counts->{'opt_req'} == 1?'':'s');	$status .= ' '.&mt('You were required to pass [quant,_1,optional criterion,optional criteria].',$counts->{'opt_req'});
	} else {
	$status .= ' '.&mt('You were required to pass [quant,_1,optional component].',$counts->{'opt_req'});
	}
}	}
return $status;	return $status;
}	}
Line 2469 sub get_counts {	Line 2712 sub get_counts {

sub end_Setup {	sub end_Setup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result=&Apache::lonxml::endredirection();	my $result;
my $dim=&get_id($parstack,$safeeval);	my $dim=&get_id($parstack,$safeeval);
my $instance=&get_instance($dim);	my $instance=&get_instance($dim);
my $version=&get_version();	my $version=&get_version();
	if ($target eq 'web' \|\| $target eq 'webgrade' \|\| $target eq 'grade') {
	$result=&Apache::lonxml::endredirection();
	}
if ($target eq 'web') {	if ($target eq 'web') {
@Apache::scripttag::parser_env = @_;	@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'});	$result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'});
Line 2505 sub end_Setup {	Line 2751 sub end_Setup {

sub grading_history {	sub grading_history {
my ($version,$dim,$id) = @_;	my ($version,$dim,$id) = @_;
if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {	if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})
	&& !&Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
return '';	return '';
}	}
my ($result,$grader);	my ($result,$grader);
Line 2551 sub start_IntroParagraph {	Line 2798 sub start_IntroParagraph {
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
}	}

	} elsif ($target eq 'edit') {
	$result = &Apache::edit::tag_start($target,$token);
	} elsif ($target eq 'modified') {
}	}
return $result;	return $result;
}	}
Line 2562 sub end_IntroParagraph {	Line 2812 sub end_IntroParagraph {
}	}
}	}

	sub insert_IntroParagraph {
	return '
	<IntroParagraph>
	<startouttext />
	<endouttext />
	</IntroParagraph>';
	}

sub start_Instance {	sub start_Instance {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $dim = &get_dim_id();	my $dim = &get_dim_id();
Line 2575 sub start_Instance {	Line 2833 sub start_Instance {
if (lc($disabled) eq 'yes') {	if (lc($disabled) eq 'yes') {
$dimension{$dim}{$id.'.disabled'}='1';	$dimension{$dim}{$id.'.disabled'}='1';
}	}
return '';	my $result;
	if ($target eq 'edit') {
	$result = &Apache::edit::tag_start($target,$token);
	$result.=
	&Apache::edit::text_arg('Id:','id',$token,10).' '.
	&Apache::edit::select_arg('Instance is Disabled:','Disabled',
	[['no', 'No'],
	['yes','Yes'],],
	$token)
	.' <br /> '.
	&Apache::edit::text_arg('Required number of passed optional elements to pass the Instance:',
	'OptionalRequired',$token,4)
	.&Apache::edit::end_row().
	&Apache::edit::start_spanning_row();
	} elsif ($target eq 'modified') {
	my $constructtag=
	&Apache::edit::get_new_args($token,$parstack,$safeeval,
	'id','OptionalRequired','Disabled');
	if ($constructtag) {
	$result = &Apache::edit::rebuild_tag($token);
	}
	}
	return $result;
}	}

sub end_Instance {	sub end_Instance {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
	my $result;
	if ($target eq 'edit') {
	$result = &Apache::edit::tag_end($target,$token);
	}
	return $result;
}	}

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

sub end_InstanceText {	sub end_InstanceText {
return '';	return '';
}	}

	sub insert_InstanceText {
	return '
	<InstanceText>
	<startouttext />
	<endouttext />
	</InstanceText>';
	}

sub start_Criteria {	sub start_Criteria {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
my $result = '';	my $result = '';
if ($target eq 'web' \|\| $target eq 'webgrade' \|\| $target eq 'grade') {	if ($target eq 'web' \|\| $target eq 'webgrade' \|\| $target eq 'grade') {
	my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
my $dim = &get_dim_id();	my $dim = &get_dim_id();
my $id=&get_id($parstack,$safeeval);	my $id=&get_id($parstack,$safeeval);
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
if ($target eq 'webgrade' && $dim ne 'top') {	if ($target eq 'webgrade') {
&Apache::lonxml::debug(" for $dim $id stashing results into $dim ");	&Apache::lonxml::debug(" for $dim $id stashing results into $dim ");
$dimension{$dim}{'result'} .= &internal_location($id);	$dimension{$dim}{'result'} .= &internal_location($id);
} else {	} else {
&Apache::lonxml::debug(" not stashing $dim $id");	&Apache::lonxml::debug(" not stashing $dim $id");
$result .= &internal_location($id);	#$result .= &internal_location($id);
}	}
}	}
&Apache::lonxml::debug("Criteria $id with $dim");	&Apache::lonxml::debug("Criteria $id with $dim");
Line 2627 sub start_Criteria {	Line 2925 sub start_Criteria {
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);	&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
push(@{$dimension{$dim}{'criterias'}},$id);	push(@{$dimension{$dim}{'criterias'}},$id);
}	}
	} elsif ($target eq 'edit') {
	$result .=&Apache::edit::tag_start($target,$token);
	$result.=
	&Apache::edit::text_arg('Id:','id',$token,10).' '.
	&Apache::edit::select_arg('Passing is Mandatory:','Mandatory',
	[['Y', 'Yes'],
	['N','No'],],
	$token)
	.' <br /> '.&Apache::edit::end_row().
	&Apache::edit::start_spanning_row();
	} elsif ($target eq 'modified') {
	my $constructtag=
	&Apache::edit::get_new_args($token,$parstack,$safeeval,
	'id','Mandatory');
	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}	}
return $result;	return $result;
}	}
Line 2713 END_CRITERIA	Line 3026 END_CRITERIA
}	}

sub end_Criteria {	sub end_Criteria {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	if ($target eq 'edit') {
	} elsif ($target eq 'modified') {
	}
	}
	sub insert_Criteria {
	return '
	<Criteria>
	<CriteriaText>
	<startouttext />
	<endouttext />
	</CriteriaText>
	</Criteria>';
	}

	sub start_CriteriaText {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result;
	if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'webgrade') {

	} elsif ($target eq 'edit') {
	$result = &Apache::edit::tag_start($target,$token);
	} elsif ($target eq 'modified') {
	}
	return $result;
	}

	sub end_CriteriaText {
	return '';
	}

	sub insert_CriteriaText {
	return '
	<CriteriaText>
	<startouttext />
	<endouttext />
	</CriteriaText>';
}	}

sub start_GraderNote {	sub start_GraderNote {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result;
if ($target eq 'webgrade') {	if ($target eq 'webgrade') {
return '<div class="LC_GRADING_gradernote"><b>'.	$result = '<div class="LC_GRADING_gradernote"><b>'.
&mt('Note to graders:').'</b>';	&mt('Note to graders:').'</b>';
	} elsif ($target eq 'edit') {
	$result = &Apache::edit::tag_start($target,$token);
	} elsif ($target eq 'modified') {
	} elsif ($target eq 'web' \|\| $target eq 'grade') {
	my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style);
}	}
my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style);	return $result;
return;
}	}

sub end_GraderNote {	sub end_GraderNote {
Line 2735 sub end_GraderNote {	Line 3089 sub end_GraderNote {
return;	return;
}	}

	sub insert_GraderNote {
	return '
	<GraderNote>
	<startouttext />
	<endouttext />
	</GraderNote>';
	}


sub proctor_validation_screen {	sub proctor_validation_screen {
my ($slot) = @_;	my ($slot) = @_;
my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();	my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();
my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');	my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
	if ($url ne '/adm/lonKaputt/lonlogo_broken.gif') {
	$url = "<tr><td colspan=\"2\"><img src=\"$url\" /></td></tr>";
	} else {
	undef($url);
	}

my $name=&Apache::loncommon::plainname($user,$domain);	my $name=&Apache::loncommon::plainname($user,$domain);

my $msg;	my $msg;
if ($env{'form.proctorpassword'}) {	if ($env{'form.proctorpassword'}) {
$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")	$msg.='<p><span class="LC_warning">'
.'</font></p>';	.&mt("Failed to authenticate the proctor.")
	.'</span></p>';
	}

	my $valid;
	my @possible_proctors=split(",",$slot->{'proctor'});
	foreach my $proctor (@possible_proctors) {
	if ($proctor =~ /$LONCAPA::username_re:$LONCAPA::domain_re/) {
	$valid = 1;
	last;
	}
}	}
	if (!$valid) {
	$msg.='<p><span class="LC_error">'
	.&mt("No valid proctors are defined.")
	.'</span></p>';
	}

if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }	if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
	my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
	$uri = &HTML::Entities::encode($uri,'<>&"');
	my %lt = &Apache::lonlocal::texthash(
	'prva' => "Proctor Validation",
	'yoro' => "Your room's proctor needs to validate your access to this resource.",
	'prus' => "Proctor's Username:",
	'pasw' => "Password:",
	'prdo' => "Proctor's Domain:",
	'vali' => 'Validate',
	'stui' => "Student who should be logged in is:",
	'name' => "Name:",
	'sid' => "Student ID:",
	'unam' => "Username:",
	);
my $result= (<<ENDCHECKOUT);	my $result= (<<ENDCHECKOUT);
<h2>Proctor Validation</h2>	<h2>$lt{'prva'}</h2>
<p>Your room's proctor needs to validate your access to this resource.</p>	<p>$lt{'yoro'}</p>
$msg	$msg
<form name="checkout" method="post" action="$env{'request.uri'}">	<form name="checkout" method="post" action="$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>
<tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>	<tr><td>$lt{'prus'}</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
<tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>	<tr><td>$lt{'pasw'}</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
<tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>	<tr><td>$lt{'prdo'}</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
</table>	</table>
<input type="submit" name="checkoutbutton" value="Validate" /><br />	<input type="submit" name="checkoutbutton" value="$lt{'vali'}" /><br />
<table border="1">	<table border="1">
<tr><td>	<tr><td>
<table>	<table>
<tr><td colspan="2">Student who should be logged in is:</td></tr>	<tr><td colspan="2">$lt{'stui'}</td></tr>
<tr><td>Name:</td><td>$name</td></tr>	<tr><td>$lt{'name'}</td><td>$name</td></tr>
<tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>	<tr><td>$lt{'sid'}</td><td>$env{'environment.id'}</td></tr>
<tr><td>Usename</td><td>$user:$domain</td></tr>	<tr><td>$lt{'unam'}</td><td>$user:$domain</td></tr>
<tr><td colspan="2"><img src="$url" /></td></tr>	$url
</table>	</table>
</tr></td>	</tr></td>
</table>	</table>
</form>	</form>
ENDCHECKOUT	ENDCHECKOUT

return $result;	return $result;
}	}

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

Removed from v.1.205
changed lines
	Added in v.1.241