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.461 and 1.465.2.12

version 1.461, 2009/12/06 21:18:24	version 1.465.2.12, 2011/01/07 05:14:57
Line 66 use lib '/home/httpd/lib/perl/';	Line 66 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','startouttext','endouttext','simpleeditbutton','definetag'));	&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'));
}	}

sub start_web {	sub start_web {
Line 128 sub homework_js {	Line 128 sub homework_js {
&setmode_javascript().	&setmode_javascript().
<<'JS';	<<'JS';
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
function setSubmittedPart (part) {	function setSubmittedPart (part) {
this.document.lonhomework.submitted.value="part_"+part;	this.document.lonhomework.submitted.value="part_"+part;
}	}
Line 143 function image_response_click (which, e)	Line 144 function image_response_click (which, e)
var y= e.clientY-getY(img_element)+Geometry.getVerticalScroll();	var y= e.clientY-getY(img_element)+Geometry.getVerticalScroll();
var click = x+':'+y;	var click = x+':'+y;
input_element.value = click;	input_element.value = click;
img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;	img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
}	}
	// ]]>
</script>	</script>
JS	JS
}	}
Line 161 function setmode(form,probmode) {	Line 162 function setmode(form,probmode) {
ENDSCRIPT	ENDSCRIPT
}	}

	sub file_delchk_js {
	my $delfilewarn = &mt('You have indicated you wish to remove some files previously included in your submission.').'\\n'.
	&mt('Continue submission with these files removed?');
	return <<"ENDSCRIPT";
	<script type="text/javascript">
	// <![CDATA[
	function file_deletion_check(formname) {
	var elemnum = formname.elements.length;
	if (elemnum == 0) {
	return true;
	}
	var str = new RegExp("^HWFILE.+_delete\$");
	var delboxes = new Array();
	for (i=0; i<formname.elements.length; i++) {
	var id = formname.elements[i].id;
	if (id != '') {
	if (str.test(id)) {
	if (formname.elements[i].type == 'checkbox') {
	if (formname.elements[i].checked) {
	delboxes.push(id);
	}
	}
	}
	}
	}
	if (delboxes.length > 0) {
	if (confirm("$delfilewarn")) {
	return true;
	} else {
	for (var j=0; j<delboxes.length; j++) {
	formname.elements[delboxes[j]].checked = false;
	}
	return false;
	}
	} else {
	return true;
	}
	}
	// ]]>
	</script>
	ENDSCRIPT
	}

sub page_start {	sub page_start {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,
$extra_head)=@_;	$extra_head)=@_;
Line 177 sub page_start {	Line 221 sub page_start {
$parstack,$parser,$safeeval);	$parstack,$parser,$safeeval);
}	}

$extra_head .= &homework_js();	$extra_head .= &homework_js().
	&Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
