loncom/homework/structuretags.pm - diff

Return to structuretags.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.512.2.24.2.3 and 1.570

version 1.512.2.24.2.3, 2023/07/05 20:57:30	version 1.570, 2019/11/07 02:58:37
Line 62 use Apache::lonxml;	Line 62 use Apache::lonxml;
use Apache::londefdef;	use Apache::londefdef;
use Apache::lonenc();	use Apache::lonenc();
use Apache::loncommon();	use Apache::loncommon();
use Apache::lonnavmaps;
use Time::HiRes qw( gettimeofday tv_interval );	use Time::HiRes qw( gettimeofday tv_interval );
use HTML::Entities();
use lib '/home/httpd/lib/perl/';	use lib '/home/httpd/lib/perl/';
use LONCAPA;	use LONCAPA;

BEGIN {	BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startpartmarker','startouttext','endpartmarker','endouttext','simpleeditbutton','definetag'));	&Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','print','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startpartmarker','startouttext','endpartmarker','endouttext','simpleeditbutton','definetag'));
}	}


Line 194 sub end_web {	Line 192 sub end_web {
return '';	return '';
}	}

	sub start_print {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	if ($target ne 'edit' && $target ne 'modified') {
	if ($target ne 'tex') {
	my $skip = &Apache::lonxml::get_all_text("/print",$parser,$style);
	&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
	}
	} elsif ($target eq "edit") {
	my $bodytext = &Apache::lonxml::get_all_text_unbalanced("/print",$parser);
	my $result = &Apache::edit::tag_start($target,$token);
	$result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
	return $result;
	} elsif ($target eq "modified") {
	return $token->[4].&Apache::edit::modifiedfield("/print",$parser);
	}
	return '';
	}

	sub end_print {
	return '';
	}

