loncom/homework/optionresponse.pm - diff

Return to optionresponse.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/optionresponse.pm between versions 1.187 and 1.192

version 1.187, 2012/10/12 12:45:46	version 1.192, 2013/12/03 14:54:29
Line 64 sub start_optionresponse {	Line 64 sub start_optionresponse {
$token,'4').	$token,'4').
&Apache::edit::select_arg('Randomize Foil Order:','randomize',	&Apache::edit::select_arg('Randomize Foil Order:','randomize',
['yes','no'],$token).	['yes','no'],$token).
&Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',	&Apache::edit::select_arg('Display of options when printed','TeXlayout',
[['horizontal','Normal list'],	[['horizontal','Normal list'],
['vertical','Listed in a vertical column']],$token).	['vertical','Listed in a vertical column']],$token).
&Apache::edit::end_row().&Apache::edit::start_spanning_row();	&Apache::edit::end_row().&Apache::edit::start_spanning_row();
Line 108 sub start_foilgroup {	Line 108 sub start_foilgroup {
my $optionlist="<option></option>\n";	my $optionlist="<option></option>\n";
my $option;	my $option;
my @opt;	my @opt;
eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);	my @raw_options = &Apache::lonxml::get_param('options', $parstack, $safeeval, 0, 0, 1);


	eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval, 0, 0, 1);

my $count=1;	my $count=1;
foreach $option (@opt) {	foreach $option (@opt) {
$optionlist.="<option value=\"$count\">$option</option>\n";	$optionlist.="<option value=\"$count\">$option</option>\n";
Line 148 ENDTABLE	Line 152 ENDTABLE
if ($target eq 'modified') {	if ($target eq 'modified') {
my @options;	my @options;
my $optchanged=0;	my $optchanged=0;
eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);

	eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval, 0, 0, 1);

if ($env{"form.$Apache::lonxml::curdepth.deleteopt"}) {	if ($env{"form.$Apache::lonxml::curdepth.deleteopt"}) {
my $delopt=$env{"form.$Apache::lonxml::curdepth.deleteopt"};	my $delopt=$env{"form.$Apache::lonxml::curdepth.deleteopt"};
&Apache::lonxml::debug("Deleting :$delopt:");	&Apache::lonxml::debug("Deleting :$delopt:");
Line 492 sub check_for_invalid {	Line 499 sub check_for_invalid {
sub displayfoils {	sub displayfoils {
my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,	my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,
$tex_option_switch, $no_tfprompt, @opt)=@_;	$tex_option_switch, $no_tfprompt, @opt)=@_;
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}	my @names;
my @names = @{ $Apache::response::foilgroup{'names'} };	if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
	@names = @{ $Apache::response::foilgroup{'names'} };
	}
	unless (@names > 0) { return;}
my @truelist;	my @truelist;
my @falselist;	my @falselist;
my $result;	my $result;
Line 513 sub displayfoils {	Line 523 sub displayfoils {
foreach $name (@whichopt) {	foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};	my $text=$Apache::response::foilgroup{$name.'.text'};
my $lastresp;	my $lastresp;
unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') \|\| ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) {	if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) \|\|
	(($env{'form.grade_username'} eq $env{'user.name'}) &&
	($env{'form.grade_domain'} eq $env{'user.domain'}))) {
$lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};	$lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};
	} else {
	unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') \|\|
	($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
	$lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};
	}
}	}
my %lastresponse=&Apache::lonnet::str2hash($lastresp);	my %lastresponse=&Apache::lonnet::str2hash($lastresp);
my $lastopt=$lastresponse{$name};	my $lastopt=$lastresponse{$name};
Line 553 sub displayfoils {	Line 570 sub displayfoils {
}	}
}	}
unless ($newvariation) {	unless ($newvariation) {
%lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});	if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) \|\|
	(($env{'form.grade_username'} eq $env{'user.name'}) &&
	($env{'form.grade_domain'} eq $env{'user.domain'}))) {
	%lastresponse =
	&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
	} else {
	unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') \|\|
	($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
	%lastresponse =
	&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
	}
	}
}	}
my $internal_counter=$Apache::lonxml::counter;	my $internal_counter=$Apache::lonxml::counter;
my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);	my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
if ($checkboxopt && (!$no_tfprompt)) {	if ($checkboxopt && (!$no_tfprompt)) {
$result.='<br />'.	$result.='<br />'.
($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':'').	($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':'').
&mt('Select all that are <b>[_1]</b>.',$checkboxopt);	&mt('Select all that are [_1].','<b>'.$checkboxopt.'</b>');
}	}
foreach $name (@whichopt) {	foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};	my $text=$Apache::response::foilgroup{$name.'.text'};

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

Removed from v.1.187
changed lines
	Added in v.1.192