if ($env{'environment.wysiwygeditor'} eq 'on') {	if (&Apache::lonhtmlcommon::htmlareabrowser()) {
$extra_head .= &Apache::lonhtmlcommon::dragmath_js("FCKEditMathPopup");	my %textarea_args = (
} else {	dragmath => 'math',
$extra_head .= &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");	);
	$extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
	}
	my $is_task = ($env{'request.uri'} =~ /\.task$/);
	if ($is_task) {
	$extra_head .= &file_delchk_js();
}	}

my %body_args;	my %body_args;
Line 254 sub page_start {	Line 303 sub page_start {
my $page_start = &Apache::loncommon::start_page($name,$extra_head,	my $page_start = &Apache::loncommon::start_page($name,$extra_head,
\%body_args);	\%body_args);
$page_start .= $pageheader;	$page_start .= $pageheader;
	if (!defined($found{'body'})
unless ($env{'request.gcicontext'} eq 'buildtest') {	&& $env{'request.state'} ne 'construct'
if (!defined($found{'body'})	&& ($target eq 'web' \|\| $target eq 'webgrade')) {
&& $env{'request.state'} ne 'construct'
&& ($target eq 'web' \|\| $target eq 'webgrade')) {	my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
	if ($symb eq '' && !$publicuser) {
my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();	$page_start .= '<p class="LC_info">'
if ($symb eq '' && !$publicuser) {	.&mt('Browsing resource, all submissions are temporary.')
$page_start .= '<p class="LC_info">'	.'</p>';
.&mt('Browsing resource, all submissions are temporary.')
.'</p>';
}
}	}
}	}

Line 276 sub page_start {	Line 322 sub page_start {
my $form_tag_start;	my $form_tag_start;
if (!defined($found{'form'})) {	if (!defined($found{'form'})) {
$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
my $uri = Apache::loncommon::inhibit_menu_check(	my $uri = &Apache::loncommon::inhibit_menu_check(
&Apache::lonenc::check_encrypt($env{'request.uri'}));	&Apache::lonenc::check_encrypt($env{'request.uri'}));
	$uri = &HTML::Entities::encode($uri,'<>&"');
$form_tag_start.=$uri.'" ';	$form_tag_start.=$uri.'" ';
if ($target eq 'edit') {	if ($target eq 'edit') {
$form_tag_start.=&Apache::edit::form_change_detection();	$form_tag_start.=&Apache::edit::form_change_detection();
}	}
	if ($is_task) {
	$form_tag_start .= ' onsubmit="return file_deletion_check(this);"';
	}
$form_tag_start.='>'."\n";	$form_tag_start.='>'."\n";

my $symb=&Apache::lonnet::symbread();	my $symb=&Apache::lonnet::symbread();
Line 323 sub get_resource_name {	Line 373 sub get_resource_name {
}	}

sub setup_rndseed {	sub setup_rndseed {
my ($safeeval)=@_;	my ($safeeval,$target)=@_;
my $rndseed;
my ($symb)=&Apache::lonnet::whichuser();	my ($symb)=&Apache::lonnet::whichuser();
	my ($questiontype,$set_safespace,$rndseed);
	if ($target eq 'analyze') {
	$questiontype = $env{'form.grade_questiontype'};
	}
	unless (defined($questiontype)) {
	$questiontype = $Apache::lonhomework::type;
	}
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 340 sub setup_rndseed {	Line 396 sub setup_rndseed {
}	}
$env{'form.rndseed'}=$rndseed;	$env{'form.rndseed'}=$rndseed;
}	}
	if (($env{'request.state'} eq "construct") &&
	($Apache::lonhomework::type eq 'randomizetry')) {
	my $tries = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
	if ($tries) {
	$rndseed += $tries;
	}
	$env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
	}
if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')	if ( ($env{'form.resetdata'} eq &mt('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')) {
Line 355 sub setup_rndseed {	Line 419 sub setup_rndseed {
if ($Apache::lonhomework::history{'resource.CODE'}) {	if ($Apache::lonhomework::history{'resource.CODE'}) {
$rndseed=&Apache::lonnet::rndseed();	$rndseed=&Apache::lonnet::rndseed();
}	}
if ($safeeval) {	$set_safespace = 1;
&Apache::lonxml::debug("Setting rndseed to $rndseed");	} elsif ($questiontype eq 'randomizetry') {
&Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);	if ($target eq 'analyze') {
}	if (defined($env{'form.grade_rndseed'})) {
	$rndseed = $env{'form.grade_rndseed'};
	}
	}
	unless (($target eq 'analyze') && (defined($rndseed))) {
	$rndseed=&Apache::lonnet::rndseed();
	my $curr_try = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
	$curr_try ++;
	}
	if ($rndseed =~/^(\d+)[,:](\d+)$/) {
	$rndseed = $1;
	}
	if ($curr_try) {
	my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
	if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
	my $inc = int(($curr_try-1)/$reqtries);
	$rndseed += $inc;
	} else {
	$rndseed += $curr_try;
	}
	}
	}
	$set_safespace = 1;
	}
	if ($set_safespace) {
	if ($safeeval) {
	&Apache::lonxml::debug("Setting rndseed to $rndseed");
	&Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
	}
	}
	unless (($env{'request.state'} eq "construct") \|\| ($symb eq '')) {
	$env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
}	}
return $rndseed;	return $rndseed;
}	}
Line 407 sub problem_edit_footer {	Line 503 sub problem_edit_footer {
<hr style="clear:both;" />	<hr style="clear:both;" />
</div>	</div>
'.	'.

&Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
"\n</form>\n".&Apache::loncommon::end_page();	"\n</form>\n".&Apache::loncommon::end_page();
}	}

Line 474 sub problem_web_to_edit_header {	Line 568 sub problem_web_to_edit_header {
".&option('exam' ,'problemtype').&mt("Exam Problem")."</option>	".&option('exam' ,'problemtype').&mt("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('anonsurvey' ,'problemtype').&mt("Anonymous Survey Question")."</option>
	".&option('anonsurveycred' ,'problemtype').&mt("Anonymous Survey Question (with credit)")."</option>
".&option('practice' ,'problemtype').&mt("Practice Problem")."</option>	".&option('practice' ,'problemtype').&mt("Practice Problem")."</option>
	".&option('randomizetry' ,'problemtype').&mt("New Randomization Each Try")."</option>
</select>	</select>
</span>	</span>
$show_all	$show_all
Line 632 sub finalize_storage {	Line 730 sub finalize_storage {
$result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,	$result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
$symb,$courseid,$domain,$name);	$symb,$courseid,$domain,$name);
&Apache::lonxml::debug('Store return message:'.$result);	&Apache::lonxml::debug('Store return message:'.$result);
if ($env{'request.role'} =~/^st/) {	&store_aggregates($symb,$courseid);
&store_aggregates($symb,$courseid);
}
}	}
} else {	} else {
&Apache::lonxml::debug('Nothing to store');	&Apache::lonxml::debug('Nothing to store');
Line 654 item store_aggregates()	Line 750 item store_aggregates()

sub store_aggregates {	sub store_aggregates {
my ($symb,$courseid) = @_;	my ($symb,$courseid) = @_;
my %aggregate;	my (%aggregate,%anoncounter,%randtrycounter);
my @parts;	my @parts;
my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};	my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
Line 664 sub store_aggregates {	Line 760 sub store_aggregates {
}	}
}	}
foreach my $part (@parts) {	foreach my $part (@parts) {
if ($Apache::lonhomework::results{'resource.'.$part.'.award'}	if ($env{'request.role'} =~/^st/) {
eq 'APPROX_ANS' \|\|	if ($Apache::lonhomework::results{'resource.'.$part.'.award'}
$Apache::lonhomework::results{'resource.'.$part.'.award'}	eq 'APPROX_ANS' \|\|
eq 'EXACT_ANS') {	$Apache::lonhomework::results{'resource.'.$part.'.award'}
$aggregate{$symb."\0".$part."\0correct"} = 1;	eq 'EXACT_ANS') {
	$aggregate{$symb."\0".$part."\0correct"} = 1;
	}
	if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
	$aggregate{$symb."\0".$part."\0users"} = 1;
	} else {
	my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]);
	if ($last_reset) {
	if (&Apache::grades::get_num_tries(\%Apache::lonhomework::history,$last_reset,$part) == 0) {
	$aggregate{$symb."\0".$part."\0users"} = 1;
	}
	}
	}
	$aggregate{$symb."\0".$part."\0attempts"} = 1;
}	}
if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {	if (($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurvey') \|\|
$aggregate{$symb."\0".$part."\0users"} = 1;	($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurveycred') \|\|
} else {	($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'randomizetry')) {
my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]);	if ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'randomizetry') {
if ($last_reset) {	$randtrycounter{$symb."\0".$part} = 1;
if (&Apache::grades::get_num_tries(\%Apache::lonhomework::history,$last_reset,$part) == 0) {	} else {
$aggregate{$symb."\0".$part."\0users"} = 1;	$anoncounter{$symb."\0".$part} = 1;
	}
	my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}};
	if ($needsrelease) {
	my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
	if ($curr_required eq '') {
	&Apache::lonnet::update_released_required($needsrelease);
	} else {
	my ($currmajor,$currminor) = split(/\./,$curr_required);
	my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
	if (($currmajor < $needsmajor) \|\| ($currmajor == $needsmajor && $currminor < $needsminor)) {
	&Apache::lonnet::update_released_required($needsrelease);
	}
}	}
}	}
}	}
$aggregate{$symb."\0".$part."\0attempts"} = 1;
}	}
if (keys (%aggregate) > 0) {	if (keys (%aggregate) > 0) {
&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
$cdomain,$cname);	$cdomain,$cname);
}	}
	if (keys(%anoncounter) > 0) {
	&Apache::lonnet::cput('nohist_anonsurveys',\%anoncounter,
	$cdomain,$cname);
	}
	if (keys(%randtrycounter) > 0) {
	&Apache::lonnet::cput('nohist_randomizetry',\%randtrycounter,
	$cdomain,$cname);
	}
}	}