sub start_tex {	sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
Line 228 sub end_tex {	Line 248 sub end_tex {
sub homework_js {	sub homework_js {
my ($postsubmit,$timeout);	my ($postsubmit,$timeout);
if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {	if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {
my $crstype;	my $crstype = &Apache::loncommon::course_type();
if (&Apache::loncommon::course_type() eq 'Community') {	if ($crstype eq 'Community') {
$crstype = 'community';	$crstype = 'community';
	} elsif ($crstype eq 'Placement') {
	$crstype = 'placement';
} else {	} else {
if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) {	if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) {
$crstype = 'official';	$crstype = 'official';
Line 272 sub homework_js {	Line 294 sub homework_js {
$jstimeout = 1000 * $timeout;	$jstimeout = 1000 * $timeout;
}	}
return &Apache::loncommon::resize_textarea_js().	return &Apache::loncommon::resize_textarea_js().
&Apache::loncommon::colorfuleditor_js().	&Apache::loncommon::colorfuleditor_js().
&setmode_javascript().	&setmode_javascript().
<<"JS";	<<"JS";
<script type="text/javascript">	<script type="text/javascript">
Line 319 var keypresshandled = 0;	Line 341 var keypresshandled = 0;
var postsubmit = '$postsubmit';	var postsubmit = '$postsubmit';

\$(document).ready(function(){	\$(document).ready(function(){
if (postsubmit != 'off') {	if (postsubmit != 'off') {
\$(document).keypress(function(event){	\$(document).keypress(function(event){
var keycode = (event.keyCode ? event.keyCode : event.which);	var keycode = (event.keyCode ? event.keyCode : event.which);
if ((keycode == '13') && (keypresshandled == 0)) {	if ((keycode == '13') && (keypresshandled == 0)) {
Line 496 sub page_start {	Line 518 sub page_start {
}	}
}	}
if ($needs_upload) {	if ($needs_upload) {
$extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js().	$extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js()
'<script type="text/javascript" '.	.'<script type="text/javascript"
'src="/res/adm/includes/file_upload.js"></script>';	src="/res/adm/includes/file_upload.js"></script>';
}	}
}	}

Line 529 sub page_start {	Line 551 sub page_start {
} elsif (!defined($found{'body'})	} elsif (!defined($found{'body'})
&& $env{'request.state'} eq 'construct') {	&& $env{'request.state'} eq 'construct') {
if ($target eq 'web' \|\| $target eq 'edit') {	if ($target eq 'web' \|\| $target eq 'edit') {
# Breadcrumbs for Authoring Space	unless ($env{'form.inhibitmenu'} eq 'yes') {
&Apache::lonhtmlcommon::clear_breadcrumbs();	# Breadcrumbs for Authoring Space
&Apache::lonhtmlcommon::add_breadcrumb({	&Apache::lonhtmlcommon::clear_breadcrumbs();
'text' => 'Authoring Space',	&Apache::lonhtmlcommon::add_breadcrumb({
'href' => &Apache::loncommon::authorspace($env{'request.uri'}),	'text' => 'Authoring Space',
});	'href' => &Apache::loncommon::authorspace($env{'request.uri'}),
# breadcrumbs (and tools) will be created	});
# in start_page->bodytag->innerregister	# breadcrumbs (and tools) will be created
	# in start_page->bodytag->innerregister

# FIXME Where are we?	# FIXME Where are we?
# &Apache::lonhtmlcommon::add_breadcrumb({	# &Apache::lonhtmlcommon::add_breadcrumb({
# 'text' => 'Problem Editing', # 'Problem Testing'	# 'text' => 'Problem Editing', # 'Problem Testing'
# 'href' => '',	# 'href' => '',
# });	# });
$pageheader =&Apache::loncommon::head_subbox(	$pageheader = &Apache::loncommon::head_subbox(
&Apache::loncommon::CSTR_pageheader());	&Apache::loncommon::CSTR_pageheader());
}	}
	}
} elsif (!defined($found{'body'})) {	} elsif (!defined($found{'body'})) {
my %add_entries;	my %add_entries;
my $background=&Apache::lonxml::get_param('background',$parstack,	my $background=&Apache::lonxml::get_param('background',$parstack,
Line 643 sub get_resource_name {	Line 667 sub get_resource_name {
}	}

sub setup_rndseed {	sub setup_rndseed {
my ($safeeval,$target,$probpartlist)=@_;	my ($safeeval,$target,$probpartlist,$prevparttype)=@_;
my ($symb)=&Apache::lonnet::whichuser();	my ($symb)=&Apache::lonnet::whichuser();
my ($questiontype,$set_safespace,$rndseed,$numtries,$reqtries);	my ($questiontype,$set_safespace,$rndseed,$numtries,$reqtries);
if ($target eq 'analyze') {	if ($target eq 'analyze') {
Line 694 sub setup_rndseed {	Line 718 sub setup_rndseed {
$env{'form.rndseed'}=$rndseed;	$env{'form.rndseed'}=$rndseed;
}	}
}	}
if ((($env{'request.state'} eq "construct") \|\| ($symb eq '')) &&	if ((($env{'request.state'} eq "construct") \|\| ($symb eq '')) &&
($Apache::lonhomework::type eq 'randomizetry')) {	($Apache::lonhomework::type eq 'randomizetry')) {
if ($numtries) {	if ($numtries) {
if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {	if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
Line 706 sub setup_rndseed {	Line 730 sub setup_rndseed {
}	}
$env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;	$env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
}	}
if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')	if ( ($env{'form.resetdata'} eq 'new_problem_variation'
&& $env{'form.submitted'} eq 'yes') \|\|	&& $env{'form.submitted'} eq 'yes') \|\|
$env{'form.newrandomization'} eq &mt('New Randomization')) {	$env{'form.newrandomization'} eq &mt('New Randomization')) {
srand(time);	srand(time);
Line 760 sub setup_rndseed {	Line 784 sub setup_rndseed {
if ($target eq 'grade') {	if ($target eq 'grade') {
$Apache::lonhomework::rawrndseed = $rndseed;	$Apache::lonhomework::rawrndseed = $rndseed;
}	}
	} elsif ($prevparttype eq 'randomizetry') {
	if ($env{'form.0.rndseed'} ne '') {
	$set_safespace = 1;
	$rndseed = $env{'form.0.rndseed'};
	}
}	}
if ($set_safespace) {	if ($set_safespace) {
if ($safeeval) {	if ($safeeval) {
&Apache::lonxml::debug("Setting rndseed to $rndseed");	&Apache::lonxml::debug("Setting rndseed to $rndseed");
&Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);	&Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
	if (($Apache::lonhomework::type eq 'randomizetry') \|\| ($prevparttype eq 'randomizetry')) {
	&Apache::lonxml::debug("Setting randomizetrypart to $Apache::inputtags::part");
	&Apache::run::run('$external::randomizetrypart="'.$Apache::inputtags::part.'";',$safeeval);
	}
}	}
}	}
unless (($env{'request.state'} eq "construct") \|\| ($symb eq '')) {	unless (($env{'request.state'} eq "construct") \|\| ($symb eq '')) {
Line 823 sub problem_edit_header {	Line 856 sub problem_edit_header {
<div class="LC_edit_problem_header">	<div class="LC_edit_problem_header">
<div class="LC_edit_problem_header_title">	<div class="LC_edit_problem_header_title">
'.&mt('Problem Editing').$mode.&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'	'.&mt('Problem Editing').$mode.&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
</div><div class="LC_edit_actionbar" id="actionbar">'.	</div><div class="LC_edit_actionbar" id="actionbar">'.
'<input type="hidden" name="problemmode" value="saveedit" />'.	'<input type="hidden" name="problemmode" value="saveedit" />'.
&problem_edit_buttons();	&problem_edit_buttons();

$return .= '</div></div>' . &Apache::lonxml::message_location();	$return .= '</div></div>' . &Apache::lonxml::message_location();
$return .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined.css" />	$return .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined.css" />
Line 853 sub problem_edit_header {	Line 886 sub problem_edit_header {
return $return;	return $return;
}	}


sub problem_edit_footer {	sub problem_edit_footer {
my $resource = $env{'request.ambiguous'};	my $resource = $env{'request.ambiguous'};
return '</td></tr></table><br />	return '</td></tr></table><br />
Line 929 sub problem_web_to_edit_header {	Line 961 sub problem_web_to_edit_header {
".&mt("Problem Type:")."	".&mt("Problem Type:")."
<select name='problemtype'>	<select name='problemtype'>
<option value=''></option>	<option value=''></option>
".&option('exam' ,'problemtype').&mt("Exam Problem")."</option>	".&option('exam' ,'problemtype').&mt("Bubblesheet Exam Problem")."</option>
".&option('problem','problemtype').&mt("Homework Problem")."</option>	".&option('problem','problemtype').&mt("Homework Problem")."</option>
".&option('survey' ,'problemtype').&mt("Survey Question")."</option>	".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
".&option('surveycred' ,'problemtype').&mt("Survey Question (with credit)")."</option>	".&option('surveycred' ,'problemtype').&mt("Survey Question (with credit)")."</option>
Line 981 $show_all	Line 1013 $show_all
</div>	</div>
<input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" />	<input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" />
<input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" />	<input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" />
<input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />	<button type="submit" name="resetdata" accesskey="r" value="reset_submissions">
	'.&mt('Reset Submissions').'</button>
</div>	</div>
<hr />	<hr />
<div class="LC_edit_problem_header_randomize_row">	<div class="LC_edit_problem_header_randomize_row">
Line 1014 $show_all	Line 1047 $show_all
'onclick="javascript:setmode(this.form,'."'edit'".')" />';	'onclick="javascript:setmode(this.form,'."'edit'".')" />';
$result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '.	$result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '.
'onclick="javascript:setmode(this.form,'."'editxml'".')" />';	'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
	if ($env{'browser.type'} ne 'explorer' \|\| $env{'browser.version'} > 9) {
	my $uri = $env{'request.uri'};
	my $daxeurl = '/daxepage'.$uri;
	$result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '.
	'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />';
	}
$result.='	$result.='
</div>	</div>
<hr />	<hr />
Line 1040 sub initialize_storage {	Line 1079 sub initialize_storage {
\|\| $Apache::lonhomework::type eq 'practice') {	\|\| $Apache::lonhomework::type eq 'practice') {

my $namespace = $symb \|\| $env{'request.uri'};	my $namespace = $symb \|\| $env{'request.uri'};
if ($env{'form.resetdata'} eq &mt('Reset Submissions') \|\|	if ($env{'form.resetdata'} eq 'reset_submissions' \|\|
($env{'form.resetdata'} eq &mt('New Problem Variation')	($env{'form.resetdata'} eq 'new_problem_variation'
&& $env{'form.submitted'} eq 'yes') \|\|	&& $env{'form.submitted'} eq 'yes') \|\|
$env{'form.newrandomization'} eq &mt('New Randomization')) {	$env{'form.newrandomization'} eq &mt('New Randomization')) {
&Apache::lonnet::tmpreset($namespace,'',$domain,$name);	&Apache::lonnet::tmpreset($namespace,'',$domain,$name);
Line 1049 sub initialize_storage {	Line 1088 sub initialize_storage {
}	}
%Apache::lonhomework::history=	%Apache::lonhomework::history=
&Apache::lonnet::tmprestore($namespace,'',$domain,$name);	&Apache::lonnet::tmprestore($namespace,'',$domain,$name);
my ($temp)=keys(%Apache::lonhomework::history);	my ($temp)=keys(%Apache::lonhomework::history) ;
&Apache::lonxml::debug("Return message of $temp");	&Apache::lonxml::debug("Return message of $temp");
} else {	} else {
%Apache::lonhomework::history=	%Apache::lonhomework::history=
Line 1072 sub initialize_storage {	Line 1111 sub initialize_storage {
&check_correctness_changes() is called in two circumstances	&check_correctness_changes() is called in two circumstances
in which the results hash is to be stored permanently, for	in which the results hash is to be stored permanently, for
grading triggered by a student's submission, where feedback on	grading triggered by a student's submission, where feedback on
correctness is to be provided to the student.	correctness is to be provided to the student.

1. Immediately prior to storing the results hash	1. Immediately prior to storing the results hash

To handle the case where a student's submission (and award) were	To handle the case where a student's submission (and award) were
stored after history was retrieved in &initialize_storage(), e.g.,	stored after history was retrieved in &initialize_storage(), e.g.,
if a student submitted answers in quick succession (e.g., from	if a student submitted answers in quick succession (e.g., from
multiple tabs). &Apache::inputtags::hidealldata() is called for	multiple tabs). &Apache::inputtags::hidealldata() is called for
any parts with out-of-order storage (i.e., correct then incorrect,	any parts with out-of-order storage (i.e., correct then incorrect,
where awarded >= 1 when correct).	where awarded >= 1 when correct).
Line 1088 sub initialize_storage {	Line 1127 sub initialize_storage {
To handle the case where lond on the student's homeserver returns	To handle the case where lond on the student's homeserver returns
delay:N -- where N is the number of transactions between the last	delay:N -- where N is the number of transactions between the last
retrieved in &initialize_storage() and the last stored immediately	retrieved in &initialize_storage() and the last stored immediately
before permanent storage of the current transaction via	before permanent storage of the current transaction via
lond::store_handler(). &Apache::grades::makehidden() is called	lond::store_handler(). &Apache::grades::makehidden() is called
for any parts with out-of-order storage (i.e., correct then incorrect,	for any parts with out-of-order storage (i.e., correct then incorrect,
where awarded >= 1 when correct).	where awarded >= 1 when correct).

Will call &store_aggregates() to increment totals for attempts,	Will call &store_aggregates() to increment totals for attempts,
students, and corrects, if running user has student role.	students, and corrects, if running user has student role.

=cut	=cut

Line 1107 sub finalize_storage {	Line 1146 sub finalize_storage {
delete(@Apache::lonhomework::results{@remove});	delete(@Apache::lonhomework::results{@remove});
my ($symb,$courseid,$domain,$name) =	my ($symb,$courseid,$domain,$name) =
&Apache::lonnet::whichuser($given_symb);	&Apache::lonnet::whichuser($given_symb);
my ($passback,$pbscope,$pbmap,$pbsymb,$pbtype,$crsdef,$ltinum,	my ($passback,$ltiscope,$ltimap,$ltisymb,$ltiref,$total,$possible,$dopassback);
$ltiref,$total,$possible,$dopassback);
if ($env{'request.state'} eq 'construct'	if ($env{'request.state'} eq 'construct'
\|\| $symb eq ''	\|\| $symb eq ''
\|\| $Apache::lonhomework::type eq 'practice') {	\|\| $Apache::lonhomework::type eq 'practice') {
Line 1122 sub finalize_storage {	Line 1160 sub finalize_storage {
if (($env{'user.name'} eq $name) && ($env{'user.domain'} eq $domain) &&	if (($env{'user.name'} eq $name) && ($env{'user.domain'} eq $domain) &&
(!$Apache::lonhomework::scantronmode) && (!defined($env{'form.grade_symb'})) &&	(!$Apache::lonhomework::scantronmode) && (!defined($env{'form.grade_symb'})) &&
(!defined($env{'form.grade_courseid'}))) {	(!defined($env{'form.grade_courseid'}))) {
if (($env{'request.lti.login'}) \|\| ($env{'request.deeplink.login'})) {	if ($env{'request.lti.login'}) {
my ($map)=&Apache::lonnet::decode_symb($symb);	my ($map)=&Apache::lonnet::decode_symb($symb);
$map = &Apache::lonnet::clutter($map);	$map = &Apache::lonnet::clutter($map);
if ($env{'request.lti.login'}) {	($passback,$ltiscope,$ltimap,$ltisymb,$ltiref) =
($passback,$pbscope,$pbmap,$pbsymb,$ltinum,$ltiref) =	&needs_lti_passback($courseid,$symb,$map);
&needs_lti_passback($courseid,$symb,$map);
} elsif ($env{'request.deeplink.login'}) {
($passback,$pbscope,$pbmap,$pbsymb,$crsdef,$ltinum,$ltiref) =
&needs_linkprot_passback($courseid,$symb,$map);
}
}	}
if ($Apache::lonhomework::history{'version'}) {	if ($Apache::lonhomework::history{'version'}) {
$laststore = $Apache::lonhomework::history{'version'}.'='.	$laststore = $Apache::lonhomework::history{'version'}.'='.
Line 1228 sub finalize_storage {	Line 1261 sub finalize_storage {
}	}
}	}
}	}
if (($dopassback) && ($pbscope eq 'resource') && ($pbsymb eq $symb)) {	if (($dopassback) && ($ltiscope eq 'resource') && ($ltisymb eq $symb)) {
$total = 0;	$total = 0;
$possible = 0;	$possible = 0;
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
Line 1269 sub finalize_storage {	Line 1302 sub finalize_storage {
&store_aggregates($symb,$courseid);	&store_aggregates($symb,$courseid);
if ($dopassback) {	if ($dopassback) {
my $scoreformat = 'decimal';	my $scoreformat = 'decimal';
if (($env{'request.lti.login'}) \|\| ($env{'request.deeplink.login'})) {	if (ref($ltiref) eq 'HASH') {
if (ref($ltiref) eq 'HASH') {	if ($ltiref->{'scoreformat'} =~ /^(decimal\|ratio\|percentage)$/) {
if ($ltiref->{'scoreformat'} =~ /^(decimal\|ratio\|percentage)$/) {	$scoreformat = $1;
$scoreformat = $1;
}
}	}
}	}
my ($pbid,$pburl,$pbtype);
if ($env{'request.lti.login'}) {
$pbid = $env{'request.lti.passbackid'};
$pburl = $env{'request.lti.passbackurl'};
$pbtype = 'lti';
} elsif ($env{'request.deeplink.login'}) {
$pbid = $env{'request.linkprotpbid'};
$pburl = $env{'request.linkprotpburl'};
$pbtype = 'linkprot';
}
my $ltigrade = {	my $ltigrade = {
'ltinum' => $ltinum,
'lti' => $ltiref,	'lti' => $ltiref,
'crsdef' => $crsdef,
'cid' => $courseid,	'cid' => $courseid,
'uname' => $env{'user.name'},	'uname' => $env{'user.name'},
'udom' => $env{'user.domain'},	'udom' => $env{'user.domain'},
'pbid' => $pbid,	'pbid' => $env{'request.lti.passbackid'},
'pburl' => $pburl,	'pburl' => $env{'request.lti.passbackurl'},
'pbtype' => $pbtype,	'scope' => $ltiscope,
'scope' => $pbscope,	'ltimap' => $ltimap,
'pbmap' => $pbmap,	'ltisymb' => $ltisymb,
'pbsymb' => $pbsymb,
'format' => $scoreformat,	'format' => $scoreformat,
};	};
if ($pbscope eq 'resource') {	if ($ltiscope eq 'resource') {
$ltigrade->{'total'} = $total;	$ltigrade->{'total'} = $total;
$ltigrade->{'possible'} = $possible;	$ltigrade->{'possible'} = $possible;
}	}
Line 1322 sub needs_lti_passback {	Line 1340 sub needs_lti_passback {
my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');	my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {	if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
if ($lti{$env{'request.lti.login'}}{'passback'}) {	if ($lti{$env{'request.lti.login'}}{'passback'}) {
my $itemnum = $env{'request.lti.login'};
my ($ltiscope,$ltiuri,$ltisymb) =	my ($ltiscope,$ltiuri,$ltisymb) =
&LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},	&LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},
$cdom,$cnum,1);	$cdom,$cnum,1);
Line 1341 sub needs_lti_passback {	Line 1358 sub needs_lti_passback {
$passback = 1;	$passback = 1;
}	}
}	}
return ($passback,$ltiscope,$ltimap,$ltisymb,$itemnum,$lti{$itemnum});	return ($passback,$ltiscope,$ltimap,$ltisymb,$lti{$env{'request.lti.login'}});
}	}
}	}
}	}
Line 1349 sub needs_lti_passback {	Line 1366 sub needs_lti_passback {
return;	return;
}	}

sub needs_linkprot_passback {
my ($courseid,$symb,$map) = @_;
if (($env{'request.linkprotpbid'}) && ($env{'request.linkprotpburl'})) {
if ($courseid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/) {
my ($cdom,$cnum) = ($1,$2);
my ($deeplink_symb,$deeplink_map,$deeplink,$passback);
$deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom);
if ($deeplink_symb) {
if ($deeplink_symb =~ /\.(page\|sequence)$/) {
$deeplink_map = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[2]);
my $navmap = Apache::lonnavmaps::navmap->new();
if (ref($navmap)) {
$deeplink = $navmap->get_mapparam(undef,$deeplink_map,'0.deeplink');
}
} else {
$deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$deeplink_symb);
$deeplink_map = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[0]);
}
if (($deeplink ne '') && ($env{'request.linkprot'} ne '')) {
my ($itemid,$tinyurl) = split(/:/,$env{'request.linkprot'});
if ($itemid =~ /^(\d+)(c\|d)$/) {
my ($itemnum,$itemtype) = ($1,$2);
my ($crsdef,$lti_in_use);
if ($itemtype eq 'c') {
$crsdef = 1;
my %crslti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider');
$lti_in_use = $crslti{$itemnum};
} else {
my %domlti = &Apache::lonnet::get_domain_lti($cdom,'linkprot');
$lti_in_use = $domlti{$itemnum};
}
my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink);
my $passback;
if ($scope eq 'resource') {
if ($deeplink_symb eq $symb) {
$passback = 1;
}
} elsif ($scope eq 'map') {
if (&Apache::lonnet::clutter($deeplink_map) eq $map) {
$passback = 1;
}
} elsif ($scope eq 'recurse') {
#FIXME check if $deeplink_map contains $map
$passback = 1;
}
return ($passback,$scope,$deeplink_map,$deeplink_symb,$crsdef,$itemnum,$lti_in_use);
}
}
}
}
}
}

=pod	=pod

=item check_correctness_changes()	=item check_correctness_changes()

For all parts for which current results contain a solved status	For all parts for which current results contain a solved status
of "incorrect_attempted", check if there was a transaction in which	of "incorrect_attempted", check if there was a transaction in which
solved was set to "correct_by_student" in the time since the last	solved was set to "correct_by_student" in the time since the last
transaction (retrieved when &initialize_storage() was called i.e.,	transaction (retrieved when &initialize_storage() was called i.e.,
when &start_problem() was called), unless:	when &start_problem() was called), unless:
(a) questiontype parameter is set to survey or anonymous survey (+/- credit)	(a) questiontype parameter is set to survey or anonymous survey (+/- credit)
(b) problemstatus is set to no or no_feedback_ever	(b) problemstatus is set to no or no_feedback_ever
If such a transaction exists, and did not occur after "reset status"	If such a transaction exists, and did not occur after "reset status"
by a user with grading privileges, then the current transaction is an	by a user with grading privileges, then the current transaction is an
example of an out-of-order transaction (i.e., incorrect occurring after	example of an out-of-order transaction (i.e., incorrect occurring after
correct). Accordingly, the current transaction should be hidden.	correct). Accordingly, the current transaction should be hidden.
Line 1507 sub store_aggregates {	Line 1471 sub store_aggregates {
} else {	} else {
$anoncounter{$symb."\0".$part} = 1;	$anoncounter{$symb."\0".$part} = 1;
}	}
my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}};	my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}.'::'};
if ($needsrelease) {	if ($needsrelease) {
my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};	my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
if ($curr_required eq '') {	if ($curr_required eq '') {
&Apache::lonnet::update_released_required($needsrelease);	&Apache::lonnet::update_released_required($needsrelease);
Line 1536 sub store_aggregates {	Line 1500 sub store_aggregates {
}	}
}	}

	sub access_status_msg {
	my ($mode,$status,$symb,$target,$ipused,$accessmsg) = @_;
	my $msg;
	if ($target eq 'web') {
	if ($status eq 'UNAVAILABLE') {
	$msg.='<p class="LC_error">'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</p>';
	} elsif ($status eq 'NOT_IN_A_SLOT') {
	$msg.='<p class="LC_warning">'.&mt('You are not currently signed up to work at this time and/or place.').'</p>';
	} elsif (($status eq 'RESERVABLE') \|\| ($status eq 'RESERVABLE_LATER') \|\|
	($status eq 'NOTRESERVABLE')) {
	$msg.='<p class="LC_warning">'.&mt('Access requires reservation to work at specific time/place.').'</p>';
	} elsif ($status ne 'NOT_YET_VIEWED') {
	$msg.='<p class="LC_warning">'.&mt('Not open to be viewed').'</p>';
	}
	if ($status eq 'CLOSED' \|\| $status eq 'INVALID_ACCESS') {
	$msg.=&mt('The problem ').$accessmsg;
	} elsif ($status eq 'UNCHECKEDOUT') {
	$msg.=&checkout_msg();
	} elsif ($status eq 'NOT_YET_VIEWED') {
	$msg.=&firstaccess_msg($accessmsg,$symb);
	} elsif ($status eq 'NOT_IN_A_SLOT') {
	$msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
	} elsif ($status eq 'RESERVABLE') {
	$msg.=&mt('Available to make a reservation.').' '.&mt('Reservation window closes [_1].',
	&Apache::lonnavmaps::timeToHumanString($accessmsg,'end')).
	'<br />'.
	&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
	} elsif ($status eq 'RESERVABLE_LATER') {
	$msg.=&mt('Window to make a reservation will open [_1].',
	&Apache::lonnavmaps::timeToHumanString($accessmsg,'start'));
	} elsif ($status eq 'NOTRESERVABLE') {
	$msg.=&mt('Not available to make a reservation.');
	} elsif ($status eq 'NEED_DIFFERENT_IP') {
	if ($ipused) {
	$msg.=&mt('You must use the same computer ([_1]) you used when you first accessed this resource using your time/place-based reservation.',"IP: $ipused");
	} else {
	$msg.=&mt('Each student must use a different computer to access this resource at this time and/or place.').'<br />'.
	&mt('Somebody else has already used this particular computer for that purpose.');
	}
	}
	$msg.='<br />';
	} elsif ($target eq 'tex') {
	my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
	: '\begin{minipage}{\textwidth}';

	$msg ='\noindent \vskip 1 mm '.
	$startminipage.'\vskip 0 mm';
	if ($status eq 'UNAVAILABLE') {
	$msg.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
	} else {
	$msg.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
	}
	}
	return $msg;
	}

	sub checkin_prompt {
	my ($target,$slot_name,$slot,$type) = @_;
	my $result;
	if ($target eq 'web') {
	$result = &Apache::bridgetask::proctor_validation_screen($slot);
	} elsif ($target eq 'grade') {
	if (!&Apache::bridgetask::proctor_check_auth($slot_name,$slot,$type)) {
	$result = &mt('An error occurred during check-in');
	}
	}
	return $result;
	}

	sub selfcheckin_resource {
	my ($resource_due,$slot_name,$slot,$symb) = @_;
	if ($slot_name ne '') {
	my $checked_in =
	$Apache::lonhomework::history{'resource.0.checkedin'};
	if ($checked_in eq '') {
	# unproctored slot access, self checkin
	my $needsiptied;
	if (ref($slot)) {
	$needsiptied = $slot->{'iptied'};
	}
	my $check = &Apache::bridgetask::check_in('problem',undef,undef,
	$slot_name,$needsiptied);
	if ($check =~ /^error: /) {
	&Apache::lonnet::logthis("Error during self-checkin of problem (symb: $symb) using slot: $slot_name");
	} else {
	$checked_in = $Apache::lonhomework::results{"resource.0.checkedin"};
	}
	}
	if ((ref($slot) eq 'HASH') && ($checked_in ne '')) {
	if ($slot->{'starttime'} < time()) {
	if (!$resource_due) {
	$resource_due = $slot->{'endtime'};
	} elsif ($slot->{'endtime'} < $resource_due) {
	$resource_due = $slot->{'endtime'};
	}
	}
	}
	}
	return $resource_due;
	}

sub checkout_msg {	sub checkout_msg {
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'resource'=>'The resource needs to be checked out',	'resource'=>'The resource needs to be checked out',
'id_expln'=>'As a resource gets checked out, a unique timestamped ID is given to it, and a permanent record is left in the system.',	'id_expln'=>'As a resource gets checked out, a unique timestamped ID is given to it, and a permanent record is left in the system.',
'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',	'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
'checkout'=>'Check out Exam for Viewing',	'checkout'=>'Check out Bubblesheet Exam for Viewing',
'checkout?'=>'Check out Exam?');	'checkout?'=>'Check out Bubblesheet Exam?');
my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});	my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
return (<<ENDCHECKOUT);	return (<<ENDCHECKOUT);
<h2>$lt{'resource'}</h2>	<h2>$lt{'resource'}</h2>
Line 1581 sub firstaccess_msg {	Line 1646 sub firstaccess_msg {
my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});	my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
my $buttontext = &mt('Show Resource');	my $buttontext = &mt('Show Resource');
my $timertext = &mt('Start Timer?');	my $timertext = &mt('Start Timer?');
my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'\'"<>&');
$result .= (<<ENDCHECKOUT);	$result .= (<<ENDCHECKOUT);
<form name="markaccess" method="post" action="$uri">	<form name="markaccess" method="post" action="$uri">
<input type="hidden" name="markaccess" value="yes" />	<input type="hidden" name="markaccess" value="yes" />
<input type="hidden" name="symb" value="$shownsymb" />
<input type="button" name="accessbutton" value="$buttontext" onclick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" />	<input type="button" name="accessbutton" value="$buttontext" onclick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" />
</form>	</form>
ENDCHECKOUT	ENDCHECKOUT
Line 1743 sub start_problem {	Line 1806 sub start_problem {
my $status;	my $status;
my $accessmsg;	my $accessmsg;
my $resource_due;	my $resource_due;
	my $ipused;

my $name= &get_resource_name($parstack,$safeeval);	my $name= &get_resource_name($parstack,$safeeval);
my ($result,$form_tag_start,$slot_name,$slot,$probpartlist,$firstaccres);	my ($result,$form_tag_start,$slot_name,$slot,$probpartlist,$firstaccres);
Line 1751 sub start_problem {	Line 1815 sub start_problem {
$target eq 'tex') {	$target eq 'tex') {
if ($env{'form.markaccess'}) {	if ($env{'form.markaccess'}) {
my @interval=&Apache::lonnet::EXT("resource.0.interval");	my @interval=&Apache::lonnet::EXT("resource.0.interval");
my ($timelimit) = ($interval[0] =~ /^(\d+)/);	my ($timelimit) = split(/_/,$interval[0]);
my $is_set = &Apache::lonnet::set_first_access($interval[1],$timelimit);	my $is_set = &Apache::lonnet::set_first_access($interval[1],$timelimit);
unless (($is_set eq 'ok') \|\| ($is_set eq 'already_set')) {	unless (($is_set eq 'ok') \|\| ($is_set eq 'already_set')) {
$firstaccres = $is_set;	$firstaccres = $is_set;
}	}
}	}

($status,$accessmsg,$slot_name,$slot) =
&Apache::lonhomework::check_slot_access('0','problem');
push (@Apache::inputtags::status,$status);
}	}

if ($target eq 'web' \|\| $target eq 'webgrade' \|\| $target eq 'tex'	if ($target eq 'web' \|\| $target eq 'webgrade' \|\| $target eq 'tex'
Line 1768 sub start_problem {	Line 1828 sub start_problem {
($result,$form_tag_start,$probpartlist) =	($result,$form_tag_start,$probpartlist) =
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,	&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
$name);	$name);
} elsif (($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) {	} elsif ((($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) \|\|
	($target eq 'answer')) {
my ($symb)= &Apache::lonnet::whichuser();	my ($symb)= &Apache::lonnet::whichuser();
if ($symb ne '') {	if ($symb ne '') {
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
Line 1781 sub start_problem {	Line 1842 sub start_problem {
}	}
}	}

	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer' \|\|
	$target eq 'tex') {

	my ($symb)= &Apache::lonnet::whichuser();
	($status,$accessmsg,$slot_name,$slot,$ipused) =
	&Apache::lonhomework::check_slot_access('0','problem',$symb,$probpartlist);
	push (@Apache::inputtags::status,$status);
	}

if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}	if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}

if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval,$target); }	if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval,$target); }
Line 1818 sub start_problem {	Line 1888 sub start_problem {
}	}
$form_tag_start.='<input type="hidden" name="rndseed" value="'.	$form_tag_start.='<input type="hidden" name="rndseed" value="'.
$rndseedval.'" />'.	$rndseedval.'" />'.
'<input type="submit" name="resetdata"	'<button type="submit" name="resetdata"
value="'.&mt('New Problem Variation').'" />';	value="new_problem_variation">'.&mt('New Problem Variation').'</button>';
if (exists($env{'form.username'})) {	if (exists($env{'form.username'})) {
$form_tag_start.=	$form_tag_start.=
'<input type="hidden" name="username"	'<input type="hidden" name="username"
Line 1842 sub start_problem {	Line 1912 sub start_problem {
}	}
if (($env{'request.state'} ne "construct") &&	if (($env{'request.state'} ne "construct") &&
($Apache::lonhomework::type eq 'randomizetry') &&	($Apache::lonhomework::type eq 'randomizetry') &&
($status eq 'CAN_ANSWER')) {	($status eq 'CAN_ANSWER') &&
	($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') &&
	(!$env{'request.role.adv'})) {
	# "New Problem Variation Each Try" header suppressed for Placement Tests, unless course personnel.
my @parts;	my @parts;
if (ref($probpartlist) eq 'ARRAY') {	if (ref($probpartlist) eq 'ARRAY') {
@parts = @{$probpartlist};	@parts = @{$probpartlist};
Line 1868 sub start_problem {	Line 1941 sub start_problem {
( $status eq 'NOTRESERVABLE') \|\|	( $status eq 'NOTRESERVABLE') \|\|
( $status eq 'RESERVABLE') \|\|	( $status eq 'RESERVABLE') \|\|
( $status eq 'RESERVABLE_LATER') \|\|	( $status eq 'RESERVABLE_LATER') \|\|
( $status eq 'INVALID_ACCESS')) {	( $status eq 'INVALID_ACCESS') \|\|
	( $status eq 'NEED_DIFFERENT_IP')) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,	my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
$style);	$style);
if ( $target eq "web" ) {	if (($status eq 'NOT_YET_VIEWED') && ($firstaccres)) {
my $msg;	$result .= '<p class="LC_error">'.
if ($status eq 'UNAVAILABLE') {	&mt('A problem occurred when trying to start the timer.').'</p>';
$msg.='<p class="LC_error">'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</p>';	}
} elsif ($status eq 'NOT_IN_A_SLOT') {	$result .= &access_status_msg('problem',$status,$symb,$target,$ipused,$accessmsg);
$msg.='<p class="LC_warning">'.&mt('You are not currently signed up to work at this time and/or place.').'</p>';
} elsif (($status eq 'RESERVABLE') \|\| ($status eq 'RESERVABLE_LATER') \|\|
($status eq 'NOTRESERVABLE')) {
$msg.='<p class="LC_warning">'.&mt('Access requires reservation to work at specific time/place.').'</p>';
} elsif ($status ne 'NOT_YET_VIEWED') {
$msg.='<p class="LC_warning">'.&mt('Not open to be viewed').'</p>';
}
if ($status eq 'CLOSED' \|\| $status eq 'INVALID_ACCESS') {
$msg.=&mt('The problem ').$accessmsg;
} elsif ($status eq 'UNCHECKEDOUT') {
$msg.=&checkout_msg();
} elsif ($status eq 'NOT_YET_VIEWED') {
if ($firstaccres) {
$msg .= '<p class="LC_error">'.
&mt('A problem occurred when trying to start the timer.').'</p>';
}
$msg.=&firstaccess_msg($accessmsg,$symb);
} elsif ($status eq 'NOT_IN_A_SLOT') {
$msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
} elsif ($status eq 'RESERVABLE') {
$msg.=&mt('Available to make a reservation.').' '.&mt('Reservation window closes [_1].',
&Apache::lonnavmaps::timeToHumanString($accessmsg,'end')).
'<br />'.
&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
} elsif ($status eq 'RESERVABLE_LATER') {
$msg.=&mt('Window to make a reservation will open [_1].',
&Apache::lonnavmaps::timeToHumanString($accessmsg,'start'));
} elsif ($status eq 'NOTRESERVABLE') {
$msg.=&mt('Not available to make a reservation.');
}
$result.=$msg.'<br />';
} elsif ($target eq 'tex') {
my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
: '\begin{minipage}{\textwidth}';
$result.='\noindent \vskip 1 mm '.
$startminipage.'\vskip 0 mm';
if ($status eq 'UNAVAILABLE') {
$result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
} else {
$result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
}
}
} elsif ($status eq 'NEEDS_CHECKIN') {	} elsif ($status eq 'NEEDS_CHECKIN') {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,	my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
$style);	$style);
if ($target eq 'web') {	$result .= &checkin_prompt($target,$slot_name,$slot,'problem');
$result .=
&Apache::bridgetask::proctor_validation_screen($slot);
} elsif ($target eq 'grade') {
&Apache::bridgetask::proctor_check_auth($slot_name,$slot,
'problem');
}
} elsif ($target eq 'web') {	} elsif ($target eq 'web') {
if ($status eq 'CAN_ANSWER') {	if ($status eq 'CAN_ANSWER') {
$resource_due = &Apache::lonhomework::due_date(0, $env{'request.symb'});	$resource_due = &Apache::lonhomework::due_date(0, $env{'request.symb'});
if ($slot_name ne '') {	if ($slot_name ne '') {
my $checked_in =	$resource_due = &selfcheckin_resource($resource_due,$slot_name,$slot,
$Apache::lonhomework::history{'resource.0.checkedin'};	$env{'request.symb'});
if ($checked_in eq '') {
# unproctored slot access, self checkin
&Apache::bridgetask::check_in('problem',undef,undef,
$slot_name);
$checked_in =
$Apache::lonhomework::results{"resource.0.checkedin"};
}
if ((ref($slot) eq 'HASH') && ($checked_in ne '')) {
if ($slot->{'starttime'} < time()) {
if (!$resource_due) {
$resource_due = $slot->{'endtime'};
} elsif ($slot->{'endtime'} < $resource_due) {
$resource_due = $slot->{'endtime'};
}
}
}
}	}
if ($resource_due) {	if ($resource_due) {
my $time_left = $resource_due - time();	my $time_left = $resource_due - time();
Line 1962 sub start_problem {	Line 1972 sub start_problem {
'<input type="hidden" name="submitted" value="yes" />';	'<input type="hidden" name="submitted" value="yes" />';
# create a page header and exit	# create a page header and exit
if ($env{'request.state'} eq "construct") {	if ($env{'request.state'} eq "construct") {
$result.= &problem_web_to_edit_header($env{'form.rndseed'});	if ($env{'form.inhibitmenu'} eq 'yes') {
	# error messages can be useful in any case
	$result.= &Apache::lonxml::message_location();
	} else {
	$result.= &problem_web_to_edit_header($env{'form.rndseed'});
	}
if ($Apache::lonhomework::type eq 'practice') {	if ($Apache::lonhomework::type eq 'practice') {
$result.= '<input type="submit" name="resetdata" '.	$result.= '<button type="submit" name="resetdata" '.
'value="'.&mt('New Problem Variation').'" />'.	'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
&practice_problem_header().'<hr />';	&practice_problem_header().'<hr />';
} elsif ($Apache::lonhomework::type eq 'randomizetry') {	} elsif ($Apache::lonhomework::type eq 'randomizetry') {
my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");	my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
my $problemstatus = &get_problem_status($Apache::inputtags::part);	my $problemstatus = &get_problem_status($Apache::inputtags::part);
Line 1992 sub start_problem {	Line 2007 sub start_problem {
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$result .= 'INSERTTEXFRONTMATTERHERE';	$result .= 'INSERTTEXFRONTMATTERHERE';
$result .= &select_metadata_hyphenation();	$result .= &select_metadata_hyphenation();


}	}
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= $form_tag_start.&problem_edit_header();	$result .= $form_tag_start.&problem_edit_header();
Line 2152 sub end_problem {	Line 2165 sub end_problem {
# Added separately at end of this routine, after added	# Added separately at end of this routine, after added
# <script></script> so document will be valid xhtml.	# <script></script> so document will be valid xhtml.
#	#
$result.= &Apache::loncommon::end_page({'discussion' => 1,	my $showdisc = 1;
	if (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') &&
	(!$env{'request.role.adv'})) {
	# For Placement Tests footer with "Post Discussion" and "Send Feedback" links is suppressed.
	$showdisc = 0;
	my ($symb)= &Apache::lonnet::whichuser();
	if ($symb) {
	my $navmap = Apache::lonnavmaps::navmap->new();
	if (ref($navmap)) {
	my $hastries = &Apache::lonplacementtest::has_tries($symb,$navmap);
	# For Placement Tests test status is displayed if this is the last resource in the course
	# and there are no tries left
	unless ($hastries) {
	if (&Apache::lonplacementtest::is_lastres($symb,$navmap)) {
	my ($score,$incomplete) =
	&Apache::lonplacementtest::check_completion(undef,undef,1);
	if (!$incomplete) {
	$result .= &Apache::lonplacementtest::showresult(1,1);
	} elsif ($incomplete < 100) {
	$result.= &Apache::lonplacementtest::showincomplete($incomplete,1);
	}
	} else {
	# For Placement Tests score is displayed if test has just been completed
	my ($score,$incomplete) = &Apache::lonplacementtest::check_completion(undef,undef,1);
	if (!$incomplete) {
	$result.= &Apache::lonplacementtest::showresult(1,1);
	}
	}
	}
	}
	}
	}
	$result.= &Apache::loncommon::end_page({'discussion' => $showdisc,
'notbody' => 1});	'notbody' => 1});
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $endminipage = '';	my $endminipage = '';
Line 2206 ENDJS	Line 2251 ENDJS
@Apache::inputtags::response=();	@Apache::inputtags::response=();
$result=&Apache::response::mandatory_part_meta;	$result=&Apache::response::mandatory_part_meta;
}	}
$result.=&Apache::response::meta_part_order();	$result.=&Apache::response::meta_part_order('problem');
$result.=&Apache::response::meta_response_order();	$result.=&Apache::response::meta_response_order();
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
&Apache::lonxml::debug("in end_problem with $target, edit");	&Apache::lonxml::debug("in end_problem with $target, edit");
Line 2266 sub start_library {	Line 2311 sub start_library {
'<input type="hidden" name="submitted" value="yes" />';	'<input type="hidden" name="submitted" value="yes" />';
$result.=&problem_web_to_edit_header($rndseed);	$result.=&problem_web_to_edit_header($rndseed);
if ($Apache::lonhomework::type eq 'practice') {	if ($Apache::lonhomework::type eq 'practice') {
$result.= '<input type="submit" name="resetdata" '.	$result.= '<button type="submit" name="resetdata" '.
'value="'.&mt('New Problem Variation').'" />'.	'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
&practice_problem_header().'<hr />';	&practice_problem_header().'<hr />';
}	}
}	}
return $result;	return $result;
Line 2284 sub end_library {	Line 2329 sub end_library {
&& $env{'request.state'} eq "construct") {	&& $env{'request.state'} eq "construct") {
$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});	$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
} elsif ($target eq 'meta') {	} elsif ($target eq 'meta') {
	$result.=&Apache::response::meta_part_order('library');
$result.=&Apache::response::meta_response_order();	$result.=&Apache::response::meta_response_order();
}	}
if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {	if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
Line 2913 sub start_part {	Line 2959 sub start_part {
if (($target eq 'grade') && &Apache::response::submitted()) {	if (($target eq 'grade') && &Apache::response::submitted()) {
$Apache::lonhomework::results{"resource.$id.rndseed"}=$rndseed;	$Apache::lonhomework::results{"resource.$id.rndseed"}=$rndseed;
}	}
	} elsif (@Apache::inputtags::partlist > 1) {
	my $prevparttype = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[-2].type");
	if ($prevparttype eq 'randomizetry') {
	my $rndseed=&setup_rndseed($safeeval,$target,'',$prevparttype);
	if (($target eq 'grade') && &Apache::response::submitted()) {
	$Apache::lonhomework::results{"resource.$id.rndseed"}=$rndseed;
	}
	}
} elsif (($target eq 'grade') && &Apache::response::submitted()) {	} elsif (($target eq 'grade') && &Apache::response::submitted()) {
$Apache::lonhomework::results{"resource.$id.rndseed"}=$Apache::lonhomework::rawrndseed;	$Apache::lonhomework::results{"resource.$id.rndseed"}=$Apache::lonhomework::rawrndseed;
}	}
Line 2989 sub start_part {	Line 3043 sub start_part {
if ($status eq 'CAN_ANSWER') {	if ($status eq 'CAN_ANSWER') {
my $problemstatus = &get_problem_status($Apache::inputtags::part);	my $problemstatus = &get_problem_status($Apache::inputtags::part);
my $num = scalar(@Apache::inputtags::partlist)-1;	my $num = scalar(@Apache::inputtags::partlist)-1;
if ((($Apache::lonhomework::default_type eq 'randomizetry') \|\|	if ((($Apache::lonhomework::default_type eq 'randomizetry') \|\|
($Apache::lonhomework::randomizetrypart)) &&	($Apache::lonhomework::randomizetrypart)) &&
($Apache::lonhomework::type ne 'randomizetry')) {	($Apache::lonhomework::type ne 'randomizetry')) {
$result .= &randomizetry_part_header($problemstatus,'none',$num);	$result .= &randomizetry_part_header($problemstatus,'none',$num);
} elsif ($Apache::lonhomework::type eq 'randomizetry') {	} elsif ($Apache::lonhomework::type eq 'randomizetry') {
Line 3050 sub end_part {	Line 3104 sub end_part {
$gradestatus='';	$gradestatus='';
}	}
$result.=$gradestatus;	$result.=$gradestatus;
if ($$tagstack[-2] eq 'td' and $target eq 'tex') {	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';}
if (not $env{'form.problem_split'}=~/yes/) {
$result.='\end{minipage}';
}
}
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table();	$result.=&Apache::edit::end_table();
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
Line 3170 sub start_problemtype {	Line 3220 sub start_problemtype {
['hide','Hide']]	['hide','Hide']]
,$token);	,$token);
$result .=&Apache::edit::checked_arg('When used as type(s):','for',	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
[ ['exam','Exam/Quiz Problem'],	[ ['exam','Bubblesheet Exam/Quiz Problem'],
['survey','Survey'],	['survey','Survey'],
['surveycred','Survey (with credit)'],	['surveycred','Survey (with credit)'],
['anonsurvey','Anonymous Survey'],	['anonsurvey','Anonymous Survey'],
Line 3313 sub end_simpleeditbutton {	Line 3363 sub end_simpleeditbutton {
}	}

sub practice_problem_header {	sub practice_problem_header {
return '<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'.	return '<h3 class="LC_info">'.&mt('Practice Problem').'</h3>'.
'<span class="LC_info">'.&mt('Submissions are not permanently recorded').	'<span class="LC_info">'.&mt('Submissions are not permanently recorded').
'</span>';	'</span>';
}	}
Line 3375 sub randomizetry_part_header {	Line 3425 sub randomizetry_part_header {
if ($num > 1) {	if ($num > 1) {
$output .= '<hr />';	$output .= '<hr />';
}	}
$output .= '<span class="LC_info"><h4>'.$header.'</h4></span>'.	$output .= '<h4 class="LC_info">'.$header.'</h4>'.
'<span class="LC_info">'.$text.'</span><br /><br />';	'<span class="LC_info">'.$text.'</span><br /><br />';
return $output;	return $output;
}	}

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

Removed from v.1.512.2.24.2.3
changed lines
	Added in v.1.570