version 1.186, 2012/06/25 10:36:00
|
version 1.194, 2014/11/27 17:37:09
|
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 116 sub start_foilgroup {
|
Line 120 sub start_foilgroup {
|
} |
} |
my $insertlist=&Apache::edit::insertlist($target,$token); |
my $insertlist=&Apache::edit::insertlist($target,$token); |
$result.=&Apache::edit::start_table($token); |
$result.=&Apache::edit::start_table($token); |
|
my %lt = &Apache::lonlocal::texthash( |
|
sel => 'Select Options', |
|
add => 'Add new Option:', |
|
del => 'Delete an Option:', |
|
); |
$result.= (<<ENDTABLE); |
$result.= (<<ENDTABLE); |
<tr><td>Select Options</td> |
<tr><td>$lt{'sel'}</td> |
<td> |
<td> |
Add new Option: <input type="text" name="$Apache::lonxml::curdepth.options" /> |
$lt{'add'} <input type="text" name="$Apache::lonxml::curdepth.options" /> |
</td> |
</td> |
<td>Delete an Option: |
<td>$lt{'del'} |
<select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select> |
<select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select> |
</td> |
</td> |
ENDTABLE |
ENDTABLE |
$result.= '<td>'.&Apache::edit::checked_arg('Print options:','texoptions', |
$result.= '<td>'.&Apache::edit::checked_arg('Print options:','texoptions', |
[ ['nochoice','Don\'t show option list'] ] |
[ ['nochoice',"Don't show option list"] ] |
,$token).'</td>'; |
,$token).'</td>'; |
$result.= '<td><label>'.&mt('Two-option checkboxes for:'). |
$result.= '<td><label>'.&mt('Two-option checkboxes for:'). |
'<select name="checkboxvalue_'.$Apache::lonxml::curdepth.'">'; |
'<select name="checkboxvalue_'.$Apache::lonxml::curdepth.'">'; |
Line 137 ENDTABLE
|
Line 146 ENDTABLE
|
} |
} |
$result.='>'.$option.'</option>'; |
$result.='>'.$option.'</option>'; |
} |
} |
$result.='</select></label>'; |
$result.='</select></label> '; |
$result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions', |
$result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions', |
[ ['nochoice','Don\'t show option list'] ] |
[ ['nochoice',"Don't show option list"] ] |
|
,$token).' '. |
|
&Apache::edit::checked_arg('','noprompt', |
|
[ ['nochoice','Omit "Select all that are ... "' ] ] |
,$token).'</td>'; |
,$token).'</td>'; |
$result.= &Apache::edit::end_row(); |
$result.= &Apache::edit::end_row(); |
$result.= &Apache::edit::start_spanning_row(); |
$result.= &Apache::edit::start_spanning_row(); |
Line 148 ENDTABLE
|
Line 160 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 161 ENDTABLE
|
Line 176 ENDTABLE
|
$optchanged=1; |
$optchanged=1; |
} |
} |
my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval, |
my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval, |
'texoptions','checkboxvalue','checkboxoptions'); |
'texoptions','checkboxvalue','checkboxoptions', |
|
'noprompt'); |
if ($optchanged || $rebuildtag ) { |
if ($optchanged || $rebuildtag ) { |
$result = "<foilgroup options=\"("; |
$result = "<foilgroup options=\"("; |
foreach my $option (@options) { |
foreach my $option (@options) { |
Line 173 ENDTABLE
|
Line 189 ENDTABLE
|
$result.=')" '; |
$result.=')" '; |
$result .= 'texoptions="'.$token->[2]{'texoptions'}.'" '; |
$result .= 'texoptions="'.$token->[2]{'texoptions'}.'" '; |
$result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" '; |
$result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" '; |
$result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"'; |
$result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'" '; |
|
$result .= 'noprompt="'.$token->[2]{'noprompt'}.'"'; |
$result .= '>'; |
$result .= '>'; |
} # else nothing changed so just use the default mechanism |
} # else nothing changed so just use the default mechanism |
} |
} |
Line 203 sub end_foilgroup {
|
Line 220 sub end_foilgroup {
|
-2,0); |
-2,0); |
my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval); |
my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval); |
my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice'); |
my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice'); |
my $noprompt =&Apache::lonxml::get_param('noprompt', $parstack, $safeeval); |
my $noprompt=&Apache::lonxml::get_param('noprompt', $parstack, $safeeval); |
|
|
if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();} |
if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();} |
&Apache::lonxml::debug("Options are $#opt"); |
&Apache::lonxml::debug("Options are $#opt"); |
Line 427 sub whichfoils {
|
Line 444 sub whichfoils {
|
|
|
sub displayanswers { |
sub displayanswers { |
my ($max,$randomize,@opt)=@_; |
my ($max,$randomize,@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'} }; |
|
} |
|
return if (!@names); |
my @whichopt = &whichfoils($max,$randomize); |
my @whichopt = &whichfoils($max,$randomize); |
my $result; |
my $result; |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 489 sub check_for_invalid {
|
Line 509 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 510 sub displayfoils {
|
Line 533 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 550 sub displayfoils {
|
Line 580 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'}; |