sub checkout_msg {	sub checkout_msg {
Line 766 sub init_problem_globals {	Line 894 sub init_problem_globals {
&Apache::lonhomework::reset_show_problem_status();	&Apache::lonhomework::reset_show_problem_status();
$Apache::lonhomework::ignore_response_errors=1;	$Apache::lonhomework::ignore_response_errors=1;
}	}
	@Apache::functionplotresponse::callscripts=();
@Apache::inputtags::responselist = ();	@Apache::inputtags::responselist = ();
@Apache::inputtags::importlist = ();	@Apache::inputtags::importlist = ();
@Apache::inputtags::previous=();	@Apache::inputtags::previous=();
Line 793 sub reset_problem_globals {	Line 922 sub reset_problem_globals {
undef($Apache::lonhomework::type);	undef($Apache::lonhomework::type);
undef($Apache::lonhomework::scantronmode);	undef($Apache::lonhomework::scantronmode);
undef($Apache::lonhomework::ignore_response_errors);	undef($Apache::lonhomework::ignore_response_errors);
	undef(@Apache::functionplotresponse::callscripts);
&Apache::lonhomework::reset_show_problem_status();	&Apache::lonhomework::reset_show_problem_status();
}	}

Line 893 sub start_problem {	Line 1023 sub start_problem {

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); }	if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval,$target); }
if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer' \|\|	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer' \|\|
$target eq 'tex') {	$target eq 'tex') {
#handle exam checkout	#handle exam checkout
Line 911 sub start_problem {	Line 1041 sub start_problem {
my @interval=&Apache::lonnet::EXT("resource.0.interval");	my @interval=&Apache::lonnet::EXT("resource.0.interval");
&Apache::lonnet::set_first_access($interval[1]);	&Apache::lonnet::set_first_access($interval[1]);
}	}

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

#handle rand seed in construction space	#handle rand seed in construction space
my $rndseed=&setup_rndseed($safeeval);	my $rndseed=&setup_rndseed($safeeval,$target);
my ($symb)=&Apache::lonnet::whichuser();	my ($symb)=&Apache::lonnet::whichuser();

if ($env{'request.state'} ne "construct" &&	if ($env{'request.state'} ne "construct" &&
($symb eq '' \|\| $Apache::lonhomework::type eq 'practice')) {	($symb eq '' \|\| $Apache::lonhomework::type eq 'practice')) {
$form_tag_start.='<input type="hidden" name="rndseed" value="'.	$form_tag_start.='<input type="hidden" name="rndseed" value="'.
$rndseed.'" />';	$rndseed.'" />'.
unless ($env{'request.gcicontext'} eq 'buildtest') {	'<input type="submit" name="resetdata"
$form_tag_start .= '<input type="submit" name="resetdata"'.	value="'.&mt('New Problem Variation').'" />';
' value="'.&mt('New Problem Variation').'" />';
}
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"
value="'.$env{'form.username'}.'" />';	value="'.$env{'form.username'}.'" />';
}	}
unless ($env{'request.gcicontext'} eq 'buildtest') {	if ($env{'request.role.adv'}) {
if ($env{'request.role.adv'}) {	$form_tag_start.= ' <label class="LC_nobreak">'
$form_tag_start.= ' <label class="LC_nobreak">'	.'<input type="checkbox" name="showallfoils"';
.'<input type="checkbox" name="showallfoils"';	if (defined($env{'form.showallfoils'})) {
if (defined($env{'form.showallfoils'})) {	$form_tag_start.=' checked="checked"';
$form_tag_start.=' checked="checked"';	}
}	$form_tag_start.= ' /> '
$form_tag_start.= ' /> '	.&mt('Show All Foils')
.&mt('Show All Foils')	.'</label>';
.'</label>';	}
}
}
if ($Apache::lonhomework::type eq 'practice') {	if ($Apache::lonhomework::type eq 'practice') {
$form_tag_start.=&practice_problem_header();	$form_tag_start.=&practice_problem_header();
}	}
unless ($env{'request.gcicontext'} eq 'buildtest') {	$form_tag_start.='<hr />';
$form_tag_start.='<hr />';	} elsif (($env{'request.state'} ne "construct") &&
}	($Apache::lonhomework::type eq 'randomizetry') &&
}	($status eq 'CAN_ANSWER')) {
	my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
($status,$accessmsg,my $slot_name,my $slot) =	my $problemstatus = &get_problem_status($Apache::inputtags::part);
&Apache::lonhomework::check_slot_access('0','problem');	$form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries);
push (@Apache::inputtags::status,$status);	}

