version 1.68, 2008/01/30 17:50:13
|
version 1.71, 2008/09/10 10:11:14
|
Line 33 use Math::Random();
|
Line 33 use Math::Random();
|
use Apache::optionresponse(); |
use Apache::optionresponse(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
|
use Apache::lonxml; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::matchresponse',('matchresponse')); |
&Apache::lonxml::register('Apache::matchresponse',('matchresponse')); |
Line 70 sub start_matchresponse {
|
Line 71 sub start_matchresponse {
|
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
my $part_id="$Apache::inputtags::part.$id"; |
my $part_id="$Apache::inputtags::part.$id"; |
|
$Apache::lonhomework::analyze{"$part_id.type"} = 'matchresponse'; |
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, |
push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, |
1); |
1); |
Line 506 sub displayfoils {
|
Line 508 sub displayfoils {
|
$optionlist="<option></option>\n"; |
$optionlist="<option></option>\n"; |
} else { |
} else { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
$optionlist='\framebox[5 mm][s]{\tiny\strut}'; |
if($env{'form.pdfFormFields'} eq 'yes') { |
} |
my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&'; |
|
$optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname); |
|
} else { |
|
$optionlist='\framebox[10 mm][s]{\tiny\strut}'; |
|
} |
|
} |
} |
} |
my $option; |
my $option; |
foreach $option (@used_letters) { |
foreach $option (@used_letters) { |
if ($option eq $last_letter) { |
if ($option eq $last_letter) { |
if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";} |
if ($target ne 'tex') { |
|
$optionlist.="<option selected=\"on\">$option</option>\n"; |
|
} elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { |
|
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
|
} |
} else { |
} else { |
if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";} |
if ($target ne 'tex') { |
|
$optionlist.="<option>$option</option>\n"; |
|
} elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { |
|
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
|
} |
} |
} |
} |
} |
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { |
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { |
Line 557 sub displayfoils {
|
Line 572 sub displayfoils {
|
# Note that if left or right positioned, we must |
# Note that if left or right positioned, we must |
# confine the bubbles to righttabsize: |
# confine the bubbles to righttabsize: |
# |
# |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam' && $env{'form.pdfFormFields'} ne 'yes') { |
$question.=' '.$optionlist.$text."\n"; |
$question.=' '.$optionlist.$text."\n"; |
my @emptyItems = (); |
my @emptyItems = (); |
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
Line 572 sub displayfoils {
|
Line 587 sub displayfoils {
|
$question .= '\end{list} \vskip -8 mm \strut '; |
$question .= '\end{list} \vskip -8 mm \strut '; |
$internal_counter++; |
$internal_counter++; |
} else { |
} else { |
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
if($env{'form.pdfFormFields'} eq 'yes') { |
|
$question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut'; |
|
} else { |
|
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
|
} |
} |
} |
} |
} |
$temp++; |
$temp++; |
Line 718 sub end_foil {
|
Line 737 sub end_foil {
|
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
&Apache::lonxml::debug("Got a name of :$name:"); |
&Apache::lonxml::debug("Got a name of :$name:"); |
if (!$name) { |
if (!$name) { |
&Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); |
&Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.')); |
$name=$Apache::lonxml::curdepth; |
$name=$Apache::lonxml::curdepth; |
} |
} |
&Apache::lonxml::debug("Using a name of :$name:"); |
&Apache::lonxml::debug("Using a name of :$name:"); |
if (defined($Apache::response::foilnames{$name})) { |
if (defined($Apache::response::foilnames{$name})) { |
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); |
&Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",'<b><tt>'.$name.'</tt></b>')); |
} |
} |
$Apache::response::foilnames{$name}++; |
$Apache::response::foilnames{$name}++; |
my $location =&Apache::lonxml::get_param('location',$parstack, |
my $location =&Apache::lonxml::get_param('location',$parstack, |