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.11 and 1.512.2.13.4.2

version 1.512.2.11, 2016/09/14 19:36:30	version 1.512.2.13.4.2, 2017/09/15 17:05:32
Line 390 sub setmode_javascript {	Line 390 sub setmode_javascript {
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
function setmode(form,probmode) {	function setmode(form,probmode) {
	var initial = form.problemmode.value;
form.problemmode.value = probmode;	form.problemmode.value = probmode;
form.submit();	form.submit();
	form.problemmode.value = initial;
}	}
// ]]>	// ]]>
</script>	</script>
Line 417 sub page_start {	Line 419 sub page_start {
$extra_head .= &homework_js().	$extra_head .= &homework_js().
&Apache::lonhtmlcommon::dragmath_js("EditMathPopup");	&Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
if (&Apache::lonhtmlcommon::htmlareabrowser()) {	if (&Apache::lonhtmlcommon::htmlareabrowser()) {
my %textarea_args = (	my %textarea_args;
	if (($env{'request.state'} ne 'construct') \|\|
	($env{'environment.nocodemirror'})) {
	%textarea_args = (
dragmath => 'math',	dragmath => 'math',
);	);
	}
$extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);	$extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
}	}
my $is_task = ($env{'request.uri'} =~ /\.task$/);	my $is_task = ($env{'request.uri'} =~ /\.task$/);
Line 644 sub setup_rndseed {	Line 650 sub setup_rndseed {
unless (defined($questiontype)) {	unless (defined($questiontype)) {
$questiontype = $Apache::lonhomework::type;	$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')
\|\| $Apache::lonhomework::history{'resource.CODE'}) {	\|\| ($Apache::lonhomework::history{'resource.CODE'})
	\|\| (($env{'form.code_for_randomlist'}) && ($target eq 'analyze'))) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['rndseed']);	['rndseed']);
$rndseed=$env{'form.rndseed'};	$rndseed=$env{'form.rndseed'};
Line 656 sub setup_rndseed {	Line 663 sub setup_rndseed {
if (!$rndseed) {	if (!$rndseed) {
$rndseed=time;	$rndseed=time;
}	}
$env{'form.rndseed'}=$rndseed;	unless ($env{'form.code_for_randomlist'}) {
	$env{'form.rndseed'}=$rndseed;
	}
}	}
if (($env{'request.state'} eq "construct") &&	if (($env{'request.state'} eq "construct") &&
($Apache::lonhomework::type eq 'randomizetry')) {	($Apache::lonhomework::type eq 'randomizetry')) {
Line 684 sub setup_rndseed {	Line 693 sub setup_rndseed {
$rndseed=join(':',&Apache::lonnet::digest($rndseed));	$rndseed=join(':',&Apache::lonnet::digest($rndseed));
}	}
}	}
if ($Apache::lonhomework::history{'resource.CODE'}) {	if (($env{'form.code_for_randomlist'}) && ($target eq 'analyze')) {
	$env{'form.CODE'} = $env{'form.code_for_randomlist'};
	$rndseed=&Apache::lonnet::rndseed();
	undef($env{'form.CODE'});
	} elsif ($Apache::lonhomework::history{'resource.CODE'}) {
$rndseed=&Apache::lonnet::rndseed();	$rndseed=&Apache::lonnet::rndseed();
}	}
$set_safespace = 1;	$set_safespace = 1;
Line 1519 sub start_problem {	Line 1532 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");
&Apache::lonnet::set_first_access($interval[1],$interval[0]);	my ($timelimit) = ($interval[0] =~ /^(\d+)/);
	&Apache::lonnet::set_first_access($interval[1],$timelimit);
}	}

($status,$accessmsg,$slot_name,$slot) =	($status,$accessmsg,$slot_name,$slot) =
Line 2485 sub start_randomlist {	Line 2499 sub start_randomlist {
}	}
if (@randomlist) {	if (@randomlist) {
my @idx_arr = (0 .. $#randomlist);	my @idx_arr = (0 .. $#randomlist);
&Apache::structuretags::shuffle(\@idx_arr);	if ($env{'form.code_for_randomlist'}) {
	&Apache::structuretags::shuffle(\@idx_arr,$target);
	undef($env{'form.code_for_randomlist'});
	} else {
	&Apache::structuretags::shuffle(\@idx_arr);
	}
my $bodytext = '';	my $bodytext = '';
my $show=$#randomlist;	my $show=$#randomlist;
my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);	my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
Line 2524 sub start_randomlist {	Line 2543 sub start_randomlist {
}	}

sub shuffle {	sub shuffle {
my $a=shift;	my ($a,$target) = @_;
my $i;	my $i;
if (ref($a) eq 'ARRAY' && @$a) {	if (ref($a) eq 'ARRAY' && @$a) {
&Apache::response::pushrandomnumber();	&Apache::response::pushrandomnumber(undef,$target);
for($i=@$a;--$i;) {	for($i=@$a;--$i;) {
my $j=int(&Math::Random::random_uniform() * ($i+1));	my $j=int(&Math::Random::random_uniform() * ($i+1));
next if $i == $j;	next if $i == $j;
Line 2933 sub end_startouttext {	Line 2952 sub end_startouttext {
.'<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>'
.'<td><span id="math_'.$areaid.'">'	.'<td><span id="math_'.$areaid.'">';
.&Apache::lonhtmlcommon::dragmath_button($areaid,1)	if ($env{'environment.nocodemirror'}) {
.'</span></td>'	$result.=&Apache::lonhtmlcommon::dragmath_button($areaid,1);
	} else {
	$result.=' ';
	}
	$result.='</span></td>'
.'<td>'	.'<td>'
.&Apache::edit::insertlist($target,$token)	.&Apache::edit::insertlist($target,$token)
.'</td>'	.'</td>'

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

Removed from v.1.512.2.11
changed lines
	Added in v.1.512.2.13.4.2