my $expression='$external::datestatus="'.$status.'";';	my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
Line 1030 sub start_problem {	Line 1162 sub start_problem {
$result .= '<input type="hidden" name="grade_'.$field.	$result .= '<input type="hidden" name="grade_'.$field.
'" value="'.$env{"form.grade_$field"}.'" />'."\n";	'" value="'.$env{"form.grade_$field"}.'" />'."\n";
}	}
	foreach my $field ('questiontype','rndseed') {
	if ($env{"form.grade_$field"} ne '') {
	$result .= '<input type="hidden" name="grade_'.$field.
	'" value="'.$env{"form.grade_$field"}.'" />'."\n";
	}
	}

}	}
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$result .= 'INSERTTEXFRONTMATTERHERE';	$result .= 'INSERTTEXFRONTMATTERHERE';
Line 1134 sub end_problem {	Line 1273 sub end_problem {
'\textit{'.$duedate_text.'} '.$toc_line;	'\textit{'.$duedate_text.'} '.$toc_line;
} else {	} else {
$frontmatter.= $begin_doc.$toc_line;	$frontmatter.= $begin_doc.$toc_line;
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}	if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) {
	$frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
	}
}	}
} else {	} else {
$frontmatter .= '\vskip 1mm\textit{'.$duedate_text.'} \\\\\\\\'.$startminipage;	$frontmatter .= '\vskip 1mm\textit{'.$duedate_text.'} \\\\\\\\'.$startminipage;
Line 1142 sub end_problem {	Line 1283 sub end_problem {
} else {	} else {
if (not $env{'request.symb'} =~ m/\.page_/) {	if (not $env{'request.symb'} =~ m/\.page_/) {
$frontmatter .= $begin_doc.$toc_line;	$frontmatter .= $begin_doc.$toc_line;
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}	if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) {
	$frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
	}
} else {	} else {
$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;	$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
}	}
Line 1178 sub end_problem {	Line 1321 sub end_problem {
if ($target ne 'tex' &&	if ($target ne 'tex' &&
$env{'form.answer_output_mode'} ne 'tex') {	$env{'form.answer_output_mode'} ne 'tex') {
$result.="</form>";	$result.="</form>";
$result.= &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields());
}	}
if ($target eq 'web') {	if ($target eq 'web') {
$result.= &Apache::loncommon::end_page({'discussion' => 1});	$result.= &Apache::loncommon::end_page({'discussion' => 1});
Line 1199 sub end_problem {	Line 1341 sub end_problem {
}	}
}	}
}	}
	if ($target eq 'web') {
	$result.=&Apache::functionplotresponse::init_script();
	}
if ($target eq 'grade') {	if ($target eq 'grade') {
&Apache::lonhomework::showhash(%Apache::lonhomework::results);	&Apache::lonhomework::showhash(%Apache::lonhomework::results);
&finalize_storage();	&finalize_storage();
Line 1256 sub start_library {	Line 1401 sub start_library {
($result,$form_tag_start)=	($result,$form_tag_start)=
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,	&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
$name);	$name);
my $rndseed=&setup_rndseed($safeeval);	my $rndseed=&setup_rndseed($safeeval,$target);
$result.=" \n $form_tag_start".	$result.=" \n $form_tag_start".
'<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);
Line 1495 sub start_instructorcomment {	Line 1640 sub start_instructorcomment {

if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer' \|\|	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer' \|\|
$target eq 'tex' \|\| $target eq 'analyze' \|\| $target eq 'webgrade') {	$target eq 'tex' \|\| $target eq 'analyze' \|\| $target eq 'webgrade') {
$result=($env{'request.role'}=~/^(in\|cc\|au\|ca\|li)/);	$result=($env{'request.role'}=~/^(in\|cc\|co\|au\|ca\|li)/);
if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) {	if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) {
my $skip=&Apache::lonxml::get_all_text("/instructorcomment",	my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
$parser,$style);	$parser,$style);
Line 1700 sub ordered_show_check {	Line 1845 sub ordered_show_check {
return $in_order_show;	return $in_order_show;
}	}

	sub start_startpartmarker {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
	my $result='';
	if ($target eq 'edit') {
	$result=&Apache::edit::tag_start($target,$token);
	$result.=&mt('Marker for the start of a part. Place end marker below to wrap in-between tags into a new part.').'</td></tr>';
	$result.=&Apache::edit::end_table();

	}
	return $result;
	}

	sub end_startpartmarker {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
	my @result;
	if ($target eq 'edit') { $result[1]='no'; }
	return @result;
	}

	sub start_endpartmarker {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
	my $result='';
	if ($target eq 'edit') {
	$result=&Apache::edit::tag_start($target,$token);
	$result.=&mt('Marker for the end of a part. Place start marker above to wrap in-between tags into a new part.').'</td></tr>';
	$result.=&Apache::edit::end_table();

	}
	return $result;
	}

	sub end_endpartmarker {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
	my @result;
	if ($target eq 'edit') { $result[1]='no'; }
	return @result;
	}

sub start_part {	sub start_part {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
if (!$Apache::lonxml::metamode) {	if (!$Apache::lonxml::metamode) {
Line 1784 sub start_part {	Line 1967 sub start_part {
'.disableexampointprint'}) eq 'yes') {	'.disableexampointprint'}) eq 'yes') {
$allow_print_points=0;	$allow_print_points=0;
}	}
if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}	if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) {
	$result .= '\vskip 10mm\fbox{\textit{'.$weight.' pt}}';

	}
} elsif ($target eq 'web') {	} elsif ($target eq 'web') {
$result.='<a name="'.&escape($Apache::inputtags::part).'" />';	if ($status eq 'CAN_ANSWER') {
	my $problemstatus = &get_problem_status($Apache::inputtags::part);
	my $probrandomize = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].type");
	my $probrandtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].randomizeontries");
	my $num = scalar(@Apache::inputtags::partlist)-1;
	if ($probrandomize eq 'randomizetry') {
	if (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.type") ne 'randomizetry') {
	$result .= &randomizetry_part_header($problemstatus,'none',$num);
	} else {
	my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
	if ($probrandtries ne $reqtries) {
	$result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
	}
	}
	} elsif (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.type") eq 'randomizetry') {
	my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
	$result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
	}
	}
	$result.='<a name="'.&escape($Apache::inputtags::part).'"></a>';
}	}
}	}
}	}
Line 1953 sub start_problemtype {	Line 2158 sub start_problemtype {
$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','Exam/Quiz Problem'],
['survey','Survey'],	['survey','Survey'],
	['surveycred','Survey (with credit)'],
	['anonsurvey','Anonymous Survey'],
	['anonsurveycred','Anonymous Survey (with credit)'],
['problem','Homework Problem'],	['problem','Homework Problem'],
['practice','Practice Problem'] ]	['practice','Practice Problem'],
	['randomizetry','New Randomization Each Try'] ]
,$token);	,$token);
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
Line 1993 sub end_startouttext {	Line 2202 sub end_startouttext {
$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>"	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>"
.'<td><span class="LC_nobreak">'.&mt('Delete?').' '	.'<td><span class="LC_nobreak">'.&mt('Delete?').' '
.&Apache::edit::deletelist($target,$token)	.&Apache::edit::deletelist($target,$token)
.'</span></td>';	.'</span></td>'
unless ($env{'environment.wysiwygeditor'} eq 'on') {	.'<td align="left"><span id="math_'.$areaid.'" />'
$result .= '<td align="left">'	.&Apache::lonhtmlcommon::dragmath_button($areaid,1)
.&Apache::lonhtmlcommon::dragmath_button($areaid,1)	.'</td>'
.'</td>'	.'<td>'
.'<td>'	.&Apache::edit::insertlist($target,$token)
.&Apache::edit::insertlist($target,$token)	.'</td>'
.'</td>';	.'<td align="right" valign="top">' .
}	&Apache::loncommon::helpLatexCheatsheet().
$result.='<td align="right" valign="top">' .
&Apache::loncommon::helpLatexCheatsheet().
&Apache::edit::end_row().	&Apache::edit::end_row().
&Apache::edit::start_spanning_row()."\n".	&Apache::edit::start_spanning_row()."\n".
&Apache::edit::editfield($token->[1],$text,"",80,8,1);	&Apache::edit::editfield($token->[1],$text,"",80,8,1);
Line 2091 sub practice_problem_header {	Line 2298 sub practice_problem_header {
'</span>';	'</span>';
}	}

	sub randomizetry_problem_header {
	my ($problemstatus,$reqtries) = @_;
	my ($header,$text);
	if ($reqtries > 1) {
	$header = &mt('New Problem Variation After Every [quant,_1,Try,Tries]',$reqtries);
	if (($problemstatus eq 'no') \|\|
	($problemstatus eq 'no_feedback_ever')) {
	$text = &mt('A new variation will be generated after every [quant,_1,try,tries], until the tries limit is reached.',$reqtries);
	} else {
	$text = &mt('A new variation will be generated after every [quant,_1,try,tries], until correct or tries limit is reached.',$reqtries);
	}
	} else {
	$header = &mt('New Problem Variation Each Try');
	if (($problemstatus eq 'no') \|\|
	($problemstatus eq 'no_feedback_ever')) {
	$text = &mt('A new variation will be generated after each try until the tries limit is reached.');

	} else {
	$text = &mt('A new variation will be generated after each try until correct or tries limit is reached.');
	}
	}
	return '<span class="LC_info"><h3>'.$header.'</h3></span>'.
	'<span class="LC_info">'.$text.'</span><hr />';
	}

	sub randomizetry_part_header {
	my ($problemstatus,$reqtries,$num) = @_;
	my ($header,$text);
	if ($reqtries eq 'none') {
	$header = &mt('No Question Variation');
	$text = &mt('For this question there will no new variation after a try.');
	} elsif ($reqtries > 1) {
	$header = &mt('New Question Variation After Every [quant,_1,Try,Tries]',$reqtries);
	if (($problemstatus eq 'no') \|\|
	($problemstatus eq 'no_feedback_ever')) {
	$text = &mt('For this question a new variation will be generated after every [quant,_1,try,tries], until the tries limit is reached.',$reqtries);
	} else {
	$text = &mt('For this question a new variation will be generated after every [quant,_1,try,tries], until correct or tries limit is reached.',$reqtries);
	}
	} else {
	$header = &mt('New Question Variation For Each Try');
	if (($problemstatus eq 'no') \|\|
	($problemstatus eq 'no_feedback_ever')) {
	$text = &mt('For this question a new variation will be generated after each try until the tries limit is reached.');
	} else {
	$text = &mt('For this question a new variation will be generated after each try until correct or tries limit is reached.');
	}
	}
	my $output;
	if ($num > 1) {
	$output .= '<hr />';
	}
	$output .= '<span class="LC_info"><h4>'.$header.'</h4></span>'.
	'<span class="LC_info">'.$text.'</span><br /><br />';
	return $output;
	}

1;	1;
__END__	__END__

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

Removed from v.1.461
changed lines
	Added in v.1.465.2.12